deduplicate - and slightly optimize IndirectInclusionTest

erik-krogh · erik-krogh · commit 87167900d1f7 · 2020-05-10T22:15:37.000+02:00
diff --git a/javascript/ql/src/semmle/javascript/InclusionTests.qll b/javascript/ql/src/semmle/javascript/InclusionTests.qll
@@ -71,8 +71,7 @@ module InclusionTest {
       count(this.getACallee()) = 1 and
       count(callee.getAReturnedExpr()) = 1 and
       not this.isImprecise() and
-      inner.getContainerNode().getALocalSource().getEnclosingExpr() = callee.getAParameter() and
-      inner.getContainedNode().getALocalSource().getEnclosingExpr() = callee.getAParameter()
+      inner.getContainerNode().getALocalSource() = DataFlow::parameterNode(callee.getAParameter())
     }
 
     override DataFlow::Node getContainerNode() {

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ module InclusionTest {`
`71`	`71`	`count(this.getACallee()) = 1 and`
`72`	`72`	`count(callee.getAReturnedExpr()) = 1 and`
`73`	`73`	`not this.isImprecise() and`
`74`		`- inner.getContainerNode().getALocalSource().getEnclosingExpr() = callee.getAParameter() and`
`75`		`- inner.getContainedNode().getALocalSource().getEnclosingExpr() = callee.getAParameter()`
	`74`	`+ inner.getContainerNode().getALocalSource() = DataFlow::parameterNode(callee.getAParameter())`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`override DataFlow::Node getContainerNode() {`