fix getName() on module instantiations

erik-krogh · erik-krogh · commit 115110475d3b · 2022-06-19T20:09:32.000+02:00
diff --git a/ql/ql/src/codeql_ql/ast/Ast.qll b/ql/ql/src/codeql_ql/ast/Ast.qll
@@ -2226,7 +2226,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {
     or
     not exists(me.getName()) and result = me.getChild().(QL::SimpleId).getValue()
     or
-    result = me.getChild().(QL::ModuleInstantiation).getName().getChild().getValue()
+    result = me.getAFieldOrChild().(QL::ModuleInstantiation).getName().getChild().getValue()
   }
 
   /**
@@ -2261,7 +2261,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {
    * The result is either a `PredicateExpr` or a `TypeExpr`.
    */
   SignatureExpr getArgument(int i) {
-    result.toQL() = me.getChild().(QL::ModuleInstantiation).getChild(i)
+    result.toQL() = me.getAFieldOrChild().(QL::ModuleInstantiation).getChild(i)
   }
 }
 
diff --git a/ql/ql/src/codeql_ql/ast/internal/Module.qll b/ql/ql/src/codeql_ql/ast/internal/Module.qll
@@ -332,7 +332,19 @@ module ModConsistency {
    *  }
    */
 
-  query predicate noName(Module mod) { not exists(mod.getName()) }
+  query predicate noName(AstNode mod) {
+    mod instanceof Module and
+    not exists(mod.(Module).getName())
+    or
+    mod instanceof ModuleExpr and
+    not exists(mod.(ModuleExpr).getName())
+  }
 
-  query predicate nonUniqueName(Module mod) { count(mod.getName()) >= 2 }
+  query predicate nonUniqueName(AstNode mod) {
+    mod instanceof Module and
+    count(mod.(Module).getName()) >= 2
+    or
+    mod instanceof ModuleExpr and
+    count(mod.(ModuleExpr).getName()) >= 2
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -2226,7 +2226,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {`
`2226`	`2226`	`or`
`2227`	`2227`	`not exists(me.getName()) and result = me.getChild().(QL::SimpleId).getValue()`
`2228`	`2228`	`or`
`2229`		`- result = me.getChild().(QL::ModuleInstantiation).getName().getChild().getValue()`
	`2229`	`+ result = me.getAFieldOrChild().(QL::ModuleInstantiation).getName().getChild().getValue()`
`2230`	`2230`	`}`
`2231`	`2231`
`2232`	`2232`	`/**`
`@@ -2261,7 +2261,7 @@ class ModuleExpr extends TModuleExpr, TypeRef {`
`2261`	`2261`	* The result is either a `PredicateExpr` or a `TypeExpr`.
`2262`	`2262`	`*/`
`2263`	`2263`	`SignatureExpr getArgument(int i) {`
`2264`		`- result.toQL() = me.getChild().(QL::ModuleInstantiation).getChild(i)`
	`2264`	`+ result.toQL() = me.getAFieldOrChild().(QL::ModuleInstantiation).getChild(i)`
`2265`	`2265`	`}`
`2266`	`2266`	`}`
`2267`	`2267`