joiner order fixes

erik-krogh · erik-krogh · commit 35c7fa58a775 · 2022-03-30T22:54:00.000+02:00
diff --git a/python/ql/lib/semmle/python/Import.qll b/python/ql/lib/semmle/python/Import.qll
@@ -1,5 +1,6 @@
 import python
 private import semmle.python.types.Builtins
+private import semmle.python.internal.CachedStages
 
 /**
  * An alias in an import statement, the `mod as name` part of `import mod as name`. May be artificial;
@@ -203,7 +204,9 @@ class Import extends Import_ {
 /** An import * statement */
 class ImportStar extends ImportStar_ {
   /* syntax: from modname import * */
+  cached
   ImportExpr getModuleExpr() {
+    Stages::AST::ref() and
     result = this.getModule()
     or
     result = this.getModule().(ImportMember).getModule()
diff --git a/python/ql/lib/semmle/python/objects/ObjectAPI.qll b/python/ql/lib/semmle/python/objects/ObjectAPI.qll
@@ -263,6 +263,7 @@ module Value {
    * object of that name.
    * For example `Value::named("len")` is the `Value` representing the `len` built-in function.
    */
+  pragma[nomagic]
   Value named(string name) {
     exists(string modname, string attrname | name = modname + "." + attrname |
       result = Module::named(modname).attr(attrname)
