Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 048afc2

Browse files
MathiasVPMathiasVP
committed
C++: Add assertion inside catch block. This does not yet work because the 'LocalScopeVariable' does not have a result for 'getFunction'.
1 parent d183dcd commit 048afc2

4 files changed

Lines changed: 100 additions & 22 deletions

File tree

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25562,7 +25562,33 @@ ir.cpp:
2556225562
# 2867| Type = [IntType] int
2556325563
# 2867| Value = [ParenthesisExpr] 0
2556425564
# 2867| ValueCategory = prvalue
25565-
# 2868| getStmt(2): [ReturnStmt] return ...
25565+
# 2869| getStmt(2): [TryStmt] try { ... }
25566+
# 2869| getStmt(): [BlockStmt] { ... }
25567+
# 2870| getStmt(0): [ExprStmt] ExprStmt
25568+
# 2870| getExpr(): [ThrowExpr] throw ...
25569+
# 2870| Type = [IntType] int
25570+
# 2870| ValueCategory = prvalue
25571+
# 2870| getExpr(): [Literal] 41
25572+
# 2870| Type = [IntType] int
25573+
# 2870| Value = [Literal] 41
25574+
# 2870| ValueCategory = prvalue
25575+
# 2871| getChild(1): [Handler] <handler>
25576+
# 2871| getParameter(): [Parameter] c
25577+
# 2871| Type = [IntType] int
25578+
# 2871| getBlock(): [CatchBlock] { ... }
25579+
# 2872| getStmt(0): [ExprStmt] ExprStmt
25580+
# 2872| getExpr(): [Literal] 0
25581+
# 2872| Type = [IntType] int
25582+
# 2872| Value = [Literal] 0
25583+
# 2872| ValueCategory = prvalue
25584+
# 2872| getExpr().getFullyConverted(): [ParenthesisExpr] (...)
25585+
# 2872| Type = [VoidType] void
25586+
# 2872| ValueCategory = prvalue
25587+
# 2872| getExpr(): [CStyleCast] (void)...
25588+
# 2872| Conversion = [VoidConversion] conversion to void
25589+
# 2872| Type = [VoidType] void
25590+
# 2872| ValueCategory = prvalue
25591+
# 2874| getStmt(3): [ReturnStmt] return ...
2556625592
ir23.cpp:
2556725593
# 1| [TopLevelFunction] bool consteval_1()
2556825594
# 1| <params>:

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

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20990,29 +20990,52 @@ ir.cpp:
2099020990
# 2867| r2867_2(glval<bool>) = VariableAddress[b] :
2099120991
# 2867| r2867_3(bool) = Load[b] : &:r2867_2, m2865_8
2099220992
# 2867| v2867_4(void) = ConditionalBranch : r2867_3
20993-
#-----| False -> Block 3
20994-
#-----| True -> Block 2
20993+
#-----| False -> Block 5
20994+
#-----| True -> Block 4
20995+
20996+
# 2865| Block 1
20997+
# 2865| v2865_11(void) = AliasedUse : m2865_3
20998+
# 2865| v2865_12(void) = ExitFunction :
2099520999

20996-
# 2867| Block 1
20997-
# 2867| m2867_5(int) = Phi : from 2:m2867_11, from 3:m2867_14
21000+
# 2865| Block 2
21001+
# 2865| v2865_13(void) = Unwind :
21002+
#-----| Goto -> Block 1
21003+
21004+
# 2867| Block 3
21005+
# 2867| m2867_5(int) = Phi : from 4:m2867_11, from 5:m2867_14
2099821006
# 2867| r2867_6(glval<int>) = VariableAddress[#temp2867:13] :
2099921007
# 2867| r2867_7(int) = Load[#temp2867:13] : &:r2867_6, m2867_5
2100021008
# 2867| m2867_8(int) = Store[z] : &:r2867_1, r2867_7
21001-
# 2868| v2868_1(void) = NoOp :
21002-
# 2865| v2865_11(void) = ReturnVoid :
21003-
# 2865| v2865_12(void) = AliasedUse : m2865_3
21004-
# 2865| v2865_13(void) = ExitFunction :
21009+
# 2870| r2870_1(glval<int>) = VariableAddress[#throw2870:9] :
21010+
# 2870| r2870_2(int) = Constant[41] :
21011+
# 2870| m2870_3(int) = Store[#throw2870:9] : &:r2870_1, r2870_2
21012+
# 2870| v2870_4(void) = ThrowValue : &:r2870_1, m2870_3
21013+
#-----| C++ Exception -> Block 6
2100521014

21006-
# 2867| Block 2
21015+
# 2867| Block 4
2100721016
# 2867| r2867_9(int) = Constant[0] :
2100821017
# 2867| r2867_10(glval<int>) = VariableAddress[#temp2867:13] :
2100921018
# 2867| m2867_11(int) = Store[#temp2867:13] : &:r2867_10, r2867_9
21010-
#-----| Goto -> Block 1
21019+
#-----| Goto -> Block 3
2101121020

