Skip to content

Commit bbf0ec8

Browse files
committed
C++: Fix implicit this.
1 parent ff6e8a2 commit bbf0ec8

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class TranslatedMicrosoftTryExceptHandler extends TranslatedElement,
2929

3030
final override Locatable getAst() { result = tryExcept.getExcept() }
3131

32-
override Instruction getFirstInstruction() { result = getChild(0).getFirstInstruction() }
32+
override Instruction getFirstInstruction() { result = this.getChild(0).getFirstInstruction() }
3333

3434
override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
3535
// t1 = -1
@@ -87,41 +87,41 @@ class TranslatedMicrosoftTryExceptHandler extends TranslatedElement,
8787
tag = TryExceptCompareNegativeOne() and
8888
(
8989
operandTag instanceof LeftOperandTag and
90-
result = getTranslatedCondition().getResult()
90+
result = this.getTranslatedCondition().getResult()
9191
or
9292
operandTag instanceof RightOperandTag and
93-
result = getInstruction(TryExceptGenerateNegativeOne())
93+
result = this.getInstruction(TryExceptGenerateNegativeOne())
9494
)
9595
or
9696
tag = TryExceptCompareNegativeOneBranch() and
9797
operandTag instanceof ConditionOperandTag and
98-
result = getInstruction(TryExceptCompareNegativeOne())
98+
result = this.getInstruction(TryExceptCompareNegativeOne())
9999
or
100100
tag = TryExceptCompareZero() and
101101
(
102102
operandTag instanceof LeftOperandTag and
103-
result = getTranslatedCondition().getResult()
103+
result = this.getTranslatedCondition().getResult()
104104
or
105105
operandTag instanceof RightOperandTag and
106-
result = getInstruction(TryExceptGenerateZero())
106+
result = this.getInstruction(TryExceptGenerateZero())
107107
)
108108
or
109109
tag = TryExceptCompareZeroBranch() and
110110
operandTag instanceof ConditionOperandTag and
111-
result = getInstruction(TryExceptCompareZero())
111+
result = this.getInstruction(TryExceptCompareZero())
112112
or
113113
tag = TryExceptCompareOne() and
114114
(
115115
operandTag instanceof LeftOperandTag and
116-
result = getTranslatedCondition().getResult()
116+
result = this.getTranslatedCondition().getResult()
117117
or
118118
operandTag instanceof RightOperandTag and
119-
result = getInstruction(TryExceptGenerateOne())
119+
result = this.getInstruction(TryExceptGenerateOne())
120120
)
121121
or
122122
tag = TryExceptCompareOneBranch() and
123123
operandTag instanceof ConditionOperandTag and
124-
result = getInstruction(TryExceptCompareOne())
124+
result = this.getInstruction(TryExceptCompareOne())
125125
}
126126

127127
override string getInstructionConstantValue(InstructionTag tag) {
@@ -139,12 +139,12 @@ class TranslatedMicrosoftTryExceptHandler extends TranslatedElement,
139139
// Generate -1 -> Compare condition
140140
tag = TryExceptGenerateNegativeOne() and
141141
kind instanceof GotoEdge and
142-
result = getInstruction(TryExceptCompareNegativeOne())
142+
result = this.getInstruction(TryExceptCompareNegativeOne())
143143
or
144144
// Compare condition -> Branch
145145
tag = TryExceptCompareNegativeOne() and
146146
kind instanceof GotoEdge and
147-
result = getInstruction(TryExceptCompareNegativeOneBranch())
147+
result = this.getInstruction(TryExceptCompareNegativeOneBranch())
148148
or
149149
// Branch -> Unwind or Generate 0
150150
tag = TryExceptCompareNegativeOneBranch() and
@@ -153,61 +153,61 @@ class TranslatedMicrosoftTryExceptHandler extends TranslatedElement,
153153
// TODO: This is not really correct. The semantics of `EXCEPTION_CONTINUE_EXECUTION` is that
154154
// we should continue execution at the point where the exception occurred. But we don't have
155155
// any instruction to model this behavior.
156-
result = getInstruction(UnwindTag())
156+
result = this.getInstruction(UnwindTag())
157157
or
158158
kind instanceof FalseEdge and
159-
result = getInstruction(TryExceptGenerateZero())
159+
result = this.getInstruction(TryExceptGenerateZero())
160160
)
161161
or
162162
// Generate 0 -> Compare condition
163163
tag = TryExceptGenerateZero() and
164164
kind instanceof GotoEdge and
165-
result = getInstruction(TryExceptCompareZero())
165+
result = this.getInstruction(TryExceptCompareZero())
166166
or
167167
// Compare condition -> Branch
168168
tag = TryExceptCompareZero() and
169169
kind instanceof GotoEdge and
170-
result = getInstruction(TryExceptCompareZeroBranch())
170+
result = this.getInstruction(TryExceptCompareZeroBranch())
171171
or
172172
// Branch -> Unwind or Generate 1
173173
tag = TryExceptCompareZeroBranch() and
174174
(
175175
kind instanceof TrueEdge and
176-
result = getInstruction(UnwindTag())
176+
result = this.getInstruction(UnwindTag())
177177
or
178178
kind instanceof FalseEdge and
179-
result = getInstruction(TryExceptGenerateOne())
179+
result = this.getInstruction(TryExceptGenerateOne())
180180
)
181181
or
182182
// Generate 1 -> Compare condition
183183
tag = TryExceptGenerateOne() and
184184
kind instanceof GotoEdge and
185-
result = getInstruction(TryExceptCompareOne())
185+
result = this.getInstruction(TryExceptCompareOne())
186186
or
187187
// Compare condition -> Branch
188188
tag = TryExceptCompareOne() and
189189
kind instanceof GotoEdge and
190-
result = getInstruction(TryExceptCompareOneBranch())
190+
result = this.getInstruction(TryExceptCompareOneBranch())
191191
or
192192
// Branch -> Handler (the condition value is always 0, -1 or 1, and we've checked for 0 or -1 already.)
193193
tag = TryExceptCompareOneBranch() and
194194
(
195195
kind instanceof TrueEdge and
196-
result = getTranslatedHandler().getFirstInstruction()
196+
result = this.getTranslatedHandler().getFirstInstruction()
197197
)
198198
or
199199
// Unwind -> Parent
200200
tag = UnwindTag() and
201201
kind instanceof GotoEdge and
202-
result = getParent().getChildSuccessor(this)
202+
result = this.getParent().getChildSuccessor(this)
203203
}
204204

205205
override Instruction getChildSuccessor(TranslatedElement child) {
206-
child = getTranslatedCondition() and
207-
result = getInstruction(TryExceptGenerateNegativeOne())
206+
child = this.getTranslatedCondition() and
207+
result = this.getInstruction(TryExceptGenerateNegativeOne())
208208
or
209-
child = getTranslatedHandler() and
210-
result = getParent().getChildSuccessor(this)
209+
child = this.getTranslatedHandler() and
210+
result = this.getParent().getChildSuccessor(this)
211211
}
212212

213213
private TranslatedExpr getTranslatedCondition() {
@@ -220,10 +220,10 @@ class TranslatedMicrosoftTryExceptHandler extends TranslatedElement,
220220

221221
override TranslatedElement getChild(int id) {
222222
id = 0 and
223-
result = getTranslatedCondition()
223+
result = this.getTranslatedCondition()
224224
or
225225
id = 1 and
226-
result = getTranslatedHandler()
226+
result = this.getTranslatedHandler()
227227
}
228228

229229
final override Function getFunction() { result = tryExcept.getEnclosingFunction() }

0 commit comments

Comments
 (0)