comments about what we resolve, and remove a debug comment

erik-krogh · erik-krogh · commit 2b5af15d8077 · 2022-06-17T09:09:58.000+02:00
diff --git a/ql/ql/src/codeql_ql/ast/internal/Module.qll b/ql/ql/src/codeql_ql/ast/internal/Module.qll
@@ -114,7 +114,6 @@ class Module_ extends FileOrModule, TModule {
   }
 }
 
-// class ModuleRef = AstNodes::TModuleExpr or AstNodes::TType;
 private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {
   not m = TFile(any(File f | f.getExtension() = "ql")) and
   exists(string q | q = imp.getQualifiedName(i) |
@@ -264,8 +263,10 @@ private predicate definesModule(
     public = false and
     ty = sig.asModuleRef()
   |
+    // resolve to the signature module
     m = ty.getResolvedModule()
     or
+    // resolve to the arguments of the instantiated module
     exists(ModuleExpr inst | inst.getResolvedModule().asModule() = mod |
       m = inst.getArgument(i).asModuleRef().getResolvedModule()
     )
diff --git a/ql/ql/src/codeql_ql/ast/internal/Predicate.qll b/ql/ql/src/codeql_ql/ast/internal/Predicate.qll
@@ -74,8 +74,10 @@ private module Cached {
       mod.hasParameter(i, pc.getPredicateName(), sig) and
       sig.getArity() = pc.getNumberOfArguments()
     |
+      // resolve to the signature predicate
       p = sig.getResolvedPredicate() // <- this is a `signature predicate`, but that's fine.
       or
+      // resolve to the instantiations
       exists(ModuleExpr inst, SignatureExpr arg | inst.getResolvedModule().asModule() = mod |
         arg = inst.getArgument(i) and
         p = arg.asPredicate().getResolvedPredicate()
diff --git a/ql/ql/src/codeql_ql/ast/internal/Type.qll b/ql/ql/src/codeql_ql/ast/internal/Type.qll
@@ -330,10 +330,10 @@ private predicate defines(FileOrModule m, string name, Type t, boolean public) {
     mod.hasParameter(i, name, param) and
     public = true
   |
-    // we resolve it both to the signature type
+    // resolve to the signature class
     t = param.asType().getResolvedType()
     or
-    // or any instantiated type
+    // resolve to the instantiations
     exists(ModuleExpr inst, SignatureExpr arg |
       inst.getArgument(i) = arg and
       inst.getResolvedModule() = m and

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ class Module_ extends FileOrModule, TModule {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`-// class ModuleRef = AstNodes::TModuleExpr or AstNodes::TType;`
`118`	`117`	`private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {`
`119`	`118`	`not m = TFile(any(File f \| f.getExtension() = "ql")) and`
`120`	`119`	`exists(string q \| q = imp.getQualifiedName(i) \|`
`@@ -264,8 +263,10 @@ private predicate definesModule(`
`264`	`263`	`public = false and`
`265`	`264`	`ty = sig.asModuleRef()`
`266`	`265`	`\|`
	`266`	`+ // resolve to the signature module`
`267`	`267`	`m = ty.getResolvedModule()`
`268`	`268`	`or`
	`269`	`+ // resolve to the arguments of the instantiated module`
`269`	`270`	`exists(ModuleExpr inst \| inst.getResolvedModule().asModule() = mod \|`
`270`	`271`	`m = inst.getArgument(i).asModuleRef().getResolvedModule()`
`271`	`272`	`)`