C++: Fix inconsistencies.

MathiasVP · MathiasVP · commit c35cb70c9f4e · 2023-04-28T10:40:18.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaInternals.qll
@@ -766,7 +766,8 @@ private predicate sourceVariableIsGlobal(
     sourceVariableHasBaseAndIndex(sv, base, indirectionIndex) and
     irVar = base.getIRVariable() and
     irVar.getEnclosingIRFunction() = func and
-    global = irVar.getAst()
+    global = irVar.getAst() and
+    not irVar instanceof IRDynamicInitializationFlag
   )
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dataflow-ir-consistency.expected
@@ -4,14 +4,6 @@ uniqueType
 uniqueNodeLocation
 missingLocation
 uniqueNodeToString
-| test.cpp:632:6:632:24 | Use of x indirection | Node should have one toString but has 2. |
-| test.cpp:632:6:632:24 | Use of x#init indirection | Node should have one toString but has 2. |
-| test.cpp:637:6:637:24 | Use of x indirection | Node should have one toString but has 2. |
-| test.cpp:637:6:637:24 | Use of x#init indirection | Node should have one toString but has 2. |
-| test.cpp:663:6:663:24 | Use of s indirection | Node should have one toString but has 2. |
-| test.cpp:663:6:663:24 | Use of s#init indirection | Node should have one toString but has 2. |
-| test.cpp:669:6:669:24 | Use of s indirection | Node should have one toString but has 2. |
-| test.cpp:669:6:669:24 | Use of s#init indirection | Node should have one toString but has 2. |
 missingToString
 parameterCallable
 localFlowIsLocal

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,8 @@ private predicate sourceVariableIsGlobal(`
`766`	`766`	`sourceVariableHasBaseAndIndex(sv, base, indirectionIndex) and`
`767`	`767`	`irVar = base.getIRVariable() and`
`768`	`768`	`irVar.getEnclosingIRFunction() = func and`
`769`		`- global = irVar.getAst()`
	`769`	`+ global = irVar.getAst() and`
	`770`	`+ not irVar instanceof IRDynamicInitializationFlag`
`770`	`771`	`)`
`771`	`772`	`}`
`772`	`773`