JS: Fix bad join order in closure

asgerf · asgerf · commit 7b7e87f17776 · 2021-03-16T13:28:11.000Z
diff --git a/javascript/ql/src/semmle/javascript/Closure.qll b/javascript/ql/src/semmle/javascript/Closure.qll
@@ -129,6 +129,11 @@ module Closure {
     container = result.getContainer()
   }
 
+  pragma[noinline]
+  private ClosureRequireCall getARequireInTopLevel(ClosureModule m) {
+    result.getTopLevel() = m
+  }
+
   /**
    * A module using the Closure module system, declared using `goog.module()` or `goog.declareModuleId()`.
    */
@@ -146,10 +151,7 @@ module Closure {
     string getClosureNamespace() { result = getModuleDeclaration().getClosureNamespace() }
 
     override Module getAnImportedModule() {
-      exists(ClosureRequireCall imprt |
-        imprt.getTopLevel() = this and
-        result.(ClosureModule).getClosureNamespace() = imprt.getClosureNamespace()
-      )
+      result.(ClosureModule).getClosureNamespace() = getARequireInTopLevel(this).getClosureNamespace()
     }
 
     /**
