Skip to content

Commit ea180c0

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent bef0a15 commit ea180c0

8 files changed

+254
-370
lines changed

‎cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency.expected

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
99
ambiguousSuccessors
10-
| ssa.c:3:14:3:16 | Uninitialized: definition of foo | Instruction 'Uninitialized: definition of foo' has 2 successors of kind 'Goto' in function '$@'. | ssa.c:2:6:2:22 | void named_designators() | void named_designators() |
11-
| ssa.c:7:13:7:37 | PointerAdd: {...} | Instruction 'PointerAdd: {...}' has 2 successors of kind 'Goto' in function '$@'. | ssa.c:6:6:6:25 | void repeated_designators() | void repeated_designators() |
12-
| ssa.cpp:418:16:418:46 | PointerAdd: {...} | Instruction 'PointerAdd: {...}' has 2 successors of kind 'Goto' in function '$@'. | ssa.cpp:417:6:417:29 | void nested_array_designators() | void nested_array_designators() |
1310
unexplainedLoop
1411
unnecessaryPhiInstruction
1512
memoryOperandDefinitionIsUnmodeled

‎cpp/ql/test/library-tests/ir/ssa/aliased_ssa_consistency_unsound.expected

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ duplicateChiOperand
77
sideEffectWithoutPrimary
88
instructionWithoutSuccessor
99
ambiguousSuccessors
10-
| ssa.c:3:14:3:16 | Uninitialized: definition of foo | Instruction 'Uninitialized: definition of foo' has 2 successors of kind 'Goto' in function '$@'. | ssa.c:2:6:2:22 | void named_designators() | void named_designators() |
11-
| ssa.c:7:13:7:37 | PointerAdd: {...} | Instruction 'PointerAdd: {...}' has 2 successors of kind 'Goto' in function '$@'. | ssa.c:6:6:6:25 | void repeated_designators() | void repeated_designators() |
12-
| ssa.cpp:418:16:418:46 | PointerAdd: {...} | Instruction 'PointerAdd: {...}' has 2 successors of kind 'Goto' in function '$@'. | ssa.cpp:417:6:417:29 | void nested_array_designators() | void nested_array_designators() |
1310
unexplainedLoop
1411
unnecessaryPhiInstruction
1512
memoryOperandDefinitionIsUnmodeled

‎cpp/ql/test/library-tests/ir/ssa/aliased_ssa_ir.expected

