JS: Fix join order

asger-semmle · asger-semmle · commit 421ad89bf9bd · 2019-07-23T17:14:56.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/JSDoc.qll b/javascript/ql/src/semmle/javascript/JSDoc.qll
@@ -445,11 +445,11 @@ module JSDoc {
      * be resolved.
      */
     DataFlow::Node getNodeFromAlias(string alias) {
-      isPrefixUsedInFile(alias, getFile()) and // Restrict size of predicate
       exists(VarDef def, VarRef ref |
         def.getContainer() = this and
         ref = def.getTarget().(BindingPattern).getABindingVarRef() and
-        ref.getName() = alias
+        ref.getName() = alias and
+        isTypenamePrefix(ref.getName()) // restrict size of predicate
       |
         exists(PropertyPattern p |
           ref = p.getValuePattern() and
@@ -480,13 +480,8 @@ module JSDoc {
     }
   }
 
-  /**
-   * Holds if a JSDoc type in `f` referenced the given local name.
-   */
-  private predicate isPrefixUsedInFile(string name, File f) {
-    exists(JSDocNamedTypeExpr t |
-      t.hasNameParts(name, _) and
-      t.getFile() = f
-    )
+  pragma[noinline]
+  private predicate isTypenamePrefix(string name) {
+    any(JSDocNamedTypeExpr expr).hasNameParts(name, _)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -445,11 +445,11 @@ module JSDoc {`
`445`	`445`	`* be resolved.`
`446`	`446`	`*/`
`447`	`447`	`DataFlow::Node getNodeFromAlias(string alias) {`
`448`		`- isPrefixUsedInFile(alias, getFile()) and // Restrict size of predicate`
`449`	`448`	`exists(VarDef def, VarRef ref \|`
`450`	`449`	`def.getContainer() = this and`
`451`	`450`	`ref = def.getTarget().(BindingPattern).getABindingVarRef() and`
`452`		`- ref.getName() = alias`
	`451`	`+ ref.getName() = alias and`
	`452`	`+ isTypenamePrefix(ref.getName()) // restrict size of predicate`
`453`	`453`	`\|`
`454`	`454`	`exists(PropertyPattern p \|`
`455`	`455`	`ref = p.getValuePattern() and`
`@@ -480,13 +480,8 @@ module JSDoc {`
`480`	`480`	`}`
`481`	`481`	`}`
`482`	`482`
`483`		`- /**`
`484`		- * Holds if a JSDoc type in `f` referenced the given local name.
`485`		`- */`
`486`		`- private predicate isPrefixUsedInFile(string name, File f) {`
`487`		`- exists(JSDocNamedTypeExpr t \|`
`488`		`- t.hasNameParts(name, _) and`
`489`		`- t.getFile() = f`
`490`		`- )`
	`483`	`+ pragma[noinline]`
	`484`	`+ private predicate isTypenamePrefix(string name) {`
	`485`	`+ any(JSDocNamedTypeExpr expr).hasNameParts(name, _)`
`491`	`486`	`}`
`492`	`487`	`}`