C++: sync and accept new consistency test

2025-12-24 04:36:35 +01:00 · 2022-04-29 15:29:07 -04:00
parent d1c6022efc
commit fe52dd93ef
21 changed files with 183 additions and 133 deletions
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRConsistency.qll
@@ -524,4 +524,23 @@ module InstructionConsistency {
        "' has a `this` argument operand that is not an address, in function '$@'." and
    irFunc = getInstructionIRFunction(instr, irFuncText)
  }
+
+  query predicate nonUniqueIRVariable(
+    Instruction instr, string message, OptionalIRFunction irFunc, string irFuncText
+  ) {
+    exists(VariableInstruction vi, IRVariable v1, IRVariable v2 |
+      instr = vi and vi.getIRVariable() = v1 and vi.getIRVariable() = v2 and v1 != v2
+    ) and
+    message =
+      "Variable instruction '" + instr.toString() +
+        "' has multiple associated variables, in function '$@'." and
+    irFunc = getInstructionIRFunction(instr, irFuncText)
+    or
+    instr.getOpcode() instanceof Opcode::VariableAddress and
+    not instr instanceof VariableInstruction and
+    message =
+      "Variable address instruction '" + instr.toString() +
+        "' has no associated variable, in function '$@'." and
+    irFunc = getInstructionIRFunction(instr, irFuncText)
+  }
 }
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRConsistency.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRConsistency.qll
@@ -524,4 +524,23 @@ module InstructionConsistency {
        "' has a `this` argument operand that is not an address, in function '$@'." and
    irFunc = getInstructionIRFunction(instr, irFuncText)
  }
+
+  query predicate nonUniqueIRVariable(
+    Instruction instr, string message, OptionalIRFunction irFunc, string irFuncText
+  ) {
+    exists(VariableInstruction vi, IRVariable v1, IRVariable v2 |
+      instr = vi and vi.getIRVariable() = v1 and vi.getIRVariable() = v2 and v1 != v2
+    ) and
+    message =
+      "Variable instruction '" + instr.toString() +
+        "' has multiple associated variables, in function '$@'." and
+    irFunc = getInstructionIRFunction(instr, irFuncText)
+    or
+    instr.getOpcode() instanceof Opcode::VariableAddress and
+    not instr instanceof VariableInstruction and
+    message =
+      "Variable address instruction '" + instr.toString() +
+        "' has no associated variable, in function '$@'." and
+    irFunc = getInstructionIRFunction(instr, irFuncText)
+  }
 }
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_consistency_unsound.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
+++ b/cpp/ql/test/library-tests/ir/ir/operand_locations.expected
@@ -4841,6 +4841,9 @@
 | ir.cpp:1043:24:1043:24 | SideEffect | ~m1043_20 |
 | ir.cpp:1043:31:1043:31 | Address | &:r1043_9 |
 | ir.cpp:1043:36:1043:55 | Address | &:r1043_11 |
+| ir.cpp:1043:43:1043:43 | Address | &:r1043_16 |
+| ir.cpp:1043:43:1043:43 | Arg(this) | this:r1043_16 |
+| ir.cpp:1043:43:1043:43 | SideEffect | ~m1043_20 |
 | ir.cpp:1043:43:1043:54 | Address | &:r1043_22 |
 | ir.cpp:1043:43:1043:54 | Address | &:r1043_24 |
 | ir.cpp:1043:43:1043:54 | Address | &:r1043_25 |
@@ -4861,11 +4864,8 @@
 | ir.cpp:1043:45:1043:49 | SideEffect | ~m1043_4 |
 | ir.cpp:1043:45:1043:49 | Unary | r1043_13 |
 | ir.cpp:1043:45:1043:49 | Unary | r1043_15 |
-| ir.cpp:1043:52:1043:52 | Address | &:r1043_16 |
-| ir.cpp:1043:52:1043:52 | Arg(this) | this:r1043_16 |
-| ir.cpp:1043:52:1043:52 | SideEffect | ~m1043_20 |
-| ir.cpp:1043:54:1043:54 | Load | ~m1043_20 |
-| ir.cpp:1043:54:1043:54 | Right | r1043_26 |
+| ir.cpp:1043:53:1043:53 | Load | ~m1043_20 |
+| ir.cpp:1043:53:1043:53 | Right | r1043_26 |
 | ir.cpp:1043:58:1043:58 | ChiPartial | partial:m1043_9 |
 | ir.cpp:1043:58:1043:58 | ChiTotal | total:m1043_3 |
 | ir.cpp:1043:58:1043:58 | StoreValue | r1043_8 |
