C++: Only create variables in FunctionIRs

jbj · jbj · commit 3e0383563070 · 2019-02-04T19:34:16.000+01:00
The previous commit had the side effect that `IRVariable`s were created
for all `Functions`, including those that did not have IR. This commit
restricts all `TIRVariable` constructors to functions that have IR.
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/TIRVariable.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/TIRVariable.qll
@@ -4,10 +4,12 @@ private import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as
 
 newtype TIRVariable =
   TIRAutomaticUserVariable(LocalScopeVariable var, Function func) {
+    Construction::functionHasIR(func) and
     var.getFunction() = func or
     var.(Parameter).getCatchBlock().getEnclosingFunction() = func
   } or
   TIRStaticUserVariable(Variable var, Function func) {
+    Construction::functionHasIR(func) and
     (
       var instanceof GlobalOrNamespaceVariable or
       var instanceof MemberVariable and not var instanceof Field
