Skip to content

Commit 4228828

Browse files
jketemajketema
committed
C++: Address review comments
1 parent 9d6a1a9 commit 4228828

File tree

5 files changed

+28
-46
lines changed

5 files changed

+28
-46
lines changed

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,14 @@ abstract class TranslatedValueCategoryAdjustment extends TranslatedExpr {
381381
final TranslatedCoreExpr getOperand() { result.getExpr() = expr }
382382
}
383383

384+
/**
385+
* Holds if `expr` requires an `SehExceptionEdge` to be generated.
386+
*/
387+
private predicate hasSehExceptionEdge(Expr expr) {
388+
expr instanceof PointerDereferenceExpr and
389+
exists(MicrosoftTryStmt tryStmt | tryStmt.getStmt() = expr.getEnclosingStmt().getParent*())
390+
}
391+
384392
/**
385393
* IR translation of an implicit lvalue-to-rvalue conversion on the result of
386394
* an expression.
@@ -403,9 +411,8 @@ class TranslatedLoad extends TranslatedValueCategoryAdjustment, TTranslatedLoad
403411
(
404412
result = this.getParent().getChildSuccessor(this, kind)
405413
or
406-
expr instanceof PointerDereferenceExpr and
414+
hasSehExceptionEdge(expr) and
407415
kind instanceof SehExceptionEdge and
408-
exists(MicrosoftTryStmt tryStmt | tryStmt.getStmt() = expr.getEnclosingStmt().getParent*()) and
409416
result = this.getParent().getExceptionSuccessorInstruction(any(GotoEdge e))
410417
)
411418
}
@@ -1955,9 +1962,8 @@ class TranslatedAssignExpr extends TranslatedNonConstantExpr {
19551962
(
19561963
result = this.getParent().getChildSuccessor(this, kind)
19571964
or
1958-
expr.getLValue() instanceof PointerDereferenceExpr and
1965+
hasSehExceptionEdge(expr.getLValue()) and
19591966
kind instanceof SehExceptionEdge and
1960-
exists(MicrosoftTryStmt tryStmt | tryStmt.getStmt() = expr.getEnclosingStmt().getParent*()) and
19611967
result = this.getParent().getExceptionSuccessorInstruction(any(GotoEdge e))
19621968
)
19631969
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49689,18 +49689,14 @@ try_except.c:
4968949689
# 52| Type = [IntType] int
4969049690
# 52| ValueCategory = prvalue(load)
4969149691
# 54| getStmt(2): [ReturnStmt] return ...
49692-
# 56| [TopLevelFunction] void k(int*, int*, int*, int*, int*)
49692+
# 56| [TopLevelFunction] void k(int*, int*, int*)
4969349693
# 56| <params>:
4969449694
# 56| getParameter(0): [Parameter] b
4969549695
# 56| Type = [IntPointerType] int *
4969649696
# 56| getParameter(1): [Parameter] c
4969749697
# 56| Type = [IntPointerType] int *
4969849698
# 56| getParameter(2): [Parameter] d
4969949699
# 56| Type = [IntPointerType] int *
49700-
# 56| getParameter(3): [Parameter] e
49701-
# 56| Type = [IntPointerType] int *
49702-
# 56| getParameter(4): [Parameter] f
49703-
# 56| Type = [IntPointerType] int *
4970449700
# 56| getEntryPoint(): [BlockStmt] { ... }
4970549701
# 57| getStmt(0): [DeclStmt] declaration
4970649702
# 57| getDeclarationEntry(0): [VariableDeclarationEntry] definition of x

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

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39258,7 +39258,7 @@ try_except.c:
3925839258
# 46| Block 7
3925939259
# 46| v46_10(void) = Unreached :
3926039260

39261-
# 56| void k(int*, int*, int*, int*, int*)
39261+
# 56| void k(int*, int*, int*)
3926239262
# 56| Block 0
3926339263
# 56| v56_1(void) = EnterFunction :
3926439264
# 56| m56_2(unknown) = AliasedDefinition :
@@ -39276,14 +39276,6 @@ try_except.c:
3927639276
# 56| m56_14(int *) = InitializeParameter[d] : &:r56_13
3927739277
# 56| r56_15(int *) = Load[d] : &:r56_13, m56_14
3927839278
# 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
3928739279
# 57| r57_1(glval<int>) = VariableAddress[x] :
3928839280
# 57| r57_2(int) = Constant[0] :
3928939281
# 57| m57_3(int) = Store[x] : &:r57_1, r57_2
@@ -39355,17 +39347,15 @@ try_except.c:
3935539347
# 66| m66_1(unknown) = Phi : from 3:m60_7, from 7:m63_7
3935639348
# 66| m66_2(unknown) = Phi : from 3:~m56_4, from 7:~m64_6
3935739349
# 66| v66_3(void) = NoOp :
39358-
# 56| v56_25(void) = ReturnIndirection[b] : &:r56_7, m56_8
39359-
# 56| v56_26(void) = ReturnIndirection[c] : &:r56_11, m66_1
39360-
# 56| v56_27(void) = ReturnIndirection[d] : &:r56_15, m56_16
39361-
# 56| v56_28(void) = ReturnIndirection[e] : &:r56_19, m56_20
39362-
# 56| v56_29(void) = ReturnIndirection[f] : &:r56_23, m56_24
39363-
# 56| v56_30(void) = ReturnVoid :
39364-
# 56| v56_31(void) = AliasedUse : ~m66_2
39365-
# 56| v56_32(void) = ExitFunction :
39350+
# 56| v56_17(void) = ReturnIndirection[b] : &:r56_7, m56_8
39351+
# 56| v56_18(void) = ReturnIndirection[c] : &:r56_11, m66_1
39352+
# 56| v56_19(void) = ReturnIndirection[d] : &:r56_15, m56_16
39353+
# 56| v56_20(void) = ReturnVoid :
39354+
# 56| v56_21(void) = AliasedUse : ~m66_2
39355+
# 56| v56_22(void) = ExitFunction :
3936639356

3936739357
# 56| Block 9
39368-
# 56| v56_33(void) = Unreached :
39358+
# 56| v56_23(void) = Unreached :
3936939359

3937039360
try_except.cpp:
3937139361
# 6| void f_cpp()

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

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37533,7 +37533,7 @@ try_except.c:
3753337533
# 46| v46_9(void) = ReturnVoid :
3753437534
#-----| Goto -> Block 1
3753537535

37536-
# 56| void k(int*, int*, int*, int*, int*)
37536+
# 56| void k(int*, int*, int*)
3753737537
# 56| Block 0
3753837538
# 56| v56_1(void) = EnterFunction :
3753937539
# 56| mu56_2(unknown) = AliasedDefinition :
@@ -37550,14 +37550,6 @@ try_except.c:
3755037550
# 56| mu56_13(int *) = InitializeParameter[d] : &:r56_12
3755137551
# 56| r56_14(int *) = Load[d] : &:r56_12, ~m?
3755237552
# 56| mu56_15(unknown) = InitializeIndirection[d] : &:r56_14
37553-
# 56| r56_16(glval<int *>) = VariableAddress[e] :
37554-
# 56| mu56_17(int *) = InitializeParameter[e] : &:r56_16
37555-
# 56| r56_18(int *) = Load[e] : &:r56_16, ~m?
37556-
# 56| mu56_19(unknown) = InitializeIndirection[e] : &:r56_18
37557-
# 56| r56_20(glval<int *>) = VariableAddress[f] :
37558-
# 56| mu56_21(int *) = InitializeParameter[f] : &:r56_20
37559-
# 56| r56_22(int *) = Load[f] : &:r56_20, ~m?
37560-
# 56| mu56_23(unknown) = InitializeIndirection[f] : &:r56_22
3756137553
# 57| r57_1(glval<int>) = VariableAddress[x] :
3756237554
# 57| r57_2(int) = Constant[0] :
3756337555
# 57| mu57_3(int) = Store[x] : &:r57_1, r57_2
@@ -37568,11 +37560,11 @@ try_except.c:
3756837560
#-----| SEH Exception -> Block 8
3756937561

3757037562
# 56| Block 1
37571-
# 56| v56_24(void) = AliasedUse : ~m?
37572-
# 56| v56_25(void) = ExitFunction :
37563+
# 56| v56_16(void) = AliasedUse : ~m?
37564+
# 56| v56_17(void) = ExitFunction :
3757337565

3757437566
# 56| Block 2
37575-
# 56| v56_26(void) = Unwind :
37567+
# 56| v56_18(void) = Unwind :
3757637568
#-----| Goto -> Block 1
3757737569

3757837570
# 59| Block 3
@@ -37630,12 +37622,10 @@ try_except.c:
3763037622

3763137623
# 66| Block 10
3763237624
# 66| v66_1(void) = NoOp :
37633-
# 56| v56_27(void) = ReturnIndirection[b] : &:r56_6, ~m?
37634-
# 56| v56_28(void) = ReturnIndirection[c] : &:r56_10, ~m?
37635-
# 56| v56_29(void) = ReturnIndirection[d] : &:r56_14, ~m?
37636-
# 56| v56_30(void) = ReturnIndirection[e] : &:r56_18, ~m?
37637-
# 56| v56_31(void) = ReturnIndirection[f] : &:r56_22, ~m?
37638-
# 56| v56_32(void) = ReturnVoid :
37625+
# 56| v56_19(void) = ReturnIndirection[b] : &:r56_6, ~m?
37626+
# 56| v56_20(void) = ReturnIndirection[c] : &:r56_10, ~m?
37627+
# 56| v56_21(void) = ReturnIndirection[d] : &:r56_14, ~m?
37628+
# 56| v56_22(void) = ReturnVoid :
3763937629
#-----| Goto -> Block 1
3764037630

3764137631
try_except.cpp:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void j(int b) {
5353
}
5454
}
5555

56-
void k(int *b, int *c, int *d, int *e, int *f) {
56+
void k(int *b, int *c, int *d) {
5757
int x = 0;
5858
__try {
5959
x = *b;

0 commit comments

Comments
 (0)