@@ -4980,6 +4980,9 @@
 | ir.cpp:1047:34:1047:34 | SideEffect | ~m1047_20 |
 | ir.cpp:1047:41:1047:41 | Address | &:r1047_9 |
 | ir.cpp:1047:46:1047:65 | Address | &:r1047_11 |
+| ir.cpp:1047:53:1047:53 | Address | &:r1047_16 |
+| ir.cpp:1047:53:1047:53 | Arg(this) | this:r1047_16 |
+| ir.cpp:1047:53:1047:53 | SideEffect | ~m1047_20 |
 | ir.cpp:1047:53:1047:64 | Address | &:r1047_23 |
 | ir.cpp:1047:53:1047:64 | Load | ~m1047_20 |
 | ir.cpp:1047:53:1047:64 | StoreValue | r1047_24 |
@@ -4994,9 +4997,6 @@
 | ir.cpp:1047:55:1047:59 | SideEffect | ~m1047_4 |
 | ir.cpp:1047:55:1047:59 | Unary | r1047_13 |
 | ir.cpp:1047:55:1047:59 | Unary | r1047_15 |
-| ir.cpp:1047:62:1047:62 | Address | &:r1047_16 |
-| ir.cpp:1047:62:1047:62 | Arg(this) | this:r1047_16 |
-| ir.cpp:1047:62:1047:62 | SideEffect | ~m1047_20 |
 | ir.cpp:1047:63:1047:63 | Right | r1047_22 |
 | ir.cpp:1047:68:1047:68 | StoreValue | r1047_8 |
 | ir.cpp:1047:68:1047:68 | Unary | r1047_7 |
@@ -5105,6 +5105,9 @@
 | ir.cpp:1051:39:1051:39 | SideEffect | ~m1051_20 |
 | ir.cpp:1051:46:1051:46 | Address | &:r1051_9 |
 | ir.cpp:1051:51:1051:70 | Address | &:r1051_11 |
+| ir.cpp:1051:58:1051:58 | Address | &:r1051_16 |
+| ir.cpp:1051:58:1051:58 | Arg(this) | this:r1051_16 |
+| ir.cpp:1051:58:1051:58 | SideEffect | ~m1051_20 |
 | ir.cpp:1051:58:1051:69 | Address | &:r1051_22 |
 | ir.cpp:1051:58:1051:69 | Address | &:r1051_24 |
 | ir.cpp:1051:58:1051:69 | Address | &:r1051_26 |
@@ -5125,9 +5128,6 @@
 | ir.cpp:1051:60:1051:64 | SideEffect | ~m1051_4 |
 | ir.cpp:1051:60:1051:64 | Unary | r1051_13 |
 | ir.cpp:1051:60:1051:64 | Unary | r1051_15 |
-| ir.cpp:1051:67:1051:67 | Address | &:r1051_16 |
-| ir.cpp:1051:67:1051:67 | Arg(this) | this:r1051_16 |
-| ir.cpp:1051:67:1051:67 | SideEffect | ~m1051_20 |
 | ir.cpp:1051:73:1051:73 | ChiPartial | partial:m1051_9 |
 | ir.cpp:1051:73:1051:73 | ChiTotal | total:m1051_3 |
 | ir.cpp:1051:73:1051:73 | StoreValue | r1051_8 |
@@ -5192,6 +5192,9 @@
 | ir.cpp:1054:49:1054:49 | SideEffect | ~m1054_20 |
 | ir.cpp:1054:56:1054:56 | Address | &:r1054_9 |
 | ir.cpp:1054:61:1054:88 | Address | &:r1054_11 |
+| ir.cpp:1054:68:1054:68 | Address | &:r1054_16 |
+| ir.cpp:1054:68:1054:68 | Arg(this) | this:r1054_16 |
+| ir.cpp:1054:68:1054:68 | SideEffect | ~m1054_20 |
 | ir.cpp:1054:68:1054:87 | Address | &:r1054_37 |
 | ir.cpp:1054:68:1054:87 | Load | ~m1054_20 |
 | ir.cpp:1054:68:1054:87 | StoreValue | r1054_38 |