21012-
# 2867| Block 3
21021+
# 2867| Block 5
2101321022
# 2867| r2867_12(int) = Constant[1] :
2101421023
# 2867| r2867_13(glval<int>) = VariableAddress[#temp2867:13] :
2101521024
# 2867| m2867_14(int) = Store[#temp2867:13] : &:r2867_13, r2867_12
21025+
#-----| Goto -> Block 3
21026+
21027+
# 2871| Block 6
21028+
# 2871| v2871_1(void) = CatchByType[int] :
21029+
#-----| C++ Exception -> Block 2
21030+
#-----| Goto -> Block 7
21031+
21032+
# 2871| Block 7
21033+
# 2871| r2871_2(glval<int>) = VariableAddress[c] :
21034+
# 2871| m2871_3(int) = InitializeParameter[c] : &:r2871_2
21035+
# 2872| r2872_1(int) = Constant[0] :
21036+
# 2872| v2872_2(void) = Convert : r2872_1
21037+
# 2874| v2874_1(void) = NoOp :
21038+
# 2865| v2865_14(void) = ReturnVoid :
2101621039
#-----| Goto -> Block 1
2101721040

2101821041
ir23.cpp:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2865,6 +2865,12 @@ template void test_assert_in_template<short>(short, int, unsigned);
28652865
void complex_assertions(int x, bool b, int max) {
28662866
int y = (assert(x > 0), x);
28672867
int z = b ? (assert(x != 0), 0) : 1;
2868+
2869+
try {
2870+
throw 41;
2871+
} catch (int c) {
2872+
assert(c < 42);
2873+
}
28682874
}
28692875

28702876
// semmle-extractor-options: -std=c++20 --clang

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

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19125,28 +19125,51 @@ ir.cpp:
1912519125
# 2867| r2867_2(glval<bool>) = VariableAddress[b] :
1912619126
# 2867| r2867_3(bool) = Load[b] : &:r2867_2, ~m?
1912719127
# 2867| v2867_4(void) = ConditionalBranch : r2867_3
19128-
#-----| False -> Block 3
19129-
#-----| True -> Block 2
19128+
#-----| False -> Block 5
19129+
#-----| True -> Block 4
19130+
19131+
# 2865| Block 1
19132+
# 2865| v2865_10(void) = AliasedUse : ~m?
19133+
# 2865| v2865_11(void) = ExitFunction :
1913019134

19131-
# 2867| Block 1
19135+
# 2865| Block 2
19136+
# 2865| v2865_12(void) = Unwind :
19137+
#-----| Goto -> Block 1
19138+
19139+
# 2867| Block 3
1913219140
# 2867| r2867_5(glval<int>) = VariableAddress[#temp2867:13] :
1913319141
# 2867| r2867_6(int) = Load[#temp2867:13] : &:r2867_5, ~m?
1913419142
# 2867| mu2867_7(int) = Store[z] : &:r2867_1, r2867_6
19135-
# 2868| v2868_1(void) = NoOp :
19136-
# 2865| v2865_10(void) = ReturnVoid :
19137-
# 2865| v2865_11(void) = AliasedUse : ~m?
19138-
# 2865| v2865_12(void) = ExitFunction :
19143+
# 2870| r2870_1(glval<int>) = VariableAddress[#throw2870:9] :
19144+
# 2870| r2870_2(int) = Constant[41] :
19145+
# 2870| mu2870_3(int) = Store[#throw2870:9] : &:r2870_1, r2870_2
19146+
# 2870| v2870_4(void) = ThrowValue : &:r2870_1, ~m?
19147+
#-----| C++ Exception -> Block 6
1913919148

19140-
# 2867| Block 2
19149+
# 2867| Block 4
1914119150
# 2867| r2867_8(int) = Constant[0] :
1914219151
# 2867| r2867_9(glval<int>) = VariableAddress[#temp2867:13] :
1914319152
# 2867| mu2867_10(int) = Store[#temp2867:13] : &:r2867_9, r2867_8
19144-
#-----| Goto -> Block 1
19153+
#-----| Goto -> Block 3
1914519154

19146-
# 2867| Block 3
19155+
# 2867| Block 5
1914719156
# 2867| r2867_11(int) = Constant[1] :
1914819157
# 2867| r2867_12(glval<int>) = VariableAddress[#temp2867:13] :
1914919158
# 2867| mu2867_13(int) = Store[#temp2867:13] : &:r2867_12, r2867_11
19159+
#-----| Goto -> Block 3
19160+
19161+
# 2871| Block 6
19162+
# 2871| v2871_1(void) = CatchByType[int] :
19163+
#-----| C++ Exception -> Block 2
19164+
#-----| Goto -> Block 7
19165+
19166+
# 2871| Block 7
19167+
# 2871| r2871_2(glval<int>) = VariableAddress[c] :
19168+
# 2871| mu2871_3(int) = InitializeParameter[c] : &:r2871_2
19169+
# 2872| r2872_1(int) = Constant[0] :
19170+
# 2872| v2872_2(void) = Convert : r2872_1
19171+
# 2874| v2874_1(void) = NoOp :
19172+
# 2865| v2865_13(void) = ReturnVoid :
1915019173
#-----| Goto -> Block 1
1915119174

1915219175
ir23.cpp:

0 commit comments

Comments
 (0)