Merge pull request #525 from jbj/uninit-badast-mergefix

semmle-qlci · web-flow · commit 816a94eaa991 · 2018-11-22T21:05:54.000Z
Approved by geoffw0, ian-semmle
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_ir.expected
@@ -4,17 +4,18 @@ bad_asts.cpp:
 #   14|     v0_0(void)           = EnterFunction                   : 
 #   14|     mu0_1(unknown)       = UnmodeledDefinition             : 
 #   15|     r0_2(glval<S>)       = VariableAddress[s]              : 
-#   15|     r0_3(glval<int>)     = FieldAddress[x]                 : r0_2
-#   15|     r0_4(int)            = Constant[0]                     : 
-#   15|     mu0_5(int)           = Store                           : r0_3, r0_4
-#   16|     r0_6(glval<S>)       = VariableAddress[s]              : 
-#   16|     r0_7(glval<unknown>) = FunctionAddress[MemberFunction] : 
-#   16|     r0_8(int)            = Constant[1]                     : 
-#   16|     r0_9(int)            = Call                            : r0_7, this:r0_6, r0_8
-#   17|     v0_10(void)          = NoOp                            : 
-#   14|     v0_11(void)          = ReturnVoid                      : 
-#   14|     v0_12(void)          = UnmodeledUse                    : mu*
-#   14|     v0_13(void)          = ExitFunction                    : 
+#   15|     mu0_3(S)             = Uninitialized                   : r0_2
+#   15|     r0_4(glval<int>)     = FieldAddress[x]                 : r0_2
+#   15|     r0_5(int)            = Constant[0]                     : 
+#   15|     mu0_6(int)           = Store                           : r0_4, r0_5
+#   16|     r0_7(glval<S>)       = VariableAddress[s]              : 
+#   16|     r0_8(glval<unknown>) = FunctionAddress[MemberFunction] : 
+#   16|     r0_9(int)            = Constant[1]                     : 
+#   16|     r0_10(int)           = Call                            : r0_8, this:r0_7, r0_9
+#   17|     v0_11(void)          = NoOp                            : 
+#   14|     v0_12(void)          = ReturnVoid                      : 
+#   14|     v0_13(void)          = UnmodeledUse                    : mu*
+#   14|     v0_14(void)          = ExitFunction                    : 
 
 #   22| Bad::Point::Point() -> void
 #   22|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -4,17 +4,18 @@ bad_asts.cpp:
 #   14|     v0_0(void)           = EnterFunction                   : 
 #   14|     mu0_1(unknown)       = UnmodeledDefinition             : 
 #   15|     r0_2(glval<S>)       = VariableAddress[s]              : 
-#   15|     r0_3(glval<int>)     = FieldAddress[x]                 : r0_2
-#   15|     r0_4(int)            = Constant[0]                     : 
-#   15|     mu0_5(int)           = Store                           : r0_3, r0_4
-#   16|     r0_6(glval<S>)       = VariableAddress[s]              : 
-#   16|     r0_7(glval<unknown>) = FunctionAddress[MemberFunction] : 
-#   16|     r0_8(int)            = Constant[1]                     : 
-#   16|     r0_9(int)            = Call                            : r0_7, this:r0_6, r0_8
-#   17|     v0_10(void)          = NoOp                            : 
-#   14|     v0_11(void)          = ReturnVoid                      : 
-#   14|     v0_12(void)          = UnmodeledUse                    : mu*
-#   14|     v0_13(void)          = ExitFunction                    : 
+#   15|     mu0_3(S)             = Uninitialized                   : r0_2
+#   15|     r0_4(glval<int>)     = FieldAddress[x]                 : r0_2
+#   15|     r0_5(int)            = Constant[0]                     : 
+#   15|     mu0_6(int)           = Store                           : r0_4, r0_5
+#   16|     r0_7(glval<S>)       = VariableAddress[s]              : 
+#   16|     r0_8(glval<unknown>) = FunctionAddress[MemberFunction] : 
+#   16|     r0_9(int)            = Constant[1]                     : 
+#   16|     r0_10(int)           = Call                            : r0_8, this:r0_7, r0_9
+#   17|     v0_11(void)          = NoOp                            : 
+#   14|     v0_12(void)          = ReturnVoid                      : 
+#   14|     v0_13(void)          = UnmodeledUse                    : mu*
+#   14|     v0_14(void)          = ExitFunction                    : 
 
 #   22| Bad::Point::Point() -> void
 #   22|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_ir.expected
@@ -4,17 +4,18 @@ bad_asts.cpp:
 #   14|     v0_0(void)           = EnterFunction                   : 
 #   14|     mu0_1(unknown)       = UnmodeledDefinition             : 
 #   15|     r0_2(glval<S>)       = VariableAddress[s]              : 
-#   15|     r0_3(glval<int>)     = FieldAddress[x]                 : r0_2
-#   15|     r0_4(int)            = Constant[0]                     : 
-#   15|     mu0_5(int)           = Store                           : r0_3, r0_4
-#   16|     r0_6(glval<S>)       = VariableAddress[s]              : 
-#   16|     r0_7(glval<unknown>) = FunctionAddress[MemberFunction] : 
-#   16|     r0_8(int)            = Constant[1]                     : 
-#   16|     r0_9(int)            = Call                            : r0_7, this:r0_6, r0_8
-#   17|     v0_10(void)          = NoOp                            : 
-#   14|     v0_11(void)          = ReturnVoid                      : 
-#   14|     v0_12(void)          = UnmodeledUse                    : mu*
-#   14|     v0_13(void)          = ExitFunction                    : 
+#   15|     mu0_3(S)             = Uninitialized                   : r0_2
+#   15|     r0_4(glval<int>)     = FieldAddress[x]                 : r0_2
+#   15|     r0_5(int)            = Constant[0]                     : 
+#   15|     mu0_6(int)           = Store                           : r0_4, r0_5
+#   16|     r0_7(glval<S>)       = VariableAddress[s]              : 
+#   16|     r0_8(glval<unknown>) = FunctionAddress[MemberFunction] : 
+#   16|     r0_9(int)            = Constant[1]                     : 
+#   16|     r0_10(int)           = Call                            : r0_8, this:r0_7, r0_9
+#   17|     v0_11(void)          = NoOp                            : 
+#   14|     v0_12(void)          = ReturnVoid                      : 
+#   14|     v0_13(void)          = UnmodeledUse                    : mu*
+#   14|     v0_14(void)          = ExitFunction                    : 
 
 #   22| Bad::Point::Point() -> void
 #   22|   Block 0