Lines changed: 68 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,38 @@
11
ssa.c:
22
# 2| void named_designators()
33
# 2| Block 0
4-
# 2| v2_1(void) = EnterFunction :
5-
# 2| m2_2(unknown) = AliasedDefinition :
6-
# 2| m2_3(unknown) = InitializeNonLocal :
7-
# 2| m2_4(unknown) = Chi : total:m2_2, partial:m2_3
8-
# 3| r3_1(glval<Foo>) = VariableAddress[foo] :
9-
# 3| m3_2(Foo) = Uninitialized[foo] : &:r3_1
10-
#-----| Goto -> Block 1
11-
#-----| Goto -> Block 1
12-
13-
# 3| Block 1
14-
# 3| r3_3(glval<int[2]>) = FieldAddress[x] : r3_1
15-
# 3| r3_5(int) = Constant[0] :
16-
# 3| r3_7(glval<int>) = PointerAdd[4] : r3_3, r3_5
17-
# 3| r3_9(int) = Constant[1234] :
18-
# 3| m3_11(int) = Store[?] : &:r3_7, r3_9
19-
# 3| m3_13(Foo) = Chi : total:m3_2, partial:m3_11
20-
# 3| r3_15(int) = Constant[1] :
21-
# 3| r3_17(glval<int>) = PointerAdd[4] : r3_3, r3_15
22-
# 3| r3_19(int) = Constant[0] :
23-
# 3| m3_21(int) = Store[?] : &:r3_17, r3_19
24-
# 3| m3_23(Foo) = Chi : total:m3_13, partial:m3_21
25-
#-----| Goto -> Block 3
26-
27-
# 3| Block 1
28-
# 3| r3_3(glval<int[2]>) = FieldAddress[x] : r3_1
29-
# 3| r3_5(int) = Constant[0] :
30-
# 3| r3_7(glval<int>) = PointerAdd[4] : r3_3, r3_5
31-
# 3| r3_9(int) = Constant[0] :
32-
# 3| m3_11(int) = Store[?] : &:r3_7, r3_9
33-
# 3| m3_13(Foo) = Chi : total:m3_2, partial:m3_11
34-
# 3| r3_15(int) = Constant[1] :
35-
# 3| r3_17(glval<int>) = PointerAdd[4] : r3_3, r3_15
36-
# 3| r3_19(int) = Constant[5678] :
37-
# 3| m3_21(int) = Store[?] : &:r3_17, r3_19
38-
# 3| m3_23(Foo) = Chi : total:m3_13, partial:m3_21
39-
#-----| Goto -> Block 3
40-
41-
# 4| Block 3
42-
# 4| v4_1(void) = NoOp :
43-
# 2| v2_5(void) = ReturnVoid :
44-
# 2| v2_6(void) = AliasedUse : m2_3
45-
# 2| v2_7(void) = ExitFunction :
4+
# 2| v2_1(void) = EnterFunction :
5+
# 2| m2_2(unknown) = AliasedDefinition :
6+
# 2| m2_3(unknown) = InitializeNonLocal :
7+
# 2| m2_4(unknown) = Chi : total:m2_2, partial:m2_3
8+
# 3| r3_1(glval<Foo>) = VariableAddress[foo] :
9+
# 3| m3_2(Foo) = Uninitialized[foo] : &:r3_1
10+
# 3| r3_3(glval<int[2]>) = FieldAddress[x] : r3_1
11+
# 3| r3_4(int) = Constant[0] :
12+
# 3| r3_5(glval<int>) = PointerAdd[4] : r3_3, r3_4
13+
# 3| r3_6(int) = Constant[1234] :
14+
# 3| m3_7(int) = Store[?] : &:r3_5, r3_6
15+
# 3| m3_8(Foo) = Chi : total:m3_2, partial:m3_7
16+
# 3| r3_9(int) = Constant[1] :
17+
# 3| r3_10(glval<int>) = PointerAdd[4] : r3_3, r3_9
18+
# 3| r3_11(int) = Constant[0] :
19+
# 3| m3_12(int) = Store[?] : &:r3_10, r3_11
20+
# 3| m3_13(Foo) = Chi : total:m3_8, partial:m3_12
21+
# 3| r3_14(glval<int[2]>) = FieldAddress[x] : r3_1
22+
# 3| r3_15(int) = Constant[0] :
23+
# 3| r3_16(glval<int>) = PointerAdd[4] : r3_14, r3_15
24+
# 3| r3_17(int) = Constant[0] :
25+
# 3| m3_18(int) = Store[?] : &:r3_16, r3_17
26+
# 3| m3_19(Foo) = Chi : total:m3_13, partial:m3_18
27+
# 3| r3_20(int) = Constant[1] :
28+
# 3| r3_21(glval<int>) = PointerAdd[4] : r3_14, r3_20
29+
# 3| r3_22(int) = Constant[5678] :
30+
# 3| m3_23(int) = Store[?] : &:r3_21, r3_22
31+
# 3| m3_24(Foo) = Chi : total:m3_19, partial:m3_23
32+
# 4| v4_1(void) = NoOp :
33+
# 2| v2_5(void) = ReturnVoid :
34+
# 2| v2_6(void) = AliasedUse : m2_3
35+
# 2| v2_7(void) = ExitFunction :
4636

4737
# 6| void repeated_designators()
4838
# 6| Block 0
@@ -54,24 +44,16 @@ ssa.c:
5444
# 7| m7_2(int[1]) = Uninitialized[x] : &:r7_1
5545
# 7| r7_3(int) = Constant[0] :
5646
# 7| r7_4(glval<int>) = PointerAdd[4] : r7_1, r7_3
57-
#-----| Goto -> Block 1
58-
#-----| Goto -> Block 1
59-
60-
# 7| Block 1
61-
# 7| r7_5(int) = Constant[1234] :
62-
# 7| m7_7(int) = Store[?] : &:r7_4, r7_5
63-
#-----| Goto -> Block 3
64-
65-
# 7| Block 1
66-
# 7| r7_5(int) = Constant[5678] :
67-
# 7| m7_7(int) = Store[?] : &:r7_4, r7_5
68-
#-----| Goto -> Block 3
69-
70-
# 8| Block 3
71-
# 8| v8_1(void) = NoOp :
72-
# 6| v6_5(void) = ReturnVoid :
73-
# 6| v6_6(void) = AliasedUse : m6_3
74-
# 6| v6_7(void) = ExitFunction :
47+
# 7| r7_5(int) = Constant[1234] :
48+
# 7| m7_6(int) = Store[?] : &:r7_4, r7_5
49+
# 7| r7_7(int) = Constant[0] :
50+
# 7| r7_8(glval<int>) = PointerAdd[4] : r7_1, r7_7
51+
# 7| r7_9(int) = Constant[5678] :
52+
# 7| m7_10(int) = Store[?] : &:r7_8, r7_9
53+
# 8| v8_1(void) = NoOp :
54+
# 6| v6_5(void) = ReturnVoid :
55+
# 6| v6_6(void) = AliasedUse : m6_3
56+
# 6| v6_7(void) = ExitFunction :
7557

