Make a base class OperatorNewOrDelete and use that in 21-6-3

Author: jeongsoolee09

cpp/common/src/codingstandards/cpp/allocations/CustomOperatorNewDelete.qll

@@ -14,19 +14,21 @@ class ConstNoThrowTReferenceType extends ReferenceType {
 }
 
 /** An `operator` that implements one of the `[replacement.functions]`. */
-abstract class CustomOperatorNewOrDelete extends Operator {
+abstract class OperatorNewOrDelete extends Operator {
+  OperatorNewOrDelete() {
+    this.getName().regexpMatch("operator new(\\[\\])?") or
+    this.getName().regexpMatch("operator delete(\\[\\])?")
+  }
+}
+
+/** An `operator` that implements one of the `[replacement.functions]`. */
+abstract class CustomOperatorNewOrDelete extends OperatorNewOrDelete {
   CustomOperatorNewOrDelete() {
     // Not in the standard library
     exists(getFile().getRelativePath()) and
     // Not in a file called `new`, which is likely to be a copy of the standard library
     // as it is in our tests
-    not forall(File file | file = this.getADeclarationLocation().getFile() |
-      file.getBaseName() = "new"
-    ) and
-    (
-      this.getName().regexpMatch("operator new(\\[\\])?") or
-      this.getName().regexpMatch("operator delete(\\[\\])?")
-    )
+    not getFile().getBaseName() = "new"
   }
 
   /**

cpp/misra/src/rules/RULE-21-6-3/AdvancedMemoryManagementUsed.ql

@@ -35,7 +35,7 @@ class AdvancedMemoryManagementFunction extends Function {
   string describe() { result = description }
 }
 
-class NonStandardNewOrNewArrayOperator extends CustomOperatorNewOrDelete {
+class NonStandardNewOrNewArrayOperator extends OperatorNewOrDelete {
   NonStandardNewOrNewArrayOperator() {
     this.getName() in ["operator new", "operator new[]"] and
     not this instanceof CustomOperatorNew // `CustomOperatorNew` only detects replaceable allocation functions.
@@ -61,7 +61,7 @@ class UserDeclaredOperatorNewOrDelete extends FunctionDeclarationEntry {
   }
 }
 
-class NonStandardDeleteOrDeleteArrayOperator extends CustomOperatorNewOrDelete {
+class NonStandardDeleteOrDeleteArrayOperator extends OperatorNewOrDelete {
   NonStandardDeleteOrDeleteArrayOperator() {
     this.getName() in ["operator delete", "operator delete[]"] and
     not this instanceof CustomOperatorDelete // `CustomOperatorDelete` only detects replaceable deallocation functions.