@@ -5206,9 +5209,6 @@
 | ir.cpp:1054:70:1054:74 | SideEffect | ~m1054_4 |
 | ir.cpp:1054:70:1054:74 | Unary | r1054_13 |
 | ir.cpp:1054:70:1054:74 | Unary | r1054_15 |
-| ir.cpp:1054:77:1054:77 | Address | &:r1054_16 |
-| ir.cpp:1054:77:1054:77 | Arg(this) | this:r1054_16 |
-| ir.cpp:1054:77:1054:77 | SideEffect | ~m1054_20 |
 | ir.cpp:1054:78:1054:82 | Address | &:r1054_22 |
 | ir.cpp:1054:78:1054:82 | Address | &:r1054_24 |
 | ir.cpp:1054:78:1054:82 | Left | r1054_25 |
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -5654,11 +5654,11 @@ ir.cpp:
 # 1038|   Block 0
 # 1038|     v1038_1(void)                             = EnterFunction                 : 
 # 1038|     mu1038_2(unknown)                         = AliasedDefinition             : 
-# 1038|     r1038_3(glval<decltype([...](...){...})>) = VariableAddress               : 
+# 1038|     r1038_3(glval<decltype([...](...){...})>) = VariableAddress[lam]          : 
 # 1038|     r1038_4(glval<decltype([...](...){...})>) = VariableAddress[#temp1038:12] : 
 # 1038|     mu1038_5(decltype([...](...){...}))       = Uninitialized[#temp1038:12]   : &:r1038_4
 # 1038|     r1038_6(decltype([...](...){...}))        = Load[#temp1038:12]            : &:r1038_4, ~m?
-# 1038|     mu1038_7(decltype([...](...){...}))       = Store[?]                      : &:r1038_3, r1038_6
+# 1038|     mu1038_7(decltype([...](...){...}))       = Store[lam]                    : &:r1038_3, r1038_6
 # 1038|     v1038_8(void)                             = ReturnVoid                    : 
 # 1038|     v1038_9(void)                             = AliasedUse                    : ~m?
 # 1038|     v1038_10(void)                            = ExitFunction                  : 
@@ -9433,31 +9433,31 @@ ir.cpp:

 # 1759| int global_2
 # 1759|   Block 0
-# 1759|     v1759_1(void)       = EnterFunction     : 
-# 1759|     mu1759_2(unknown)   = AliasedDefinition : 
-# 1759|     r1759_3(glval<int>) = VariableAddress   : 
-# 1759|     r1759_4(int)        = Constant[1]       : 
-# 1759|     mu1759_5(int)       = Store[?]          : &:r1759_3, r1759_4
-# 1759|     v1759_6(void)       = ReturnVoid        : 
-# 1759|     v1759_7(void)       = AliasedUse        : ~m?
-# 1759|     v1759_8(void)       = ExitFunction      : 
+# 1759|     v1759_1(void)       = EnterFunction             : 
+# 1759|     mu1759_2(unknown)   = AliasedDefinition         : 
+# 1759|     r1759_3(glval<int>) = VariableAddress[global_2] : 
+# 1759|     r1759_4(int)        = Constant[1]               : 
+# 1759|     mu1759_5(int)       = Store[global_2]           : &:r1759_3, r1759_4
+# 1759|     v1759_6(void)       = ReturnVoid                : 
+# 1759|     v1759_7(void)       = AliasedUse                : ~m?
+# 1759|     v1759_8(void)       = ExitFunction              : 

 # 1761| int const global_3
 # 1761|   Block 0
