A15-2-2: Address cartesian product

lcartey · lcartey · commit afc027bea4dc · 2023-08-20T23:58:39.000+01:00
Missing target call in DeletedExpr.
diff --git a/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql b/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
@@ -53,10 +53,13 @@ class NewWrapperFunction extends Function {
 
 /** An expression on which `delete` is called, directly or indirectly. */
 class DeletedExpr extends Expr {
+  pragma[noinline, nomagic]
   DeletedExpr() {
-    this = any(DeleteExpr deleteExpr).getExpr() or
+    this = any(DeleteExpr deleteExpr).getExpr()
+    or
     exists(DeleteWrapperFunction dwf, FunctionCall call |
-      this = call.getArgument(dwf.getADeleteParameter().getIndex())
+      this = call.getArgument(dwf.getADeleteParameter().getIndex()) and
+      call.getTarget() = dwf
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,13 @@ class NewWrapperFunction extends Function {`
`53`	`53`
`54`	`54`	/** An expression on which `delete` is called, directly or indirectly. */
`55`	`55`	`class DeletedExpr extends Expr {`
	`56`	`+ pragma[noinline, nomagic]`
`56`	`57`	`DeletedExpr() {`
`57`		`- this = any(DeleteExpr deleteExpr).getExpr() or`
	`58`	`+ this = any(DeleteExpr deleteExpr).getExpr()`
	`59`	`+ or`
`58`	`60`	`exists(DeleteWrapperFunction dwf, FunctionCall call \|`
`59`		`- this = call.getArgument(dwf.getADeleteParameter().getIndex())`
	`61`	`+ this = call.getArgument(dwf.getADeleteParameter().getIndex()) and`
	`62`	`+ call.getTarget() = dwf`
`60`	`63`	`)`
`61`	`64`	`}`
`62`	`65`	`}`