Skip to content

Commit 3eb768c

Browse files
jketemajketema
committed
C++: Generate SEH edges for pointer dereference stores in __try blocks
1 parent 67d623f commit 3eb768c

File tree

4 files changed

+125
-95
lines changed

4 files changed

+125
-95
lines changed

‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1945,7 +1945,14 @@ class TranslatedAssignExpr extends TranslatedNonConstantExpr {
19451945

19461946
override Instruction getInstructionSuccessorInternal(InstructionTag tag, EdgeKind kind) {
19471947
tag = AssignmentStoreTag() and
1948-
result = this.getParent().getChildSuccessor(this, kind)
1948+
(
1949+
result = this.getParent().getChildSuccessor(this, kind)
1950+
or
1951+
expr.getLValue() instanceof PointerDereferenceExpr and
1952+
kind instanceof SehExceptionEdge and
1953+
exists(MicrosoftTryStmt tryStmt | tryStmt.getStmt() = expr.getEnclosingStmt().getParent*()) and
1954+
result = this.getParent().getExceptionSuccessorInstruction(any(GotoEdge e))
1955+
)
19491956
}
19501957

19511958
override Instruction getChildSuccessorInternal(TranslatedElement child, EdgeKind kind) {

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

Lines changed: 98 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -39194,7 +39194,6 @@ try_except.c:
3919439194
# 32| Block 7
3919539195
# 32| v32_10(void) = Unreached :
3919639196

39197-
<<<<<<< HEAD
3919839197
# 46| void j(int)
3919939198
# 46| Block 0
3920039199
# 46| v46_1(void) = EnterFunction :
@@ -39258,82 +39257,104 @@ try_except.c:
3925839257

3925939258
# 46| Block 7
3926039259
# 46| v46_10(void) = Unreached :
39261-
=======
39262-
# 44| void i(int*, int*, int*, int*, int*)
39263-
# 44| Block 0
39264-
# 44| v44_1(void) = EnterFunction :
39265-
# 44| m44_2(unknown) = AliasedDefinition :
39266-
# 44| m44_3(unknown) = InitializeNonLocal :
39267-
# 44| m44_4(unknown) = Chi : total:m44_2, partial:m44_3
39268-
# 44| r44_5(glval<int *>) = VariableAddress[b] :
39269-
# 44| m44_6(int *) = InitializeParameter[b] : &:r44_5
39270-
# 44| r44_7(int *) = Load[b] : &:r44_5, m44_6
39271-
# 44| m44_8(unknown) = InitializeIndirection[b] : &:r44_7
39272-
# 44| r44_9(glval<int *>) = VariableAddress[c] :
39273-
# 44| m44_10(int *) = InitializeParameter[c] : &:r44_9
39274-
# 44| r44_11(int *) = Load[c] : &:r44_9, m44_10
39275-
# 44| m44_12(unknown) = InitializeIndirection[c] : &:r44_11
39276-
# 44| r44_13(glval<int *>) = VariableAddress[d] :
39277-
# 44| m44_14(int *) = InitializeParameter[d] : &:r44_13
39278-
# 44| r44_15(int *) = Load[d] : &:r44_13, m44_14
39279-
# 44| m44_16(unknown) = InitializeIndirection[d] : &:r44_15
39280-
# 44| r44_17(glval<int *>) = VariableAddress[e] :
39281-
# 44| m44_18(int *) = InitializeParameter[e] : &:r44_17
39282-
# 44| r44_19(int *) = Load[e] : &:r44_17, m44_18
39283-
# 44| m44_20(unknown) = InitializeIndirection[e] : &:r44_19
39284-
# 44| r44_21(glval<int *>) = VariableAddress[f] :
39285-
# 44| m44_22(int *) = InitializeParameter[f] : &:r44_21
39286-
# 44| r44_23(int *) = Load[f] : &:r44_21, m44_22
39287-
# 44| m44_24(unknown) = InitializeIndirection[f] : &:r44_23
39288-
# 45| r45_1(glval<int>) = VariableAddress[x] :
39289-
# 45| r45_2(int) = Constant[0] :
39290-
# 45| m45_3(int) = Store[x] : &:r45_1, r45_2
39291-
# 47| r47_1(glval<int *>) = VariableAddress[b] :
39292-
# 47| r47_2(int *) = Load[b] : &:r47_1, m44_6
39293-
# 47| r47_3(int) = Load[?] : &:r47_2, ~m44_8
39294-
# 47| r47_4(glval<int>) = VariableAddress[x] :
39295-
# 47| m47_5(int) = Store[x] : &:r47_4, r47_3
39296-
# 48| r48_1(glval<int>) = VariableAddress[x] :
39297-
# 48| r48_2(int) = Load[x] : &:r48_1, m47_5
39298-
# 48| r48_3(glval<int *>) = VariableAddress[c] :
39299-
# 48| r48_4(int *) = Load[c] : &:r48_3, m44_10
39300-
# 48| r48_5(glval<int>) = CopyValue : r48_4
39301-
# 48| m48_6(int) = Store[?] : &:r48_5, r48_2
39302-
# 48| m48_7(unknown) = Chi : total:m44_12, partial:m48_6
39303-
# 49| r49_1(glval<int>) = VariableAddress[y] :
39304-
# 49| r49_2(glval<int *>) = VariableAddress[d] :
39305-
# 49| r49_3(int *) = Load[d] : &:r49_2, m44_14
39306-
# 49| r49_4(int) = Load[?] : &:r49_3, ~m44_16
39307-
# 49| m49_5(int) = Store[y] : &:r49_1, r49_4
39308-
# 50| r50_1(glval<int[2]>) = VariableAddress[x] :
39309-
# 50| m50_2(int[2]) = Uninitialized[x] : &:r50_1
39310-
# 50| r50_3(int) = Constant[0] :
39311-
# 50| r50_4(glval<int>) = PointerAdd[4] : r50_1, r50_3
39312-
# 50| r50_5(glval<int *>) = VariableAddress[e] :
39313-
# 50| r50_6(int *) = Load[e] : &:r50_5, m44_18
39314-
# 50| r50_7(int) = Load[?] : &:r50_6, ~m44_20
39315-
# 50| m50_8(int) = Store[?] : &:r50_4, r50_7
39316-
# 50| m50_9(int[2]) = Chi : total:m50_2, partial:m50_8
39317-
# 50| r50_10(int) = Constant[1] :
39318-
# 50| r50_11(glval<int>) = PointerAdd[4] : r50_1, r50_10
39319-
# 50| r50_12(glval<int *>) = VariableAddress[f] :
39320-
# 50| r50_13(int *) = Load[f] : &:r50_12, m44_22
39321-
# 50| r50_14(int) = Load[?] : &:r50_13, ~m44_24
39322-
# 50| m50_15(int) = Store[?] : &:r50_11, r50_14
39323-
# 50| m50_16(int[2]) = Chi : total:m50_9, partial:m50_15
39324-
# 55| v55_1(void) = NoOp :
39325-
# 44| v44_25(void) = ReturnIndirection[b] : &:r44_7, m44_8
39326-
# 44| v44_26(void) = ReturnIndirection[c] : &:r44_11, m48_7
39327-
# 44| v44_27(void) = ReturnIndirection[d] : &:r44_15, m44_16
39328-
# 44| v44_28(void) = ReturnIndirection[e] : &:r44_19, m44_20
39329-
# 44| v44_29(void) = ReturnIndirection[f] : &:r44_23, m44_24
39330-
# 44| v44_30(void) = ReturnVoid :
39331-
# 44| v44_31(void) = AliasedUse : m44_3
39332-
# 44| v44_32(void) = ExitFunction :
39333-
39334-
# 44| Block 1
39335-
# 44| v44_33(void) = Unreached :
39336-
>>>>>>> ad6e7a0f0f8 (C++: Add `__try` with load test case)
39260+
39261+
# 56| void k(int*, int*, int*, int*, int*)
39262+
# 56| Block 0
39263+
# 56| v56_1(void) = EnterFunction :
39264+
# 56| m56_2(unknown) = AliasedDefinition :
39265+
# 56| m56_3(unknown) = InitializeNonLocal :
39266+
# 56| m56_4(unknown) = Chi : total:m56_2, partial:m56_3
39267+
# 56| r56_5(glval<int *>) = VariableAddress[b] :
39268+
# 56| m56_6(int *) = InitializeParameter[b] : &:r56_5
39269+
# 56| r56_7(int *) = Load[b] : &:r56_5, m56_6
39270+
# 56| m56_8(unknown) = InitializeIndirection[b] : &:r56_7
39271+
# 56| r56_9(glval<int *>) = VariableAddress[c] :
39272+
# 56| m56_10(int *) = InitializeParameter[c] : &:r56_9
39273+
# 56| r56_11(int *) = Load[c] : &:r56_9, m56_10
39274+
# 56| m56_12(unknown) = InitializeIndirection[c] : &:r56_11
39275+
# 56| r56_13(glval<int *>) = VariableAddress[d] :
39276+
# 56| m56_14(int *) = InitializeParameter[d] : &:r56_13
39277+
# 56| r56_15(int *) = Load[d] : &:r56_13, m56_14
39278+
# 56| m56_16(unknown) = InitializeIndirection[d] : &:r56_15
39279+
# 56| r56_17(glval<int *>) = VariableAddress[e] :
39280+
# 56| m56_18(int *) = InitializeParameter[e] : &:r56_17
39281+
# 56| r56_19(int *) = Load[e] : &:r56_17, m56_18
39282+
# 56| m56_20(unknown) = InitializeIndirection[e] : &:r56_19
39283+
# 56| r56_21(glval<int *>) = VariableAddress[f] :
39284+
# 56| m56_22(int *) = InitializeParameter[f] : &:r56_21
39285+
# 56| r56_23(int *) = Load[f] : &:r56_21, m56_22
39286+
# 56| m56_24(unknown) = InitializeIndirection[f] : &:r56_23
39287+
# 57| r57_1(glval<int>) = VariableAddress[x] :
39288+
# 57| r57_2(int) = Constant[0] :
39289+
# 57| m57_3(int) = Store[x] : &:r57_1, r57_2
39290+
# 59| r59_1(glval<int *>) = VariableAddress[b] :
39291+
# 59| r59_2(int *) = Load[b] : &:r59_1, m56_6
39292+
# 59| r59_3(int) = Load[?] : &:r59_2, ~m56_8
39293+
# 59| r59_4(glval<int>) = VariableAddress[x] :
39294+
# 59| m59_5(int) = Store[x] : &:r59_4, r59_3
39295+
# 60| r60_1(glval<int>) = VariableAddress[x] :
39296+
# 60| r60_2(int) = Load[x] : &:r60_1, m59_5
39297+
# 60| r60_3(glval<int *>) = VariableAddress[c] :
39298+
# 60| r60_4(int *) = Load[c] : &:r60_3, m56_10
39299+
# 60| r60_5(glval<int>) = CopyValue : r60_4
39300+
# 60| m60_6(int) = Store[?] : &:r60_5, r60_2
39301+
# 60| m60_7(unknown) = Chi : total:m56_12, partial:m60_6
39302+
#-----| Goto -> Block 1
39303+
#-----| SEH Exception -> Block 4
39304+
39305+
# 61| Block 1
39306+
# 61| r61_1(glval<int>) = VariableAddress[y] :
39307+
# 61| r61_2(glval<int *>) = VariableAddress[d] :
39308+
# 61| r61_3(int *) = Load[d] : &:r61_2, m56_14
39309+
# 61| r61_4(int) = Load[?] : &:r61_3, ~m56_16
39310+
# 61| m61_5(int) = Store[y] : &:r61_1, r61_4
39311+
#-----| Goto -> Block 6
39312+
39313+
# 63| Block 2
39314+
# 63| r63_1(int) = Constant[0] :
39315+
# 63| r63_2(bool) = CompareEQ : r63_7, r63_1
39316+
# 63| v63_3(void) = ConditionalBranch : r63_2
39317+
#-----| False -> Block 3
39318+
#-----| True -> Block 7
39319+
39320+
# 63| Block 3
39321+
# 63| r63_4(int) = Constant[1] :
39322+
# 63| r63_5(bool) = CompareEQ : r63_7, r63_4
39323+
# 63| v63_6(void) = ConditionalBranch : r63_5
39324+
#-----| False -> Block 7
39325+
#-----| True -> Block 5
39326+
39327+
# 63| Block 4
39328+
# 63| r63_7(int) = Constant[1] :
39329+
# 63| r63_8(int) = Constant[-1] :
39330+
# 63| r63_9(bool) = CompareEQ : r63_7, r63_8
39331+
# 63| v63_10(void) = ConditionalBranch : r63_9
39332+
#-----| False -> Block 2
39333+
#-----| True -> Block 7
39334+
39335+
# 64| Block 5
39336+
# 64| r64_1(glval<unknown>) = FunctionAddress[sink] :
39337+
# 64| r64_2(glval<int>) = VariableAddress[x] :
39338+
# 64| r64_3(int) = Load[x] : &:r64_2, m59_5
39339+
# 64| v64_4(void) = Call[sink] : func:r64_1, 0:r64_3
39340+
# 64| m64_5(unknown) = ^CallSideEffect : ~m56_4
39341+
# 64| m64_6(unknown) = Chi : total:m56_4, partial:m64_5
39342+
#-----| Goto -> Block 6
39343+
39344+
# 66| Block 6
39345+
# 66| m66_1(unknown) = Phi : from 1:~m56_4, from 5:~m64_6
39346+
# 66| v66_2(void) = NoOp :
39347+
# 56| v56_25(void) = ReturnIndirection[b] : &:r56_7, m56_8
39348+
# 56| v56_26(void) = ReturnIndirection[c] : &:r56_11, m60_7
39349+
# 56| v56_27(void) = ReturnIndirection[d] : &:r56_15, m56_16
39350+
# 56| v56_28(void) = ReturnIndirection[e] : &:r56_19, m56_20
39351+
# 56| v56_29(void) = ReturnIndirection[f] : &:r56_23, m56_24
39352+
# 56| v56_30(void) = ReturnVoid :
39353+
# 56| v56_31(void) = AliasedUse : ~m66_1
39354+
# 56| v56_32(void) = ExitFunction :
39355+
39356+
# 56| Block 7
39357+
# 56| v56_33(void) = Unreached :
3933739358

3933839359
try_except.cpp:
3933939360
# 6| void f_cpp()

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ lostReachability
2121
backEdgeCountMismatch
2222
useNotDominatedByDefinition
2323
| ir.cpp:1535:8:1535:8 | Unary | Operand 'Unary' is not dominated by its definition in function '$@'. | ir.cpp:1535:8:1535:8 | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() | void StructuredBindingDataMemberStruct::StructuredBindingDataMemberStruct() |
24-
| try_except.c:63:13:63:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:56:6:56:6 | void k(int*, int*, int*, int*, int*) | void k(int*, int*, int*, int*, int*) |
25-
| try_except.c:63:13:63:13 | Left | Operand 'Left' is not dominated by its definition in function '$@'. | try_except.c:56:6:56:6 | void k(int*, int*, int*, int*, int*) | void k(int*, int*, int*, int*, int*) |
2624
switchInstructionWithoutDefaultEdge
2725
notMarkedAsConflated
2826
wronglyMarkedAsConflated

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37572,12 +37572,8 @@ try_except.c:
3757237572
# 60| r60_4(int *) = Load[c] : &:r60_3, ~m?
3757337573
# 60| r60_5(glval<int>) = CopyValue : r60_4
3757437574
# 60| mu60_6(int) = Store[?] : &:r60_5, r60_2
37575-
# 61| r61_1(glval<int>) = VariableAddress[y] :
37576-
# 61| r61_2(glval<int *>) = VariableAddress[d] :
37577-
# 61| r61_3(int *) = Load[d] : &:r61_2, ~m?
37578-
# 61| r61_4(int) = Load[?] : &:r61_3, ~m?
37579-
# 61| mu61_5(int) = Store[y] : &:r61_1, r61_4
37580-
#-----| Goto -> Block 7
37575+
#-----| Goto -> Block 3
37576+
#-----| SEH Exception -> Block 6
3758137577

3758237578
# 56| Block 1
3758337579
# 56| v56_24(void) = AliasedUse : ~m?
@@ -37587,36 +37583,44 @@ try_except.c:
3758737583
# 56| v56_26(void) = Unwind :
3758837584
#-----| Goto -> Block 1
3758937585

37590-
# 63| Block 3
37586+
# 61| Block 3
37587+
# 61| r61_1(glval<int>) = VariableAddress[y] :
37588+
# 61| r61_2(glval<int *>) = VariableAddress[d] :
37589+
# 61| r61_3(int *) = Load[d] : &:r61_2, ~m?
37590+
# 61| r61_4(int) = Load[?] : &:r61_3, ~m?
37591+
# 61| mu61_5(int) = Store[y] : &:r61_1, r61_4
37592+
#-----| Goto -> Block 8
37593+
37594+
# 63| Block 4
3759137595
# 63| r63_1(int) = Constant[0] :
3759237596
# 63| r63_2(bool) = CompareEQ : r63_7, r63_1
3759337597
# 63| v63_3(void) = ConditionalBranch : r63_2
37594-
#-----| False -> Block 4
37598+
#-----| False -> Block 5
3759537599
#-----| True -> Block 2
3759637600

37597-
# 63| Block 4
37601+
# 63| Block 5
3759837602
# 63| r63_4(int) = Constant[1] :
3759937603
# 63| r63_5(bool) = CompareEQ : r63_7, r63_4
3760037604
# 63| v63_6(void) = ConditionalBranch : r63_5
37601-
#-----| True -> Block 6
37605+
#-----| True -> Block 7
3760237606

37603-
# 63| Block 5
37607+
# 63| Block 6
3760437608
# 63| r63_7(int) = Constant[1] :
3760537609
# 63| r63_8(int) = Constant[-1] :
3760637610
# 63| r63_9(bool) = CompareEQ : r63_7, r63_8
3760737611
# 63| v63_10(void) = ConditionalBranch : r63_9
37608-
#-----| False -> Block 3
37612+
#-----| False -> Block 4
3760937613
#-----| True -> Block 2
3761037614

37611-
# 64| Block 6
37615+
# 64| Block 7
3761237616
# 64| r64_1(glval<unknown>) = FunctionAddress[sink] :
3761337617
# 64| r64_2(glval<int>) = VariableAddress[x] :
3761437618
# 64| r64_3(int) = Load[x] : &:r64_2, ~m?
3761537619
# 64| v64_4(void) = Call[sink] : func:r64_1, 0:r64_3
3761637620
# 64| mu64_5(unknown) = ^CallSideEffect : ~m?
37617-
#-----| Goto -> Block 7
37621+
#-----| Goto -> Block 8
3761837622

37619-
# 66| Block 7
37623+
# 66| Block 8
3762037624
# 66| v66_1(void) = NoOp :
3762137625
# 56| v56_27(void) = ReturnIndirection[b] : &:r56_6, ~m?
3762237626
# 56| v56_28(void) = ReturnIndirection[c] : &:r56_10, ~m?

0 commit comments

Comments
 (0)