-# 1761|     v1761_1(void)       = EnterFunction     : 
-# 1761|     mu1761_2(unknown)   = AliasedDefinition : 
-# 1761|     r1761_3(glval<int>) = VariableAddress   : 
-# 1761|     r1761_4(int)        = Constant[2]       : 
-# 1761|     mu1761_5(int)       = Store[?]          : &:r1761_3, r1761_4
-# 1761|     v1761_6(void)       = ReturnVoid        : 
-# 1761|     v1761_7(void)       = AliasedUse        : ~m?
-# 1761|     v1761_8(void)       = ExitFunction      : 
+# 1761|     v1761_1(void)       = EnterFunction             : 
+# 1761|     mu1761_2(unknown)   = AliasedDefinition         : 
+# 1761|     r1761_3(glval<int>) = VariableAddress[global_3] : 
+# 1761|     r1761_4(int)        = Constant[2]               : 
+# 1761|     mu1761_5(int)       = Store[global_3]           : &:r1761_3, r1761_4
+# 1761|     v1761_6(void)       = ReturnVoid                : 
+# 1761|     v1761_7(void)       = AliasedUse                : ~m?
+# 1761|     v1761_8(void)       = ExitFunction              : 

 # 1763| constructor_only global_4
 # 1763|   Block 0
 # 1763|     v1763_1(void)                    = EnterFunction                     : 
 # 1763|     mu1763_2(unknown)                = AliasedDefinition                 : 
-# 1763|     r1763_3(glval<constructor_only>) = VariableAddress                   : 
+# 1763|     r1763_3(glval<constructor_only>) = VariableAddress[global_4]         : 
 # 1763|     r1763_4(glval<unknown>)          = FunctionAddress[constructor_only] : 
 # 1763|     r1763_5(int)                     = Constant[1]                       : 
 # 1763|     v1763_6(void)                    = Call[constructor_only]            : func:r1763_4, this:r1763_3, 0:r1763_5
@@ -9471,7 +9471,7 @@ ir.cpp:
 # 1765|   Block 0
 # 1765|     v1765_1(void)                    = EnterFunction                     : 
 # 1765|     mu1765_2(unknown)                = AliasedDefinition                 : 
-# 1765|     r1765_3(glval<constructor_only>) = VariableAddress                   : 
+# 1765|     r1765_3(glval<constructor_only>) = VariableAddress[global_5]         : 
 # 1765|     r1765_4(glval<unknown>)          = FunctionAddress[constructor_only] : 
 # 1765|     r1765_5(int)                     = Constant[2]                       : 
 # 1765|     v1765_6(void)                    = Call[constructor_only]            : func:r1765_4, this:r1765_3, 0:r1765_5
@@ -9485,11 +9485,11 @@ ir.cpp:
 # 1767|   Block 0
 # 1767|     v1767_1(void)            = EnterFunction                   : 
 # 1767|     mu1767_2(unknown)        = AliasedDefinition               : 
-# 1767|     r1767_3(glval<char *>)   = VariableAddress                 : 
+# 1767|     r1767_3(glval<char *>)   = VariableAddress[global_string]  : 
 # 1767|     r1767_4(glval<char[14]>) = StringConstant["global string"] : 
 # 1767|     r1767_5(char *)          = Convert                         : r1767_4
 # 1767|     r1767_6(char *)          = Convert                         : r1767_5
-# 1767|     mu1767_7(char *)         = Store[?]                        : &:r1767_3, r1767_6
+# 1767|     mu1767_7(char *)         = Store[global_string]            : &:r1767_3, r1767_6
 # 1767|     v1767_8(void)            = ReturnVoid                      : 
 # 1767|     v1767_9(void)            = AliasedUse                      : ~m?
 # 1767|     v1767_10(void)           = ExitFunction                    : 
@@ -9717,31 +9717,31 @@ smart_ptr.cpp:
 struct_init.cpp:
 #    9| Info infos_in_file[]
 #    9|   Block 0
