Skip to content

Commit 11566ee

Browse files
MathiasVPMathiasVP
committed
C++: Accept test changes.
1 parent e4ec792 commit 11566ee

3 files changed

Lines changed: 44 additions & 68 deletions

File tree

‎cpp/ql/test/library-tests/ir/ir/aliased_ir.expected‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21030,52 +21030,40 @@ ir.cpp:
2103021030
#-----| Goto -> Block 7
2103121031

2103221032
# 2873| Block 7
21033-
# 2873| r2873_2(glval<int>) = VariableAddress[c] :
21034-
# 2873| m2873_3(int) = InitializeParameter[c] : &:r2873_2
21035-
# 2874| r2874_1(int) = Constant[0] :
21036-
# 2874| v2874_2(void) = Convert : r2874_1
21037-
# 2875| r2875_1(glval<int>) = VariableAddress[shadowed] :
21038-
# 2875| r2875_2(int) = Load[shadowed] : &:r2875_1, ~m2867_4
21039-
# 2875| r2875_3(int) = Constant[42] :
21040-
# 2875| r2875_4(bool) = CompareLT : r2875_2, r2875_3
21041-
# 2875| v2875_5(void) = ConditionalBranch : r2875_4
21033+
# 2873| r2873_2(glval<int>) = VariableAddress[c] :
21034+
# 2873| m2873_3(int) = InitializeParameter[c] : &:r2873_2
21035+
# 2874| r2874_1(glval<int>) = VariableAddress[c] :
21036+
# 2874| r2874_2(int) = Load[c] : &:r2874_1, m2873_3
21037+
# 2874| r2874_3(int) = Constant[42] :
21038+
# 2874| r2874_4(bool) = CompareLT : r2874_2, r2874_3
21039+
# 2874| v2874_5(void) = ConditionalBranch : r2874_4
2104221040
#-----| True -> Block 8
2104321041

21044-
# 2878| Block 8
21045-
# 2878| r2878_1(glval<int>) = VariableAddress[shadowed] :
21046-
# 2878| r2878_2(int) = Load[shadowed] : &:r2878_1, ~m2867_4
21047-
# 2878| r2878_3(int) = Constant[0] :
21048-
# 2878| r2878_4(bool) = CompareGT : r2878_2, r2878_3
21049-
# 2878| v2878_5(void) = ConditionalBranch : r2878_4
21050-
#-----| True -> Block 9
21051-
21052-
# 2879| Block 9
21042+
# 2875| Block 8
21043+
# 2875| r2875_1(int) = Constant[0] :
21044+
# 2875| v2875_2(void) = Convert : r2875_1
21045+
# 2878| r2878_1(int) = Constant[0] :
21046+
# 2878| v2878_2(void) = Convert : r2878_1
2105321047
# 2879| r2879_1(glval<int>) = VariableAddress[shadowed] :
2105421048
# 2879| m2879_2(int) = Uninitialized[shadowed] : &:r2879_1
2105521049
# 2882| r2882_1(glval<int>) = VariableAddress[#throw2882:13] :
2105621050
# 2882| r2882_2(int) = Constant[41] :
2105721051
# 2882| m2882_3(int) = Store[#throw2882:13] : &:r2882_1, r2882_2
2105821052
# 2882| v2882_4(void) = ThrowValue : &:r2882_1, m2882_3
21059-
#-----| C++ Exception -> Block 10
21053+
#-----| C++ Exception -> Block 9
2106021054

21061-
# 2883| Block 10
21055+
# 2883| Block 9
2106221056
# 2883| v2883_1(void) = CatchByType[int] :
2106321057
#-----| C++ Exception -> Block 2
21064-
#-----| Goto -> Block 11
21058+
#-----| Goto -> Block 10
2106521059

21066-
# 2883| Block 11
21060+
# 2883| Block 10
2106721061
# 2883| r2883_2(glval<int>) = VariableAddress[shadowed] :
2106821062
# 2883| m2883_3(int) = InitializeParameter[shadowed] : &:r2883_2
21069-
# 2884| r2884_1(glval<int>) = VariableAddress[shadowed] :
21070-
# 2884| r2884_2(int) = Load[shadowed] : &:r2884_1, m2879_2
21071-
# 2884| r2884_3(int) = Constant[42] :
21072-
# 2884| r2884_4(bool) = CompareLT : r2884_2, r2884_3
21073-
# 2884| v2884_5(void) = ConditionalBranch : r2884_4
21074-
#-----| True -> Block 12
21075-
21076-
# 2886| Block 12
21077-
# 2886| v2886_1(void) = NoOp :
21078-
# 2867| v2867_14(void) = ReturnVoid :
21063+
# 2884| r2884_1(int) = Constant[0] :
21064+
# 2884| v2884_2(void) = Convert : r2884_1
21065+
# 2886| v2886_1(void) = NoOp :
21066+
# 2867| v2867_14(void) = ReturnVoid :
2107921067
#-----| Goto -> Block 1
2108021068

2108121069
ir23.cpp:

