C++: add getIRVariable for this temp variables

Robert Marsh · Robert Marsh · commit b4a947ddf193 · 2020-05-22T15:43:34.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -694,6 +694,11 @@ class TranslatedThisExpr extends TranslatedNonConstantExpr {
     operandTag instanceof AddressOperandTag and
     result = getInstruction(ThisAddressTag())
   }
+
+  override IRVariable getInstructionVariable(InstructionTag tag) {
+    tag = ThisAddressTag() and
+    result = this.getEnclosingFunction().getThisVariable()
+  }
 }
 
 abstract class TranslatedVariableAccess extends TranslatedNonConstantExpr {
diff --git a/cpp/ql/test/library-tests/ir/escape/ssa_escape.expected b/cpp/ql/test/library-tests/ir/escape/ssa_escape.expected
@@ -1,3 +0,0 @@
-| escape.cpp:211:7:211:7 | c |
-| escape.cpp:219:7:219:8 | c3 |
-| escape.cpp:223:7:223:8 | c4 |
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected

Original file line number	Diff line number	Diff line change
`@@ -694,6 +694,11 @@ class TranslatedThisExpr extends TranslatedNonConstantExpr {`
`694`	`694`	`operandTag instanceof AddressOperandTag and`
`695`	`695`	`result = getInstruction(ThisAddressTag())`
`696`	`696`	`}`
	`697`	`+`
	`698`	`+ override IRVariable getInstructionVariable(InstructionTag tag) {`
	`699`	`+ tag = ThisAddressTag() and`
	`700`	`+ result = this.getEnclosingFunction().getThisVariable()`
	`701`	`+ }`
`697`	`702`	`}`
`698`	`703`
`699`	`704`	`abstract class TranslatedVariableAccess extends TranslatedNonConstantExpr {`