-#    9|     v9_1(void)              = EnterFunction             : 
-#    9|     mu9_2(unknown)          = AliasedDefinition         : 
-#    9|     r9_3(glval<Info[]>)     = VariableAddress           : 
-#    9|     r9_4(int)               = Constant[0]               : 
-#    9|     r9_5(glval<Info>)       = PointerAdd[16]            : r9_3, r9_4
-#   10|     r10_1(glval<char *>)    = FieldAddress[name]        : r9_5
-#   10|     r10_2(glval<char[2]>)   = StringConstant["1"]       : 
-#   10|     r10_3(char *)           = Convert                   : r10_2
-#   10|     mu10_4(char *)          = Store[?]                  : &:r10_1, r10_3
-#   10|     r10_5(glval<..(*)(..)>) = FieldAddress[handler]     : r9_5
-#   10|     r10_6(..(*)(..))        = FunctionAddress[handler1] : 
-#   10|     mu10_7(..(*)(..))       = Store[?]                  : &:r10_5, r10_6
-#    9|     r9_6(int)               = Constant[1]               : 
-#    9|     r9_7(glval<Info>)       = PointerAdd[16]            : r9_3, r9_6
-#   11|     r11_1(glval<char *>)    = FieldAddress[name]        : r9_7
-#   11|     r11_2(glval<char[2]>)   = StringConstant["3"]       : 
-#   11|     r11_3(char *)           = Convert                   : r11_2
-#   11|     mu11_4(char *)          = Store[?]                  : &:r11_1, r11_3
-#   11|     r11_5(glval<..(*)(..)>) = FieldAddress[handler]     : r9_7
-#   11|     r11_6(glval<..()(..)>)  = FunctionAddress[handler2] : 
-#   11|     r11_7(..(*)(..))        = CopyValue                 : r11_6
-#   11|     mu11_8(..(*)(..))       = Store[?]                  : &:r11_5, r11_7
-#    9|     v9_8(void)              = ReturnVoid                : 
-#    9|     v9_9(void)              = AliasedUse                : ~m?
-#    9|     v9_10(void)             = ExitFunction              : 
+#    9|     v9_1(void)              = EnterFunction                  : 
+#    9|     mu9_2(unknown)          = AliasedDefinition              : 
+#    9|     r9_3(glval<Info[]>)     = VariableAddress[infos_in_file] : 
+#    9|     r9_4(int)               = Constant[0]                    : 
+#    9|     r9_5(glval<Info>)       = PointerAdd[16]                 : r9_3, r9_4
+#   10|     r10_1(glval<char *>)    = FieldAddress[name]             : r9_5
+#   10|     r10_2(glval<char[2]>)   = StringConstant["1"]            : 
+#   10|     r10_3(char *)           = Convert                        : r10_2
+#   10|     mu10_4(char *)          = Store[?]                       : &:r10_1, r10_3
+#   10|     r10_5(glval<..(*)(..)>) = FieldAddress[handler]          : r9_5
+#   10|     r10_6(..(*)(..))        = FunctionAddress[handler1]      : 
+#   10|     mu10_7(..(*)(..))       = Store[?]                       : &:r10_5, r10_6
+#    9|     r9_6(int)               = Constant[1]                    : 
+#    9|     r9_7(glval<Info>)       = PointerAdd[16]                 : r9_3, r9_6
+#   11|     r11_1(glval<char *>)    = FieldAddress[name]             : r9_7
+#   11|     r11_2(glval<char[2]>)   = StringConstant["3"]            : 
+#   11|     r11_3(char *)           = Convert                        : r11_2
+#   11|     mu11_4(char *)          = Store[?]                       : &:r11_1, r11_3
+#   11|     r11_5(glval<..(*)(..)>) = FieldAddress[handler]          : r9_7
+#   11|     r11_6(glval<..()(..)>)  = FunctionAddress[handler2]      : 
+#   11|     r11_7(..(*)(..))        = CopyValue                      : r11_6
+#   11|     mu11_8(..(*)(..))       = Store[?]                       : &:r11_5, r11_7
+#    9|     v9_8(void)              = ReturnVoid                     : 
+#    9|     v9_9(void)              = AliasedUse                     : ~m?
+#    9|     v9_10(void)             = ExitFunction                   : 

 #   16| void let_info_escape(Info*)
 #   16|   Block 0
--- a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_consistency_unsound.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency_unsound.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency_unsound.expected
+++ b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_consistency_unsound.expected
@@ -23,6 +23,7 @@ invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
 thisArgumentIsNonPointer
+nonUniqueIRVariable
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_consistency.expected
@@ -4,8 +4,6 @@ unexpectedOperand
 duplicateOperand
 missingPhiOperand
 missingOperandType