‎cpp/ql/test/library-tests/ir/ir/ir.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2871,17 +2871,17 @@ namespace {
28712871
try {
28722872
throw 41;
28732873
} catch (int c) {
2874-
assert(c < 42); // $ MISSING: var=2873
2875-
assert(shadowed < 42); // $ SPURIOUS: var=2879
2874+
assert(c < 42); // $ var=2873
2875+
assert(shadowed < 42); // no assertion generated
28762876
}
28772877

2878-
assert(shadowed > 0); // $ SPURIOUS: var=2879
2878+
assert(shadowed > 0); // no assertion generated
28792879
int shadowed;
28802880

28812881
try {
28822882
throw 41;
28832883
} catch (int shadowed) {
2884-
assert(shadowed < 42); // $ SPURIOUS: var=2879
2884+
assert(shadowed < 42); // no assertion generated
28852885
}
28862886
}
28872887
}

‎cpp/ql/test/library-tests/ir/ir/raw_ir.expected‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19164,52 +19164,40 @@ ir.cpp:
1916419164
#-----| Goto -> Block 7
1916519165

1916619166
# 2873| Block 7
19167-
# 2873| r2873_2(glval<int>) = VariableAddress[c] :
19168-
# 2873| mu2873_3(int) = InitializeParameter[c] : &:r2873_2
19169-
# 2874| r2874_1(int) = Constant[0] :
19170-
# 2874| v2874_2(void) = Convert : r2874_1
19171-
# 2875| r2875_1(glval<int>) = VariableAddress[shadowed] :
19172-
# 2875| r2875_2(int) = Load[shadowed] : &:r2875_1, ~m?
19173-
# 2875| r2875_3(int) = Constant[42] :
19174-
# 2875| r2875_4(bool) = CompareLT : r2875_2, r2875_3
19175-
# 2875| v2875_5(void) = ConditionalBranch : r2875_4
19167+
# 2873| r2873_2(glval<int>) = VariableAddress[c] :
19168+
# 2873| mu2873_3(int) = InitializeParameter[c] : &:r2873_2
19169+
# 2874| r2874_1(glval<int>) = VariableAddress[c] :
19170+
# 2874| r2874_2(int) = Load[c] : &:r2874_1, ~m?
19171+
# 2874| r2874_3(int) = Constant[42] :
19172+
# 2874| r2874_4(bool) = CompareLT : r2874_2, r2874_3
19173+
# 2874| v2874_5(void) = ConditionalBranch : r2874_4
1917619174
#-----| True -> Block 8
1917719175

19178-
# 2878| Block 8
19179-
# 2878| r2878_1(glval<int>) = VariableAddress[shadowed] :
19180-
# 2878| r2878_2(int) = Load[shadowed] : &:r2878_1, ~m?
19181-
# 2878| r2878_3(int) = Constant[0] :
19182-
# 2878| r2878_4(bool) = CompareGT : r2878_2, r2878_3
19183-
# 2878| v2878_5(void) = ConditionalBranch : r2878_4
19184-
#-----| True -> Block 9
19185-
19186-
# 2879| Block 9
19176+
# 2875| Block 8
19177+
# 2875| r2875_1(int) = Constant[0] :
19178+
# 2875| v2875_2(void) = Convert : r2875_1
19179+
# 2878| r2878_1(int) = Constant[0] :
19180+
# 2878| v2878_2(void) = Convert : r2878_1
1918719181
# 2879| r2879_1(glval<int>) = VariableAddress[shadowed] :
1918819182
# 2879| mu2879_2(int) = Uninitialized[shadowed] : &:r2879_1
1918919183
# 2882| r2882_1(glval<int>) = VariableAddress[#throw2882:13] :
1919019184
# 2882| r2882_2(int) = Constant[41] :
1919119185
# 2882| mu2882_3(int) = Store[#throw2882:13] : &:r2882_1, r2882_2
1919219186
# 2882| v2882_4(void) = ThrowValue : &:r2882_1, ~m?
19193-
#-----| C++ Exception -> Block 10
19187+
#-----| C++ Exception -> Block 9
1919419188

19195-
# 2883| Block 10
19189+
# 2883| Block 9
1919619190
# 2883| v2883_1(void) = CatchByType[int] :
1919719191
#-----| C++ Exception -> Block 2
19198-
#-----| Goto -> Block 11
19192+
#-----| Goto -> Block 10
1919919193

19200-
# 2883| Block 11
19194+
# 2883| Block 10
1920119195
# 2883| r2883_2(glval<int>) = VariableAddress[shadowed] :
1920219196
# 2883| mu2883_3(int) = InitializeParameter[shadowed] : &:r2883_2
19203-
# 2884| r2884_1(glval<int>) = VariableAddress[shadowed] :
19204-
# 2884| r2884_2(int) = Load[shadowed] : &:r2884_1, ~m?
19205-
# 2884| r2884_3(int) = Constant[42] :
19206-
# 2884| r2884_4(bool) = CompareLT : r2884_2, r2884_3
19207-
# 2884| v2884_5(void) = ConditionalBranch : r2884_4
19208-
#-----| True -> Block 12
19209-
19210-
# 2886| Block 12
19211-
# 2886| v2886_1(void) = NoOp :
19212-
# 2867| v2867_13(void) = ReturnVoid :
19197+
# 2884| r2884_1(int) = Constant[0] :
19198+
# 2884| v2884_2(void) = Convert : r2884_1
19199+
# 2886| v2886_1(void) = NoOp :
19200+
# 2867| v2867_13(void) = ReturnVoid :
1921319201
#-----| Goto -> Block 1
1921419202

1921519203
ir23.cpp:

0 commit comments

Comments
 (0)