QL: fix bad join

erik-krogh · erik-krogh · commit 5717a216d38b · 2021-12-17T20:22:20.000+01:00
diff --git a/ql/ql/src/codeql_ql/ast/internal/Module.qll b/ql/ql/src/codeql_ql/ast/internal/Module.qll
@@ -105,7 +105,7 @@ private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {
     (
       exists(Container c, Container parent |
         // should ideally look at `qlpack.yml` files
-        parent = imp.getLocation().getFile().getParentContainer+() and
+        parent = pragma[only_bind_out](imp.getLocation()).getFile().getParentContainer+() and
         exists(YAML::QLPack pack |
           pack.getFile().getParentContainer() = parent and
           c.getParentContainer() = pack.getADependency*().getFile().getParentContainer()
@@ -122,7 +122,8 @@ private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {
         definesModule(container, q, m, _) and
         (
           exists(container.(Folder_).getFolder().getFile("qlpack.yml")) or
-          container.(Folder_).getFolder() = imp.getLocation().getFile().getParentContainer() or
+          container.(Folder_).getFolder() =
+            pragma[only_bind_out](imp.getLocation()).getFile().getParentContainer() or
           not container instanceof Folder_
         )
       )
@@ -194,7 +195,7 @@ private module Cached {
     not m = TFile(any(File f | f.getExtension() = "ql")) and
     not exists(me.getQualifier()) and
     exists(ContainerOrModule enclosing, string name | resolveModuleExprHelper(me, enclosing, name) |
-      definesModule(enclosing.getEnclosing*(), name, m, _)
+      definesModule(enclosing, name, m, _)
     )
     or
     exists(FileOrModule mid |
@@ -205,7 +206,7 @@ private module Cached {
 
   pragma[noinline]
   private predicate resolveModuleExprHelper(ModuleExpr me, ContainerOrModule enclosing, string name) {
-    enclosing = getEnclosingModule(me) and
+    enclosing = getEnclosingModule(me).getEnclosing*() and
     name = me.getName()
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {`
`105`	`105`	`(`
`106`	`106`	`exists(Container c, Container parent \|`
`107`	`107`	// should ideally look at `qlpack.yml` files
`108`		`- parent = imp.getLocation().getFile().getParentContainer+() and`
	`108`	`+ parent = pragma[only_bind_out](imp.getLocation()).getFile().getParentContainer+() and`
`109`	`109`	`exists(YAML::QLPack pack \|`
`110`	`110`	`pack.getFile().getParentContainer() = parent and`
`111`	`111`	`c.getParentContainer() = pack.getADependency*().getFile().getParentContainer()`
`@@ -122,7 +122,8 @@ private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {`
`122`	`122`	`definesModule(container, q, m, _) and`
`123`	`123`	`(`
`124`	`124`	`exists(container.(Folder_).getFolder().getFile("qlpack.yml")) or`
`125`		`- container.(Folder_).getFolder() = imp.getLocation().getFile().getParentContainer() or`
	`125`	`+ container.(Folder_).getFolder() =`
	`126`	`+ pragma[only_bind_out](imp.getLocation()).getFile().getParentContainer() or`
`126`	`127`	`not container instanceof Folder_`
`127`	`128`	`)`
`128`	`129`	`)`
`@@ -194,7 +195,7 @@ private module Cached {`
`194`	`195`	`not m = TFile(any(File f \| f.getExtension() = "ql")) and`
`195`	`196`	`not exists(me.getQualifier()) and`
`196`	`197`	`exists(ContainerOrModule enclosing, string name \| resolveModuleExprHelper(me, enclosing, name) \|`
`197`		`- definesModule(enclosing.getEnclosing*(), name, m, _)`
	`198`	`+ definesModule(enclosing, name, m, _)`
`198`	`199`	`)`
`199`	`200`	`or`
`200`	`201`	`exists(FileOrModule mid \|`
`@@ -205,7 +206,7 @@ private module Cached {`
`205`	`206`
`206`	`207`	`pragma[noinline]`
`207`	`208`	`private predicate resolveModuleExprHelper(ModuleExpr me, ContainerOrModule enclosing, string name) {`
`208`		`- enclosing = getEnclosingModule(me) and`
	`209`	`+ enclosing = getEnclosingModule(me).getEnclosing*() and`
`209`	`210`	`name = me.getName()`
`210`	`211`	`}`
`211`	`212`	`}`