-| cpp11.cpp:36:18:36:18 | ChiTotal | Operand 'ChiTotal' of instruction 'Chi' is missing a type in function '$@'. | cpp11.cpp:36:5:36:14 | int global_int | int global_int |
-| misc.c:210:24:210:28 | ChiTotal | Operand 'ChiTotal' of instruction 'Chi' is missing a type in function '$@'. | misc.c:210:5:210:20 | int global_with_init | int global_with_init |
 duplicateChiOperand
 sideEffectWithoutPrimary
 instructionWithoutSuccessor
@@ -93,8 +91,6 @@ useNotDominatedByDefinition
 switchInstructionWithoutDefaultEdge
 notMarkedAsConflated
 wronglyMarkedAsConflated
-| cpp11.cpp:36:18:36:18 | Chi: 5 | Instruction 'Chi: 5' should not be marked as having a conflated result in function '$@'. | cpp11.cpp:36:5:36:14 | int global_int | int global_int |
-| misc.c:210:24:210:28 | Chi: ... + ... | Instruction 'Chi: ... + ...' should not be marked as having a conflated result in function '$@'. | misc.c:210:5:210:20 | int global_with_init | int global_with_init |
 invalidOverlap
 nonUniqueEnclosingIRFunction
 fieldAddressOnNonPointer
@@ -102,6 +98,9 @@ thisArgumentIsNonPointer
 | pmcallexpr.cpp:8:2:8:15 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | array_delete.cpp:5:6:5:6 | void f() | void f() |
 | pointer_to_member.cpp:23:5:23:54 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 | pointer_to_member.cpp:24:5:24:49 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
+nonUniqueIRVariable
+| misc.c:178:22:178:40 | VariableAddress: __PRETTY_FUNCTION__ | Variable address instruction 'VariableAddress: __PRETTY_FUNCTION__' has no associated variable, in function '$@'. | misc.c:177:6:177:14 | void magicvars() | void magicvars() |
+| misc.c:179:27:179:34 | VariableAddress: __func__ | Variable address instruction 'VariableAddress: __func__' has no associated variable, in function '$@'. | misc.c:177:6:177:14 | void magicvars() | void magicvars() |
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/dataflow-ir-consistency.expected
@@ -1,45 +1,4 @@
 uniqueEnclosingCallable
-| cpp11.cpp:35:11:35:22 | Address | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:11:35:22 | AliasedDefinition | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:11:35:22 | VariableAddress | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:11:35:22 | VariableAddress [post update] | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:26:35:26 | 5 | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:26:35:26 | ChiPartial | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:26:35:26 | ChiTotal | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:26:35:26 | Store | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:35:26:35:26 | StoreValue | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:36:5:36:14 | Address | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:36:5:36:14 | VariableAddress | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:36:5:36:14 | VariableAddress [post update] | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:36:18:36:18 | 5 | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:36:18:36:18 | ChiPartial | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:36:18:36:18 | Store | Node should have one enclosing callable but has 0. |
-| cpp11.cpp:36:18:36:18 | StoreValue | Node should have one enclosing callable but has 0. |
-| misc.c:10:5:10:13 | Address | Node should have one enclosing callable but has 0. |
-| misc.c:10:5:10:13 | AliasedDefinition | Node should have one enclosing callable but has 0. |
-| misc.c:10:5:10:13 | VariableAddress | Node should have one enclosing callable but has 0. |
-| misc.c:10:5:10:13 | VariableAddress [post update] | Node should have one enclosing callable but has 0. |
-| misc.c:10:17:10:17 | 1 | Node should have one enclosing callable but has 0. |
-| misc.c:10:17:10:17 | ChiPartial | Node should have one enclosing callable but has 0. |
-| misc.c:10:17:10:17 | ChiTotal | Node should have one enclosing callable but has 0. |
-| misc.c:10:17:10:17 | Store | Node should have one enclosing callable but has 0. |
-| misc.c:10:17:10:17 | StoreValue | Node should have one enclosing callable but has 0. |
-| misc.c:11:5:11:13 | Address | Node should have one enclosing callable but has 0. |
-| misc.c:11:5:11:13 | AliasedDefinition | Node should have one enclosing callable but has 0. |
-| misc.c:11:5:11:13 | VariableAddress | Node should have one enclosing callable but has 0. |
-| misc.c:11:5:11:13 | VariableAddress [post update] | Node should have one enclosing callable but has 0. |
-| misc.c:11:17:11:21 | ... + ... | Node should have one enclosing callable but has 0. |
-| misc.c:11:17:11:21 | ChiPartial | Node should have one enclosing callable but has 0. |
-| misc.c:11:17:11:21 | ChiTotal | Node should have one enclosing callable but has 0. |
-| misc.c:11:17:11:21 | Store | Node should have one enclosing callable but has 0. |
-| misc.c:11:17:11:21 | StoreValue | Node should have one enclosing callable but has 0. |
-| misc.c:210:5:210:20 | Address | Node should have one enclosing callable but has 0. |
-| misc.c:210:5:210:20 | VariableAddress | Node should have one enclosing callable but has 0. |
-| misc.c:210:5:210:20 | VariableAddress [post update] | Node should have one enclosing callable but has 0. |
-| misc.c:210:24:210:28 | ... + ... | Node should have one enclosing callable but has 0. |
-| misc.c:210:24:210:28 | ChiPartial | Node should have one enclosing callable but has 0. |
-| misc.c:210:24:210:28 | Store | Node should have one enclosing callable but has 0. |
-| misc.c:210:24:210:28 | StoreValue | Node should have one enclosing callable but has 0. |
 uniqueType
 uniqueNodeLocation
 | aggregateinitializer.c:1:6:1:6 | AliasedDefinition | Node should have one location but has 20. |
