C++: Only report implicit destructors if we need to translate them.

MathiasVP · MathiasVP · commit a756f14e7728 · 2024-04-04T14:41:23.000+01:00
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
@@ -92,13 +92,17 @@ abstract class TranslatedExpr extends TranslatedElement {
     or
     exists(int maxChildId, int destructorIndex |
       maxChildId = max(int childId | exists(this.getChildInternal(childId))) and
-      result.(TranslatedExpr).getExpr() = expr.getImplicitDestructorCall(destructorIndex) and
+      result = this.getImplicitDestructorCall(destructorIndex) and
       id = maxChildId + 1 + destructorIndex
     )
   }
 
+  final private TranslatedExpr getImplicitDestructorCall(int index) {
+    result.getExpr() = expr.getImplicitDestructorCall(index)
+  }
+
   final override predicate hasAnImplicitDestructorCall() {
-    exists(expr.getAnImplicitDestructorCall())
+    exists(this.getImplicitDestructorCall(_))
   }
 
   final override int getFirstDestructorCallIndex() {

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,17 @@ abstract class TranslatedExpr extends TranslatedElement {`
`92`	`92`	`or`
`93`	`93`	`exists(int maxChildId, int destructorIndex \|`
`94`	`94`	`maxChildId = max(int childId \| exists(this.getChildInternal(childId))) and`
`95`		`- result.(TranslatedExpr).getExpr() = expr.getImplicitDestructorCall(destructorIndex) and`
	`95`	`+ result = this.getImplicitDestructorCall(destructorIndex) and`
`96`	`96`	`id = maxChildId + 1 + destructorIndex`
`97`	`97`	`)`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ final private TranslatedExpr getImplicitDestructorCall(int index) {`
	`101`	`+ result.getExpr() = expr.getImplicitDestructorCall(index)`
	`102`	`+ }`
	`103`	`+`
`100`	`104`	`final override predicate hasAnImplicitDestructorCall() {`
`101`		`- exists(expr.getAnImplicitDestructorCall())`
	`105`	`+ exists(this.getImplicitDestructorCall(_))`
`102`	`106`	`}`
`103`	`107`
`104`	`108`	`final override int getFirstDestructorCallIndex() {`