JS: SharedFlowStepFromPreCallGraph

asgerf · asgerf · commit b8049f19e24f · 2021-03-23T14:53:12.000Z
diff --git a/javascript/ql/src/semmle/javascript/dataflow/internal/PreCallGraphStep.qll b/javascript/ql/src/semmle/javascript/dataflow/internal/PreCallGraphStep.qll
@@ -89,26 +89,21 @@ private class NodeWithPreCallGraphStep extends DataFlow::Node {
   }
 }
 
-private class AdditionalFlowStepFromPreCallGraph extends NodeWithPreCallGraphStep,
-  DataFlow::AdditionalFlowStep {
+private class SharedFlowStepFromPreCallGraph extends DataFlow::SharedFlowStep {
   override predicate step(DataFlow::Node pred, DataFlow::Node succ) {
-    pred = this and
-    PreCallGraphStep::step(this, succ)
+    PreCallGraphStep::step(pred, succ)
   }
 
   override predicate storeStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop) {
-    pred = this and
-    PreCallGraphStep::storeStep(this, succ, prop)
+    PreCallGraphStep::storeStep(pred, succ, prop)
   }
 
   override predicate loadStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {
-    pred = this and
-    PreCallGraphStep::loadStep(this, succ, prop)
+    PreCallGraphStep::loadStep(pred, succ, prop)
   }
 
   override predicate loadStoreStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {
-    pred = this and
-    PreCallGraphStep::loadStoreStep(this, succ, prop)
+    PreCallGraphStep::loadStoreStep(pred, succ, prop)
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -89,26 +89,21 @@ private class NodeWithPreCallGraphStep extends DataFlow::Node {`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`-private class AdditionalFlowStepFromPreCallGraph extends NodeWithPreCallGraphStep,`
`93`		`- DataFlow::AdditionalFlowStep {`
	`92`	`+private class SharedFlowStepFromPreCallGraph extends DataFlow::SharedFlowStep {`
`94`	`93`	`override predicate step(DataFlow::Node pred, DataFlow::Node succ) {`
`95`		`- pred = this and`
`96`		`- PreCallGraphStep::step(this, succ)`
	`94`	`+ PreCallGraphStep::step(pred, succ)`
`97`	`95`	`}`
`98`	`96`
`99`	`97`	`override predicate storeStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop) {`
`100`		`- pred = this and`
`101`		`- PreCallGraphStep::storeStep(this, succ, prop)`
	`98`	`+ PreCallGraphStep::storeStep(pred, succ, prop)`
`102`	`99`	`}`
`103`	`100`
`104`	`101`	`override predicate loadStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {`
`105`		`- pred = this and`
`106`		`- PreCallGraphStep::loadStep(this, succ, prop)`
	`102`	`+ PreCallGraphStep::loadStep(pred, succ, prop)`
`107`	`103`	`}`
`108`	`104`
`109`	`105`	`override predicate loadStoreStep(DataFlow::Node pred, DataFlow::Node succ, string prop) {`
`110`		`- pred = this and`
`111`		`- PreCallGraphStep::loadStoreStep(this, succ, prop)`
	`106`	`+ PreCallGraphStep::loadStoreStep(pred, succ, prop)`
`112`	`107`	`}`
`113`	`108`	`}`
`114`	`109`