--- a/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/raw_consistency.expected
@@ -148,6 +148,9 @@ thisArgumentIsNonPointer
 | pmcallexpr.cpp:8:2:8:15 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | array_delete.cpp:5:6:5:6 | void f() | void f() |
 | pointer_to_member.cpp:23:5:23:54 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 | pointer_to_member.cpp:24:5:24:49 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
+nonUniqueIRVariable
+| misc.c:178:22:178:40 | VariableAddress: __PRETTY_FUNCTION__ | Variable address instruction 'VariableAddress: __PRETTY_FUNCTION__' has no associated variable, in function '$@'. | misc.c:177:6:177:14 | void magicvars() | void magicvars() |
+| misc.c:179:27:179:34 | VariableAddress: __func__ | Variable address instruction 'VariableAddress: __func__' has no associated variable, in function '$@'. | misc.c:177:6:177:14 | void magicvars() | void magicvars() |
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected
+++ b/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_consistency.expected
@@ -98,6 +98,9 @@ thisArgumentIsNonPointer
 | pmcallexpr.cpp:8:2:8:15 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | array_delete.cpp:5:6:5:6 | void f() | void f() |
 | pointer_to_member.cpp:23:5:23:54 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
 | pointer_to_member.cpp:24:5:24:49 | Call: call to expression | Call instruction 'Call: call to expression' has a `this` argument operand that is not an address, in function '$@'. | pointer_to_member.cpp:14:5:14:9 | int usePM(int PM::*) | int usePM(int PM::*) |
+nonUniqueIRVariable
+| misc.c:178:22:178:40 | VariableAddress: __PRETTY_FUNCTION__ | Variable address instruction 'VariableAddress: __PRETTY_FUNCTION__' has no associated variable, in function '$@'. | misc.c:177:6:177:14 | void magicvars() | void magicvars() |
+| misc.c:179:27:179:34 | VariableAddress: __func__ | Variable address instruction 'VariableAddress: __func__' has no associated variable, in function '$@'. | misc.c:177:6:177:14 | void magicvars() | void magicvars() |
 missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
--- a/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected
+++ b/cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ir_gvn.expected
@@ -71,20 +71,20 @@ test.cpp:

 #   10| int global01
 #   10|   Block 0
-#   10|     v10_1(void)       = EnterFunction     : 
-#   10|     m10_2(unknown)    = AliasedDefinition : 
+#   10|     v10_1(void)       = EnterFunction             : 
+#   10|     m10_2(unknown)    = AliasedDefinition         : 
 #   10|         valnum = unique
-#   10|     r10_3(glval<int>) = VariableAddress   : 
+#   10|     r10_3(glval<int>) = VariableAddress[global01] : 
 #   10|         valnum = unique
-#   10|     r10_4(int)        = Constant[1]       : 
+#   10|     r10_4(int)        = Constant[1]               : 
 #   10|         valnum = m10_5, r10_4
