github
diff --git a/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll‎
Lines changed: 13 additions & 0 deletions b/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll‎
Lines changed: 14 additions & 0 deletions b/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCondition.qll‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll‎
Lines changed: 6 additions & 0 deletions b/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll‎
Lines changed: 2 additions & 0 deletions b/‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll‎
Lines changed: 2 additions & 0 deletions
@@ -47,6 +47,8 @@ abstract class TranslatedCall extends TranslatedExpr {
     else result = this.getFirstCallTargetInstruction(kind)
   }
 
+  override Instruction getLastInstruction() { result = this.getSideEffects().getLastInstruction() }
+
   override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
     tag = CallTag() and
     opcode instanceof Opcode::Call and
@@ -246,6 +248,15 @@ abstract class TranslatedSideEffects extends TranslatedElement {
     result = this.getParent().getChildSuccessor(this, kind)
   }
 
+  override Instruction getLastInstruction() {
+    if exists(this.getAChild())
+    then result = this.getChild(max(int i | exists(this.getChild(i)))).getLastInstruction()
+    else
+      // If there are no side effects, the "last" instruction should be the parent call's last
+      // instruction, so that implicit destructors can be inserted in the right place.
+      result = this.getParent().getInstruction(CallTag())
+  }
+
   final override Instruction getInstructionSuccessor(InstructionTag tag, EdgeKind kind) { none() }
 
   /** Gets the primary instruction to be associated with each side effect instruction. */
@@ -423,6 +434,8 @@ abstract class TranslatedSideEffect extends TranslatedElement {
     kind instanceof GotoEdge
   }
 
+  override Instruction getLastInstruction() { result = this.getInstruction(OnlyInstructionTag()) }
+
   final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType type) {
     tag = OnlyInstructionTag() and
     this.sideEffectInstruction(opcode, type)
 
@@ -56,6 +56,10 @@ abstract class TranslatedFlexibleCondition extends TranslatedCondition, Conditio
     result = this.getOperand().getFirstInstruction(kind)
   }
 
+  final override Instruction getLastInstruction() {
+    result = this.getOperand().getLastInstruction()
+  }
+
   final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
     none()
   }
@@ -104,6 +108,12 @@ abstract class TranslatedBinaryLogicalOperation extends TranslatedNativeConditio
     result = this.getLeftOperand().getFirstInstruction(kind)
   }
 
+  final override Instruction getLastInstruction() {
+    result = this.getLeftOperand().getLastInstruction()
+    or
+    result = this.getRightOperand().getLastInstruction()
+  }
+
   final override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
     none()
   }
@@ -162,6 +172,10 @@ class TranslatedValueCondition extends TranslatedCondition, TTranslatedValueCond
     result = this.getValueExpr().getFirstInstruction(kind)
   }
 
+  override Instruction getLastInstruction() {
+    result = this.getInstruction(ValueConditionConditionalBranchTag())
+  }
+
   override predicate hasInstruction(Opcode opcode, InstructionTag tag, CppType resultType) {
     tag = ValueConditionConditionalBranchTag() and
     opcode instanceof Opcode::ConditionalBranch and
 
@@ -156,6 +156,12 @@ class TranslatedStaticLocalVariableDeclarationEntry extends TranslatedDeclaratio
     kind instanceof GotoEdge
   }
 
+  final override Instruction getLastInstruction() {
+    result = this.getInstruction(DynamicInitializationConditionalBranchTag())
+    or
+    result = this.getInstruction(DynamicInitializationFlagStoreTag())
+  }
+
   final override Instruction getInstructionSuccessor(InstructionTag tag, EdgeKind kind) {
     tag = DynamicInitializationFlagAddressTag() and
     kind instanceof GotoEdge and
 
@@ -904,6 +904,8 @@ abstract class TranslatedElement extends TTranslatedElement {
    */
   abstract Instruction getInstructionSuccessor(InstructionTag tag, EdgeKind kind);
 
+  abstract Instruction getLastInstruction();
+
   /**
    * Gets the successor instruction to which control should flow after the
    * child element specified by `child` has finished execution. The successor