7658
ssa.cpp:
7759
# 13| int ChiPhiNode(Point*, bool, bool)
@@ -1978,37 +1960,29 @@ ssa.cpp:
19781960
# 418| m418_2(int[1][2]) = Uninitialized[x] : &:r418_1
19791961
# 418| r418_3(int) = Constant[0] :
19801962
# 418| r418_4(glval<int[2]>) = PointerAdd[8] : r418_1, r418_3
1981-
#-----| Goto -> Block 1
1982-
#-----| Goto -> Block 1
1983-
1984-
# 418| Block 1
1985-
# 418| r418_5(int) = Constant[0] :
1986-
# 418| r418_7(glval<int>) = PointerAdd[4] : r418_4, r418_5
1987-
# 418| r418_9(int) = Constant[0] :
1988-
# 418| m418_11(int) = Store[?] : &:r418_7, r418_9
1989-
# 418| m418_13(int[1][2]) = Chi : total:m418_2, partial:m418_11
1990-
# 418| r418_15(int) = Constant[1] :
1991-
# 418| r418_17(glval<int>) = PointerAdd[4] : r418_4, r418_15
1992-
# 418| r418_19(int) = Constant[5678] :
1993-
# 418| m418_21(int) = Store[?] : &:r418_17, r418_19
1994-
# 418| m418_23(int[1][2]) = Chi : total:m418_13, partial:m418_21
1995-
#-----| Goto -> Block 3
1996-
1997-
# 418| Block 1
1998-
# 418| r418_5(int) = Constant[0] :
1999-
# 418| r418_7(glval<int>) = PointerAdd[4] : r418_4, r418_5
2000-
# 418| r418_9(int) = Constant[1234] :
2001-
# 418| m418_11(int) = Store[?] : &:r418_7, r418_9
2002-
# 418| m418_13(int[1][2]) = Chi : total:m418_2, partial:m418_11
2003-
# 418| r418_15(int) = Constant[1] :
2004-
# 418| r418_17(glval<int>) = PointerAdd[4] : r418_4, r418_15
2005-
# 418| r418_19(int) = Constant[0] :
2006-
# 418| m418_21(int) = Store[?] : &:r418_17, r418_19
2007-
# 418| m418_23(int[1][2]) = Chi : total:m418_13, partial:m418_21
2008-
#-----| Goto -> Block 3
2009-
2010-
# 419| Block 3
2011-
# 419| v419_1(void) = NoOp :
2012-
# 417| v417_5(void) = ReturnVoid :
2013-
# 417| v417_6(void) = AliasedUse : m417_3
2014-
# 417| v417_7(void) = ExitFunction :
1963+
# 418| r418_5(int) = Constant[0] :
1964+
# 418| r418_6(glval<int>) = PointerAdd[4] : r418_4, r418_5
1965+
# 418| r418_7(int) = Constant[1234] :
1966+
# 418| m418_8(int) = Store[?] : &:r418_6, r418_7
1967+
# 418| m418_9(int[1][2]) = Chi : total:m418_2, partial:m418_8
1968+
# 418| r418_10(int) = Constant[1] :
1969+
# 418| r418_11(glval<int>) = PointerAdd[4] : r418_4, r418_10
1970+
# 418| r418_12(int) = Constant[0] :
1971+
# 418| m418_13(int) = Store[?] : &:r418_11, r418_12
1972+
# 418| m418_14(int[1][2]) = Chi : total:m418_9, partial:m418_13
1973+
# 418| r418_15(int) = Constant[0] :
1974+
# 418| r418_16(glval<int[2]>) = PointerAdd[8] : r418_1, r418_15
1975+
# 418| r418_17(int) = Constant[0] :
1976+
# 418| r418_18(glval<int>) = PointerAdd[4] : r418_16, r418_17
1977+
# 418| r418_19(int) = Constant[0] :
1978+
# 418| m418_20(int) = Store[?] : &:r418_18, r418_19
1979+
# 418| m418_21(int[1][2]) = Chi : total:m418_14, partial:m418_20
1980+
# 418| r418_22(int) = Constant[1] :
1981+
# 418| r418_23(glval<int>) = PointerAdd[4] : r418_16, r418_22
1982+
# 418| r418_24(int) = Constant[5678] :
1983+
# 418| m418_25(int) = Store[?] : &:r418_23, r418_24
1984+
# 418| m418_26(int[1][2]) = Chi : total:m418_21, partial:m418_25
1985+
# 419| v419_1(void) = NoOp :
1986+
# 417| v417_5(void) = ReturnVoid :
1987+
# 417| v417_6(void) = AliasedUse : m417_3
1988+
# 417| v417_7(void) = ExitFunction :

0 commit comments

Comments
 (0)