-#   10|     m10_5(int)        = Store[?]          : &:r10_3, r10_4
+#   10|     m10_5(int)        = Store[global01]           : &:r10_3, r10_4
 #   10|         valnum = m10_5, r10_4
-#   10|     m10_6(unknown)    = Chi               : total:m10_2, partial:m10_5
+#   10|     m10_6(unknown)    = Chi                       : total:m10_2, partial:m10_5
 #   10|         valnum = unique
-#   10|     v10_7(void)       = ReturnVoid        : 
-#   10|     v10_8(void)       = AliasedUse        : ~m10_6
-#   10|     v10_9(void)       = ExitFunction      : 
+#   10|     v10_7(void)       = ReturnVoid                : 
+#   10|     v10_8(void)       = AliasedUse                : ~m10_6
+#   10|     v10_9(void)       = ExitFunction              : 

 #   12| void test01(int, int)
 #   12|   Block 0
@@ -170,20 +170,20 @@ test.cpp:

 #   21| int global02
 #   21|   Block 0
-#   21|     v21_1(void)       = EnterFunction     : 
-#   21|     m21_2(unknown)    = AliasedDefinition : 
+#   21|     v21_1(void)       = EnterFunction             : 
+#   21|     m21_2(unknown)    = AliasedDefinition         : 
 #   21|         valnum = unique
-#   21|     r21_3(glval<int>) = VariableAddress   : 
+#   21|     r21_3(glval<int>) = VariableAddress[global02] : 
 #   21|         valnum = unique
-#   21|     r21_4(int)        = Constant[2]       : 
+#   21|     r21_4(int)        = Constant[2]               : 
 #   21|         valnum = m21_5, r21_4
-#   21|     m21_5(int)        = Store[?]          : &:r21_3, r21_4
+#   21|     m21_5(int)        = Store[global02]           : &:r21_3, r21_4
 #   21|         valnum = m21_5, r21_4
-#   21|     m21_6(unknown)    = Chi               : total:m21_2, partial:m21_5
+#   21|     m21_6(unknown)    = Chi                       : total:m21_2, partial:m21_5
 #   21|         valnum = unique
-#   21|     v21_7(void)       = ReturnVoid        : 
-#   21|     v21_8(void)       = AliasedUse        : ~m21_6
-#   21|     v21_9(void)       = ExitFunction      : 
+#   21|     v21_7(void)       = ReturnVoid                : 
+#   21|     v21_8(void)       = AliasedUse                : ~m21_6
+#   21|     v21_9(void)       = ExitFunction              : 

 #   25| void test02(int, int)
 #   25|   Block 0
@@ -276,20 +276,20 @@ test.cpp:

 #   35| int global03
 #   35|   Block 0
-#   35|     v35_1(void)       = EnterFunction     : 
-#   35|     m35_2(unknown)    = AliasedDefinition : 
+#   35|     v35_1(void)       = EnterFunction             : 
+#   35|     m35_2(unknown)    = AliasedDefinition         : 
 #   35|         valnum = unique
-#   35|     r35_3(glval<int>) = VariableAddress   : 
+#   35|     r35_3(glval<int>) = VariableAddress[global03] : 
 #   35|         valnum = unique
-#   35|     r35_4(int)        = Constant[3]       : 
+#   35|     r35_4(int)        = Constant[3]               : 
 #   35|         valnum = m35_5, r35_4
-#   35|     m35_5(int)        = Store[?]          : &:r35_3, r35_4
+#   35|     m35_5(int)        = Store[global03]           : &:r35_3, r35_4
 #   35|         valnum = m35_5, r35_4
-#   35|     m35_6(unknown)    = Chi               : total:m35_2, partial:m35_5
+#   35|     m35_6(unknown)    = Chi                       : total:m35_2, partial:m35_5
 #   35|         valnum = unique
-#   35|     v35_7(void)       = ReturnVoid        : 
-#   35|     v35_8(void)       = AliasedUse        : ~m35_6
-#   35|     v35_9(void)       = ExitFunction      : 
+#   35|     v35_7(void)       = ReturnVoid                : 
+#   35|     v35_8(void)       = AliasedUse                : ~m35_6
+#   35|     v35_9(void)       = ExitFunction              : 

 #   39| void test03(int, int, int*)
 #   39|   Block 0