Skip to content

Commit 3619b01

Browse files
committed
Merge branch 'brodes/seh_flow_phase2_splitting_seh_edges' of https://github.com/microsoft/codeql into brodes/seh_flow_phase2_splitting_seh_edges
2 parents 48c8697 + 3115833 commit 3619b01

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

cpp/ql/lib/semmle/code/cpp/ir/implementation/EdgeKind.qll

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ private newtype TEdgeKind =
99
TTrueEdge() or // 'true' edge of conditional branch
1010
TFalseEdge() or // 'false' edge of conditional branch
1111
TCppExceptionEdge() or // Thrown C++ exception
12-
TSehExceptionEdge() or // Thrown C++ exception
12+
TSehExceptionEdge() or // Thrown SEH exception
1313
TDefaultEdge() or // 'default' label of switch
1414
TCaseEdge(string minValue, string maxValue) {
1515
// Case label of switch
@@ -58,24 +58,22 @@ abstract private class ExceptionEdgeImpl extends EdgeKindImpl { }
5858
* An "exception" edge, representing the successor of an instruction when that
5959
* instruction's evaluation throws an exception.
6060
*
61-
* Exception edges are expclitly sublcassed to
62-
* `CppExceptionEdge` and `SehExceptionEdge` only.
63-
* Further sublcasses, if required, should be added privately
64-
* here for IR efficiency.
61+
* Exception edges are expclitly sublcassed to `CppExceptionEdge` and `SehExceptionEdge`
62+
* only. Further sublcasses, if required, should be added privately here for IR efficiency.
6563
*/
6664
final class ExceptionEdge = ExceptionEdgeImpl;
6765

6866
/**
6967
* An "exception" edge, representing the successor of an instruction when that
70-
* instruction's evaluation throws an exception for C++ exceptions
68+
* instruction's evaluation throws a C++ exception.
7169
*/
7270
class CppExceptionEdge extends ExceptionEdgeImpl, TCppExceptionEdge {
7371
final override string toString() { result = "C++ Exception" }
7472
}
7573

7674
/**
7775
* An "exception" edge, representing the successor of an instruction when that
78-
* instruction's evaluation throws an exception for SEH exceptions
76+
* instruction's evaluation throws an SEH exception.
7977
*/
8078
class SehExceptionEdge extends ExceptionEdgeImpl, TSehExceptionEdge {
8179
final override string toString() { result = "SEH Exception" }
@@ -145,12 +143,12 @@ module EdgeKind {
145143
FalseEdge falseEdge() { result = TFalseEdge() }
146144

147145
/**
148-
* Gets an instance of the `CppExceptionEdge` class.
146+
* Gets the single instance of the `CppExceptionEdge` class.
149147
*/
150148
CppExceptionEdge cppExceptionEdge() { result = TCppExceptionEdge() }
151149

152150
/**
153-
* Gets an instance of the `SehExceptionEdge` class.
151+
* Gets the single instance of the `SehExceptionEdge` class.
154152
*/
155153
SehExceptionEdge sehExceptionEdge() { result = TSehExceptionEdge() }
156154

0 commit comments

Comments
 (0)