C++: Unsuppress temporary destructors in IR

Robert Marsh · MathiasVP · commit 75c453fd3054 · 2024-04-04T10:29:59.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll
@@ -127,9 +127,6 @@ private predicate ignoreExprAndDescendants(Expr expr) {
   exists(BuiltInVarArgsStart vaStartExpr |
     vaStartExpr.getLastNamedParameter().getFullyConverted() = expr
   )
-  or
-  // suppress destructors of temporary variables until proper support is added for them.
-  exists(Expr parent | parent.getAnImplicitDestructorCall() = expr)
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -97,6 +97,19 @@ abstract class TranslatedExpr extends TranslatedElement {
     )
   }
 
+  final override predicate hasAnImplicitDestructorCall() {
+    exists(expr.getAnImplicitDestructorCall())
+  }
+
+  final override int getFirstDestructorCallIndex() {
+    not this.handlesDestructorsExplicitly() and
+    (
+      result = max(int childId | exists(this.getChildInternal(childId))) + 1
+      or
+      not exists(this.getChildInternal(_)) and result = 0
+    )
+  }
+
   final override Locatable getAst() { result = expr }
 
   final override Declaration getFunction() { result = getEnclosingDeclaration(expr) }

Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,6 @@ private predicate ignoreExprAndDescendants(Expr expr) {`
`127`	`127`	`exists(BuiltInVarArgsStart vaStartExpr \|`
`128`	`128`	`vaStartExpr.getLastNamedParameter().getFullyConverted() = expr`
`129`	`129`	`)`
`130`		`- or`
`131`		`- // suppress destructors of temporary variables until proper support is added for them.`
`132`		`- exists(Expr parent \| parent.getAnImplicitDestructorCall() = expr)`
`133`	`130`	`}`
`134`	`131`
`135`	`132`	`/**`