From aab3a88bf9e9f9be34f811d71262dec635236dfb Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 23 Jul 2023 15:08:58 +0100
Subject: [PATCH 001/435] Pointers: 0 is a null pointer constant

According to MISRA C 2012 8.11 zero is a null pointer constant, and so
should not be flagged as non_compliant.
---
 c/common/src/codingstandards/c/Pointers.qll                | 7 +------
 ...ConversionBetweenPointerToObjectAndIntegerType.expected | 3 ---
 c/misra/test/rules/RULE-11-4/test.c                        | 4 ++--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/c/common/src/codingstandards/c/Pointers.qll b/c/common/src/codingstandards/c/Pointers.qll
index 458c2271eb..6410b81322 100644
--- a/c/common/src/codingstandards/c/Pointers.qll
+++ b/c/common/src/codingstandards/c/Pointers.qll
@@ -62,12 +62,7 @@ class ArrayPointerArithmeticExpr extends PointerArithmeticExpr, ArrayExpr {
 predicate isNullPointerConstant(Expr e) {
   e.findRootCause() instanceof NULLMacro
   or
-  exists(CStyleCast c |
-    not c.isImplicit() and
-    c.getExpr() = e and
-    e instanceof Zero and
-    c.getType() instanceof VoidPointerType
-  )
+  e instanceof Zero
   or
   isNullPointerConstant(e.(Conversion).getExpr())
 }
diff --git a/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected b/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
index 5fedfdcce4..060de9944f 100644
--- a/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
+++ b/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
@@ -1,6 +1,3 @@
-| test.c:5:21:5:42 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
-| test.c:5:35:5:42 | (int *)... | Cast performed between a pointer to object type and a pointer to an integer type. |
 | test.c:6:21:6:37 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
 | test.c:8:8:8:24 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
-| test.c:10:22:10:22 | (unsigned int *)... | Cast performed between a pointer to object type and a pointer to an integer type. |
 | test.c:12:22:12:39 | (unsigned int *)... | Cast performed between a pointer to object type and a pointer to an integer type. |
diff --git a/c/misra/test/rules/RULE-11-4/test.c b/c/misra/test/rules/RULE-11-4/test.c
index 25e3f3c4b2..1e3a798b86 100644
--- a/c/misra/test/rules/RULE-11-4/test.c
+++ b/c/misra/test/rules/RULE-11-4/test.c
@@ -2,12 +2,12 @@
 
 void f1(void) {
   unsigned int v1 = (unsigned int)(void *)0; // COMPLIANT
-  unsigned int v2 = (unsigned int)(int *)0;  // NON_COMPLIANT
+  unsigned int v2 = (unsigned int)(int *)0;  // COMPLIANT
   unsigned int v3 = (unsigned int)&v2;       // NON_COMPLIANT
   v3 = v2;                                   // COMPLIANT
   v3 = (unsigned int)&v2;                    // NON_COMPLIANT
   v3 = NULL;                                 // COMPLIANT
-  unsigned int *v4 = 0;                      // NON_COMPLIANT
+  unsigned int *v4 = 0;                      // COMPLIANT
   unsigned int *v5 = NULL;                   // COMPLIANT
   unsigned int *v6 = (unsigned int *)v2;     // NON_COMPLIANT
 }
\ No newline at end of file

From 5ad86efd7427cf1f14833a6b28959788cf8c9346 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 23 Jul 2023 21:05:13 +0100
Subject: [PATCH 002/435] RULE-11-4: Compress macro results

Where results arise from macro expansions, where there's no possibility
that the cast was passed in through a macro argument, we compress the
results by reporting the macro location once instead of each use.
---
 ...ionBetweenPointerToObjectAndIntegerType.ql | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
index 4071cf63b5..72e713c7f1 100644
--- a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
+++ b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
@@ -13,15 +13,34 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.Macro
 import codingstandards.c.Pointers
 
-from CStyleCast cast, Type typeFrom, Type typeTo
+MacroInvocation getAMacroInvocation(CStyleCast cast) { result.getAnExpandedElement() = cast }
+
+Macro getPrimaryMacro(CStyleCast cast) {
+  exists(MacroInvocation mi |
+    mi = getAMacroInvocation(cast) and
+    not exists(MacroInvocation otherMi |
+      otherMi = getAMacroInvocation(cast) and otherMi.getParentInvocation() = mi
+    ) and
+    result = mi.getMacro() and
+    not result instanceof FunctionLikeMacro
+  )
+}
+
+from Locatable primaryLocation, CStyleCast cast, Type typeFrom, Type typeTo
 where
   not isExcluded(cast, Pointers1Package::castBetweenObjectPointerAndDifferentObjectTypeQuery()) and
   typeFrom = cast.getExpr().getUnderlyingType() and
   typeTo = cast.getUnderlyingType() and
   [typeFrom, typeTo] instanceof IntegralType and
   [typeFrom, typeTo] instanceof PointerToObjectType and
-  not isNullPointerConstant(cast.getExpr())
-select cast,
+  not isNullPointerConstant(cast.getExpr()) and
+  // If this alert is arising through a macro expansion, flag the macro instead, to
+  // help make the alerts more manageable
+  if exists(getPrimaryMacro(cast))
+  then primaryLocation = getPrimaryMacro(cast)
+  else primaryLocation = cast
+select primaryLocation,
   "Cast performed between a pointer to object type and a pointer to an integer type."

From 916df884a479765497265267a0fc36f40ae564fa Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 23 Jul 2023 21:28:35 +0100
Subject: [PATCH 003/435] RULE 11.4: Improve reporting

Improve the message by (a) reporting which order the cast is (b) what
the actual types are (c) by providing a link to the macro invocation if
the cast is created by a function like macro
---
 ...ionBetweenPointerToObjectAndIntegerType.ql | 63 +++++++++++++++----
 ...weenPointerToObjectAndIntegerType.expected |  9 ++-
 c/misra/test/rules/RULE-11-4/test.c           | 12 ++++
 3 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
index 72e713c7f1..625aec2220 100644
--- a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
+++ b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
@@ -24,23 +24,62 @@ Macro getPrimaryMacro(CStyleCast cast) {
     not exists(MacroInvocation otherMi |
       otherMi = getAMacroInvocation(cast) and otherMi.getParentInvocation() = mi
     ) and
-    result = mi.getMacro() and
-    not result instanceof FunctionLikeMacro
+    result = mi.getMacro()
   )
 }
 
-from Locatable primaryLocation, CStyleCast cast, Type typeFrom, Type typeTo
+Macro getNonFunctionPrimaryMacro(CStyleCast cast) {
+  result = getPrimaryMacro(cast) and
+  not result instanceof FunctionLikeMacro
+}
+
+from
+  Locatable primaryLocation, CStyleCast cast, Type typeFrom, Type typeTo, string message,
+  string extraMessage, Locatable optionalPlaceholderLocation, string optionalPlaceholderMessage
 where
   not isExcluded(cast, Pointers1Package::castBetweenObjectPointerAndDifferentObjectTypeQuery()) and
   typeFrom = cast.getExpr().getUnderlyingType() and
   typeTo = cast.getUnderlyingType() and
-  [typeFrom, typeTo] instanceof IntegralType and
-  [typeFrom, typeTo] instanceof PointerToObjectType and
+  (
+    typeFrom instanceof PointerToObjectType and
+    typeTo instanceof IntegralType and
+    message =
+      "Cast from pointer to object type '" + typeFrom + "' to integer type '" + typeTo + "'" +
+        extraMessage + "."
+    or
+    typeFrom instanceof IntegralType and
+    typeTo instanceof PointerToObjectType and
+    message =
+      "Cast from integer type '" + typeFrom + "' to pointer to object type '" + typeTo + "'" +
+        extraMessage + "."
+  ) and
   not isNullPointerConstant(cast.getExpr()) and
-  // If this alert is arising through a macro expansion, flag the macro instead, to
-  // help make the alerts more manageable
-  if exists(getPrimaryMacro(cast))
-  then primaryLocation = getPrimaryMacro(cast)
-  else primaryLocation = cast
-select primaryLocation,
-  "Cast performed between a pointer to object type and a pointer to an integer type."
+  // If this alert is arising through a non-function-like macro expansion, flag the macro instead, to
+  // help make the alerts more manageable. We only do this for non-function-like macros because they
+  // cannot be context specific.
+  if exists(getNonFunctionPrimaryMacro(cast))
+  then
+    primaryLocation = getNonFunctionPrimaryMacro(cast) and
+    extraMessage = "" and
+    optionalPlaceholderLocation = primaryLocation and
+    optionalPlaceholderMessage = ""
+  else (
+    primaryLocation = cast and
+    // If the cast is in a macro expansion which is context specific, we still report the original
+    // location, but also add a link to the most specific macro that contains the cast, to aid
+    // validation.
+    if exists(getPrimaryMacro(cast))
+    then
+      extraMessage = " from expansion of macro $@" and
+      exists(Macro m |
+        m = getPrimaryMacro(cast) and
+        optionalPlaceholderLocation = m and
+        optionalPlaceholderMessage = m.getName()
+      )
+    else (
+      extraMessage = "" and
+      optionalPlaceholderLocation = cast and
+      optionalPlaceholderMessage = ""
+    )
+  )
+select primaryLocation, message, optionalPlaceholderLocation, optionalPlaceholderMessage
diff --git a/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected b/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
index 060de9944f..44d5ca5943 100644
--- a/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
+++ b/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
@@ -1,3 +1,6 @@
-| test.c:6:21:6:37 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
-| test.c:8:8:8:24 | (unsigned int)... | Cast performed between a pointer to object type and a pointer to an integer type. |
-| test.c:12:22:12:39 | (unsigned int *)... | Cast performed between a pointer to object type and a pointer to an integer type. |
+| test.c:6:21:6:37 | (unsigned int)... | Cast from pointer to object type 'unsigned int *' to integer type 'unsigned int'. | test.c:6:21:6:37 | (unsigned int)... |  |
+| test.c:8:8:8:24 | (unsigned int)... | Cast from pointer to object type 'unsigned int *' to integer type 'unsigned int'. | test.c:8:8:8:24 | (unsigned int)... |  |
+| test.c:12:22:12:39 | (unsigned int *)... | Cast from integer type 'unsigned int' to pointer to object type 'unsigned int *'. | test.c:12:22:12:39 | (unsigned int *)... |  |
+| test.c:15:1:15:24 | #define FOO (int *)0x200 | Cast from integer type 'int' to pointer to object type 'int *'. | test.c:15:1:15:24 | #define FOO (int *)0x200 |  |
+| test.c:23:3:23:22 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:17:1:17:34 | #define FOO_FUNCTIONAL(x) (int *)x | FOO_FUNCTIONAL |
+| test.c:24:14:24:25 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:18:1:18:23 | #define FOO_INSERT(x) x | FOO_INSERT |
diff --git a/c/misra/test/rules/RULE-11-4/test.c b/c/misra/test/rules/RULE-11-4/test.c
index 1e3a798b86..5a78387247 100644
--- a/c/misra/test/rules/RULE-11-4/test.c
+++ b/c/misra/test/rules/RULE-11-4/test.c
@@ -10,4 +10,16 @@ void f1(void) {
   unsigned int *v4 = 0;                      // COMPLIANT
   unsigned int *v5 = NULL;                   // COMPLIANT
   unsigned int *v6 = (unsigned int *)v2;     // NON_COMPLIANT
+}
+
+#define FOO (int *)0x200 // NON_COMPLIANT
+#define FOO_WRAPPER FOO;
+#define FOO_FUNCTIONAL(x) (int *)x
+#define FOO_INSERT(x) x
+
+void test_macros() {
+  FOO;                      // Issue is reported at the macro
+  FOO_WRAPPER;              // Issue is reported at the macro
+  FOO_FUNCTIONAL(0x200);    // NON_COMPLIANT
+  FOO_INSERT((int *)0x200); // NON_COMPLIANT
 }
\ No newline at end of file

From 49d0aef4a6997c7b8d49f787b9903f3517b665c5 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 28 Jul 2023 17:09:43 -0700
Subject: [PATCH 004/435] Add change note.

---
 change_notes/2023-07-28-rule-11-4-improvements.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 change_notes/2023-07-28-rule-11-4-improvements.md

diff --git a/change_notes/2023-07-28-rule-11-4-improvements.md b/change_notes/2023-07-28-rule-11-4-improvements.md
new file mode 100644
index 0000000000..d97e554a26
--- /dev/null
+++ b/change_notes/2023-07-28-rule-11-4-improvements.md
@@ -0,0 +1,4 @@
+ - `RULE-11-4`
+   - Reduce false positives by considering `0` a null pointer constant.
+   - Improve reporting of the order of the cast and the actual types involved.
+   - Improve reporting where the result is expanded from a macro by either reporting the macro itself (if it is not dependent on the context) or by including a link to the macro in the alert message.
\ No newline at end of file

From dad044ed54cfba7fd6b0b6ffeb52061a1e4e2a29 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Tue, 31 Oct 2023 17:02:29 +0000
Subject: [PATCH 005/435] C++: Accept test changes after
 github/codeql/pull/14637.

---
 .../MissingConstructorCallForManuallyManagedObject.expected  | 4 ++++
 cpp/cert/test/rules/MEM53-CPP/test.cpp                       | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected b/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
index 7225190e38..e06f6b9a63 100644
--- a/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
+++ b/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
@@ -2,6 +2,7 @@ WARNING: Module DataFlow has been deprecated and may be removed in future (/home
 WARNING: Module DataFlow has been deprecated and may be removed in future (/home/runner/work/semmle-code/semmle-code/codeql-coding-standards/cpp/cert/src/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.ql:25,38-46)
 WARNING: Module DataFlow has been deprecated and may be removed in future (/home/runner/work/semmle-code/semmle-code/codeql-coding-standards/cpp/cert/src/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.ql:25,65-73)
 edges
+| test.cpp:65:21:65:34 | call to operator new | test.cpp:67:26:67:32 | call to realloc |
 nodes
 | test.cpp:16:26:16:31 | call to malloc | semmle.label | call to malloc |
 | test.cpp:17:38:17:43 | call to malloc | semmle.label | call to malloc |
@@ -12,6 +13,8 @@ nodes
 | test.cpp:47:26:47:39 | call to operator new | semmle.label | call to operator new |
 | test.cpp:49:29:49:42 | call to operator new | semmle.label | call to operator new |
 | test.cpp:51:29:51:42 | call to operator new | semmle.label | call to operator new |
+| test.cpp:65:21:65:34 | call to operator new | semmle.label | call to operator new |
+| test.cpp:67:26:67:32 | call to realloc | semmle.label | call to realloc |
 subpaths
 #select
 | test.cpp:16:26:16:31 | call to malloc | test.cpp:16:26:16:31 | call to malloc | test.cpp:16:26:16:31 | call to malloc | Allocation to cast without constructor call |
@@ -23,3 +26,4 @@ subpaths
 | test.cpp:47:26:47:39 | call to operator new | test.cpp:47:26:47:39 | call to operator new | test.cpp:47:26:47:39 | call to operator new | Allocation to cast without constructor call |
 | test.cpp:49:29:49:42 | call to operator new | test.cpp:49:29:49:42 | call to operator new | test.cpp:49:29:49:42 | call to operator new | Allocation to cast without constructor call |
 | test.cpp:51:29:51:42 | call to operator new | test.cpp:51:29:51:42 | call to operator new | test.cpp:51:29:51:42 | call to operator new | Allocation to cast without constructor call |
+| test.cpp:67:26:67:32 | call to realloc | test.cpp:65:21:65:34 | call to operator new | test.cpp:67:26:67:32 | call to realloc | Allocation to cast without constructor call |
diff --git a/cpp/cert/test/rules/MEM53-CPP/test.cpp b/cpp/cert/test/rules/MEM53-CPP/test.cpp
index 12c6d1ee56..82c0953a60 100644
--- a/cpp/cert/test/rules/MEM53-CPP/test.cpp
+++ b/cpp/cert/test/rules/MEM53-CPP/test.cpp
@@ -63,6 +63,7 @@ void test_no_constructor_but_has_destructor() {
 
 void test_realloc() {
   void *goodAlloc = ::operator new(sizeof(ClassA));
-  ClassA *a1 = new (goodAlloc) ClassA{1};                        // COMPLIANT
-  ClassA *a2 = (ClassA *)realloc(goodAlloc, sizeof(ClassA) * 2); // COMPLIANT
+  ClassA *a1 = new (goodAlloc) ClassA{1}; // COMPLIANT
+  ClassA *a2 = (ClassA *)realloc(
+      goodAlloc, sizeof(ClassA) * 2); // COMPLIANT [FALSE_POSITIVE]
 }
\ No newline at end of file

From faf222e15365f1d86bf468912afb21491094829d Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 28 Nov 2023 17:00:26 +0100
Subject: [PATCH 006/435] Use new `isPrototyped` predicate in RULE-8-2

From CodeQL 2.15.4 onwards, parameters declared in a declaration list will
have a location.
---
 .../rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
index e46085750d..583bf257aa 100644
--- a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
+++ b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
@@ -48,11 +48,9 @@ where
     msg = "Function " + f + " does not specify void for no parameters present."
     or
     //parameters declared in declaration list (not in function signature)
-    //have placeholder file location associated only
-    exists(Parameter p |
-      p.getFunction() = f and
-      not p.getFile() = f.getFile() and
-      msg = "Function " + f + " declares parameter in unsupported declaration list."
-    )
+    //have no prototype
+    not f.isPrototyped() and
+    not hasZeroParamDecl(f) and
+    msg = "Function " + f + " declares parameter in unsupported declaration list."
   )
 select f, msg

From 95d048ad923e60a359ec264cd2285b7025400b4a Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Tue, 28 Nov 2023 16:14:58 +0000
Subject: [PATCH 007/435] C++: Disable the workaround for bitwise operations
 since the underlying bug has been fixed.

---
 cpp/common/src/codingstandards/cpp/Bitwise.qll | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Bitwise.qll b/cpp/common/src/codingstandards/cpp/Bitwise.qll
index 0e19cae29d..871587b4ea 100644
--- a/cpp/common/src/codingstandards/cpp/Bitwise.qll
+++ b/cpp/common/src/codingstandards/cpp/Bitwise.qll
@@ -5,16 +5,6 @@
 private import cpp as cpp
 
 module Bitwise {
-  /**
-   * A binary bitwise assign operation, excluding += and -= on pointers, which seem to be erroneously
-   * included.
-   */
-  class AssignBitwiseOperation extends cpp::AssignBitwiseOperation {
-    AssignBitwiseOperation() {
-      // exclude += and -= on pointers, which seem to be erroneously included
-      // in the database schema
-      not this instanceof cpp::AssignPointerAddExpr and
-      not this instanceof cpp::AssignPointerSubExpr
-    }
-  }
+  /** A binary bitwise assign operation. */
+  class AssignBitwiseOperation extends cpp::AssignBitwiseOperation { }
 }

From f553ba0d5fd3d8e02d069e4cf283e4dce85a278d Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 29 Nov 2023 10:08:44 +0000
Subject: [PATCH 008/435] Completely rip out the Bitwise library.

---
 .../OperandsOfAnInappropriateEssentialType.ql          |  3 +--
 ...twiseOperatorOperandsHaveDifferentUnderlyingType.ql |  3 +--
 .../M5-0-21/BitwiseOperatorAppliedToSignedTypes.ql     |  3 +--
 .../M5-8-1/RightBitShiftOperandIsNegativeOrTooWide.ql  |  3 +--
 cpp/common/src/codingstandards/cpp/Bitwise.qll         | 10 ----------
 5 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 cpp/common/src/codingstandards/cpp/Bitwise.qll

diff --git a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
index 6fdde80119..005b7c6cf5 100644
--- a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
+++ b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
@@ -14,7 +14,6 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.c.misra.EssentialTypes
-import codingstandards.cpp.Bitwise
 
 /**
  * Holds if the operator `operator` has an operand `child` that is of an inappropriate essential type
@@ -178,7 +177,7 @@ predicate isInappropriateEssentialType(
     child =
       [
         operator.(BinaryBitwiseOperation).getAnOperand(),
-        operator.(Bitwise::AssignBitwiseOperation).getAnOperand()
+        operator.(AssignBitwiseOperation).getAnOperand()
       ] and
     not operator instanceof LShiftExpr and
     not operator instanceof RShiftExpr and
diff --git a/cpp/autosar/src/rules/M5-0-20/BitwiseOperatorOperandsHaveDifferentUnderlyingType.ql b/cpp/autosar/src/rules/M5-0-20/BitwiseOperatorOperandsHaveDifferentUnderlyingType.ql
index 9e85a15e50..6d0554bf11 100644
--- a/cpp/autosar/src/rules/M5-0-20/BitwiseOperatorOperandsHaveDifferentUnderlyingType.ql
+++ b/cpp/autosar/src/rules/M5-0-20/BitwiseOperatorOperandsHaveDifferentUnderlyingType.ql
@@ -16,7 +16,6 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Bitwise
 import codingstandards.cpp.Conversion
 
 predicate isBinaryBitwiseOperation(Operation o, VariableAccess l, VariableAccess r) {
@@ -24,7 +23,7 @@ predicate isBinaryBitwiseOperation(Operation o, VariableAccess l, VariableAccess
     l = bbo.getLeftOperand() and r = bbo.getRightOperand()
   )
   or
-  exists(Bitwise::AssignBitwiseOperation abo | abo = o |
+  exists(AssignBitwiseOperation abo | abo = o |
     l = abo.getLValue() and
     r = abo.getRValue()
   )
diff --git a/cpp/autosar/src/rules/M5-0-21/BitwiseOperatorAppliedToSignedTypes.ql b/cpp/autosar/src/rules/M5-0-21/BitwiseOperatorAppliedToSignedTypes.ql
index d000155189..02bb5314cd 100644
--- a/cpp/autosar/src/rules/M5-0-21/BitwiseOperatorAppliedToSignedTypes.ql
+++ b/cpp/autosar/src/rules/M5-0-21/BitwiseOperatorAppliedToSignedTypes.ql
@@ -17,7 +17,6 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Bitwise
 
 from Operation o, VariableAccess va
 where
@@ -25,7 +24,7 @@ where
   (
     o instanceof UnaryBitwiseOperation or
     o instanceof BinaryBitwiseOperation or
-    o instanceof Bitwise::AssignBitwiseOperation
+    o instanceof AssignBitwiseOperation
   ) and
   o.getAnOperand() = va and
   va.getTarget().getUnderlyingType().(IntegralType).isSigned()
diff --git a/cpp/autosar/src/rules/M5-8-1/RightBitShiftOperandIsNegativeOrTooWide.ql b/cpp/autosar/src/rules/M5-8-1/RightBitShiftOperandIsNegativeOrTooWide.ql
index 38da7115f3..b94d76fd94 100644
--- a/cpp/autosar/src/rules/M5-8-1/RightBitShiftOperandIsNegativeOrTooWide.ql
+++ b/cpp/autosar/src/rules/M5-8-1/RightBitShiftOperandIsNegativeOrTooWide.ql
@@ -17,7 +17,6 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Bitwise
 
 class ShiftOperation extends Operation {
   Expr leftOperand;
@@ -34,7 +33,7 @@ class ShiftOperation extends Operation {
       rightOperand = o.getRightOperand()
     )
     or
-    exists(Bitwise::AssignBitwiseOperation o | this = o |
+    exists(AssignBitwiseOperation o | this = o |
       (
         o instanceof AssignLShiftExpr
         or
diff --git a/cpp/common/src/codingstandards/cpp/Bitwise.qll b/cpp/common/src/codingstandards/cpp/Bitwise.qll
deleted file mode 100644
index 871587b4ea..0000000000
--- a/cpp/common/src/codingstandards/cpp/Bitwise.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * A library for addressing issues in bitwise operator modelling in our database schema.
- */
-
-private import cpp as cpp
-
-module Bitwise {
-  /** A binary bitwise assign operation. */
-  class AssignBitwiseOperation extends cpp::AssignBitwiseOperation { }
-}

From b126c7f06de76c9e7d85268cc3fcce6cd88602b9 Mon Sep 17 00:00:00 2001
From: Remco Vermeulen <rvermeulen@users.noreply.github.com>
Date: Wed, 29 Nov 2023 12:02:00 -0800
Subject: [PATCH 009/435] Add webhook handler used in an Azure Function

---
 scripts/release/webhook-handler.js | 229 +++++++++++++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 scripts/release/webhook-handler.js

diff --git a/scripts/release/webhook-handler.js b/scripts/release/webhook-handler.js
new file mode 100644
index 0000000000..01a29f316e
--- /dev/null
+++ b/scripts/release/webhook-handler.js
@@ -0,0 +1,229 @@
+/**
+ * This function is triggered by a GitHub webhook when a check run completes.
+ * It expects the following environment variables to be set:
+ * - GITHUB_APP_ID: the ID of the GitHub App used to authenticate
+ * - GITHUB_APP_INSTALLATION_ID: the ID of the GitHub App installation
+ * - GITHUB_APP_PRIVATE_KEY: the private key of the GitHub App
+ * - GITHUB_WEBHOOK_SECRET: the secret used to sign the webhook
+ * - GITHUB_WORKFLOW_ID: the ID of the workflow to trigger, this should be the id of the workflow `update-release-status.yml`
+ */
+const crypto = require('crypto');
+const { Buffer } = require('buffer');
+const https = require('https');
+
+function encode(obj) {
+    return Buffer.from(JSON.stringify(obj)).toString('base64url');
+}
+
+function createJwtToken() {
+
+    const signingKey = crypto.createPrivateKey(Buffer.from(process.env['GITHUB_APP_PRIVATE_KEY'], 'base64'));
+
+    const claims = {
+        // Issue 60 seconds in the past to account for clock drift.
+        iat: Math.floor(Date.now() / 1000) - 60,
+        // The token is valid for 1 minutes
+        exp: Math.floor(Date.now() / 1000) + (1 * 60),
+        iss: process.env["GITHUB_APP_ID"]
+    };
+
+    const header = {
+        alg: "RS256",
+        typ: "JWT"
+    };
+
+    const payload = `${encode(header)}.${encode(claims)}`;
+    const signer = crypto.createSign('RSA-SHA256');
+    const signature = (signer.update(payload), signer.sign(signingKey, 'base64url'));
+
+    return `${payload}.${signature}`;
+}
+
+function createAccessToken(context) {
+    return new Promise((resolve, reject) => {
+        const options = {
+            hostname: 'api.github.com',
+            path: `/app/installations/${process.env["GITHUB_APP_INSTALLATION_ID"]}/access_tokens`,
+            method: 'POST'
+        };
+
+        const req = https.request(options, (res) => {
+            res.on('data', (data) => {
+                const body = JSON.parse(data.toString('utf8'));
+                access_token = body.token;
+                //context.log(access_token);
+                resolve(access_token);
+            });
+
+            res.on('error', (error) => {
+                reject(error);
+            })
+        });
+
+        req.setHeader('Accept', 'application/vnd.github+json');
+        const token = createJwtToken();
+        //context.log(`JWT Token ${token}`);
+        req.setHeader('Authorization', `Bearer ${token}`);
+        req.setHeader('X-GitHub-Api-Version', '2022-11-28');
+        req.setHeader('User-Agent', 'CodeQL Coding Standards Automation');
+
+        req.end();
+    });
+}
+
+function triggerReleaseUpdate(context, access_token, head_sha) {
+    context.log(`Triggering release update for head sha ${head_sha}`)
+    return new Promise((resolve, reject) => {
+        const options = {
+            hostname: 'api.github.com',
+            path: `/repos/github/codeql-coding-standards/actions/workflows/${process.env["GITHUB_WORKFLOW_ID"]}/dispatches`,
+            method: 'POST'
+        };
+
+        const req = https.request(options, (res) => {
+            res.on('error', (error) => {
+                reject(error);
+            })
+        });
+
+        req.setHeader('Accept', 'application/vnd.github+json');
+        req.setHeader('Authorization', `Bearer ${access_token}`);
+        req.setHeader('X-GitHub-Api-Version', '2022-11-28');
+        req.setHeader('User-Agent', 'CodeQL Coding Standards Automation');
+
+        const params = {
+            ref: 'main',
+            inputs: {
+                "head-sha": head_sha
+            }
+        };
+        req.on('response', (response) => {
+            context.log(`Received status code ${response.statusCode} with message ${response.statusMessage}`);
+            resolve();
+        });
+        req.end(JSON.stringify(params));
+    });
+}
+
+function listCheckRunsForRefPerPage(context, access_token, ref, page = 1) {
+    context.log(`Listing check runs for ${ref}`)
+    return new Promise((resolve, reject) => {
+        const options = {
+            hostname: 'api.github.com',
+            path: `/repos/github/codeql-coding-standards/commits/${ref}/check-runs?page=${page}&per_page=100`,
+            method: 'GET',
+            headers: {
+                'Accept': 'application/vnd.github+json',
+                'Authorization': `Bearer ${access_token}`,
+                'X-GitHub-Api-Version': '2022-11-28',
+                'User-Agent': 'CodeQL Coding Standards Automation'
+            }
+        };
+
+        const req = https.request(options, (res) => {
+            if (res.statusCode != 200) {
+                reject(`Received status code ${res.statusCode} with message ${res.statusMessage}`);
+            } else {
+                var body = [];
+                res.on('data', (chunk) => {
+                    body.push(chunk);
+                }); 
+                res.on('end', () => {
+                    try {
+                        body = JSON.parse(Buffer.concat(body).toString('utf8'));
+                        resolve(body);
+                    } catch (error) {
+                        reject(error);
+                    }
+                });
+            }
+        });
+        req.on('error', (error) => {    
+            reject(error);
+        });
+
+        req.end();
+    });
+}
+
+async function listCheckRunsForRef(context, access_token, ref) {
+    let page = 1;
+    let check_runs = [];
+    const first_page = await listCheckRunsForRefPerPage(context, access_token, ref, page);
+    check_runs = check_runs.concat(first_page.check_runs);
+    while (first_page.total_count > check_runs.length) {
+        page++;
+        const next_page = await listCheckRunsForRefPerPage(context, access_token, ref, page);
+        check_runs = check_runs.concat(next_page.check_runs);
+    }
+    return check_runs;
+}
+
+function hasReleaseStatusCheckRun(check_runs) {
+    return check_runs.some(check_run => check_run.name == 'release-status');
+}
+
+function isValidSignature(req) {
+    const hmac = crypto.createHmac("sha256", process.env["GITHUB_WEBHOOK_SECRET"]);
+    const signature = hmac.update(JSON.stringify(req.body)).digest('hex');
+    const shaSignature = `sha256=${signature}`;
+    const gitHubSignature = req.headers['x-hub-signature-256'];
+
+    return !shaSignature.localeCompare(gitHubSignature);
+}
+
+module.exports = async function (context, req) {
+    context.log('Webhook received.');
+
+    if (isValidSignature(req)) {
+        const event = req.headers['x-github-event'];
+
+        if (event == 'check_run') {
+            webhook = req.body;
+
+            // To avoid infinite loops, we skip triggering the workflow for the following checkruns. 
+            const check_runs_to_skip = [
+                // check run created by manual dispatch of Update Release workflow
+                'Update release',
+                // check runs created by job in Update release status workflow
+                'update-release',
+                // when update-release calls reusable workflow Update release
+                'update-release / Update release',
+                'validate-check-runs',
+                // check run that validates the whole release
+                'release-status'];
+            const update_release_actions = ['completed', 'rerequested'];
+
+            if (update_release_actions.includes(webhook.action) && !check_runs_to_skip.includes(webhook.check_run.name)) {
+                context.log(`Triggering update release status because ${webhook.check_run.name} received action ${webhook.action}`);
+
+                try {
+                    const access_token = await createAccessToken(context);
+                    const check_runs = await listCheckRunsForRef(context, access_token, webhook.check_run.head_sha);
+                    if (hasReleaseStatusCheckRun(check_runs)) {
+                        context.log(`Release status check run found for ${webhook.check_run.head_sha}`);
+                        await triggerReleaseUpdate(context, access_token, webhook.check_run.head_sha);
+                    } else {
+                        context.log(`Skippping, no release status check run found for ${webhook.check_run.head_sha}`);
+                    }
+                } catch (error) {
+                    context.log(`Failed with error: ${error}`);
+                }
+            } else {
+                context.log(`Skipping action ${webhook.action} for ${webhook.check_run.name}`)
+            }
+        } else {
+            context.log(`Skipping event: ${event}`)
+        }
+
+        context.res = {
+            status: 200
+        };
+    } else {
+        context.log('Received invalid GitHub signature')
+        context.res = {
+            status: 401,
+            body: 'Invalid x-hub-signature-256 value'
+        };
+    }
+}
\ No newline at end of file

From ff193da3604ca45e893848abc380fb44bc1be5f1 Mon Sep 17 00:00:00 2001
From: Remco Vermeulen <rvermeulen@users.noreply.github.com>
Date: Wed, 29 Nov 2023 12:15:12 -0800
Subject: [PATCH 010/435] Update function description

---
 scripts/release/webhook-handler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/release/webhook-handler.js b/scripts/release/webhook-handler.js
index 01a29f316e..8016cb256b 100644
--- a/scripts/release/webhook-handler.js
+++ b/scripts/release/webhook-handler.js
@@ -1,5 +1,5 @@
 /**
- * This function is triggered by a GitHub webhook when a check run completes.
+ * This function should be installed as an Azure Function with a HTTP trigger and configured as a GitHub webhook.
  * It expects the following environment variables to be set:
  * - GITHUB_APP_ID: the ID of the GitHub App used to authenticate
  * - GITHUB_APP_INSTALLATION_ID: the ID of the GitHub App installation

From d2b668b4da9409bb06237b3613ef7a85dcc8d172 Mon Sep 17 00:00:00 2001
From: Remco Vermeulen <rvermeulen@users.noreply.github.com>
Date: Wed, 29 Nov 2023 12:23:01 -0800
Subject: [PATCH 011/435] Correct comment

---
 scripts/release/webhook-handler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/release/webhook-handler.js b/scripts/release/webhook-handler.js
index 8016cb256b..6197bedb48 100644
--- a/scripts/release/webhook-handler.js
+++ b/scripts/release/webhook-handler.js
@@ -22,7 +22,7 @@ function createJwtToken() {
     const claims = {
         // Issue 60 seconds in the past to account for clock drift.
         iat: Math.floor(Date.now() / 1000) - 60,
-        // The token is valid for 1 minutes
+        // The token is valid for 1 minute(s).
         exp: Math.floor(Date.now() / 1000) + (1 * 60),
         iss: process.env["GITHUB_APP_ID"]
     };

From 4e415d7819c5ea3abebe0c20f867d3922574a0c6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 5 Dec 2023 10:47:53 +0000
Subject: [PATCH 012/435] A7-2-1: Fix typo in query message.

---
 cpp/autosar/src/rules/A7-2-1/NonEnumeratorEnumValue.ql        | 2 +-
 cpp/autosar/test/rules/A7-2-1/NonEnumeratorEnumValue.expected | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/autosar/src/rules/A7-2-1/NonEnumeratorEnumValue.ql b/cpp/autosar/src/rules/A7-2-1/NonEnumeratorEnumValue.ql
index 9b41c97129..f4dcd7f32e 100644
--- a/cpp/autosar/src/rules/A7-2-1/NonEnumeratorEnumValue.ql
+++ b/cpp/autosar/src/rules/A7-2-1/NonEnumeratorEnumValue.ql
@@ -47,7 +47,7 @@ where
     then
       description =
         "Cast to enum $@ with from expression with value " + c.getExpr().getValue().toFloat() +
-          "_+ which is not one of the enumerator values in function " +
+          " which is not one of the enumerator values in function " +
           c.getEnclosingFunction().getName() + "."
     else
       if exists(upperBound(c.getExpr()))
diff --git a/cpp/autosar/test/rules/A7-2-1/NonEnumeratorEnumValue.expected b/cpp/autosar/test/rules/A7-2-1/NonEnumeratorEnumValue.expected
index 9c99c44897..6ac5cfca86 100644
--- a/cpp/autosar/test/rules/A7-2-1/NonEnumeratorEnumValue.expected
+++ b/cpp/autosar/test/rules/A7-2-1/NonEnumeratorEnumValue.expected
@@ -7,4 +7,4 @@
 | test.cpp:27:12:27:25 | (Foo)... | Cast to enum $@ with from expression with range 0...3 which may not be one of the enumerator values in function test_bitwise_or. | test.cpp:2:6:2:8 | Foo | Foo |
 | test.cpp:28:12:28:25 | (Foo)... | Cast to enum $@ with from expression with range 0...7 which may not be one of the enumerator values in function test_bitwise_or. | test.cpp:2:6:2:8 | Foo | Foo |
 | test.cpp:39:12:39:17 | (Bar)... | Cast to enum $@ with from expression with range 1...1 which may not be one of the enumerator values in function test_constant. | test.cpp:5:6:5:8 | Bar | Bar |
-| test.cpp:41:12:41:17 | (Bar)... | Cast to enum $@ with from expression with value 1_+ which is not one of the enumerator values in function test_constant. | test.cpp:5:6:5:8 | Bar | Bar |
+| test.cpp:41:12:41:17 | (Bar)... | Cast to enum $@ with from expression with value 1 which is not one of the enumerator values in function test_constant. | test.cpp:5:6:5:8 | Bar | Bar |

From bbbb6d832baae34a7392db85d81673bb6ab79d89 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 5 Dec 2023 10:48:57 +0000
Subject: [PATCH 013/435] A7-2-1: Add change note for typo

---
 change_notes/2023-12-05-a7-2-1-typo.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 change_notes/2023-12-05-a7-2-1-typo.md

diff --git a/change_notes/2023-12-05-a7-2-1-typo.md b/change_notes/2023-12-05-a7-2-1-typo.md
new file mode 100644
index 0000000000..f87fc7cf8b
--- /dev/null
+++ b/change_notes/2023-12-05-a7-2-1-typo.md
@@ -0,0 +1 @@
+ * `A7-2-1` - fix typo in some alert messages.
\ No newline at end of file

From 0274eb6e00c4edf70e8ccab0f7abbc1003d2f017 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Thu, 14 Dec 2023 17:18:55 +0000
Subject: [PATCH 014/435] C: Accept test changes from #15107.

---
 .../DoNotPerformFileOperationsOnDevices.expected     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected b/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected
index 06bf56cf8a..d8632eb3c1 100644
--- a/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected
+++ b/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected
@@ -1,12 +1,12 @@
 edges
-| test.c:20:15:20:23 | scanf output argument | test.c:21:8:21:16 | file_name indirection |
-| test.c:45:15:45:23 | scanf output argument | test.c:46:29:46:37 | file_name indirection |
+| test.c:20:15:20:23 | scanf output argument | test.c:21:8:21:16 | *file_name |
+| test.c:45:15:45:23 | scanf output argument | test.c:46:29:46:37 | *file_name |
 nodes
 | test.c:20:15:20:23 | scanf output argument | semmle.label | scanf output argument |
-| test.c:21:8:21:16 | file_name indirection | semmle.label | file_name indirection |
+| test.c:21:8:21:16 | *file_name | semmle.label | *file_name |
 | test.c:45:15:45:23 | scanf output argument | semmle.label | scanf output argument |
-| test.c:46:29:46:37 | file_name indirection | semmle.label | file_name indirection |
+| test.c:46:29:46:37 | *file_name | semmle.label | *file_name |
 subpaths
 #select
-| test.c:21:8:21:16 | file_name | test.c:20:15:20:23 | scanf output argument | test.c:21:8:21:16 | file_name indirection | This argument to a file access function is derived from $@ and then passed to func(file_name), which calls fopen((unnamed parameter 0)). | test.c:20:15:20:23 | scanf output argument | user input (value read by scanf) |
-| test.c:46:29:46:37 | file_name | test.c:45:15:45:23 | scanf output argument | test.c:46:29:46:37 | file_name indirection | This argument to a file access function is derived from $@ and then passed to CreateFile(lpFileName). | test.c:45:15:45:23 | scanf output argument | user input (value read by scanf) |
+| test.c:21:8:21:16 | file_name | test.c:20:15:20:23 | scanf output argument | test.c:21:8:21:16 | *file_name | This argument to a file access function is derived from $@ and then passed to func(file_name), which calls fopen((unnamed parameter 0)). | test.c:20:15:20:23 | scanf output argument | user input (value read by scanf) |
+| test.c:46:29:46:37 | file_name | test.c:45:15:45:23 | scanf output argument | test.c:46:29:46:37 | *file_name | This argument to a file access function is derived from $@ and then passed to CreateFile(lpFileName). | test.c:45:15:45:23 | scanf output argument | user input (value read by scanf) |

From f2425ad6fe898fb04ffe258c8c5312521336818f Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Fri, 22 Dec 2023 11:43:53 +0100
Subject: [PATCH 015/435] Use database extensionals instead of their wrapper
 classes in two predicates

We are planning to change the charpred of `Function` in the CodeQL C++ library,
which means the code changed here will no longer compile. By switching to the
extensionals, the code will keep compiling.

DIL before:
```
noinline
`ConstantExprs::isFunction/1#600714be`(
  /* Element::Element */ interned unique entity el
)
{
  exists(interned dontcare string _, interned dontcare int _1 |
    functions(el, _, _1)
  ) or
  exists(interned dontcare int _ | exprparents(el, _, el))
}

noopt
`ConstantExprs::callHasNoTarget/1#e6e8caa4`(
  /* @funbindexpr */ interned unique entity fc
)
{
  exists(/* Function::Function */ interned entity f |
    funbind(fc, f) and not(`ConstantExprs::isFunction/1#600714be`(f))
  )
}
```

DIL after:
```
noinline
`ConstantExprs::isFunction/1#600714be`(/* @element */ interned unique entity el)
{
  exists(interned dontcare string _, interned dontcare int _1 |
    functions(el, _, _1)
  ) or
  exists(interned dontcare int _ | exprparents(el, _, el))
}

noopt
`ConstantExprs::callHasNoTarget/1#e6e8caa4`(
  /* @funbindexpr */ interned unique entity fc
)
{
  exists(/* @function */ interned entity f |
    funbind(fc, f) and not(`ConstantExprs::isFunction/1#600714be`(f))
  )
}
```
---
 .../cpp/enhancements/ControlFlowGraphEnhancements.qll       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/enhancements/ControlFlowGraphEnhancements.qll b/cpp/common/src/codingstandards/cpp/enhancements/ControlFlowGraphEnhancements.qll
index 74d7e8e1c1..9dac58377c 100644
--- a/cpp/common/src/codingstandards/cpp/enhancements/ControlFlowGraphEnhancements.qll
+++ b/cpp/common/src/codingstandards/cpp/enhancements/ControlFlowGraphEnhancements.qll
@@ -10,8 +10,8 @@ import cpp
  * should be in this relation.
  */
 pragma[noinline]
-private predicate isFunction(Element el) {
-  el instanceof Function
+private predicate isFunction(@element el) {
+  el instanceof @function
   or
   el.(Expr).getParent() = el
 }
@@ -22,7 +22,7 @@ private predicate isFunction(Element el) {
  */
 pragma[noopt]
 private predicate callHasNoTarget(@funbindexpr fc) {
-  exists(Function f |
+  exists(@function f |
     funbind(fc, f) and
     not isFunction(f)
   )

From 378f4fa481acda19ac3378c3107699b0c40ba5cc Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 2 Jan 2024 16:01:55 +0100
Subject: [PATCH 016/435] Resolve name clash with CodeQL defined
 `UserDefinedLiteral`

---
 .../A13-1-2/UserDefinedLiteralOperatorSuffixViolation.ql      | 4 ++--
 .../UserDefinedLiteralsOperatorsShallNotHaveSideEffects.ql    | 4 ++--
 ...lsOperatorsShallOnlyPerformConversionOfPassedParameters.ql | 4 ++--
 .../rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.ql   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpp/autosar/src/rules/A13-1-2/UserDefinedLiteralOperatorSuffixViolation.ql b/cpp/autosar/src/rules/A13-1-2/UserDefinedLiteralOperatorSuffixViolation.ql
index 7fe8bcdbe7..c739035596 100644
--- a/cpp/autosar/src/rules/A13-1-2/UserDefinedLiteralOperatorSuffixViolation.ql
+++ b/cpp/autosar/src/rules/A13-1-2/UserDefinedLiteralOperatorSuffixViolation.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.UserDefinedLiteral
+import codingstandards.cpp.UserDefinedLiteral as udl
 
-from UserDefinedLiteral udl
+from udl::UserDefinedLiteral udl
 where
   not isExcluded(udl, NamingPackage::userDefinedLiteralOperatorSuffixViolationQuery()) and
   not udl.hasCompliantSuffix()
diff --git a/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallNotHaveSideEffects.ql b/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallNotHaveSideEffects.ql
index 0cbb9f101e..b41a57f900 100644
--- a/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallNotHaveSideEffects.ql
+++ b/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallNotHaveSideEffects.ql
@@ -14,11 +14,11 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.UserDefinedLiteral
+import codingstandards.cpp.UserDefinedLiteral as udl
 import codingstandards.cpp.SideEffect
 import codingstandards.cpp.sideeffect.DefaultEffects
 
-from UserDefinedLiteral udl, SideEffect e
+from udl::UserDefinedLiteral udl, SideEffect e
 where
   not isExcluded(udl,
     SideEffects2Package::userDefinedLiteralsOperatorsShallNotHaveSideEffectsQuery()) and
diff --git a/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql b/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql
index b010e616cb..840d7423fb 100644
--- a/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql
+++ b/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql
@@ -16,10 +16,10 @@
 import cpp
 import codingstandards.cpp.dataflow.TaintTracking
 import codingstandards.cpp.autosar
-import codingstandards.cpp.UserDefinedLiteral
+import codingstandards.cpp.UserDefinedLiteral as udl
 import codingstandards.cpp.SideEffect
 
-from UserDefinedLiteral udl, Expr retExpr
+from udl::UserDefinedLiteral udl, Expr retExpr
 where
   not isExcluded(udl,
     SideEffects2Package::userDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParametersQuery()) and
diff --git a/cpp/cert/src/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.ql b/cpp/cert/src/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.ql
index f7dddb4d99..eb2163f667 100644
--- a/cpp/cert/src/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.ql
+++ b/cpp/cert/src/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.cert
-import codingstandards.cpp.UserDefinedLiteral
+import codingstandards.cpp.UserDefinedLiteral as udl
 
-from UserDefinedLiteral udl
+from udl::UserDefinedLiteral udl
 where
   not isExcluded(udl, NamingPackage::useOfReservedLiteralSuffixIdentifierQuery()) and
   not udl.hasCompliantSuffix()

From 978777e689ae043e15292bc7a4a138c3006e994c Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 10 Jan 2024 10:22:15 +0100
Subject: [PATCH 017/435] Fix ODR violations in AUTOSAR A2-10-5 test

The CodeQL test framework assumes that all code will become part to the same
nameless link target, which means that the duplicate declarations of `test3`
and `test4` are ODR violations. Moreover, newer versions of the C/C++ frontend
used in the C/C++ extractor will implement CWG 2387, which means that the
instantiations of `number_two` will also cause ODR violations.

Fix the above by renaming `test3` and `test4` in `test`b.cpp` and making
the `number_two` variable templates `static`.
---
 ...mberObjectWithExternalOrInternalLinkageIsReused.expected | 4 ++--
 cpp/autosar/test/rules/A2-10-5/test1a.cpp                   | 2 +-
 cpp/autosar/test/rules/A2-10-5/test1b.cpp                   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected b/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected
index 66d2b38c57..d6f496a3c6 100644
--- a/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected
+++ b/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected
@@ -1,6 +1,6 @@
 | test1a.cpp:2:12:2:13 | g1 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:2:12:2:13 | g1 | g1 | test1b.cpp:2:12:2:13 | g1 | g1 |
 | test1a.cpp:6:12:6:13 | g3 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:6:12:6:13 | g3 | g3 | test1b.cpp:6:12:6:13 | g3 | g3 |
-| test1a.cpp:17:43:17:43 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:17:43:17:43 | number_two | number_two | test1b.cpp:11:43:11:43 | number_two | number_two |
+| test1a.cpp:17:50:17:50 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:17:50:17:50 | number_two | number_two | test1b.cpp:11:50:11:50 | number_two | number_two |
 | test1b.cpp:2:12:2:13 | g1 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:2:12:2:13 | g1 | g1 | test1a.cpp:2:12:2:13 | g1 | g1 |
 | test1b.cpp:6:12:6:13 | g3 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:6:12:6:13 | g3 | g3 | test1a.cpp:6:12:6:13 | g3 | g3 |
-| test1b.cpp:11:43:11:43 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:11:43:11:43 | number_two | number_two | test1a.cpp:17:43:17:43 | number_two | number_two |
+| test1b.cpp:11:50:11:50 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:11:50:11:50 | number_two | number_two | test1a.cpp:17:50:17:50 | number_two | number_two |
diff --git a/cpp/autosar/test/rules/A2-10-5/test1a.cpp b/cpp/autosar/test/rules/A2-10-5/test1a.cpp
index 80f63c3c69..749ad38b0f 100644
--- a/cpp/autosar/test/rules/A2-10-5/test1a.cpp
+++ b/cpp/autosar/test/rules/A2-10-5/test1a.cpp
@@ -14,7 +14,7 @@ int test() { return number_one<int>; }
 
 long test2() { return number_one<long>; }
 
-template <class T> constexpr T number_two = T(1); // NON_COMPLIANT
+template <class T> static constexpr T number_two = T(1); // NON_COMPLIANT
 
 int test3() { return number_two<int>; }
 
diff --git a/cpp/autosar/test/rules/A2-10-5/test1b.cpp b/cpp/autosar/test/rules/A2-10-5/test1b.cpp
index 132588d5dd..342d739c4d 100644
--- a/cpp/autosar/test/rules/A2-10-5/test1b.cpp
+++ b/cpp/autosar/test/rules/A2-10-5/test1b.cpp
@@ -8,8 +8,8 @@ static int g3 = 0; // NON_COMPLIANT
 
 static void f1() {} // NON_COMPLIANT
 
-template <class T> constexpr T number_two = T(1); // NON_COMPLIANT
+template <class T> static constexpr T number_two = T(1); // NON_COMPLIANT
 
-int test3() { return number_two<int>; }
+int test5() { return number_two<int>; }
 
-long test4() { return number_two<long>; }
\ No newline at end of file
+long test6() { return number_two<long>; }
\ No newline at end of file

From c43ccb9e350b9979d70c0c11f7c63de505a5fbbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:51:10 +0000
Subject: [PATCH 018/435] Bump gitpython from 3.1.37 to 3.1.41 in /scripts

Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.37 to 3.1.41.
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES)
- [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.37...3.1.41)

---
updated-dependencies:
- dependency-name: gitpython
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/release/requirements.txt | 2 +-
 scripts/requirements.txt         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/release/requirements.txt b/scripts/release/requirements.txt
index 5cdcc51546..653323eaaa 100644
--- a/scripts/release/requirements.txt
+++ b/scripts/release/requirements.txt
@@ -1,5 +1,5 @@
 semantic-version==2.10.0
 PyGithub==1.59.1
 PyYAML==6.0.1
-GitPython==3.1.37
+GitPython==3.1.41
 pytest==7.4.3
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
index 0ad0f1c747..8a240a6dab 100644
--- a/scripts/requirements.txt
+++ b/scripts/requirements.txt
@@ -2,7 +2,7 @@ beautifulsoup4==4.9.3
 certifi==2023.7.22
 chardet==3.0.4
 gitdb==4.0.5
-GitPython==3.1.37
+GitPython==3.1.41
 idna==2.10
 Jinja2==2.11.3
 MarkupSafe==1.1.1

From 41fdf0776492aa7dcde36ddd7fc402b9540adca4 Mon Sep 17 00:00:00 2001
From: Remco Vermeulen <rvermeulen@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:44:47 -0800
Subject: [PATCH 019/435] Include test case FP/FN report

---
 .../MissingSpecialMemberFunction.expected     |  6 ++
 cpp/autosar/test/rules/A12-0-1/test.cpp       | 61 +++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/cpp/autosar/test/rules/A12-0-1/MissingSpecialMemberFunction.expected b/cpp/autosar/test/rules/A12-0-1/MissingSpecialMemberFunction.expected
index 9e1cd591c6..ced97cced2 100644
--- a/cpp/autosar/test/rules/A12-0-1/MissingSpecialMemberFunction.expected
+++ b/cpp/autosar/test/rules/A12-0-1/MissingSpecialMemberFunction.expected
@@ -1,2 +1,8 @@
 | test.cpp:12:7:12:8 | C3 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:12:7:12:8 | C3 | C3 |
 | test.cpp:28:7:28:8 | C5 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:28:7:28:8 | C5 | C5 |
+| test.cpp:51:7:51:9 | C10 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:51:7:51:9 | C10 | C10 |
+| test.cpp:55:7:55:9 | C11 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:55:7:55:9 | C11 | C11 |
+| test.cpp:59:7:59:9 | C12 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:59:7:59:9 | C12 | C12 |
+| test.cpp:63:7:63:9 | C13 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:63:7:63:9 | C13 | C13 |
+| test.cpp:67:7:67:9 | C14 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:67:7:67:9 | C14 | C14 |
+| test.cpp:71:7:71:9 | C15 | Class $@ has provided at least one user-defined special member function but is missing definitions for all five special member functions. | test.cpp:71:7:71:9 | C15 | C15 |
diff --git a/cpp/autosar/test/rules/A12-0-1/test.cpp b/cpp/autosar/test/rules/A12-0-1/test.cpp
index 71652633b4..4711420ce0 100644
--- a/cpp/autosar/test/rules/A12-0-1/test.cpp
+++ b/cpp/autosar/test/rules/A12-0-1/test.cpp
@@ -46,4 +46,65 @@ struct C7::C8 { // COMPLIANT
 struct C9 { // COMPLIANT
   C9() {}
   C9(int x) {}
+};
+
+class C10 {
+  ~C10() = default; // NON_COMPLIANT
+};
+
+class C11 {
+  ~C11() = delete; // NON_COMPLIANT
+};
+
+class C12 {
+  C12(C12 const &); // NON_COMPLIANT
+};
+
+class C13 {
+  C13(C13 const &) = default; // NON_COMPLIANT
+};
+
+class C14 {
+  C14(C14 const &) = delete; // NON_COMPLIANT
+};
+
+class C15 {
+  C15& operator=(C15 const &); // NON_COMPLIANT
+};
+
+template<typename T>
+class C16 { // COMPLIANT
+  C16() = default;};
+
+template<typename T>
+class C17 { // COMPLIANT
+  C17() = default;
+  C17(C17 const &) = default;
+  C17(C17 &&) = default;
+  virtual ~C17() = default;
+  C17 &operator=(C17 const &) = default;
+  C17 &operator=(C17 &&) = default;
+};
+
+template<typename T>
+class C18 { // COMPLIANT
+  C18() = default;
+  C18(C18 const &) = delete;
+  C18(C18 &&) = delete;
+  virtual ~C18() = default;
+  C18 &operator=(C18 const &) = delete;
+  C18 &operator=(C18 &&) = delete;
+};
+
+template<typename T>
+class C19 { // COMPLIANT
+  public:
+  explicit C19(T i) : i(i) {}
+  C19(C19 const &) = delete;
+  C19(C19 &&) = delete;
+  virtual ~C19() = default;
+  C19 &operator=(C19 const &) = delete;
+  C19 &operator=(C19 &&) = delete;
+  private:
+    T i;
 };
\ No newline at end of file

From 01d32f0cbf4c2bfe16d5e4a40fdaa7bbcb68638a Mon Sep 17 00:00:00 2001
From: Remco Vermeulen <rvermeulen@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:29:19 -0800
Subject: [PATCH 020/435] Fix test file formatting

---
 cpp/autosar/test/rules/A12-0-1/test.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/cpp/autosar/test/rules/A12-0-1/test.cpp b/cpp/autosar/test/rules/A12-0-1/test.cpp
index 4711420ce0..9a38204641 100644
--- a/cpp/autosar/test/rules/A12-0-1/test.cpp
+++ b/cpp/autosar/test/rules/A12-0-1/test.cpp
@@ -69,15 +69,14 @@ class C14 {
 };
 
 class C15 {
-  C15& operator=(C15 const &); // NON_COMPLIANT
+  C15 &operator=(C15 const &); // NON_COMPLIANT
 };
 
-template<typename T>
-class C16 { // COMPLIANT
-  C16() = default;};
+template <typename T> class C16 { // COMPLIANT
+  C16() = default;
+};
 
-template<typename T>
-class C17 { // COMPLIANT
+template <typename T> class C17 { // COMPLIANT
   C17() = default;
   C17(C17 const &) = default;
   C17(C17 &&) = default;
@@ -86,8 +85,7 @@ class C17 { // COMPLIANT
   C17 &operator=(C17 &&) = default;
 };
 
-template<typename T>
-class C18 { // COMPLIANT
+template <typename T> class C18 { // COMPLIANT
   C18() = default;
   C18(C18 const &) = delete;
   C18(C18 &&) = delete;
@@ -96,15 +94,15 @@ class C18 { // COMPLIANT
   C18 &operator=(C18 &&) = delete;
 };
 
-template<typename T>
-class C19 { // COMPLIANT
-  public:
+template <typename T> class C19 { // COMPLIANT
+public:
   explicit C19(T i) : i(i) {}
   C19(C19 const &) = delete;
   C19(C19 &&) = delete;
   virtual ~C19() = default;
   C19 &operator=(C19 const &) = delete;
   C19 &operator=(C19 &&) = delete;
-  private:
-    T i;
+
+private:
+  T i;
 };
\ No newline at end of file

From dc13ffedf5ae06862e823131f96138c1521d2f88 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 9 Feb 2024 10:51:39 +0000
Subject: [PATCH 021/435] Accept changes from github/codeql/15549

---
 ...rithmeticOnNonArrayObjectPointers.expected |  18 +--
 ...rSubtractAScaledIntegerToAPointer.expected |  10 +-
 ...rToMoreStrictlyAlignedPointerType.expected | 126 +++++++++---------
 ...nctionPointerWithIncompatibleType.expected |  14 +-
 ...iableViaPointerOfIncompatibleType.expected |  22 +--
 .../DoNotModifyConstantObjects.expected       |  14 +-
 ...NotPerformFileOperationsOnDevices.expected |   4 +-
 ...odifyAlignmentOfMemoryWithRealloc.expected |  10 +-
 .../ConstLikeReturnValue.expected             |  10 +-
 ...PointersAddressingDifferentArrays.expected |  16 +--
 ...ionalOperatorsWithDifferingArrays.expected |  26 ++--
 ...eMemoryAllocatedDynamicallyShared.expected |   8 +-
 ...sedToCompareNullTerminatedStrings.expected |  12 +-
 ...entOfAnArrayPassedToASmartPointer.expected |  12 +-
 ...UsedWithPointersToNonFinalClasses.expected |  22 +--
 .../A5-1-7/LambdaPassedToTypeid.expected      |   4 +-
 ...terArithmeticOnPolymorphicObjects.expected |  22 +--
 ...ThroughAPointerOfTheIncorrectType.expected |   4 +-
 ...uctorCallForManuallyManagedObject.expected |   2 +-
 ...uctorCallForManuallyManagedObject.expected |   8 +-
 ...UndefinedMemberThroughNullPointer.expected |   4 +-
 ...PointersAddressingDifferentArrays.expected |  16 +--
 ...ionalOperatorsWithDifferingArrays.expected |  26 ++--
 ...alueStoredInUnrelatedSmartPointer.expected |  30 ++---
 .../ThrowingOperatorNewReturnsNull.expected   |   4 +-
 25 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected b/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
index 8a7bfe553b..e5e0252e3a 100644
--- a/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
+++ b/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
@@ -1,13 +1,13 @@
 edges
-| test.c:14:38:14:39 | p1 | test.c:18:10:18:11 | v1 |
-| test.c:14:38:14:39 | p1 | test.c:19:10:19:11 | v2 |
-| test.c:14:38:14:39 | p1 | test.c:20:10:20:11 | p1 |
-| test.c:14:38:14:39 | p1 | test.c:21:10:21:11 | p1 |
-| test.c:14:38:14:39 | p1 | test.c:22:9:22:10 | p1 |
-| test.c:14:38:14:39 | p1 | test.c:23:13:23:14 | p1 |
-| test.c:14:38:14:39 | p1 | test.c:24:9:24:10 | p1 |
-| test.c:14:38:14:39 | p1 | test.c:25:9:25:10 | p1 |
-| test.c:51:30:51:38 | & ... | test.c:14:38:14:39 | p1 |
+| test.c:14:38:14:39 | p1 | test.c:18:10:18:11 | v1 | provenance |  |
+| test.c:14:38:14:39 | p1 | test.c:19:10:19:11 | v2 | provenance |  |
+| test.c:14:38:14:39 | p1 | test.c:20:10:20:11 | p1 | provenance |  |
+| test.c:14:38:14:39 | p1 | test.c:21:10:21:11 | p1 | provenance |  |
+| test.c:14:38:14:39 | p1 | test.c:22:9:22:10 | p1 | provenance |  |
+| test.c:14:38:14:39 | p1 | test.c:23:13:23:14 | p1 | provenance |  |
+| test.c:14:38:14:39 | p1 | test.c:24:9:24:10 | p1 | provenance |  |
+| test.c:14:38:14:39 | p1 | test.c:25:9:25:10 | p1 | provenance |  |
+| test.c:51:30:51:38 | & ... | test.c:14:38:14:39 | p1 | provenance |  |
 nodes
 | test.c:14:38:14:39 | p1 | semmle.label | p1 |
 | test.c:18:10:18:11 | v1 | semmle.label | v1 |
diff --git a/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected b/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
index 1d3f5dcf13..bfd6b23128 100644
--- a/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
+++ b/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
@@ -1,9 +1,9 @@
 edges
-| test.c:7:13:7:14 | p1 | test.c:9:9:9:10 | p1 |
-| test.c:16:19:16:41 | ... - ... | test.c:18:26:18:31 | offset |
-| test.c:16:19:16:41 | ... - ... | test.c:29:6:29:11 | offset |
-| test.c:17:17:17:26 | sizeof(<expr>) | test.c:23:9:23:12 | size |
-| test.c:29:6:29:11 | offset | test.c:7:13:7:14 | p1 |
+| test.c:7:13:7:14 | p1 | test.c:9:9:9:10 | p1 | provenance |  |
+| test.c:16:19:16:41 | ... - ... | test.c:18:26:18:31 | offset | provenance |  |
+| test.c:16:19:16:41 | ... - ... | test.c:29:6:29:11 | offset | provenance |  |
+| test.c:17:17:17:26 | sizeof(<expr>) | test.c:23:9:23:12 | size | provenance |  |
+| test.c:29:6:29:11 | offset | test.c:7:13:7:14 | p1 | provenance |  |
 nodes
 | test.c:7:13:7:14 | p1 | semmle.label | p1 |
 | test.c:9:9:9:10 | p1 | semmle.label | p1 |
diff --git a/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected b/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
index a1c9a14fa2..c4bc63cc94 100644
--- a/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
+++ b/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
@@ -1,67 +1,67 @@
 edges
-| test.c:75:14:75:16 | & ... | test.c:76:11:76:12 | v1 |
-| test.c:75:14:75:16 | & ... | test.c:77:12:77:13 | v1 |
-| test.c:75:14:75:16 | & ... | test.c:78:10:78:11 | v1 |
-| test.c:75:14:75:16 | & ... | test.c:79:12:79:13 | v1 |
-| test.c:75:14:75:16 | & ... | test.c:80:11:80:12 | v1 |
-| test.c:75:14:75:16 | & ... | test.c:81:13:81:14 | v1 |
-| test.c:84:14:84:16 | & ... | test.c:85:11:85:12 | v2 |
-| test.c:84:14:84:16 | & ... | test.c:86:12:86:13 | v2 |
-| test.c:84:14:84:16 | & ... | test.c:87:10:87:11 | v2 |
-| test.c:84:14:84:16 | & ... | test.c:88:12:88:13 | v2 |
-| test.c:84:14:84:16 | & ... | test.c:89:11:89:12 | v2 |
-| test.c:84:14:84:16 | & ... | test.c:90:13:90:14 | v2 |
-| test.c:93:14:93:16 | & ... | test.c:94:11:94:12 | v3 |
-| test.c:93:14:93:16 | & ... | test.c:95:12:95:13 | v3 |
-| test.c:93:14:93:16 | & ... | test.c:96:10:96:11 | v3 |
-| test.c:93:14:93:16 | & ... | test.c:97:12:97:13 | v3 |
-| test.c:93:14:93:16 | & ... | test.c:98:11:98:12 | v3 |
-| test.c:93:14:93:16 | & ... | test.c:99:13:99:14 | v3 |
-| test.c:102:14:102:16 | & ... | test.c:103:11:103:12 | v4 |
-| test.c:102:14:102:16 | & ... | test.c:104:12:104:13 | v4 |
-| test.c:102:14:102:16 | & ... | test.c:105:10:105:11 | v4 |
-| test.c:102:14:102:16 | & ... | test.c:106:12:106:13 | v4 |
-| test.c:102:14:102:16 | & ... | test.c:107:11:107:12 | v4 |
-| test.c:102:14:102:16 | & ... | test.c:108:13:108:14 | v4 |
-| test.c:111:14:111:16 | & ... | test.c:112:11:112:12 | v5 |
-| test.c:111:14:111:16 | & ... | test.c:113:12:113:13 | v5 |
-| test.c:111:14:111:16 | & ... | test.c:114:10:114:11 | v5 |
-| test.c:111:14:111:16 | & ... | test.c:115:12:115:13 | v5 |
-| test.c:111:14:111:16 | & ... | test.c:116:11:116:12 | v5 |
-| test.c:111:14:111:16 | & ... | test.c:117:13:117:14 | v5 |
-| test.c:120:14:120:16 | & ... | test.c:121:11:121:12 | v6 |
-| test.c:120:14:120:16 | & ... | test.c:122:12:122:13 | v6 |
-| test.c:120:14:120:16 | & ... | test.c:123:10:123:11 | v6 |
-| test.c:120:14:120:16 | & ... | test.c:124:12:124:13 | v6 |
-| test.c:120:14:120:16 | & ... | test.c:125:11:125:12 | v6 |
-| test.c:120:14:120:16 | & ... | test.c:126:13:126:14 | v6 |
-| test.c:129:22:129:22 | v | test.c:130:17:130:17 | v |
-| test.c:135:21:135:23 | & ... | test.c:129:22:129:22 | v |
-| test.c:138:21:138:23 | & ... | test.c:129:22:129:22 | v |
-| test.c:166:24:166:29 | call to malloc | test.c:167:13:167:15 | & ... |
-| test.c:166:24:166:29 | call to malloc | test.c:168:16:168:17 | s1 |
-| test.c:166:24:166:29 | call to malloc | test.c:169:13:169:14 | s1 |
-| test.c:166:24:166:29 | call to malloc | test.c:169:13:169:14 | s1 |
-| test.c:169:13:169:14 | s1 | test.c:129:22:129:22 | v |
-| test.c:174:13:174:14 | s2 | test.c:129:22:129:22 | v |
-| test.c:179:13:179:14 | s3 | test.c:129:22:129:22 | v |
-| test.c:183:14:183:26 | call to aligned_alloc | test.c:184:11:184:12 | v1 |
-| test.c:183:14:183:26 | call to aligned_alloc | test.c:185:10:185:11 | v1 |
-| test.c:183:14:183:26 | call to aligned_alloc | test.c:186:13:186:14 | v1 |
-| test.c:183:14:183:26 | call to aligned_alloc | test.c:187:13:187:14 | v1 |
-| test.c:187:13:187:14 | v1 | test.c:129:22:129:22 | v |
-| test.c:189:14:189:26 | call to aligned_alloc | test.c:190:13:190:14 | v2 |
-| test.c:190:13:190:14 | v2 | test.c:129:22:129:22 | v |
-| test.c:222:8:222:9 | p2 | test.c:223:11:223:12 | v1 |
-| test.c:222:8:222:9 | p2 | test.c:224:12:224:13 | v1 |
-| test.c:222:8:222:9 | p2 | test.c:225:10:225:11 | v1 |
-| test.c:222:8:222:9 | p2 | test.c:226:12:226:13 | v1 |
-| test.c:222:8:222:9 | p2 | test.c:227:11:227:12 | v1 |
-| test.c:222:8:222:9 | p2 | test.c:228:13:228:14 | v1 |
-| test.c:238:13:238:14 | & ... | test.c:244:12:244:13 | ip |
-| test.c:241:15:241:18 | & ... | test.c:247:9:247:12 | & ... |
-| test.c:252:16:252:18 | & ... | test.c:254:11:254:13 | ps1 |
-| test.c:252:16:252:18 | & ... | test.c:256:10:256:12 | ps1 |
+| test.c:75:14:75:16 | & ... | test.c:76:11:76:12 | v1 | provenance |  |
+| test.c:75:14:75:16 | & ... | test.c:77:12:77:13 | v1 | provenance |  |
+| test.c:75:14:75:16 | & ... | test.c:78:10:78:11 | v1 | provenance |  |
+| test.c:75:14:75:16 | & ... | test.c:79:12:79:13 | v1 | provenance |  |
+| test.c:75:14:75:16 | & ... | test.c:80:11:80:12 | v1 | provenance |  |
+| test.c:75:14:75:16 | & ... | test.c:81:13:81:14 | v1 | provenance |  |
+| test.c:84:14:84:16 | & ... | test.c:85:11:85:12 | v2 | provenance |  |
+| test.c:84:14:84:16 | & ... | test.c:86:12:86:13 | v2 | provenance |  |
+| test.c:84:14:84:16 | & ... | test.c:87:10:87:11 | v2 | provenance |  |
+| test.c:84:14:84:16 | & ... | test.c:88:12:88:13 | v2 | provenance |  |
+| test.c:84:14:84:16 | & ... | test.c:89:11:89:12 | v2 | provenance |  |
+| test.c:84:14:84:16 | & ... | test.c:90:13:90:14 | v2 | provenance |  |
+| test.c:93:14:93:16 | & ... | test.c:94:11:94:12 | v3 | provenance |  |
+| test.c:93:14:93:16 | & ... | test.c:95:12:95:13 | v3 | provenance |  |
+| test.c:93:14:93:16 | & ... | test.c:96:10:96:11 | v3 | provenance |  |
+| test.c:93:14:93:16 | & ... | test.c:97:12:97:13 | v3 | provenance |  |
+| test.c:93:14:93:16 | & ... | test.c:98:11:98:12 | v3 | provenance |  |
+| test.c:93:14:93:16 | & ... | test.c:99:13:99:14 | v3 | provenance |  |
+| test.c:102:14:102:16 | & ... | test.c:103:11:103:12 | v4 | provenance |  |
+| test.c:102:14:102:16 | & ... | test.c:104:12:104:13 | v4 | provenance |  |
+| test.c:102:14:102:16 | & ... | test.c:105:10:105:11 | v4 | provenance |  |
+| test.c:102:14:102:16 | & ... | test.c:106:12:106:13 | v4 | provenance |  |
+| test.c:102:14:102:16 | & ... | test.c:107:11:107:12 | v4 | provenance |  |
+| test.c:102:14:102:16 | & ... | test.c:108:13:108:14 | v4 | provenance |  |
+| test.c:111:14:111:16 | & ... | test.c:112:11:112:12 | v5 | provenance |  |
+| test.c:111:14:111:16 | & ... | test.c:113:12:113:13 | v5 | provenance |  |
+| test.c:111:14:111:16 | & ... | test.c:114:10:114:11 | v5 | provenance |  |
+| test.c:111:14:111:16 | & ... | test.c:115:12:115:13 | v5 | provenance |  |
+| test.c:111:14:111:16 | & ... | test.c:116:11:116:12 | v5 | provenance |  |
+| test.c:111:14:111:16 | & ... | test.c:117:13:117:14 | v5 | provenance |  |
+| test.c:120:14:120:16 | & ... | test.c:121:11:121:12 | v6 | provenance |  |
+| test.c:120:14:120:16 | & ... | test.c:122:12:122:13 | v6 | provenance |  |
+| test.c:120:14:120:16 | & ... | test.c:123:10:123:11 | v6 | provenance |  |
+| test.c:120:14:120:16 | & ... | test.c:124:12:124:13 | v6 | provenance |  |
+| test.c:120:14:120:16 | & ... | test.c:125:11:125:12 | v6 | provenance |  |
+| test.c:120:14:120:16 | & ... | test.c:126:13:126:14 | v6 | provenance |  |
+| test.c:129:22:129:22 | v | test.c:130:17:130:17 | v | provenance |  |
+| test.c:135:21:135:23 | & ... | test.c:129:22:129:22 | v | provenance |  |
+| test.c:138:21:138:23 | & ... | test.c:129:22:129:22 | v | provenance |  |
+| test.c:166:24:166:29 | call to malloc | test.c:167:13:167:15 | & ... | provenance |  |
+| test.c:166:24:166:29 | call to malloc | test.c:168:16:168:17 | s1 | provenance |  |
+| test.c:166:24:166:29 | call to malloc | test.c:169:13:169:14 | s1 | provenance |  |
+| test.c:166:24:166:29 | call to malloc | test.c:169:13:169:14 | s1 | provenance |  |
+| test.c:169:13:169:14 | s1 | test.c:129:22:129:22 | v | provenance |  |
+| test.c:174:13:174:14 | s2 | test.c:129:22:129:22 | v | provenance |  |
+| test.c:179:13:179:14 | s3 | test.c:129:22:129:22 | v | provenance |  |
+| test.c:183:14:183:26 | call to aligned_alloc | test.c:184:11:184:12 | v1 | provenance |  |
+| test.c:183:14:183:26 | call to aligned_alloc | test.c:185:10:185:11 | v1 | provenance |  |
+| test.c:183:14:183:26 | call to aligned_alloc | test.c:186:13:186:14 | v1 | provenance |  |
+| test.c:183:14:183:26 | call to aligned_alloc | test.c:187:13:187:14 | v1 | provenance |  |
+| test.c:187:13:187:14 | v1 | test.c:129:22:129:22 | v | provenance |  |
+| test.c:189:14:189:26 | call to aligned_alloc | test.c:190:13:190:14 | v2 | provenance |  |
+| test.c:190:13:190:14 | v2 | test.c:129:22:129:22 | v | provenance |  |
+| test.c:222:8:222:9 | p2 | test.c:223:11:223:12 | v1 | provenance |  |
+| test.c:222:8:222:9 | p2 | test.c:224:12:224:13 | v1 | provenance |  |
+| test.c:222:8:222:9 | p2 | test.c:225:10:225:11 | v1 | provenance |  |
+| test.c:222:8:222:9 | p2 | test.c:226:12:226:13 | v1 | provenance |  |
+| test.c:222:8:222:9 | p2 | test.c:227:11:227:12 | v1 | provenance |  |
+| test.c:222:8:222:9 | p2 | test.c:228:13:228:14 | v1 | provenance |  |
+| test.c:238:13:238:14 | & ... | test.c:244:12:244:13 | ip | provenance |  |
+| test.c:241:15:241:18 | & ... | test.c:247:9:247:12 | & ... | provenance |  |
+| test.c:252:16:252:18 | & ... | test.c:254:11:254:13 | ps1 | provenance |  |
+| test.c:252:16:252:18 | & ... | test.c:256:10:256:12 | ps1 | provenance |  |
 nodes
 | test.c:7:11:7:13 | & ... | semmle.label | & ... |
 | test.c:8:12:8:14 | & ... | semmle.label | & ... |
diff --git a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
index 4c18bb2672..546c753ebb 100644
--- a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
+++ b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
@@ -1,11 +1,11 @@
 edges
-| test.c:48:68:48:70 | fns [f1] | test.c:49:3:49:5 | fns [f1] |
-| test.c:49:3:49:5 | fns [f1] | test.c:49:8:49:9 | f1 |
-| test.c:61:28:61:29 | f2 | test.c:62:3:62:11 | v1_called |
-| test.c:73:3:73:5 | fns [post update] [f1] | test.c:75:45:75:48 | & ... [f1] |
-| test.c:73:3:73:13 | ... = ... | test.c:73:3:73:5 | fns [post update] [f1] |
-| test.c:73:12:73:13 | v2 | test.c:73:3:73:13 | ... = ... |
-| test.c:75:45:75:48 | & ... [f1] | test.c:48:68:48:70 | fns [f1] |
+| test.c:48:68:48:70 | fns [f1] | test.c:49:3:49:5 | fns [f1] | provenance |  |
+| test.c:49:3:49:5 | fns [f1] | test.c:49:8:49:9 | f1 | provenance |  |
+| test.c:61:28:61:29 | f2 | test.c:62:3:62:11 | v1_called | provenance |  |
+| test.c:73:3:73:5 | fns [post update] [f1] | test.c:75:45:75:48 | & ... [f1] | provenance |  |
+| test.c:73:3:73:13 | ... = ... | test.c:73:3:73:5 | fns [post update] [f1] | provenance |  |
+| test.c:73:12:73:13 | v2 | test.c:73:3:73:13 | ... = ... | provenance |  |
+| test.c:75:45:75:48 | & ... [f1] | test.c:48:68:48:70 | fns [f1] | provenance |  |
 nodes
 | test.c:48:68:48:70 | fns [f1] | semmle.label | fns [f1] |
 | test.c:49:3:49:5 | fns [f1] | semmle.label | fns [f1] |
diff --git a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
index e42f003f0f..137017d53a 100644
--- a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
+++ b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
@@ -1,15 +1,15 @@
 edges
-| test.c:49:8:49:9 | s3 | test.c:50:8:50:9 | s1 |
-| test.c:60:16:60:18 | E1A | test.c:61:16:61:17 | e1 |
-| test.c:60:16:60:18 | E1A | test.c:65:10:65:12 | & ... |
-| test.c:68:22:68:22 | v | test.c:68:41:68:41 | v |
-| test.c:72:13:72:15 | & ... | test.c:68:22:68:22 | v |
-| test.c:74:13:74:15 | & ... | test.c:68:22:68:22 | v |
-| test.c:97:32:97:37 | call to malloc | test.c:98:40:98:41 | s2 |
-| test.c:97:32:97:37 | call to malloc | test.c:98:40:98:41 | s2 |
-| test.c:98:32:98:38 | call to realloc | test.c:99:3:99:4 | s3 |
-| test.c:98:32:98:38 | call to realloc | test.c:100:10:100:11 | s3 |
-| test.c:98:40:98:41 | s2 | test.c:98:32:98:38 | call to realloc |
+| test.c:49:8:49:9 | s3 | test.c:50:8:50:9 | s1 | provenance |  |
+| test.c:60:16:60:18 | E1A | test.c:61:16:61:17 | e1 | provenance |  |
+| test.c:60:16:60:18 | E1A | test.c:65:10:65:12 | & ... | provenance |  |
+| test.c:68:22:68:22 | v | test.c:68:41:68:41 | v | provenance |  |
+| test.c:72:13:72:15 | & ... | test.c:68:22:68:22 | v | provenance |  |
+| test.c:74:13:74:15 | & ... | test.c:68:22:68:22 | v | provenance |  |
+| test.c:97:32:97:37 | call to malloc | test.c:98:40:98:41 | s2 | provenance |  |
+| test.c:97:32:97:37 | call to malloc | test.c:98:40:98:41 | s2 | provenance |  |
+| test.c:98:32:98:38 | call to realloc | test.c:99:3:99:4 | s3 | provenance |  |
+| test.c:98:32:98:38 | call to realloc | test.c:100:10:100:11 | s3 | provenance |  |
+| test.c:98:40:98:41 | s2 | test.c:98:32:98:38 | call to realloc | provenance |  |
 nodes
 | test.c:6:19:6:20 | & ... | semmle.label | & ... |
 | test.c:11:10:11:11 | & ... | semmle.label | & ... |
diff --git a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
index 3211c4fab1..bef45f3841 100644
--- a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
+++ b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
@@ -1,11 +1,11 @@
 edges
-| test.c:5:8:5:9 | & ... | test.c:6:4:6:5 | aa |
-| test.c:26:15:26:15 | a | test.c:27:4:27:4 | a |
-| test.c:34:13:34:14 | & ... | test.c:39:7:39:8 | p1 |
-| test.c:39:7:39:8 | p1 | test.c:26:15:26:15 | a |
-| test.c:40:7:40:9 | * ... | test.c:26:15:26:15 | a |
-| test.c:59:7:59:8 | & ... | test.c:60:4:60:4 | p |
-| test.c:79:11:79:16 | call to strchr | test.c:81:6:81:12 | ... ++ |
+| test.c:5:8:5:9 | & ... | test.c:6:4:6:5 | aa | provenance |  |
+| test.c:26:15:26:15 | a | test.c:27:4:27:4 | a | provenance |  |
+| test.c:34:13:34:14 | & ... | test.c:39:7:39:8 | p1 | provenance |  |
+| test.c:39:7:39:8 | p1 | test.c:26:15:26:15 | a | provenance |  |
+| test.c:40:7:40:9 | * ... | test.c:26:15:26:15 | a | provenance |  |
+| test.c:59:7:59:8 | & ... | test.c:60:4:60:4 | p | provenance |  |
+| test.c:79:11:79:16 | call to strchr | test.c:81:6:81:12 | ... ++ | provenance |  |
 nodes
 | test.c:5:8:5:9 | & ... | semmle.label | & ... |
 | test.c:6:4:6:5 | aa | semmle.label | aa |
diff --git a/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected b/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected
index d8632eb3c1..93d6de6b8a 100644
--- a/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected
+++ b/c/cert/test/rules/FIO32-C/DoNotPerformFileOperationsOnDevices.expected
@@ -1,6 +1,6 @@
 edges
-| test.c:20:15:20:23 | scanf output argument | test.c:21:8:21:16 | *file_name |
-| test.c:45:15:45:23 | scanf output argument | test.c:46:29:46:37 | *file_name |
+| test.c:20:15:20:23 | scanf output argument | test.c:21:8:21:16 | *file_name | provenance |  |
+| test.c:45:15:45:23 | scanf output argument | test.c:46:29:46:37 | *file_name | provenance |  |
 nodes
 | test.c:20:15:20:23 | scanf output argument | semmle.label | scanf output argument |
 | test.c:21:8:21:16 | *file_name | semmle.label | *file_name |
diff --git a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
index 0592cb038d..0ae87f2ee8 100644
--- a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
+++ b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
@@ -1,9 +1,9 @@
 edges
-| test.c:5:10:5:22 | call to aligned_alloc | test.c:15:8:15:28 | call to aligned_alloc_wrapper |
-| test.c:8:29:8:31 | ptr | test.c:8:64:8:66 | ptr |
-| test.c:15:8:15:28 | call to aligned_alloc_wrapper | test.c:16:24:16:25 | v1 |
-| test.c:16:24:16:25 | v1 | test.c:8:29:8:31 | ptr |
-| test.c:22:8:22:20 | call to aligned_alloc | test.c:23:16:23:17 | v3 |
+| test.c:5:10:5:22 | call to aligned_alloc | test.c:15:8:15:28 | call to aligned_alloc_wrapper | provenance |  |
+| test.c:8:29:8:31 | ptr | test.c:8:64:8:66 | ptr | provenance |  |
+| test.c:15:8:15:28 | call to aligned_alloc_wrapper | test.c:16:24:16:25 | v1 | provenance |  |
+| test.c:16:24:16:25 | v1 | test.c:8:29:8:31 | ptr | provenance |  |
+| test.c:22:8:22:20 | call to aligned_alloc | test.c:23:16:23:17 | v3 | provenance |  |
 nodes
 | test.c:5:10:5:22 | call to aligned_alloc | semmle.label | call to aligned_alloc |
 | test.c:8:29:8:31 | ptr | semmle.label | ptr |
diff --git a/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected b/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
index 94e63062c5..d62a413f98 100644
--- a/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
+++ b/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
@@ -3,11 +3,11 @@ problems
 | test.c:64:5:64:9 | conv4 | test.c:61:11:61:20 | call to localeconv | test.c:64:5:64:9 | conv4 | The object returned by the function localeconv should not be modified. |
 | test.c:73:5:73:8 | conv | test.c:69:25:69:34 | call to localeconv | test.c:73:5:73:8 | conv | The object returned by the function localeconv should not be modified. |
 edges
-| test.c:5:18:5:22 | c_str | test.c:8:8:8:12 | c_str |
-| test.c:15:16:15:21 | call to getenv | test.c:21:9:21:12 | env1 |
-| test.c:21:9:21:12 | env1 | test.c:5:18:5:22 | c_str |
-| test.c:61:11:61:20 | call to localeconv | test.c:64:5:64:9 | conv4 |
-| test.c:69:25:69:34 | call to localeconv | test.c:73:5:73:8 | conv |
+| test.c:5:18:5:22 | c_str | test.c:8:8:8:12 | c_str | provenance |  |
+| test.c:15:16:15:21 | call to getenv | test.c:21:9:21:12 | env1 | provenance |  |
+| test.c:21:9:21:12 | env1 | test.c:5:18:5:22 | c_str | provenance |  |
+| test.c:61:11:61:20 | call to localeconv | test.c:64:5:64:9 | conv4 | provenance |  |
+| test.c:69:25:69:34 | call to localeconv | test.c:73:5:73:8 | conv | provenance |  |
 nodes
 | test.c:5:18:5:22 | c_str | semmle.label | c_str |
 | test.c:8:8:8:12 | c_str | semmle.label | c_str |
diff --git a/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected b/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
index d0ba3bdb5c..c595e7e5f7 100644
--- a/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
+++ b/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
@@ -4,14 +4,14 @@ problems
 | test.c:13:10:13:11 | p4 | test.c:5:14:5:15 | l2 | test.c:13:10:13:11 | p4 | Subtraction between left operand pointing to array $@ and other operand pointing to array $@. | test.c:3:7:3:8 | l2 | l2 | test.c:2:7:2:8 | l1 | l1 |
 | test.c:13:15:13:16 | l1 | test.c:13:15:13:16 | l1 | test.c:13:15:13:16 | l1 | Subtraction between right operand pointing to array $@ and other operand pointing to array $@. | test.c:2:7:2:8 | l1 | l1 | test.c:3:7:3:8 | l2 | l2 |
 edges
-| test.c:4:14:4:15 | l1 | test.c:4:14:4:18 | access to array |
-| test.c:4:14:4:18 | access to array | test.c:10:10:10:11 | p1 |
-| test.c:4:14:4:18 | access to array | test.c:12:10:12:11 | p1 |
-| test.c:5:14:5:15 | l2 | test.c:5:14:5:19 | access to array |
-| test.c:5:14:5:19 | access to array | test.c:11:10:11:11 | p2 |
-| test.c:5:14:5:19 | access to array | test.c:12:15:12:16 | p2 |
-| test.c:5:14:5:19 | access to array | test.c:13:10:13:11 | p4 |
-| test.c:5:14:5:19 | access to array | test.c:14:10:14:11 | p4 |
+| test.c:4:14:4:15 | l1 | test.c:4:14:4:18 | access to array | provenance |  |
+| test.c:4:14:4:18 | access to array | test.c:10:10:10:11 | p1 | provenance |  |
+| test.c:4:14:4:18 | access to array | test.c:12:10:12:11 | p1 | provenance |  |
+| test.c:5:14:5:15 | l2 | test.c:5:14:5:19 | access to array | provenance |  |
+| test.c:5:14:5:19 | access to array | test.c:11:10:11:11 | p2 | provenance |  |
+| test.c:5:14:5:19 | access to array | test.c:12:15:12:16 | p2 | provenance |  |
+| test.c:5:14:5:19 | access to array | test.c:13:10:13:11 | p4 | provenance |  |
+| test.c:5:14:5:19 | access to array | test.c:14:10:14:11 | p4 | provenance |  |
 nodes
 | test.c:4:14:4:15 | l1 | semmle.label | l1 |
 | test.c:4:14:4:18 | access to array | semmle.label | access to array |
diff --git a/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected b/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
index 8db569a98d..05c0ed4ca0 100644
--- a/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
+++ b/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
@@ -10,19 +10,19 @@ problems
 | test.c:25:7:25:14 | ... >= ... | test.c:7:14:7:15 | l1 | test.c:25:7:25:8 | p1 | Compare operation >= comparing left operand pointing to array $@ and other operand pointing to array $@. | test.c:2:7:2:8 | l1 | l1 | test.c:4:7:4:8 | l3 | l3 |
 | test.c:25:7:25:14 | ... >= ... | test.c:25:13:25:14 | l3 | test.c:25:13:25:14 | l3 | Compare operation >= comparing right operand pointing to array $@ and other operand pointing to array $@. | test.c:4:7:4:8 | l3 | l3 | test.c:2:7:2:8 | l1 | l1 |
 edges
-| test.c:6:13:6:14 | l1 | test.c:13:12:13:13 | p0 |
-| test.c:7:14:7:15 | l1 | test.c:7:14:7:18 | access to array |
-| test.c:7:14:7:18 | access to array | test.c:11:7:11:8 | p1 |
-| test.c:7:14:7:18 | access to array | test.c:13:7:13:8 | p1 |
-| test.c:7:14:7:18 | access to array | test.c:15:13:15:14 | p1 |
-| test.c:7:14:7:18 | access to array | test.c:17:7:17:8 | p1 |
-| test.c:7:14:7:18 | access to array | test.c:23:13:23:14 | p1 |
-| test.c:7:14:7:18 | access to array | test.c:25:7:25:8 | p1 |
-| test.c:8:14:8:15 | l1 | test.c:8:14:8:18 | access to array |
-| test.c:8:14:8:18 | access to array | test.c:11:12:11:13 | p2 |
-| test.c:8:14:8:18 | access to array | test.c:21:7:21:8 | p2 |
-| test.c:9:14:9:15 | l2 | test.c:9:14:9:18 | access to array |
-| test.c:9:14:9:18 | access to array | test.c:21:12:21:13 | p3 |
+| test.c:6:13:6:14 | l1 | test.c:13:12:13:13 | p0 | provenance |  |
+| test.c:7:14:7:15 | l1 | test.c:7:14:7:18 | access to array | provenance |  |
+| test.c:7:14:7:18 | access to array | test.c:11:7:11:8 | p1 | provenance |  |
+| test.c:7:14:7:18 | access to array | test.c:13:7:13:8 | p1 | provenance |  |
+| test.c:7:14:7:18 | access to array | test.c:15:13:15:14 | p1 | provenance |  |
+| test.c:7:14:7:18 | access to array | test.c:17:7:17:8 | p1 | provenance |  |
+| test.c:7:14:7:18 | access to array | test.c:23:13:23:14 | p1 | provenance |  |
+| test.c:7:14:7:18 | access to array | test.c:25:7:25:8 | p1 | provenance |  |
+| test.c:8:14:8:15 | l1 | test.c:8:14:8:18 | access to array | provenance |  |
+| test.c:8:14:8:18 | access to array | test.c:11:12:11:13 | p2 | provenance |  |
+| test.c:8:14:8:18 | access to array | test.c:21:7:21:8 | p2 | provenance |  |
+| test.c:9:14:9:15 | l2 | test.c:9:14:9:18 | access to array | provenance |  |
+| test.c:9:14:9:18 | access to array | test.c:21:12:21:13 | p3 | provenance |  |
 nodes
 | test.c:6:13:6:14 | l1 | semmle.label | l1 |
 | test.c:7:14:7:15 | l1 | semmle.label | l1 |
diff --git a/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.expected b/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.expected
index 5881d5e78f..a6c41a6d75 100644
--- a/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.expected
+++ b/c/common/test/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.expected
@@ -6,10 +6,10 @@ problems
 | test.c:18:36:18:38 | ptr | test.c:27:7:27:8 | & ... | test.c:18:36:18:38 | ptr | Free expression frees memory which was not dynamically allocated. |
 | test.c:26:8:26:8 | p | test.c:25:13:25:14 | & ... | test.c:26:8:26:8 | p | Free expression frees memory which was not dynamically allocated. |
 edges
-| test.c:18:24:18:26 | ptr | test.c:18:36:18:38 | ptr |
-| test.c:25:13:25:14 | & ... | test.c:26:8:26:8 | p |
-| test.c:27:7:27:8 | & ... | test.c:28:15:28:15 | p |
-| test.c:28:15:28:15 | p | test.c:18:24:18:26 | ptr |
+| test.c:18:24:18:26 | ptr | test.c:18:36:18:38 | ptr | provenance |  |
+| test.c:25:13:25:14 | & ... | test.c:26:8:26:8 | p | provenance |  |
+| test.c:27:7:27:8 | & ... | test.c:28:15:28:15 | p | provenance |  |
+| test.c:28:15:28:15 | p | test.c:18:24:18:26 | ptr | provenance |  |
 nodes
 | test.c:8:8:8:10 | g_p | semmle.label | g_p |
 | test.c:10:8:10:10 | g_p | semmle.label | g_p |
diff --git a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
index bdfec99b4a..cded1a0a89 100644
--- a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
+++ b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
@@ -1,10 +1,10 @@
 edges
-| test.c:12:13:12:15 | a | test.c:14:10:14:10 | a |
-| test.c:12:13:12:15 | a | test.c:23:13:23:13 | a |
-| test.c:12:13:12:15 | a | test.c:24:10:24:10 | a |
-| test.c:13:13:13:15 | b | test.c:14:13:14:13 | b |
-| test.c:18:15:18:28 | {...} | test.c:21:10:21:10 | e |
-| test.c:19:15:19:28 | {...} | test.c:21:13:21:13 | f |
+| test.c:12:13:12:15 | a | test.c:14:10:14:10 | a | provenance |  |
+| test.c:12:13:12:15 | a | test.c:23:13:23:13 | a | provenance |  |
+| test.c:12:13:12:15 | a | test.c:24:10:24:10 | a | provenance |  |
+| test.c:13:13:13:15 | b | test.c:14:13:14:13 | b | provenance |  |
+| test.c:18:15:18:28 | {...} | test.c:21:10:21:10 | e | provenance |  |
+| test.c:19:15:19:28 | {...} | test.c:21:13:21:13 | f | provenance |  |
 nodes
 | test.c:10:10:10:12 | a | semmle.label | a |
 | test.c:10:15:10:17 | b | semmle.label | b |
diff --git a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
index dcf263fc54..5f752403dc 100644
--- a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
+++ b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
@@ -1,10 +1,10 @@
 edges
-| test.cpp:3:36:3:45 | new[] | test.cpp:19:27:19:44 | call to allocate_int_array |
-| test.cpp:3:36:3:45 | new[] | test.cpp:23:12:23:29 | call to allocate_int_array |
-| test.cpp:3:36:3:45 | new[] | test.cpp:27:20:27:37 | call to allocate_int_array |
-| test.cpp:11:29:11:41 | call to unique_ptr | test.cpp:12:27:12:28 | v2 |
-| test.cpp:12:27:12:28 | v2 | test.cpp:12:30:12:36 | call to release |
-| test.cpp:27:20:27:37 | call to allocate_int_array | test.cpp:32:12:32:20 | int_array |
+| test.cpp:3:36:3:45 | new[] | test.cpp:19:27:19:44 | call to allocate_int_array | provenance |  |
+| test.cpp:3:36:3:45 | new[] | test.cpp:23:12:23:29 | call to allocate_int_array | provenance |  |
+| test.cpp:3:36:3:45 | new[] | test.cpp:27:20:27:37 | call to allocate_int_array | provenance |  |
+| test.cpp:11:29:11:41 | call to unique_ptr | test.cpp:12:27:12:28 | v2 | provenance |  |
+| test.cpp:12:27:12:28 | v2 | test.cpp:12:30:12:36 | call to release | provenance |  |
+| test.cpp:27:20:27:37 | call to allocate_int_array | test.cpp:32:12:32:20 | int_array | provenance |  |
 nodes
 | test.cpp:3:36:3:45 | new[] | semmle.label | new[] |
 | test.cpp:11:29:11:41 | call to unique_ptr | semmle.label | call to unique_ptr |
diff --git a/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected b/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
index 4234d93b32..b47755725c 100644
--- a/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
+++ b/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
@@ -1,15 +1,15 @@
 edges
-| test.cpp:10:18:10:20 | foo | test.cpp:11:23:11:25 | foo |
-| test.cpp:10:18:10:20 | foo | test.cpp:11:50:11:52 | foo |
-| test.cpp:22:18:22:20 | foo | test.cpp:24:18:24:20 | foo |
-| test.cpp:35:11:35:17 | new | test.cpp:38:6:38:7 | l1 |
-| test.cpp:35:11:35:17 | new | test.cpp:39:6:39:7 | l1 |
-| test.cpp:37:11:37:13 | & ... | test.cpp:40:6:40:7 | l3 |
-| test.cpp:37:11:37:13 | & ... | test.cpp:41:6:41:7 | l3 |
-| test.cpp:38:6:38:7 | l1 | test.cpp:10:18:10:20 | foo |
-| test.cpp:39:6:39:7 | l1 | test.cpp:22:18:22:20 | foo |
-| test.cpp:40:6:40:7 | l3 | test.cpp:10:18:10:20 | foo |
-| test.cpp:41:6:41:7 | l3 | test.cpp:22:18:22:20 | foo |
+| test.cpp:10:18:10:20 | foo | test.cpp:11:23:11:25 | foo | provenance |  |
+| test.cpp:10:18:10:20 | foo | test.cpp:11:50:11:52 | foo | provenance |  |
+| test.cpp:22:18:22:20 | foo | test.cpp:24:18:24:20 | foo | provenance |  |
+| test.cpp:35:11:35:17 | new | test.cpp:38:6:38:7 | l1 | provenance |  |
+| test.cpp:35:11:35:17 | new | test.cpp:39:6:39:7 | l1 | provenance |  |
+| test.cpp:37:11:37:13 | & ... | test.cpp:40:6:40:7 | l3 | provenance |  |
+| test.cpp:37:11:37:13 | & ... | test.cpp:41:6:41:7 | l3 | provenance |  |
+| test.cpp:38:6:38:7 | l1 | test.cpp:10:18:10:20 | foo | provenance |  |
+| test.cpp:39:6:39:7 | l1 | test.cpp:22:18:22:20 | foo | provenance |  |
+| test.cpp:40:6:40:7 | l3 | test.cpp:10:18:10:20 | foo | provenance |  |
+| test.cpp:41:6:41:7 | l3 | test.cpp:22:18:22:20 | foo | provenance |  |
 nodes
 | test.cpp:10:18:10:20 | foo | semmle.label | foo |
 | test.cpp:11:23:11:25 | foo | semmle.label | foo |
diff --git a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
index 4b19073ded..6d65a7b5d5 100644
--- a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
+++ b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
@@ -1,6 +1,6 @@
 edges
-| test.cpp:5:13:5:30 | [...](...){...} | test.cpp:8:38:8:39 | l1 |
-| test.cpp:6:13:6:30 | [...](...){...} | test.cpp:9:38:9:39 | l2 |
+| test.cpp:5:13:5:30 | [...](...){...} | test.cpp:8:38:8:39 | l1 | provenance |  |
+| test.cpp:6:13:6:30 | [...](...){...} | test.cpp:9:38:9:39 | l2 | provenance |  |
 nodes
 | test.cpp:5:13:5:30 | [...](...){...} | semmle.label | [...](...){...} |
 | test.cpp:6:13:6:30 | [...](...){...} | semmle.label | [...](...){...} |
diff --git a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
index 0ee15c65b5..eabb6d7515 100644
--- a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
+++ b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
@@ -1,15 +1,15 @@
 edges
-| test.cpp:15:19:15:21 | foo | test.cpp:16:24:16:26 | foo |
-| test.cpp:15:19:15:21 | foo | test.cpp:16:51:16:53 | foo |
-| test.cpp:27:19:27:21 | foo | test.cpp:29:18:29:20 | foo |
-| test.cpp:40:12:40:19 | new | test.cpp:43:6:43:7 | l1 |
-| test.cpp:40:12:40:19 | new | test.cpp:44:6:44:7 | l1 |
-| test.cpp:42:12:42:14 | & ... | test.cpp:45:6:45:7 | l3 |
-| test.cpp:42:12:42:14 | & ... | test.cpp:46:6:46:7 | l3 |
-| test.cpp:43:6:43:7 | l1 | test.cpp:15:19:15:21 | foo |
-| test.cpp:44:6:44:7 | l1 | test.cpp:27:19:27:21 | foo |
-| test.cpp:45:6:45:7 | l3 | test.cpp:15:19:15:21 | foo |
-| test.cpp:46:6:46:7 | l3 | test.cpp:27:19:27:21 | foo |
+| test.cpp:15:19:15:21 | foo | test.cpp:16:24:16:26 | foo | provenance |  |
+| test.cpp:15:19:15:21 | foo | test.cpp:16:51:16:53 | foo | provenance |  |
+| test.cpp:27:19:27:21 | foo | test.cpp:29:18:29:20 | foo | provenance |  |
+| test.cpp:40:12:40:19 | new | test.cpp:43:6:43:7 | l1 | provenance |  |
+| test.cpp:40:12:40:19 | new | test.cpp:44:6:44:7 | l1 | provenance |  |
+| test.cpp:42:12:42:14 | & ... | test.cpp:45:6:45:7 | l3 | provenance |  |
+| test.cpp:42:12:42:14 | & ... | test.cpp:46:6:46:7 | l3 | provenance |  |
+| test.cpp:43:6:43:7 | l1 | test.cpp:15:19:15:21 | foo | provenance |  |
+| test.cpp:44:6:44:7 | l1 | test.cpp:27:19:27:21 | foo | provenance |  |
+| test.cpp:45:6:45:7 | l3 | test.cpp:15:19:15:21 | foo | provenance |  |
+| test.cpp:46:6:46:7 | l3 | test.cpp:27:19:27:21 | foo | provenance |  |
 nodes
 | test.cpp:15:19:15:21 | foo | semmle.label | foo |
 | test.cpp:16:24:16:26 | foo | semmle.label | foo |
diff --git a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
index a50daa096e..9c6e6dd071 100644
--- a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
+++ b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
@@ -1,6 +1,6 @@
 edges
-| test.cpp:6:19:6:37 | new[] | test.cpp:9:12:9:13 | l1 |
-| test.cpp:7:22:7:40 | new[] | test.cpp:10:12:10:13 | l2 |
+| test.cpp:6:19:6:37 | new[] | test.cpp:9:12:9:13 | l1 | provenance |  |
+| test.cpp:7:22:7:40 | new[] | test.cpp:10:12:10:13 | l2 | provenance |  |
 nodes
 | test.cpp:6:19:6:37 | new[] | semmle.label | new[] |
 | test.cpp:7:22:7:40 | new[] | semmle.label | new[] |
diff --git a/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected b/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
index e64315e044..860fec1d80 100644
--- a/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
+++ b/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
@@ -1,5 +1,5 @@
 edges
-| test.cpp:65:21:65:34 | call to operator new | test.cpp:67:26:67:32 | call to realloc |
+| test.cpp:65:21:65:34 | call to operator new | test.cpp:67:26:67:32 | call to realloc | provenance |  |
 nodes
 | test.cpp:16:26:16:31 | call to malloc | semmle.label | call to malloc |
 | test.cpp:17:38:17:43 | call to malloc | semmle.label | call to malloc |
diff --git a/cpp/cert/test/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.expected b/cpp/cert/test/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.expected
index 00ed15c370..f7f4705ef3 100644
--- a/cpp/cert/test/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.expected
+++ b/cpp/cert/test/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.expected
@@ -1,8 +1,8 @@
 edges
-| test.cpp:16:26:16:31 | call to malloc | test.cpp:22:8:22:9 | a1 |
-| test.cpp:17:38:17:43 | call to malloc | test.cpp:23:8:23:9 | a2 |
-| test.cpp:18:26:18:39 | call to operator new | test.cpp:26:21:26:22 | a3 |
-| test.cpp:20:29:20:42 | call to operator new | test.cpp:27:21:27:22 | a4 |
+| test.cpp:16:26:16:31 | call to malloc | test.cpp:22:8:22:9 | a1 | provenance |  |
+| test.cpp:17:38:17:43 | call to malloc | test.cpp:23:8:23:9 | a2 | provenance |  |
+| test.cpp:18:26:18:39 | call to operator new | test.cpp:26:21:26:22 | a3 | provenance |  |
+| test.cpp:20:29:20:42 | call to operator new | test.cpp:27:21:27:22 | a4 | provenance |  |
 nodes
 | test.cpp:16:26:16:31 | call to malloc | semmle.label | call to malloc |
 | test.cpp:17:38:17:43 | call to malloc | semmle.label | call to malloc |
diff --git a/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.expected b/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.expected
index a4e40cc6cb..7a43b3757e 100644
--- a/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.expected
+++ b/cpp/common/test/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.expected
@@ -2,8 +2,8 @@ problems
 | test.cpp:10:3:10:13 | call to expression | test.cpp:8:22:8:28 | 0 | test.cpp:10:9:10:10 | l2 | A null pointer-to-member value from $@ is passed as the second operand to a pointer-to-member expression. | test.cpp:8:22:8:28 | test.cpp:8:22:8:28 | initialization |
 | test.cpp:11:8:11:9 | l3 | test.cpp:9:17:9:23 | 0 | test.cpp:11:8:11:9 | l3 | A null pointer-to-member value from $@ is passed as the second operand to a pointer-to-member expression. | test.cpp:9:17:9:23 | test.cpp:9:17:9:23 | initialization |
 edges
-| test.cpp:8:22:8:28 | 0 | test.cpp:10:9:10:10 | l2 |
-| test.cpp:9:17:9:23 | 0 | test.cpp:11:8:11:9 | l3 |
+| test.cpp:8:22:8:28 | 0 | test.cpp:10:9:10:10 | l2 | provenance |  |
+| test.cpp:9:17:9:23 | 0 | test.cpp:11:8:11:9 | l3 | provenance |  |
 nodes
 | test.cpp:8:22:8:28 | 0 | semmle.label | 0 |
 | test.cpp:9:17:9:23 | 0 | semmle.label | 0 |
diff --git a/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected b/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
index 537228a000..dcbc6d05bc 100644
--- a/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
+++ b/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
@@ -4,14 +4,14 @@ problems
 | test.cpp:13:10:13:11 | p4 | test.cpp:5:14:5:15 | l2 | test.cpp:13:10:13:11 | p4 | Subtraction between left operand pointing to array $@ and other operand pointing to array $@. | test.cpp:3:7:3:8 | l2 | l2 | test.cpp:2:7:2:8 | l1 | l1 |
 | test.cpp:13:15:13:16 | l1 | test.cpp:13:15:13:16 | l1 | test.cpp:13:15:13:16 | l1 | Subtraction between right operand pointing to array $@ and other operand pointing to array $@. | test.cpp:2:7:2:8 | l1 | l1 | test.cpp:3:7:3:8 | l2 | l2 |
 edges
-| test.cpp:4:14:4:15 | l1 | test.cpp:4:14:4:18 | access to array |
-| test.cpp:4:14:4:18 | access to array | test.cpp:10:10:10:11 | p1 |
-| test.cpp:4:14:4:18 | access to array | test.cpp:12:10:12:11 | p1 |
-| test.cpp:5:14:5:15 | l2 | test.cpp:5:14:5:19 | access to array |
-| test.cpp:5:14:5:19 | access to array | test.cpp:11:10:11:11 | p2 |
-| test.cpp:5:14:5:19 | access to array | test.cpp:12:15:12:16 | p2 |
-| test.cpp:5:14:5:19 | access to array | test.cpp:13:10:13:11 | p4 |
-| test.cpp:5:14:5:19 | access to array | test.cpp:14:10:14:11 | p4 |
+| test.cpp:4:14:4:15 | l1 | test.cpp:4:14:4:18 | access to array | provenance |  |
+| test.cpp:4:14:4:18 | access to array | test.cpp:10:10:10:11 | p1 | provenance |  |
+| test.cpp:4:14:4:18 | access to array | test.cpp:12:10:12:11 | p1 | provenance |  |
+| test.cpp:5:14:5:15 | l2 | test.cpp:5:14:5:19 | access to array | provenance |  |
+| test.cpp:5:14:5:19 | access to array | test.cpp:11:10:11:11 | p2 | provenance |  |
+| test.cpp:5:14:5:19 | access to array | test.cpp:12:15:12:16 | p2 | provenance |  |
+| test.cpp:5:14:5:19 | access to array | test.cpp:13:10:13:11 | p4 | provenance |  |
+| test.cpp:5:14:5:19 | access to array | test.cpp:14:10:14:11 | p4 | provenance |  |
 nodes
 | test.cpp:4:14:4:15 | l1 | semmle.label | l1 |
 | test.cpp:4:14:4:18 | access to array | semmle.label | access to array |
diff --git a/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected b/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
index 22ddfd123a..f02c9a5712 100644
--- a/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
+++ b/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
@@ -10,19 +10,19 @@ problems
 | test.cpp:25:7:25:14 | ... >= ... | test.cpp:7:14:7:15 | l1 | test.cpp:25:7:25:8 | p1 | Compare operation >= comparing left operand pointing to array $@ and other operand pointing to array $@. | test.cpp:2:7:2:8 | l1 | l1 | test.cpp:4:7:4:8 | l3 | l3 |
 | test.cpp:25:7:25:14 | ... >= ... | test.cpp:25:13:25:14 | l3 | test.cpp:25:13:25:14 | l3 | Compare operation >= comparing right operand pointing to array $@ and other operand pointing to array $@. | test.cpp:4:7:4:8 | l3 | l3 | test.cpp:2:7:2:8 | l1 | l1 |
 edges
-| test.cpp:6:13:6:14 | l1 | test.cpp:13:12:13:13 | p0 |
-| test.cpp:7:14:7:15 | l1 | test.cpp:7:14:7:18 | access to array |
-| test.cpp:7:14:7:18 | access to array | test.cpp:11:7:11:8 | p1 |
-| test.cpp:7:14:7:18 | access to array | test.cpp:13:7:13:8 | p1 |
-| test.cpp:7:14:7:18 | access to array | test.cpp:15:13:15:14 | p1 |
-| test.cpp:7:14:7:18 | access to array | test.cpp:17:7:17:8 | p1 |
-| test.cpp:7:14:7:18 | access to array | test.cpp:23:13:23:14 | p1 |
-| test.cpp:7:14:7:18 | access to array | test.cpp:25:7:25:8 | p1 |
-| test.cpp:8:14:8:15 | l1 | test.cpp:8:14:8:18 | access to array |
-| test.cpp:8:14:8:18 | access to array | test.cpp:11:12:11:13 | p2 |
-| test.cpp:8:14:8:18 | access to array | test.cpp:21:7:21:8 | p2 |
-| test.cpp:9:14:9:15 | l2 | test.cpp:9:14:9:18 | access to array |
-| test.cpp:9:14:9:18 | access to array | test.cpp:21:12:21:13 | p3 |
+| test.cpp:6:13:6:14 | l1 | test.cpp:13:12:13:13 | p0 | provenance |  |
+| test.cpp:7:14:7:15 | l1 | test.cpp:7:14:7:18 | access to array | provenance |  |
+| test.cpp:7:14:7:18 | access to array | test.cpp:11:7:11:8 | p1 | provenance |  |
+| test.cpp:7:14:7:18 | access to array | test.cpp:13:7:13:8 | p1 | provenance |  |
+| test.cpp:7:14:7:18 | access to array | test.cpp:15:13:15:14 | p1 | provenance |  |
+| test.cpp:7:14:7:18 | access to array | test.cpp:17:7:17:8 | p1 | provenance |  |
+| test.cpp:7:14:7:18 | access to array | test.cpp:23:13:23:14 | p1 | provenance |  |
+| test.cpp:7:14:7:18 | access to array | test.cpp:25:7:25:8 | p1 | provenance |  |
+| test.cpp:8:14:8:15 | l1 | test.cpp:8:14:8:18 | access to array | provenance |  |
+| test.cpp:8:14:8:18 | access to array | test.cpp:11:12:11:13 | p2 | provenance |  |
+| test.cpp:8:14:8:18 | access to array | test.cpp:21:7:21:8 | p2 | provenance |  |
+| test.cpp:9:14:9:15 | l2 | test.cpp:9:14:9:18 | access to array | provenance |  |
+| test.cpp:9:14:9:18 | access to array | test.cpp:21:12:21:13 | p3 | provenance |  |
 nodes
 | test.cpp:6:13:6:14 | l1 | semmle.label | l1 |
 | test.cpp:7:14:7:15 | l1 | semmle.label | l1 |
diff --git a/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected b/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected
index 3d00ff0d6a..0b23493cfa 100644
--- a/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected
+++ b/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected
@@ -6,21 +6,21 @@ problems
 | test.cpp:12:28:12:29 | v2 | test.cpp:10:8:10:17 | new | test.cpp:12:28:12:29 | v2 | Raw pointer flows to initialize multiple unrelated smart pointers. |
 | test.cpp:17:27:17:28 | v1 | test.cpp:16:13:16:22 | new | test.cpp:17:27:17:28 | v1 | Raw pointer flows to initialize multiple unrelated smart pointers. |
 edges
-| test.cpp:3:14:3:15 | v1 | test.cpp:5:27:5:28 | v1 |
-| test.cpp:3:14:3:15 | v1 | test.cpp:5:27:5:28 | v1 |
-| test.cpp:3:14:3:15 | v1 | test.cpp:7:28:7:29 | v2 |
-| test.cpp:4:13:4:14 | v1 | test.cpp:7:28:7:29 | v2 |
-| test.cpp:5:27:5:28 | v1 | test.cpp:5:27:5:29 | call to shared_ptr |
-| test.cpp:5:27:5:29 | call to shared_ptr | test.cpp:6:28:6:29 | p1 |
-| test.cpp:5:27:5:29 | call to shared_ptr | test.cpp:6:28:6:29 | p1 |
-| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get |
-| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get |
-| test.cpp:8:8:8:14 | 0 | test.cpp:9:28:9:29 | v2 |
-| test.cpp:10:8:10:17 | new | test.cpp:11:28:11:29 | v2 |
-| test.cpp:10:8:10:17 | new | test.cpp:12:28:12:29 | v2 |
-| test.cpp:16:13:16:22 | new | test.cpp:17:27:17:28 | v1 |
-| test.cpp:16:13:16:22 | new | test.cpp:19:6:19:7 | v1 |
-| test.cpp:19:6:19:7 | v1 | test.cpp:3:14:3:15 | v1 |
+| test.cpp:3:14:3:15 | v1 | test.cpp:5:27:5:28 | v1 | provenance |  |
+| test.cpp:3:14:3:15 | v1 | test.cpp:5:27:5:28 | v1 | provenance |  |
+| test.cpp:3:14:3:15 | v1 | test.cpp:7:28:7:29 | v2 | provenance |  |
+| test.cpp:4:13:4:14 | v1 | test.cpp:7:28:7:29 | v2 | provenance |  |
+| test.cpp:5:27:5:28 | v1 | test.cpp:5:27:5:29 | call to shared_ptr | provenance |  |
+| test.cpp:5:27:5:29 | call to shared_ptr | test.cpp:6:28:6:29 | p1 | provenance |  |
+| test.cpp:5:27:5:29 | call to shared_ptr | test.cpp:6:28:6:29 | p1 | provenance |  |
+| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get | provenance |  |
+| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get | provenance |  |
+| test.cpp:8:8:8:14 | 0 | test.cpp:9:28:9:29 | v2 | provenance |  |
+| test.cpp:10:8:10:17 | new | test.cpp:11:28:11:29 | v2 | provenance |  |
+| test.cpp:10:8:10:17 | new | test.cpp:12:28:12:29 | v2 | provenance |  |
+| test.cpp:16:13:16:22 | new | test.cpp:17:27:17:28 | v1 | provenance |  |
+| test.cpp:16:13:16:22 | new | test.cpp:19:6:19:7 | v1 | provenance |  |
+| test.cpp:19:6:19:7 | v1 | test.cpp:3:14:3:15 | v1 | provenance |  |
 nodes
 | test.cpp:3:14:3:15 | v1 | semmle.label | v1 |
 | test.cpp:4:13:4:14 | v1 | semmle.label | v1 |
diff --git a/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.expected b/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.expected
index ae8a0d626b..5e047a77da 100644
--- a/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.expected
+++ b/cpp/common/test/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.expected
@@ -3,8 +3,8 @@ problems
 | test.cpp:12:5:12:19 | return ... | test.cpp:12:12:12:18 | 0 | test.cpp:12:12:12:18 | 0 | operator new(size_t) may return null instead of throwing a std::bad_alloc exception. |
 | test.cpp:14:5:14:33 | return ... | test.cpp:4:10:4:23 | call to operator new | test.cpp:14:12:14:26 | call to can_return_null | operator new(size_t) may return null instead of throwing a std::bad_alloc exception. |
 edges
-| test.cpp:4:10:4:23 | call to operator new | test.cpp:14:12:14:26 | call to can_return_null |
-| test.cpp:8:23:8:23 | 0 | test.cpp:10:12:10:24 | localVariable |
+| test.cpp:4:10:4:23 | call to operator new | test.cpp:14:12:14:26 | call to can_return_null | provenance |  |
+| test.cpp:8:23:8:23 | 0 | test.cpp:10:12:10:24 | localVariable | provenance |  |
 nodes
 | test.cpp:4:10:4:23 | call to operator new | semmle.label | call to operator new |
 | test.cpp:8:23:8:23 | 0 | semmle.label | 0 |

From 0b02e6b06e40c2c52cfd625155d12d09ea91074d Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 9 Feb 2024 12:39:56 +0000
Subject: [PATCH 022/435] Accept changes from github/codeql/15549

---
 .../PlacementNewInsufficientStorage.expected  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.expected b/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.expected
index 3c38e192bc..a4c3bb1df6 100644
--- a/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.expected
+++ b/cpp/common/test/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.expected
@@ -7,18 +7,18 @@ problems
 | test.cpp:100:16:100:39 | new | test.cpp:65:36:65:38 | call to pop | test.cpp:100:21:100:28 | badAlloc | Placement new expression is used with an insufficiently large memory allocation from $@. | test.cpp:65:36:65:38 | call to pop | call to pop |
 | test.cpp:113:7:113:32 | new[] | test.cpp:113:14:113:21 | badAlloc | test.cpp:113:14:113:21 | badAlloc | Placement new expression is used with an insufficiently large memory allocation from $@. | test.cpp:113:14:113:21 | badAlloc | badAlloc |
 edges
-| test.cpp:18:36:18:49 | call to operator new | test.cpp:19:21:19:44 | correctlyAllocatedMemory |
-| test.cpp:24:37:24:50 | call to operator new | test.cpp:25:21:25:45 | correctlyAllocatedMemory2 |
-| test.cpp:29:32:29:45 | call to operator new | test.cpp:31:21:31:40 | badlyAllocatedMemory |
-| test.cpp:35:33:35:46 | call to operator new | test.cpp:37:21:37:41 | badlyAllocatedMemory2 |
-| test.cpp:62:16:62:29 | call to operator new | test.cpp:67:12:67:17 | memory |
-| test.cpp:62:16:62:29 | call to operator new | test.cpp:67:12:67:17 | memory |
-| test.cpp:65:36:65:38 | call to pop | test.cpp:67:12:67:17 | memory |
-| test.cpp:65:36:65:38 | call to pop | test.cpp:67:12:67:17 | memory |
-| test.cpp:67:12:67:17 | memory | test.cpp:94:32:94:39 | call to allocate |
-| test.cpp:67:12:67:17 | memory | test.cpp:98:31:98:38 | call to allocate |
-| test.cpp:94:32:94:39 | call to allocate | test.cpp:95:21:95:29 | goodAlloc |
-| test.cpp:98:31:98:38 | call to allocate | test.cpp:100:21:100:28 | badAlloc |
+| test.cpp:18:36:18:49 | call to operator new | test.cpp:19:21:19:44 | correctlyAllocatedMemory | provenance |  |
+| test.cpp:24:37:24:50 | call to operator new | test.cpp:25:21:25:45 | correctlyAllocatedMemory2 | provenance |  |
+| test.cpp:29:32:29:45 | call to operator new | test.cpp:31:21:31:40 | badlyAllocatedMemory | provenance |  |
+| test.cpp:35:33:35:46 | call to operator new | test.cpp:37:21:37:41 | badlyAllocatedMemory2 | provenance |  |
+| test.cpp:62:16:62:29 | call to operator new | test.cpp:67:12:67:17 | memory | provenance |  |
+| test.cpp:62:16:62:29 | call to operator new | test.cpp:67:12:67:17 | memory | provenance |  |
+| test.cpp:65:36:65:38 | call to pop | test.cpp:67:12:67:17 | memory | provenance |  |
+| test.cpp:65:36:65:38 | call to pop | test.cpp:67:12:67:17 | memory | provenance |  |
+| test.cpp:67:12:67:17 | memory | test.cpp:94:32:94:39 | call to allocate | provenance |  |
+| test.cpp:67:12:67:17 | memory | test.cpp:98:31:98:38 | call to allocate | provenance |  |
+| test.cpp:94:32:94:39 | call to allocate | test.cpp:95:21:95:29 | goodAlloc | provenance |  |
+| test.cpp:98:31:98:38 | call to allocate | test.cpp:100:21:100:28 | badAlloc | provenance |  |
 nodes
 | test.cpp:18:36:18:49 | call to operator new | semmle.label | call to operator new |
 | test.cpp:19:21:19:44 | correctlyAllocatedMemory | semmle.label | correctlyAllocatedMemory |

From a2eefa47691998e45b1e0b053ee535711b35dc34 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Wed, 28 Feb 2024 11:40:17 +0100
Subject: [PATCH 023/435] Update test after frontend update

---
 .../UserDefinedConversionOperatorsShouldNotBeUsed.expected      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/test/rules/A13-5-3/UserDefinedConversionOperatorsShouldNotBeUsed.expected b/cpp/autosar/test/rules/A13-5-3/UserDefinedConversionOperatorsShouldNotBeUsed.expected
index e757cdf984..14e68ab4a9 100644
--- a/cpp/autosar/test/rules/A13-5-3/UserDefinedConversionOperatorsShouldNotBeUsed.expected
+++ b/cpp/autosar/test/rules/A13-5-3/UserDefinedConversionOperatorsShouldNotBeUsed.expected
@@ -1,4 +1,4 @@
 | test.cpp:33:7:33:7 | call to operator A | User-defined conversion operators should not be used. |
 | test.cpp:35:24:35:24 | call to operator A * | User-defined conversion operators should not be used. |
-| test.cpp:37:15:37:15 | call to operator B::array_A * | User-defined conversion operators should not be used. |
+| test.cpp:37:15:37:15 | call to operator A (*)[3] | User-defined conversion operators should not be used. |
 | test.cpp:41:7:41:7 | call to operator A * | User-defined conversion operators should not be used. |

From 1f9bc6b4445ae3203a7c11e3ff6ecdfe5f16ed4f Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 13 Mar 2024 15:12:34 +0000
Subject: [PATCH 024/435] Remove the copy of DataFlow that was added in
 6aee03ef5ac577d77fbf034a46a6637f31aefbee now that the 'absolute path' problem
 has been fixed.

---
 ...interArithmeticOnNonArrayObjectPointers.ql |  2 +-
 ...otAddOrSubtractAScaledIntegerToAPointer.ql |  2 +-
 .../CON30-C/CleanUpThreadSpecificStorage.ql   |  4 +-
 ...AppropriateThreadObjectStorageDurations.ql |  4 +-
 ...eadObjectStorageDurationsNotInitialized.ql |  4 +-
 ...propriateStorageDurationsFunctionReturn.ql |  2 +-
 .../ERR30-C/FunctionCallBeforeErrnoCheck.ql   |  2 +-
 ...nOrderOfFunctionArgumentsForSideEffects.ql |  4 +-
 ...PointerToMoreStrictlyAlignedPointerType.ql |  2 +-
 ...CallFunctionPointerWithIncompatibleType.ql |  2 +-
 ...essVariableViaPointerOfIncompatibleType.ql |  2 +-
 .../EXP40-C/DoNotModifyConstantObjects.ql     |  2 +-
 ...sAliasedPointerToRestrictQualifiedParam.ql |  2 +-
 ...trictPointerReferencesOverlappingObject.ql |  2 +-
 ...sfulFgetsOrFgetwsMayReturnAnEmptyString.ql |  2 +-
 ...uesForFsetposThatAreReturnedFromFgetpos.ql |  2 +-
 ...ToctouRaceConditionsWhileAccessingFiles.ql |  2 +-
 .../InsufficientMemoryAllocatedForObject.ql   |  2 +-
 ...DoNotModifyAlignmentOfMemoryWithRealloc.ql |  2 +-
 ...oNotPassInvalidDataToTheAsctimeFunction.ql |  2 +-
 ...ArgOnAVaListThatHasAnIndeterminateValue.ql |  2 +-
 ...yAsyncSafeFunctionsWithinSignalHandlers.ql |  2 +-
 ...eturnFromAComputationalExceptionHandler.ql |  2 +-
 .../DoNotAttemptToModifyStringLiterals.ql     |  2 +-
 ...sHasSufficientSpaceForTheNullTerminator.ql |  2 +-
 ...lTerminatedToFunctionThatExpectsAString.ql |  2 +-
 c/common/src/codingstandards/c/Errno.qll      |  2 +-
 .../src/codingstandards/c/OutOfBounds.qll     |  2 +-
 c/common/src/codingstandards/c/Signal.qll     |  2 +-
 .../ArrayFunctionArgumentNumberOfElements.ql  |  2 +-
 .../ValueReturnedByAFunctionNotUsed.ql        |  2 +-
 .../ObjectCopiedToAnOverlappingObject.ql      |  2 +-
 ...emcmpUsedToCompareNullTerminatedStrings.ql |  2 +-
 ...leOpenForReadAndWriteOnDifferentStreams.ql |  2 +-
 .../AttemptToWriteToAReadOnlyStream.ql        |  2 +-
 ...OnlyPerformConversionOfPassedParameters.ql |  2 +-
 .../A13-2-1/AssignmentOperatorReturnThis.ql   |  2 +-
 .../A15-1-3/ThrownExceptionsShouldBeUnique.ql |  2 +-
 ...structorErrorLeavesObjectInInvalidState.ql |  2 +-
 ...AnElementOfAnArrayPassedToASmartPointer.ql |  2 +-
 .../rules/A18-5-2/DoNotUseNonPlacementNew.ql  |  2 +-
 .../A18-5-8/UnnecessaryUseOfDynamicStorage.ql |  2 +-
 .../ArgumentToForwardSubsequentlyUsed.ql      |  2 +-
 ...SharedPointerUsedWithNoOwnershipSharing.ql |  2 +-
 .../src/rules/A27-0-4/CStyleStringsUsed.ql    |  2 +-
 ...hmeticUsedWithPointersToNonFinalClasses.ql |  2 +-
 .../rules/A5-1-7/LambdaPassedToDecltype.ql    |  2 +-
 .../src/rules/A5-1-7/LambdaPassedToTypeid.ql  |  2 +-
 .../rules/A7-5-1/InvalidFunctionReturnType.ql |  2 +-
 ...nterAsParameterWithoutLifetimeSemantics.ql |  2 +-
 ...trPassedToFunctionWithImproperSemantics.ql |  2 +-
 .../FunctionReturnMultipleValueCondition.ql   |  2 +-
 ...ersOrReferencesToPrivateOrProtectedData.ql |  2 +-
 .../FunctionErroneousReturnValueNotTested.ql  |  2 +-
 ...epresentationsOfFloatingPointValuesUsed.ql |  2 +-
 .../PointerSubtractionOnDifferentArrays.ql    |  2 +-
 ...ointerToAVirtualBaseClassCastToAPointer.ql |  2 +-
 ...nstMemberFunctionReturnsNonConstPointer.ql |  2 +-
 ...GenericCppLibraryFunctionsDoNotOverflow.ql |  2 +-
 ...sePointerArithmeticOnPolymorphicObjects.ql |  2 +-
 ...fectsInFunctionCallsAsFunctionArguments.ql |  4 +-
 ...nArrayThroughAPointerOfTheIncorrectType.ql |  2 +-
 .../DetectAndHandleMemoryAllocationErrors.ql  |  2 +-
 .../MEM53-CPP/ManuallyManagedLifetime.qll     |  2 +-
 ...ConstructorCallForManuallyManagedObject.ql |  2 +-
 ...gDestructorCallForManuallyManagedObject.ql |  2 +-
 .../BadlySeededRandomNumberGenerator.ql       |  2 +-
 .../src/codingstandards/cpp/AccessPath.qll    |  2 +-
 .../src/codingstandards/cpp/Allocations.qll   |  2 +-
 .../src/codingstandards/cpp/Concurrency.qll   |  2 +-
 .../src/codingstandards/cpp/ConstHelpers.qll  |  2 +-
 .../cpp/FgetsErrorManagement.qll              |  2 +-
 .../src/codingstandards/cpp/Iterators.qll     |  4 +-
 .../src/codingstandards/cpp/Nullness.qll      |  2 +-
 .../src/codingstandards/cpp/Overflow.qll      |  2 +-
 .../codingstandards/cpp/ReadErrorsAndEOF.qll  |  2 +-
 .../src/codingstandards/cpp/SideEffect.qll    |  2 +-
 .../src/codingstandards/cpp/SmartPointers.qll |  2 +-
 .../cpp/allocations/PlacementNew.qll          |  2 +-
 .../codingstandards/cpp/dataflow/DataFlow.qll | 36 ------------------
 .../cpp/dataflow/DataFlow2.qll                | 25 -------------
 .../cpp/dataflow/TaintTracking.qll            | 37 -------------------
 .../tainttracking1/TaintTrackingParameter.qll |  6 ---
 .../lifetimeprofile/LifetimeProfile.qll       |  2 +-
 .../cpp/resources/ResourceManagement.qll      |  2 +-
 ...onExistingMemberThroughPointerToMember.qll |  2 +-
 ...essOfUndefinedMemberThroughNullPointer.qll |  2 +-
 ...emberThroughUninitializedStaticPointer.qll |  2 +-
 .../BasicStringMayNotBeNullTerminated.qll     |  4 +-
 .../ConstLikeReturnValue.qll                  |  2 +-
 .../ContainerAccessWithoutRangeCheck.qll      |  2 +-
 .../DanglingCaptureWhenMovingLambdaObject.qll |  2 +-
 ...nglingCaptureWhenReturningLambdaObject.qll |  2 +-
 .../DoNotAccessAClosedFile.qll                |  2 +-
 ...otAllowAMutexToGoOutOfScopeWhileLocked.qll |  2 +-
 .../DoNotDestroyAMutexWhileItIsLocked.qll     |  2 +-
 ...tractPointersAddressingDifferentArrays.qll |  2 +-
 ...nterArithmeticToAddressDifferentArrays.qll |  2 +-
 ...RelationalOperatorsWithDifferingArrays.qll |  2 +-
 .../InvalidatedEnvStringPointers.qll          |  2 +-
 .../InvalidatedEnvStringPointersWarn.qll      |  2 +-
 .../IOFstreamMissingPositioning.qll           |  2 +-
 .../MovedFromObjectsUnspecifiedState.qll      |  2 +-
 .../nonconstantformat/NonConstantFormat.qll   |  2 +-
 ...lyFreeMemoryAllocatedDynamicallyShared.qll |  2 +-
 ...nterValueStoredInUnrelatedSmartPointer.qll |  2 +-
 .../PlacementNewInsufficientStorage.qll       |  2 +-
 .../PlacementNewNotProperlyAligned.qll        |  2 +-
 ...tringNumberConversionMissingErrorCheck.qll |  2 +-
 .../ThrowingOperatorNewReturnsNull.qll        |  2 +-
 ...eOnlyArrayIndexingForPointerArithmetic.qll |  2 +-
 .../cpp/standardlibrary/FileStreams.qll       |  4 +-
 .../cpp/trustboundary/UninitializedField.qll  |  2 +-
 .../UnusedReturnValue.ql                      |  2 +-
 .../UnusedReturnValue.ql                      |  2 +-
 .../UnusedReturnValue.ql                      |  2 +-
 116 files changed, 120 insertions(+), 224 deletions(-)
 delete mode 100644 cpp/common/src/codingstandards/cpp/dataflow/DataFlow.qll
 delete mode 100644 cpp/common/src/codingstandards/cpp/dataflow/DataFlow2.qll
 delete mode 100644 cpp/common/src/codingstandards/cpp/dataflow/TaintTracking.qll
 delete mode 100644 cpp/common/src/codingstandards/cpp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll

diff --git a/c/cert/src/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql b/c/cert/src/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql
index 2f8ecec25d..0ddf56150c 100644
--- a/c/cert/src/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql
+++ b/c/cert/src/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import NonArrayPointerToArrayIndexingExprFlow::PathGraph
 
 /**
diff --git a/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql b/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql
index c641c17124..d832eb6014 100644
--- a/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql
+++ b/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.c.Pointers
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import ScaledIntegerPointerArithmeticFlow::PathGraph
 
 /**
diff --git a/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql b/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
index 59fab6e455..d55f1326bf 100644
--- a/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
+++ b/c/cert/src/rules/CON30-C/CleanUpThreadSpecificStorage.ql
@@ -15,8 +15,8 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Concurrency
-import codingstandards.cpp.dataflow.TaintTracking
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
 
 module TssCreateToTssDeleteConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
diff --git a/c/cert/src/rules/CON34-C/AppropriateThreadObjectStorageDurations.ql b/c/cert/src/rules/CON34-C/AppropriateThreadObjectStorageDurations.ql
index e0617c266d..71138f4ff8 100644
--- a/c/cert/src/rules/CON34-C/AppropriateThreadObjectStorageDurations.ql
+++ b/c/cert/src/rules/CON34-C/AppropriateThreadObjectStorageDurations.ql
@@ -15,8 +15,8 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Concurrency
-import codingstandards.cpp.dataflow.TaintTracking
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.commons.Alloc
 
 from C11ThreadCreateCall tcc, StackVariable sv, Expr arg, Expr acc
diff --git a/c/cert/src/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.ql b/c/cert/src/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.ql
index 0fd94911ec..ddcddb8dc5 100644
--- a/c/cert/src/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.ql
+++ b/c/cert/src/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.ql
@@ -16,8 +16,8 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Concurrency
-import codingstandards.cpp.dataflow.TaintTracking
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
 
 from TSSGetFunctionCall tsg, ThreadedFunction tf
 where
diff --git a/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql b/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
index 9097f14297..b5d7e5e378 100644
--- a/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
+++ b/c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 class Source extends StackVariable {
   Source() { not this instanceof Parameter }
diff --git a/c/cert/src/rules/ERR30-C/FunctionCallBeforeErrnoCheck.ql b/c/cert/src/rules/ERR30-C/FunctionCallBeforeErrnoCheck.ql
index 8d63bb5d06..dd2e2175f7 100644
--- a/c/cert/src/rules/ERR30-C/FunctionCallBeforeErrnoCheck.ql
+++ b/c/cert/src/rules/ERR30-C/FunctionCallBeforeErrnoCheck.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.c.Errno
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * A call to an `OutOfBandErrnoSettingFunction`
diff --git a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.ql b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.ql
index bf8f99fd27..fb14515c61 100644
--- a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.ql
+++ b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.ql
@@ -14,8 +14,8 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.SideEffect
-import codingstandards.cpp.dataflow.DataFlow
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
 /** Holds if the function's return value is derived from the `AliasParamter` p. */
diff --git a/c/cert/src/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.ql b/c/cert/src/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.ql
index e5735a5fda..f3b3aa364d 100644
--- a/c/cert/src/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.ql
+++ b/c/cert/src/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Alignment
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 import ExprWithAlignmentToCStyleCastFlow::PathGraph
 
diff --git a/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql b/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
index e28dbddaaf..9bbe27aa31 100644
--- a/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
+++ b/c/cert/src/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import SuspectFunctionPointerToCallFlow::PathGraph
 
 /**
diff --git a/c/cert/src/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.ql b/c/cert/src/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.ql
index 825f85b0bd..fde564665c 100644
--- a/c/cert/src/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.ql
+++ b/c/cert/src/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.controlflow.Dominance
 import IndirectCastFlow::PathGraph
 
diff --git a/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql b/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
index d79224435f..20c9f1bcc8 100644
--- a/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
+++ b/c/cert/src/rules/EXP40-C/DoNotModifyConstantObjects.ql
@@ -12,7 +12,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import CastFlow::PathGraph
 import codingstandards.cpp.SideEffect
 
diff --git a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
index a4cc4e8944..1b792d16d5 100644
--- a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
+++ b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -14,7 +14,7 @@ import cpp
 import codingstandards.c.cert
 import codingstandards.c.Pointers
 import codingstandards.c.Variable
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.pointsto.PointsTo
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
diff --git a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
index bbe41259b8..f220401c82 100644
--- a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
+++ b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
@@ -11,7 +11,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.controlflow.Dominance
 import codingstandards.c.cert
 import codingstandards.c.Variable
diff --git a/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql b/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
index 2dce0d465c..54f555d7cb 100644
--- a/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
+++ b/c/cert/src/rules/FIO37-C/SuccessfulFgetsOrFgetwsMayReturnAnEmptyString.ql
@@ -14,7 +14,7 @@ import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.FgetsErrorManagement
 import codingstandards.cpp.Dereferenced
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 
 /*
  * CFG nodes that follows a successful call to `fgets`
diff --git a/c/cert/src/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql b/c/cert/src/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql
index 33a906136f..7ed5887e42 100644
--- a/c/cert/src/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql
+++ b/c/cert/src/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql
@@ -12,7 +12,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 class FgetposCall extends FunctionCall {
   FgetposCall() { this.getTarget().hasGlobalOrStdName("fgetpos") }
diff --git a/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql b/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
index 2ddfa6cf4c..b02ce2f58d 100644
--- a/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
+++ b/c/cert/src/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.standardlibrary.FileAccess
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
 /**
diff --git a/c/cert/src/rules/MEM35-C/InsufficientMemoryAllocatedForObject.ql b/c/cert/src/rules/MEM35-C/InsufficientMemoryAllocatedForObject.ql
index 7683140327..5ff1725269 100644
--- a/c/cert/src/rules/MEM35-C/InsufficientMemoryAllocatedForObject.ql
+++ b/c/cert/src/rules/MEM35-C/InsufficientMemoryAllocatedForObject.ql
@@ -16,7 +16,7 @@ import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Overflow
 import semmle.code.cpp.controlflow.Guards
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import semmle.code.cpp.models.Models
 
 /**
diff --git a/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql b/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
index 512b783030..df0eb3b1e3 100644
--- a/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
+++ b/c/cert/src/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.ql
@@ -15,7 +15,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Alignment
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import AlignedAllocToReallocFlow::PathGraph
 
 int getStatedValue(Expr e) {
diff --git a/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql b/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
index 52dd0b1046..fa4a29cb3d 100644
--- a/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
+++ b/c/cert/src/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.ql
@@ -14,7 +14,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * The argument of a call to `asctime`
diff --git a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
index 821b79c8e4..338dc83308 100644
--- a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
+++ b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
@@ -13,7 +13,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Macro
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 abstract class VaAccess extends Expr { }
 
diff --git a/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql b/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
index 19730b4677..0da48daa70 100644
--- a/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
+++ b/c/cert/src/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.c.Signal
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * Does not access an external variable except
diff --git a/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql b/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
index 5a064c0904..fa3cc3bf14 100644
--- a/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
+++ b/c/cert/src/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.c.Signal
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * CFG nodes preceeding a `ReturnStmt`
diff --git a/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql b/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
index 40f19ed4a0..244fe6d8e5 100644
--- a/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
+++ b/c/cert/src/rules/STR30-C/DoNotAttemptToModifyStringLiterals.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import semmle.code.cpp.security.BufferWrite
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * Class that includes into `BufferWrite` functions that will modify their
diff --git a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
index 4e2e48708a..3742207720 100644
--- a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
+++ b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.PossiblyUnsafeStringOperation
 
 /**
diff --git a/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql b/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql
index d661edade5..365136f99d 100644
--- a/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql
+++ b/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql
@@ -15,7 +15,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Naming
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.PossiblyUnsafeStringOperation
 
 /**
diff --git a/c/common/src/codingstandards/c/Errno.qll b/c/common/src/codingstandards/c/Errno.qll
index 86ecabe8f1..d606593a1e 100644
--- a/c/common/src/codingstandards/c/Errno.qll
+++ b/c/common/src/codingstandards/c/Errno.qll
@@ -1,7 +1,7 @@
 /** Provides a library for errno-setting functions. */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * An errno-setting function
diff --git a/c/common/src/codingstandards/c/OutOfBounds.qll b/c/common/src/codingstandards/c/OutOfBounds.qll
index 87c7c17870..92d519699c 100644
--- a/c/common/src/codingstandards/c/OutOfBounds.qll
+++ b/c/common/src/codingstandards/c/OutOfBounds.qll
@@ -11,7 +11,7 @@ import codingstandards.cpp.Allocations
 import codingstandards.cpp.Overflow
 import codingstandards.cpp.PossiblyUnsafeStringOperation
 import codingstandards.cpp.SimpleRangeAnalysisCustomizations
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
 module OOB {
diff --git a/c/common/src/codingstandards/c/Signal.qll b/c/common/src/codingstandards/c/Signal.qll
index 35286be4d9..95b27e2898 100644
--- a/c/common/src/codingstandards/c/Signal.qll
+++ b/c/common/src/codingstandards/c/Signal.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * A signal corresponding to a computational exception
diff --git a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
index 208e8153d6..a6f5f2c1a2 100644
--- a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
+++ b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * Models a function parameter of type array with specified size
diff --git a/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql b/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql
index 02d0a54ec1..3b224544f2 100644
--- a/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql
+++ b/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 from Call c
 where
diff --git a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
index bee9b41e2c..fe1226dcea 100644
--- a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
+++ b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
@@ -13,7 +13,7 @@
 import cpp
 import codingstandards.c.misra
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * Offset in bytes of a field access
diff --git a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
index 44e21d14db..ec1470a8ec 100644
--- a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
+++ b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
@@ -15,7 +15,7 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.c.misra.EssentialTypes
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import NullTerminatedStringToMemcmpFlow::PathGraph
 
 // Data flow from a StringLiteral or from an array of characters, to a memcmp call
diff --git a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
index c01afea39f..877fbea9aa 100644
--- a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
+++ b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.standardlibrary.FileAccess
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import semmle.code.cpp.controlflow.SubBasicBlocks
 
diff --git a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
index 6dc3b3ee71..8c27b936b8 100644
--- a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
+++ b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
@@ -13,7 +13,7 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.standardlibrary.FileAccess
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 module FileDFConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
diff --git a/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql b/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql
index 840d7423fb..4593065e01 100644
--- a/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql
+++ b/cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql
@@ -14,7 +14,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.autosar
 import codingstandards.cpp.UserDefinedLiteral as udl
 import codingstandards.cpp.SideEffect
diff --git a/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql b/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
index ae0acc3bb5..4e6b7d6f0c 100644
--- a/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
+++ b/cpp/autosar/src/rules/A13-2-1/AssignmentOperatorReturnThis.ql
@@ -16,7 +16,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.Operator
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 predicate returnsThisPointer(UserAssignmentOperator o) {
   exists(PointerDereferenceExpr p, ThisExpr t, ReturnStmt r |
diff --git a/cpp/autosar/src/rules/A15-1-3/ThrownExceptionsShouldBeUnique.ql b/cpp/autosar/src/rules/A15-1-3/ThrownExceptionsShouldBeUnique.ql
index 1459b79b43..97e9133a7a 100644
--- a/cpp/autosar/src/rules/A15-1-3/ThrownExceptionsShouldBeUnique.ql
+++ b/cpp/autosar/src/rules/A15-1-3/ThrownExceptionsShouldBeUnique.ql
@@ -16,7 +16,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.exceptions.ExceptionFlow
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.valuenumbering.HashCons
 
 /** Find a value which defines the exception thrown by the `DirectThrowExpr`, if any. */
diff --git a/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql b/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
index 9fcd8fa609..1b3a3cfed2 100644
--- a/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
+++ b/cpp/autosar/src/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.ql
@@ -15,7 +15,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.autosar
 import codingstandards.cpp.exceptions.ExceptionFlow
 import codingstandards.cpp.exceptions.ExceptionSpecifications
diff --git a/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql b/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
index 842dc14390..353c985137 100644
--- a/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
+++ b/cpp/autosar/src/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.ql
@@ -16,7 +16,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.SmartPointers
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import SingleObjectSmartPointerArrayConstructionFlow::PathGraph
 
 class AutosarSmartPointerArraySpecialisation extends AutosarSmartPointer {
diff --git a/cpp/autosar/src/rules/A18-5-2/DoNotUseNonPlacementNew.ql b/cpp/autosar/src/rules/A18-5-2/DoNotUseNonPlacementNew.ql
index 082827f5bb..1320d6e486 100644
--- a/cpp/autosar/src/rules/A18-5-2/DoNotUseNonPlacementNew.ql
+++ b/cpp/autosar/src/rules/A18-5-2/DoNotUseNonPlacementNew.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 from NewOrNewArrayExpr na
 where
diff --git a/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql b/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
index 979dc0824e..cdf35374f9 100644
--- a/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
+++ b/cpp/autosar/src/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.ql
@@ -16,7 +16,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.standardlibrary.Utility
 
 /*
diff --git a/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql b/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
index d87366c624..a3acf916ec 100644
--- a/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
+++ b/cpp/autosar/src/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.standardlibrary.Utility
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 from StdForwardCall f, Access a
 where
diff --git a/cpp/autosar/src/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.ql b/cpp/autosar/src/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.ql
index c7ff6f6bf2..0294bfe2e6 100644
--- a/cpp/autosar/src/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.ql
+++ b/cpp/autosar/src/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.ql
@@ -16,7 +16,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.SmartPointers
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /*
  * Finds `std::shared_ptr` local variables which are not copy or move initialized, and are not used in
diff --git a/cpp/autosar/src/rules/A27-0-4/CStyleStringsUsed.ql b/cpp/autosar/src/rules/A27-0-4/CStyleStringsUsed.ql
index b698ecf351..b24a4a96cf 100644
--- a/cpp/autosar/src/rules/A27-0-4/CStyleStringsUsed.ql
+++ b/cpp/autosar/src/rules/A27-0-4/CStyleStringsUsed.ql
@@ -14,7 +14,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 class InstanceOfCStyleString extends Expr {
   InstanceOfCStyleString() {
diff --git a/cpp/autosar/src/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.ql b/cpp/autosar/src/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.ql
index 34b6660778..ac2375f6aa 100644
--- a/cpp/autosar/src/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.ql
+++ b/cpp/autosar/src/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.ql
@@ -17,7 +17,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.Type
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import NonFinalClassToPointerArithmeticExprFlow::PathGraph
 
 class ArrayAccessOrPointerArith extends Expr {
diff --git a/cpp/autosar/src/rules/A5-1-7/LambdaPassedToDecltype.ql b/cpp/autosar/src/rules/A5-1-7/LambdaPassedToDecltype.ql
index afbd809664..971d3b9259 100644
--- a/cpp/autosar/src/rules/A5-1-7/LambdaPassedToDecltype.ql
+++ b/cpp/autosar/src/rules/A5-1-7/LambdaPassedToDecltype.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 module LambdaExpressionToInitializerConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source.asExpr() instanceof LambdaExpression }
diff --git a/cpp/autosar/src/rules/A5-1-7/LambdaPassedToTypeid.ql b/cpp/autosar/src/rules/A5-1-7/LambdaPassedToTypeid.ql
index 08dbecc755..56952dace9 100644
--- a/cpp/autosar/src/rules/A5-1-7/LambdaPassedToTypeid.ql
+++ b/cpp/autosar/src/rules/A5-1-7/LambdaPassedToTypeid.ql
@@ -14,7 +14,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.autosar
 import LambdaExpressionToTypeidFlow::PathGraph
 
diff --git a/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql b/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
index 6994ab028f..c36bda6cdd 100644
--- a/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
+++ b/cpp/autosar/src/rules/A7-5-1/InvalidFunctionReturnType.ql
@@ -16,7 +16,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 from Parameter p, ReturnStmt ret
 where
diff --git a/cpp/autosar/src/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.ql b/cpp/autosar/src/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.ql
index 811d98eccb..0bf42ce4ca 100644
--- a/cpp/autosar/src/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.ql
+++ b/cpp/autosar/src/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.ql
@@ -16,7 +16,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.SmartPointers
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.standardlibrary.Utility
 
 Expr lifetimeAffectingSmartPointerExpr(Function f) {
diff --git a/cpp/autosar/src/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.ql b/cpp/autosar/src/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.ql
index 5dec96ed81..3cd310b59b 100644
--- a/cpp/autosar/src/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.ql
+++ b/cpp/autosar/src/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.ql
@@ -18,7 +18,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.SmartPointers
 import codingstandards.cpp.standardlibrary.Utility
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 Expr underlyingObjectAffectingUniquePointerExpr(Function f) {
   result =
diff --git a/cpp/autosar/src/rules/A8-4-4/FunctionReturnMultipleValueCondition.ql b/cpp/autosar/src/rules/A8-4-4/FunctionReturnMultipleValueCondition.ql
index fa38b1d3f6..ff0040f26f 100644
--- a/cpp/autosar/src/rules/A8-4-4/FunctionReturnMultipleValueCondition.ql
+++ b/cpp/autosar/src/rules/A8-4-4/FunctionReturnMultipleValueCondition.ql
@@ -16,7 +16,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 abstract class OutputValue extends Element {
   abstract string getOutputName();
diff --git a/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql b/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql
index f40faad3dd..478f8dcdf0 100644
--- a/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql
+++ b/cpp/autosar/src/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql
@@ -15,7 +15,7 @@
 import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.CommonTypes as CommonTypes
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 class AccessAwareMemberFunction extends MemberFunction {
   Class c;
diff --git a/cpp/autosar/src/rules/M0-3-2/FunctionErroneousReturnValueNotTested.ql b/cpp/autosar/src/rules/M0-3-2/FunctionErroneousReturnValueNotTested.ql
index aee4e40838..cd94d63ffc 100644
--- a/cpp/autosar/src/rules/M0-3-2/FunctionErroneousReturnValueNotTested.ql
+++ b/cpp/autosar/src/rules/M0-3-2/FunctionErroneousReturnValueNotTested.ql
@@ -19,7 +19,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.controlflow.Guards
 
 from FunctionCall fc
diff --git a/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql b/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
index f7e6664269..279ad08f3c 100644
--- a/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
+++ b/cpp/autosar/src/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql
@@ -14,7 +14,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 predicate pointeeIsModified(PointerDereferenceExpr e, Expr m) {
   exists(Assignment a | a.getLValue() = e and m = a)
diff --git a/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql b/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
index ec432cea42..d6d4f6130a 100644
--- a/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
+++ b/cpp/autosar/src/rules/M5-0-17/PointerSubtractionOnDifferentArrays.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import ArrayToPointerDiffOperandFlow::PathGraph
 
 module ArrayToPointerDiffOperandConfig implements DataFlow::ConfigSig {
diff --git a/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql b/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
index 8f20bf808e..d24c4d35df 100644
--- a/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-2/PointerToAVirtualBaseClassCastToAPointer.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 from Cast cast, VirtualBaseClass castFrom, Class castTo
 where
diff --git a/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql b/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
index 98207a62a3..559b41527c 100644
--- a/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
+++ b/cpp/autosar/src/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.ql
@@ -18,7 +18,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 class ReferenceTypeWithNonConstBaseType extends ReferenceType {
   ReferenceTypeWithNonConstBaseType() { not this.getBaseType().isConst() }
diff --git a/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql b/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
index 720880dbe4..d60227d2c8 100644
--- a/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
+++ b/cpp/cert/src/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql
@@ -16,7 +16,7 @@ import codingstandards.cpp.cert
 import codingstandards.cpp.Iterators
 import codingstandards.cpp.rules.containeraccesswithoutrangecheck.ContainerAccessWithoutRangeCheck as ContainerAccessWithoutRangeCheck
 import semmle.code.cpp.controlflow.Guards
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
 /**
diff --git a/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql b/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
index a7756b6a6a..0f5c50164c 100644
--- a/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
+++ b/cpp/cert/src/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.cpp.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import NonFinalClassToPointerArithmeticExprFlow::PathGraph
 
 class ArrayAccessOrPointerArith extends Expr {
diff --git a/cpp/cert/src/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql b/cpp/cert/src/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql
index a385ee1ffc..7bfb298d3d 100644
--- a/cpp/cert/src/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql
+++ b/cpp/cert/src/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql
@@ -14,8 +14,8 @@
 import cpp
 import codingstandards.cpp.cert
 import codingstandards.cpp.SideEffect
-import codingstandards.cpp.dataflow.DataFlow
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
 /** Holds if the function's return value is derived from the `AliasParamter` p. */
diff --git a/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql b/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
index bdf6a7973e..e900d1b259 100644
--- a/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
+++ b/cpp/cert/src/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.cpp.cert
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import AllocationToDeleteFlow::PathGraph
 
 module AllocationToDeleteConfig implements DataFlow::ConfigSig {
diff --git a/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql b/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
index c25e1aa0ad..083aad1e3c 100644
--- a/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
+++ b/cpp/cert/src/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.ql
@@ -13,7 +13,7 @@
 import cpp
 import codingstandards.cpp.cert
 import semmle.code.cpp.controlflow.Guards
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.exceptions.ExceptionSpecifications
 
 /**
diff --git a/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll b/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll
index 358a3583fc..413a4b0d3c 100644
--- a/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll
+++ b/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll
@@ -3,7 +3,7 @@ import codingstandards.cpp.Conversion
 import codingstandards.cpp.TrivialType
 import ManuallyManagedLifetime
 import semmle.code.cpp.controlflow.Dominance
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 
 /**
  * A taint-tracking configuration from allocation expressions to casts to a specific pointer type.
diff --git a/cpp/cert/src/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.ql b/cpp/cert/src/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.ql
index 30c5280482..6e3121e46d 100644
--- a/cpp/cert/src/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.ql
+++ b/cpp/cert/src/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.ql
@@ -14,7 +14,7 @@ import cpp
 import codingstandards.cpp.cert
 import codingstandards.cpp.TrivialType
 import ManuallyManagedLifetime
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import AllocToStaticCastFlow::PathGraph
 
 /*
diff --git a/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql b/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
index b498729d69..22e2ac336f 100644
--- a/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
+++ b/cpp/cert/src/rules/MEM53-CPP/MissingDestructorCallForManuallyManagedObject.ql
@@ -13,7 +13,7 @@
 import cpp
 import codingstandards.cpp.cert
 import ManuallyManagedLifetime
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import FreeWithoutDestructorFlow::PathGraph
 
 from FreeWithoutDestructorFlow::PathNode source, FreeWithoutDestructorFlow::PathNode sink
diff --git a/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql b/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
index 52b14d9629..76f8500362 100644
--- a/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
+++ b/cpp/cert/src/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.ql
@@ -15,7 +15,7 @@
 import cpp
 import codingstandards.cpp.cert
 import codingstandards.cpp.standardlibrary.Random
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 
 from RandomNumberEngineCreation createRandomNumberEngine, string seedSource
 where
diff --git a/cpp/common/src/codingstandards/cpp/AccessPath.qll b/cpp/common/src/codingstandards/cpp/AccessPath.qll
index 2393d25db4..ff7601ed4b 100644
--- a/cpp/common/src/codingstandards/cpp/AccessPath.qll
+++ b/cpp/common/src/codingstandards/cpp/AccessPath.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 newtype TFieldQualifier =
   ExplicitQualifier(VariableAccess v) or
diff --git a/cpp/common/src/codingstandards/cpp/Allocations.qll b/cpp/common/src/codingstandards/cpp/Allocations.qll
index 5bc87221e2..db47b0b028 100644
--- a/cpp/common/src/codingstandards/cpp/Allocations.qll
+++ b/cpp/common/src/codingstandards/cpp/Allocations.qll
@@ -7,7 +7,7 @@
 
 import cpp
 import semmle.code.cpp.controlflow.SSA
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * Holds if `alloc` is a use of `malloc` or `new`.  `kind` is
diff --git a/cpp/common/src/codingstandards/cpp/Concurrency.qll b/cpp/common/src/codingstandards/cpp/Concurrency.qll
index d856fa4515..5e7d154d59 100644
--- a/cpp/common/src/codingstandards/cpp/Concurrency.qll
+++ b/cpp/common/src/codingstandards/cpp/Concurrency.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 
 /**
  * Models CFG nodes which should be added to a thread context.
diff --git a/cpp/common/src/codingstandards/cpp/ConstHelpers.qll b/cpp/common/src/codingstandards/cpp/ConstHelpers.qll
index 8cba3efde4..a7457dc845 100644
--- a/cpp/common/src/codingstandards/cpp/ConstHelpers.qll
+++ b/cpp/common/src/codingstandards/cpp/ConstHelpers.qll
@@ -4,7 +4,7 @@
 
 import cpp
 import codingstandards.cpp.SideEffect
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.FunctionParameter
 
 /** A variable that can be modified (both the pointer and object pointed to if pointer type) */
diff --git a/cpp/common/src/codingstandards/cpp/FgetsErrorManagement.qll b/cpp/common/src/codingstandards/cpp/FgetsErrorManagement.qll
index 7686714635..4f99b02e2e 100644
--- a/cpp/common/src/codingstandards/cpp/FgetsErrorManagement.qll
+++ b/cpp/common/src/codingstandards/cpp/FgetsErrorManagement.qll
@@ -4,7 +4,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.controlflow.Guards
 
 /*
diff --git a/cpp/common/src/codingstandards/cpp/Iterators.qll b/cpp/common/src/codingstandards/cpp/Iterators.qll
index 593da544ea..72a9909c20 100644
--- a/cpp/common/src/codingstandards/cpp/Iterators.qll
+++ b/cpp/common/src/codingstandards/cpp/Iterators.qll
@@ -3,8 +3,8 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.StdNamespace
 
 abstract class ContainerAccess extends VariableAccess {
diff --git a/cpp/common/src/codingstandards/cpp/Nullness.qll b/cpp/common/src/codingstandards/cpp/Nullness.qll
index d76db4afad..8751c54d9b 100644
--- a/cpp/common/src/codingstandards/cpp/Nullness.qll
+++ b/cpp/common/src/codingstandards/cpp/Nullness.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 private class PointerToMember extends Variable {
   PointerToMember() { this.getType() instanceof PointerToMemberType }
diff --git a/cpp/common/src/codingstandards/cpp/Overflow.qll b/cpp/common/src/codingstandards/cpp/Overflow.qll
index dca1386513..28a5c0d9db 100644
--- a/cpp/common/src/codingstandards/cpp/Overflow.qll
+++ b/cpp/common/src/codingstandards/cpp/Overflow.qll
@@ -6,7 +6,7 @@ import cpp
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 import SimpleRangeAnalysisCustomizations
 import semmle.code.cpp.controlflow.Guards
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import codingstandards.cpp.Expr
 import codingstandards.cpp.UndefinedBehavior
diff --git a/cpp/common/src/codingstandards/cpp/ReadErrorsAndEOF.qll b/cpp/common/src/codingstandards/cpp/ReadErrorsAndEOF.qll
index 7adb911c9f..c3c433d20d 100644
--- a/cpp/common/src/codingstandards/cpp/ReadErrorsAndEOF.qll
+++ b/cpp/common/src/codingstandards/cpp/ReadErrorsAndEOF.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.standardlibrary.FileAccess
 
 /**
diff --git a/cpp/common/src/codingstandards/cpp/SideEffect.qll b/cpp/common/src/codingstandards/cpp/SideEffect.qll
index 08cd9394d3..4b78b5c818 100644
--- a/cpp/common/src/codingstandards/cpp/SideEffect.qll
+++ b/cpp/common/src/codingstandards/cpp/SideEffect.qll
@@ -1,7 +1,7 @@
 /** A module to reason about side effects. */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 private import exceptions.ExceptionFlow
 private import codingstandards.cpp.Expr
 private import codingstandards.cpp.Variable
diff --git a/cpp/common/src/codingstandards/cpp/SmartPointers.qll b/cpp/common/src/codingstandards/cpp/SmartPointers.qll
index dda645a399..0f01d886be 100644
--- a/cpp/common/src/codingstandards/cpp/SmartPointers.qll
+++ b/cpp/common/src/codingstandards/cpp/SmartPointers.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 // Local cached version of localExprFlow to avoid bad magic
 cached
diff --git a/cpp/common/src/codingstandards/cpp/allocations/PlacementNew.qll b/cpp/common/src/codingstandards/cpp/allocations/PlacementNew.qll
index 5547f2e151..2c9139d0ae 100644
--- a/cpp/common/src/codingstandards/cpp/allocations/PlacementNew.qll
+++ b/cpp/common/src/codingstandards/cpp/allocations/PlacementNew.qll
@@ -22,7 +22,7 @@
 
 import cpp
 import codingstandards.cpp.Conversion
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /*
  * TODO You can also have alignas on types
diff --git a/cpp/common/src/codingstandards/cpp/dataflow/DataFlow.qll b/cpp/common/src/codingstandards/cpp/dataflow/DataFlow.qll
deleted file mode 100644
index c11bf80fc6..0000000000
--- a/cpp/common/src/codingstandards/cpp/dataflow/DataFlow.qll
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Provides a library for local (intra-procedural) and global (inter-procedural)
- * data flow analysis: deciding whether data can flow from a _source_ to a
- * _sink_.
- *
- * Unless configured otherwise, _flow_ means that the exact value of
- * the source may reach the sink. We do not track flow across pointer
- * dereferences or array indexing. To track these types of flow, where the
- * exact value may not be preserved, import
- * `semmle.code.cpp.dataflow.TaintTracking`.
- *
- * To use global (interprocedural) data flow, extend the class
- * `DataFlow::Configuration` as documented on that class. To use local
- * (intraprocedural) data flow between expressions, call
- * `DataFlow::localExprFlow`. For more general cases of local data flow, call
- * `DataFlow::localFlow` or `DataFlow::localFlowStep` with arguments of type
- * `DataFlow::Node`.
- *
- * NOTE: This is copied from `codeql/cpp-all` to avoid deprecation warnings
- * that cannot be avoided in tests.
- */
-
-import cpp
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow {
-  private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
-  private import codeql.dataflow.DataFlow
-  import DataFlowMake<CppOldDataFlow>
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl1
-}
diff --git a/cpp/common/src/codingstandards/cpp/dataflow/DataFlow2.qll b/cpp/common/src/codingstandards/cpp/dataflow/DataFlow2.qll
deleted file mode 100644
index 83859535d8..0000000000
--- a/cpp/common/src/codingstandards/cpp/dataflow/DataFlow2.qll
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Provides a `DataFlow2` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
- *
- * NOTE: This is copied from `codeql/cpp-all` to avoid deprecation warnings
- * that cannot be avoided in tests.
- */
-
-import cpp
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow2` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow2 {
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl2
-}
diff --git a/cpp/common/src/codingstandards/cpp/dataflow/TaintTracking.qll b/cpp/common/src/codingstandards/cpp/dataflow/TaintTracking.qll
deleted file mode 100644
index 2b43a53ccb..0000000000
--- a/cpp/common/src/codingstandards/cpp/dataflow/TaintTracking.qll
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- *
- * We define _taint propagation_ informally to mean that a substantial part of
- * the information from the source is preserved at the sink. For example, taint
- * propagates from `x` to `x + 100`, but it does not propagate from `x` to `x >
- * 100` since we consider a single bit of information to be too little.
- *
- * To use global (interprocedural) taint tracking, extend the class
- * `TaintTracking::Configuration` as documented on that class. To use local
- * (intraprocedural) taint tracking between expressions, call
- * `TaintTracking::localExprTaint`. For more general cases of local taint
- * tracking, call `TaintTracking::localTaint` or
- * `TaintTracking::localTaintStep` with arguments of type `DataFlow::Node`.
- *
- * NOTE: This is copied from `codeql/cpp-all` to avoid deprecation warnings
- * that cannot be avoided in tests.
- */
-
-import codingstandards.cpp.dataflow.DataFlow
-import codingstandards.cpp.dataflow.DataFlow2
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.TaintTracking` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking {
-  import codingstandards.cpp.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
-  private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
-  private import semmle.code.cpp.dataflow.internal.TaintTrackingImplSpecific
-  private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<CppOldDataFlow, CppOldTaintTracking>
-  import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingImpl
-}
diff --git a/cpp/common/src/codingstandards/cpp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/cpp/common/src/codingstandards/cpp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index 63e9c85e22..0000000000
--- a/cpp/common/src/codingstandards/cpp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.code.cpp.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import codingstandards.cpp.dataflow.DataFlow::DataFlow as DataFlow
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl as DataFlowInternal
-}
diff --git a/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll b/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll
index 7990f50216..354dccdc56 100644
--- a/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll
+++ b/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll
@@ -1,5 +1,5 @@
 import cpp
-private import codingstandards.cpp.dataflow.DataFlow
+private import semmle.code.cpp.dataflow.DataFlow
 private import semmle.code.cpp.controlflow.Nullness
 private import codingstandards.cpp.Dereferenced
 private import codingstandards.cpp.Expr
diff --git a/cpp/common/src/codingstandards/cpp/resources/ResourceManagement.qll b/cpp/common/src/codingstandards/cpp/resources/ResourceManagement.qll
index 0798575495..db65dd4920 100644
--- a/cpp/common/src/codingstandards/cpp/resources/ResourceManagement.qll
+++ b/cpp/common/src/codingstandards/cpp/resources/ResourceManagement.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 /**
  * The `ResourceAcquisitionExpr` abstract class models resource
diff --git a/cpp/common/src/codingstandards/cpp/rules/accessofnonexistingmemberthroughpointertomember/AccessOfNonExistingMemberThroughPointerToMember.qll b/cpp/common/src/codingstandards/cpp/rules/accessofnonexistingmemberthroughpointertomember/AccessOfNonExistingMemberThroughPointerToMember.qll
index 138c0a89b5..ac135386f3 100644
--- a/cpp/common/src/codingstandards/cpp/rules/accessofnonexistingmemberthroughpointertomember/AccessOfNonExistingMemberThroughPointerToMember.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/accessofnonexistingmemberthroughpointertomember/AccessOfNonExistingMemberThroughPointerToMember.qll
@@ -7,7 +7,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Expr
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 abstract class AccessOfNonExistingMemberThroughPointerToMemberSharedQuery extends Query { }
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.qll b/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.qll
index ab8659efd8..e0fb382008 100644
--- a/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughnullpointer/AccessOfUndefinedMemberThroughNullPointer.qll
@@ -7,7 +7,7 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Nullness
 import codingstandards.cpp.Expr
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import NullPointerToPointerMemberExpressionFlow::PathGraph
 
 abstract class AccessOfUndefinedMemberThroughNullPointerSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.qll b/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.qll
index ca1e2a4282..0271d7c6e7 100644
--- a/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/accessofundefinedmemberthroughuninitializedstaticpointer/AccessOfUndefinedMemberThroughUninitializedStaticPointer.qll
@@ -12,7 +12,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.EncapsulatingFunctions
diff --git a/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll b/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll
index cea798ae11..e27f09fd98 100644
--- a/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll
@@ -8,8 +8,8 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import semmle.code.cpp.security.BufferWrite
 import semmle.code.cpp.commons.Buffer
-import codingstandards.cpp.dataflow.DataFlow
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.PossiblyUnsafeStringOperation
 
 abstract class BasicStringMayNotBeNullTerminatedSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll b/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll
index f4636b6b13..e5fa82df19 100644
--- a/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll
@@ -5,7 +5,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import DFFlow::PathGraph
 
 abstract class ConstLikeReturnValueSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.qll b/cpp/common/src/codingstandards/cpp/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.qll
index a3dabedd5a..840cd5330a 100644
--- a/cpp/common/src/codingstandards/cpp/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/containeraccesswithoutrangecheck/ContainerAccessWithoutRangeCheck.qll
@@ -12,7 +12,7 @@ import codingstandards.cpp.Operator
 import semmle.code.cpp.controlflow.Guards
 private import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
 abstract class ContainerAccessWithoutRangeCheckSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.qll b/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.qll
index ab2b067279..902d0ecf1f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenmovinglambdaobject/DanglingCaptureWhenMovingLambdaObject.qll
@@ -5,7 +5,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Expr
diff --git a/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.qll b/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.qll
index c35b723ff3..4ab01520f6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/danglingcapturewhenreturninglambdaobject/DanglingCaptureWhenReturningLambdaObject.qll
@@ -5,7 +5,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.qll b/cpp/common/src/codingstandards/cpp/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.qll
index 3d84366d9a..83266ed524 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotaccessaclosedfile/DoNotAccessAClosedFile.qll
@@ -6,7 +6,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.standardlibrary.FileAccess
 import semmle.code.cpp.controlflow.SubBasicBlocks
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.qll b/cpp/common/src/codingstandards/cpp/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.qll
index 8a8155f971..759d235eb4 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotallowamutextogooutofscopewhilelocked/DoNotAllowAMutexToGoOutOfScopeWhileLocked.qll
@@ -17,7 +17,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Concurrency
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 
 abstract class DoNotAllowAMutexToGoOutOfScopeWhileLockedSharedQuery extends Query { }
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.qll b/cpp/common/src/codingstandards/cpp/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.qll
index 46335c3d94..d77ae8cf39 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotdestroyamutexwhileitislocked/DoNotDestroyAMutexWhileItIsLocked.qll
@@ -15,7 +15,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Concurrency
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 
 abstract class DoNotDestroyAMutexWhileItIsLockedSharedQuery extends Query { }
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.qll b/cpp/common/src/codingstandards/cpp/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.qll
index 0aa8d64feb..adb9785814 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.qll
@@ -6,7 +6,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import ArrayToPointerDiffOperandFlow::PathGraph
 
 module ArrayToPointerDiffOperandConfig implements DataFlow::ConfigSig {
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotusepointerarithmetictoaddressdifferentarrays/DoNotUsePointerArithmeticToAddressDifferentArrays.qll b/cpp/common/src/codingstandards/cpp/rules/donotusepointerarithmetictoaddressdifferentarrays/DoNotUsePointerArithmeticToAddressDifferentArrays.qll
index dd10b840c5..57b4eb0bfb 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotusepointerarithmetictoaddressdifferentarrays/DoNotUsePointerArithmeticToAddressDifferentArrays.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotusepointerarithmetictoaddressdifferentarrays/DoNotUsePointerArithmeticToAddressDifferentArrays.qll
@@ -7,7 +7,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
 abstract class DoNotUsePointerArithmeticToAddressDifferentArraysSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.qll b/cpp/common/src/codingstandards/cpp/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.qll
index 155ed1a7f4..aa8fa29bfd 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.qll
@@ -7,7 +7,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import ArrayToRelationalOperationOperandFlow::PathGraph
 
 abstract class DoNotUseRelationalOperatorsWithDifferingArraysSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.qll b/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.qll
index 81a3251355..3949ff50a8 100644
--- a/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.qll
@@ -6,7 +6,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 abstract class InvalidatedEnvStringPointersSharedQuery extends Query { }
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.qll b/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.qll
index fd8a969d00..8bc1b0c920 100644
--- a/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.qll
@@ -6,7 +6,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.rules.invalidatedenvstringpointers.InvalidatedEnvStringPointers as EnvString
 
 abstract class InvalidatedEnvStringPointersWarnSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.qll b/cpp/common/src/codingstandards/cpp/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.qll
index 3a7e225369..89f847c5aa 100644
--- a/cpp/common/src/codingstandards/cpp/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/iofstreammissingpositioning/IOFstreamMissingPositioning.qll
@@ -5,7 +5,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.standardlibrary.FileStreams
 import codingstandards.cpp.standardlibrary.FileAccess
diff --git a/cpp/common/src/codingstandards/cpp/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.qll b/cpp/common/src/codingstandards/cpp/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.qll
index a0006eb643..f17da7e457 100644
--- a/cpp/common/src/codingstandards/cpp/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/movedfromobjectsunspecifiedstate/MovedFromObjectsUnspecifiedState.qll
@@ -4,7 +4,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.standardlibrary.Utility
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/nonconstantformat/NonConstantFormat.qll b/cpp/common/src/codingstandards/cpp/rules/nonconstantformat/NonConstantFormat.qll
index 91b2b05a3f..248cde106f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/nonconstantformat/NonConstantFormat.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/nonconstantformat/NonConstantFormat.qll
@@ -1,7 +1,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import semmle.code.cpp.commons.Printf
 
 abstract class NonConstantFormatSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.qll b/cpp/common/src/codingstandards/cpp/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.qll
index bede451e24..89c732ff5a 100644
--- a/cpp/common/src/codingstandards/cpp/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/onlyfreememoryallocateddynamicallyshared/OnlyFreeMemoryAllocatedDynamicallyShared.qll
@@ -7,7 +7,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Allocations
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import NonDynamicPointerToFreeFlow::PathGraph
 
 /**
diff --git a/cpp/common/src/codingstandards/cpp/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.qll b/cpp/common/src/codingstandards/cpp/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.qll
index e24fb91539..2ee92b1611 100644
--- a/cpp/common/src/codingstandards/cpp/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.qll
@@ -8,7 +8,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.SmartPointers
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import PointerToSmartPointerConstructorFlowFlow::PathGraph
 
 abstract class OwnedPointerValueStoredInUnrelatedSmartPointerSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.qll b/cpp/common/src/codingstandards/cpp/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.qll
index dc26d13b87..6b2c6c87c9 100644
--- a/cpp/common/src/codingstandards/cpp/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/placementnewinsufficientstorage/PlacementNewInsufficientStorage.qll
@@ -7,7 +7,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.allocations.PlacementNew
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import PlacementNewOriginFlow::PathGraph
 
 abstract class PlacementNewInsufficientStorageSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.qll b/cpp/common/src/codingstandards/cpp/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.qll
index 72286f2d79..d250061a23 100644
--- a/cpp/common/src/codingstandards/cpp/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/placementnewnotproperlyaligned/PlacementNewNotProperlyAligned.qll
@@ -7,7 +7,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.allocations.PlacementNew
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import PlacementNewOriginFlow::PathGraph
 
 abstract class PlacementNewNotProperlyAlignedSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.qll b/cpp/common/src/codingstandards/cpp/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.qll
index 98fd51a58f..fd56f5d899 100644
--- a/cpp/common/src/codingstandards/cpp/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/stringnumberconversionmissingerrorcheck/StringNumberConversionMissingErrorCheck.qll
@@ -7,7 +7,7 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.TaintTracking
 import codingstandards.cpp.standardlibrary.CharStreams
 
 abstract class StringNumberConversionMissingErrorCheckSharedQuery extends Query { }
diff --git a/cpp/common/src/codingstandards/cpp/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.qll b/cpp/common/src/codingstandards/cpp/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.qll
index 9dbefeaa75..e28ef7ab07 100644
--- a/cpp/common/src/codingstandards/cpp/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/throwingoperatornewreturnsnull/ThrowingOperatorNewReturnsNull.qll
@@ -4,7 +4,7 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.allocations.CustomOperatorNewDelete
 import codingstandards.cpp.exceptions.ExceptionSpecifications
 import codingstandards.cpp.Customizations
diff --git a/cpp/common/src/codingstandards/cpp/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.qll b/cpp/common/src/codingstandards/cpp/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.qll
index c421ae3cc9..3b0abbad0d 100644
--- a/cpp/common/src/codingstandards/cpp/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/useonlyarrayindexingforpointerarithmetic/UseOnlyArrayIndexingForPointerArithmetic.qll
@@ -6,7 +6,7 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 
 abstract class UseOnlyArrayIndexingForPointerArithmeticSharedQuery extends Query { }
 
diff --git a/cpp/common/src/codingstandards/cpp/standardlibrary/FileStreams.qll b/cpp/common/src/codingstandards/cpp/standardlibrary/FileStreams.qll
index c4724d36c2..709e80dc1a 100644
--- a/cpp/common/src/codingstandards/cpp/standardlibrary/FileStreams.qll
+++ b/cpp/common/src/codingstandards/cpp/standardlibrary/FileStreams.qll
@@ -10,8 +10,8 @@
  */
 
 import cpp
-import codingstandards.cpp.dataflow.DataFlow
-import codingstandards.cpp.dataflow.TaintTracking
+import semmle.code.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.TaintTracking
 private import codingstandards.cpp.Operator
 
 /**
diff --git a/cpp/common/src/codingstandards/cpp/trustboundary/UninitializedField.qll b/cpp/common/src/codingstandards/cpp/trustboundary/UninitializedField.qll
index e6a2bbe706..f58f1352a7 100644
--- a/cpp/common/src/codingstandards/cpp/trustboundary/UninitializedField.qll
+++ b/cpp/common/src/codingstandards/cpp/trustboundary/UninitializedField.qll
@@ -5,7 +5,7 @@
  */
 
 import cpp
-private import codingstandards.cpp.dataflow.DataFlow
+private import semmle.code.cpp.dataflow.DataFlow
 private import semmle.code.cpp.controlflow.SubBasicBlocks
 private import semmle.code.cpp.padding.Padding as Padding
 private import semmle.code.cpp.dataflow.internal.FlowVar
diff --git a/cpp/common/test/deviations/deviation_permits_basic_test/UnusedReturnValue.ql b/cpp/common/test/deviations/deviation_permits_basic_test/UnusedReturnValue.ql
index 2517965fc1..38b75bda3c 100644
--- a/cpp/common/test/deviations/deviation_permits_basic_test/UnusedReturnValue.ql
+++ b/cpp/common/test/deviations/deviation_permits_basic_test/UnusedReturnValue.ql
@@ -16,7 +16,7 @@
 
 import cpp
 import codingstandards.cpp.CodingStandards
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.exclusions.cpp.RuleMetadata
 
 /* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
diff --git a/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.ql b/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.ql
index 2517965fc1..38b75bda3c 100644
--- a/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.ql
+++ b/cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.ql
@@ -16,7 +16,7 @@
 
 import cpp
 import codingstandards.cpp.CodingStandards
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.exclusions.cpp.RuleMetadata
 
 /* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
diff --git a/cpp/common/test/deviations/deviations_report_deviated/UnusedReturnValue.ql b/cpp/common/test/deviations/deviations_report_deviated/UnusedReturnValue.ql
index 2517965fc1..38b75bda3c 100644
--- a/cpp/common/test/deviations/deviations_report_deviated/UnusedReturnValue.ql
+++ b/cpp/common/test/deviations/deviations_report_deviated/UnusedReturnValue.ql
@@ -16,7 +16,7 @@
 
 import cpp
 import codingstandards.cpp.CodingStandards
-import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.dataflow.DataFlow
 import codingstandards.cpp.exclusions.cpp.RuleMetadata
 
 /* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */

From 4b4373615affbe350aef308db34d8e26b2d4fd75 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Wed, 13 Mar 2024 21:53:02 +0000
Subject: [PATCH 025/435] Accept test changes.

---
 ...bleLengthArraySizeNotInValidRange.expected |  2 ++
 ...rithmeticOnNonArrayObjectPointers.expected |  5 ++++
 ...rSubtractAScaledIntegerToAPointer.expected |  4 ++++
 .../CleanUpThreadSpecificStorage.expected     |  6 +++++
 ...riateThreadObjectStorageDurations.expected |  8 +++++++
 ...ectStorageDurationsNotInitialized.expected |  5 ++++
 ...ateStorageDurationsFunctionReturn.expected |  5 ++++
 .../ERR30-C/ErrnoReadBeforeReturn.expected    |  1 +
 .../ERR30-C/SetlocaleMightSetErrno.expected   |  1 +
 ...tRelyOnIndeterminateValuesOfErrno.expected |  4 ++++
 ...ectAndHandleStandardLibraryErrors.expected |  1 +
 ...OfFunctionArgumentsForSideEffects.expected | 24 +++++++++++++++++++
 ...rToMoreStrictlyAlignedPointerType.expected | 10 ++++++++
 ...nctionPointerWithIncompatibleType.expected |  4 ++++
 ...iableViaPointerOfIncompatibleType.expected |  7 ++++++
 .../DoNotModifyConstantObjects.expected       |  4 ++++
 ...edPointerToRestrictQualifiedParam.expected | 12 ++++++++++
 ...ointerReferencesOverlappingObject.expected |  7 ++++++
 ...esetStringsOnFgetsOrFgetwsFailure.expected |  3 +++
 ...FsetposThatAreReturnedFromFgetpos.expected |  5 ++++
 ...RaceConditionsWhileAccessingFiles.expected |  1 +
 ...ufficientMemoryAllocatedForObject.expected |  2 ++
 ...odifyAlignmentOfMemoryWithRealloc.expected |  5 ++++
 ...ssInvalidDataToTheAsctimeFunction.expected |  4 ++++
 ...VaListThatHasAnIndeterminateValue.expected |  7 ++++++
 ...SafeFunctionsWithinSignalHandlers.expected |  3 +++
 ...romAComputationalExceptionHandler.expected |  1 +
 ...oNotAttemptToModifyStringLiterals.expected | 15 ++++++++++++
 ...fficientSpaceForTheNullTerminator.expected |  6 +++++
 ...natedToFunctionThatExpectsAString.expected |  9 +++++++
 ...yFunctionArgumentNumberOfElements.expected |  6 +++++
 ...sedToCompareNullTerminatedStrings.expected |  4 ++++
 ...ForReadAndWriteOnDifferentStreams.expected |  1 +
 .../AttemptToWriteToAReadOnlyStream.expected  |  6 +++++
 ...omparedWithUnmodifiedReturnValues.expected |  8 +++++++
 ...rformConversionOfPassedParameters.expected |  3 +++
 .../AssignmentOperatorReturnThis.expected     |  1 +
 .../ThrownExceptionsShouldBeUnique.expected   |  1 +
 ...orErrorLeavesObjectInInvalidState.expected |  9 +++++++
 ...entOfAnArrayPassedToASmartPointer.expected |  7 ++++++
 .../UnnecessaryUseOfDynamicStorage.expected   |  4 ++++
 ...ArgumentToForwardSubsequentlyUsed.expected |  3 +++
 ...PointerUsedWithNoOwnershipSharing.expected |  1 +
 .../rules/A27-0-4/CStyleStringsUsed.expected  |  3 +++
 ...UsedWithPointersToNonFinalClasses.expected |  4 ++++
 .../A5-1-7/LambdaPassedToDecltype.expected    |  6 +++++
 .../A5-1-7/LambdaPassedToTypeid.expected      |  4 ++++
 .../A7-1-2/VariableMissingConstexpr.expected  |  6 +++++
 .../A7-5-1/InvalidFunctionReturnType.expected |  3 +++
 ...ParameterWithoutLifetimeSemantics.expected |  2 ++
 ...edToFunctionWithImproperSemantics.expected |  2 ++
 ...tParametersDeclaredAsTNotModified.expected |  2 ++
 ...eferencesToPrivateOrProtectedData.expected |  3 +++
 ...tionErroneousReturnValueNotTested.expected |  3 +++
 ...ntationsOfFloatingPointValuesUsed.expected |  3 +++
 ...berFunctionReturnsNonConstPointer.expected |  2 ++
 ...cCppLibraryFunctionsDoNotOverflow.expected |  9 +++++++
 .../CTR53-CPP/UseValidIteratorRanges.expected |  6 +++++
 ...terArithmeticOnPolymorphicObjects.expected |  4 ++++
 ...nFunctionCallsAsFunctionArguments.expected | 24 +++++++++++++++++++
 ...ThroughAPointerOfTheIncorrectType.expected |  4 ++++
 ...ctAndHandleMemoryAllocationErrors.expected |  7 ++++++
 .../BadlySeededRandomNumberGenerator.expected |  1 +
 63 files changed, 323 insertions(+)

diff --git a/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected b/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
index 25153f195b..bcb1c8eddd 100644
--- a/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
+++ b/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
@@ -1,3 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:104,11-19)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:87,5-18)
 | test.c:14:8:14:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
 | test.c:15:8:15:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
 | test.c:16:8:16:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
diff --git a/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected b/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
index e5e0252e3a..d75db521af 100644
--- a/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
+++ b/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
@@ -1,3 +1,8 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:23,60-68)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:24,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:36,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:44,26-34)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:65,3-11)
 edges
 | test.c:14:38:14:39 | p1 | test.c:18:10:18:11 | v1 | provenance |  |
 | test.c:14:38:14:39 | p1 | test.c:19:10:19:11 | v2 | provenance |  |
diff --git a/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected b/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
index bfd6b23128..7782984e5b 100644
--- a/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
+++ b/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:72,56-64)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:73,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:75,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:84,45-53)
 edges
 | test.c:7:13:7:14 | p1 | test.c:9:9:9:10 | p1 | provenance |  |
 | test.c:16:19:16:41 | ... - ... | test.c:18:26:18:31 | offset | provenance |  |
diff --git a/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected b/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
index e03b665a1c..9b1288d578 100644
--- a/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
+++ b/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
@@ -1,3 +1,9 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:21,46-54)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:22,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:31,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:41,35-43)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:49,36-44)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:51,36-44)
 | test.c:27:3:27:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
 | test.c:49:3:49:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
 | test.c:71:3:71:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
diff --git a/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected b/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected
index c3cdc8bd7b..a513b55b73 100644
--- a/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected
+++ b/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected
@@ -1,3 +1,11 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,29-37)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,54-62)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:35,62-70)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:40,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:40,30-38)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:41,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:41,30-38)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,3-16)
 | test.c:23:3:23:13 | call to thrd_create | $@ not declared with appropriate storage duration | test.c:23:24:23:29 | & ... | Shared object |
 | test.c:74:3:74:13 | call to thrd_create | $@ not declared with appropriate storage duration | test.c:74:24:74:24 | p | Shared object |
 | test.c:85:3:85:13 | call to thrd_create | $@ not declared with appropriate storage duration | test.c:85:24:85:24 | p | Shared object |
diff --git a/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected b/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected
index 95d0a20041..337df4c14c 100644
--- a/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected
+++ b/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected
@@ -1 +1,6 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:28,38-46)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:31,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:31,30-38)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:32,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:32,30-38)
 | test.c:14:7:14:13 | call to tss_get | Call to a thread specific storage function from within a threaded context on an object that may not be owned by this thread. |
diff --git a/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected b/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
index ff842ddcad..18d28b61bc 100644
--- a/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
+++ b/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
@@ -1,2 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:22,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:26,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:39,6-14)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:39,26-34)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:45,3-11)
 | test.c:3:10:3:10 | a | $@ with automatic storage may be accessible outside of its lifetime. | test.c:3:10:3:10 | a | a |
 | test.c:15:4:15:8 | param [inner post update] | $@ with automatic storage may be accessible outside of its lifetime. | test.c:15:12:15:13 | a2 | a2 |
diff --git a/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected b/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
index b6d7caa513..b3e5c4b7fc 100644
--- a/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
+++ b/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
@@ -1,3 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ErrnoReadBeforeReturn.ql:40,7-15)
 | test.c:69:7:69:11 | * ... | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
 | test.c:69:7:69:11 | call to __errno_location | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
 | test.c:70:5:70:10 | call to perror | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
diff --git a/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected b/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
index 9ab88a3395..0ffaf56bd1 100644
--- a/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
+++ b/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
@@ -1,2 +1,3 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (SetlocaleMightSetErrno.ql:64,7-15)
 | test.c:98:3:98:11 | call to setlocale | Do not read `errno` before checking the return value of a call to `setlocale`. |
 | test.c:104:7:104:15 | call to setlocale | The value of `errno` may be different than `0` when `setlocale` is called. The following `errno` check might be invalid. |
diff --git a/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected b/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
index da9122cfd4..77fa7b7ba7 100644
--- a/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
+++ b/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:50,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:50,27-35)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:51,9-17)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:54,9-17)
 | test.c:12:5:12:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:10:21:10:26 | call to signal | call to signal |
 | test.c:30:5:30:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:26:21:26:26 | call to signal | call to signal |
 | test.c:49:5:49:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:45:21:45:26 | call to signal | call to signal |
diff --git a/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected b/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected
index fbcc44b856..a32a03a3b9 100644
--- a/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected
+++ b/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected
@@ -1,3 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleStandardLibraryErrors.ql:453,5-13)
 | test.c:18:3:18:11 | call to setlocale | Missing error detection for the call to function `setlocale`. |
 | test.c:24:23:24:31 | call to setlocale | Missing error detection for the call to function `setlocale`. |
 | test.c:29:22:29:27 | call to calloc | Missing error detection for the call to function `calloc`. |
diff --git a/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected b/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected
index 3ea1a05fd7..6ea3499517 100644
--- a/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected
+++ b/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected
@@ -1 +1,25 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,59-67)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,33-41)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,33-41)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,59-67)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,53-61)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,55-63)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,55-63)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,7-20)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,7-20)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,5-18)
 | test.c:20:3:20:4 | call to f1 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.c:20:6:20:7 | call to f2 | call to f2 | test.c:20:12:20:13 | call to f3 | call to f3 |
diff --git a/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected b/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
index c4bc63cc94..b6f96f6ea5 100644
--- a/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
+++ b/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
@@ -1,3 +1,13 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:98,86-94)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:120,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:122,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:127,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:133,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:139,55-63)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:140,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:142,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:149,26-34)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:164,44-52)
 edges
 | test.c:75:14:75:16 | & ... | test.c:76:11:76:12 | v1 | provenance |  |
 | test.c:75:14:75:16 | & ... | test.c:77:12:77:13 | v1 | provenance |  |
diff --git a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
index 546c753ebb..1b6505f472 100644
--- a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
+++ b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:40,54-62)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:41,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:45,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:50,43-51)
 edges
 | test.c:48:68:48:70 | fns [f1] | test.c:49:3:49:5 | fns [f1] | provenance |  |
 | test.c:49:3:49:5 | fns [f1] | test.c:49:8:49:9 | f1 | provenance |  |
diff --git a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
index 137017d53a..3316256acb 100644
--- a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
+++ b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
@@ -1,3 +1,10 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:61,38-46)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:64,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:69,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:102,23-31)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:111,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:111,45-53)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:133,27-35)
 edges
 | test.c:49:8:49:9 | s3 | test.c:50:8:50:9 | s1 | provenance |  |
 | test.c:60:16:60:18 | E1A | test.c:61:16:61:17 | e1 | provenance |  |
diff --git a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
index bef45f3841..e7af404ec1 100644
--- a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
+++ b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:35,30-38)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:36,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:42,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:47,19-27)
 edges
 | test.c:5:8:5:9 | & ... | test.c:6:4:6:5 | aa | provenance |  |
 | test.c:26:15:26:15 | a | test.c:27:4:27:4 | a | provenance |  |
diff --git a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected
index 4d4c20a39c..a77a92ee81 100644
--- a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected
+++ b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected
@@ -1,3 +1,15 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:103,36-44)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:118,51-59)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:119,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:121,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:127,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:132,40-48)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:146,41-49)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:147,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:150,43-51)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:151,9-17)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:158,43-51)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:159,9-17)
 | test.c:59:3:59:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:59:13:59:15 | & ... | aliased pointer | test.c:59:8:59:10 | & ... | restrict-qualified parameter | test.c:59:8:59:10 | & ... | addressof1 | test.c:59:13:59:15 | & ... | addressof2 |
 | test.c:65:3:65:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:65:15:65:19 | & ... | aliased pointer | test.c:65:8:65:12 | & ... | restrict-qualified parameter | test.c:65:8:65:12 | & ... | addressof1 | test.c:65:15:65:19 | & ... | addressof2 |
 | test.c:67:3:67:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:67:15:67:16 | px | aliased pointer | test.c:67:8:67:12 | & ... | restrict-qualified parameter | test.c:67:8:67:12 | & ... | addressof1 | test.c:63:13:63:17 | & ... | addressof2 |
diff --git a/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected b/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
index 3746991c09..591e17661a 100644
--- a/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
+++ b/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
@@ -1,3 +1,10 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:42,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:43,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:47,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:53,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:56,58-66)
+WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:72,64-72)
+WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:73,64-72)
 | test.c:18:22:18:23 | i2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:18:17:18:18 | i3 | i3 | test.c:18:22:18:23 | i2 | the object pointed to by i2 |
 | test.c:19:8:19:9 | g2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:5:15:5:16 | g1 | g1 | test.c:19:8:19:9 | g2 | the object pointed to by g2 |
 | test.c:20:8:20:9 | i2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:16:17:16:18 | i1 | i1 | test.c:20:8:20:9 | i2 | the object pointed to by i2 |
diff --git a/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected b/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
index 20c108cfa0..6a73ee98a7 100644
--- a/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
+++ b/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
@@ -1,3 +1,6 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:42,11-19)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:42,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:43,13-21)
 | test.c:20:10:20:12 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:15:7:15:11 | call to fgets | call to fgets |
 | test.c:57:10:57:12 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:52:7:52:11 | call to fgets | call to fgets |
 | test.c:66:18:66:20 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:61:7:61:11 | call to fgets | call to fgets |
diff --git a/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected b/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected
index 8074710738..637918f241 100644
--- a/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected
+++ b/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected
@@ -1,2 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:25,32-40)
+WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:26,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:28,14-22)
+WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:31,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:37,21-29)
 | test.c:7:24:7:30 | & ... | The position argument of a call to `fsetpos()` should be obtained from a call to `fgetpos()`. |
 | test.c:33:24:33:30 | & ... | The position argument of a call to `fsetpos()` should be obtained from a call to `fgetpos()`. |
diff --git a/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected b/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
index 1b2923b780..f294ce05b7 100644
--- a/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
+++ b/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
@@ -1,2 +1,3 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ToctouRaceConditionsWhileAccessingFiles.ql:27,35-43)
 | test.c:4:13:4:17 | call to fopen | This call is trying to prevent an existing file from being overwritten by $@. An attacker might be able to exploit the race window between the two calls. | test.c:11:9:11:13 | call to fopen | another call |
 | test.c:88:13:88:17 | call to fopen | This call is trying to prevent an existing file from being overwritten by $@. An attacker might be able to exploit the race window between the two calls. | test.c:95:9:95:13 | call to fopen | another call |
diff --git a/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected b/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected
index 30dece9299..73dd6ba1e0 100644
--- a/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected
+++ b/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected
@@ -1,3 +1,5 @@
+WARNING: Module TaintTracking has been deprecated and may be removed in future (InsufficientMemoryAllocatedForObject.ql:85,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (InsufficientMemoryAllocatedForObject.ql:143,5-18)
 | test.c:12:19:12:24 | call to malloc | Allocation size (32 bytes) is not a multiple of the size of 'S1' (36 bytes). | test.c:12:26:12:32 | 32 |  |
 | test.c:15:19:15:24 | call to malloc | Allocation size calculated from the size of a different type ($@). | test.c:15:26:15:35 | sizeof(<expr>) | sizeof(S1 *) |
 | test.c:20:19:20:24 | call to malloc | Allocation size (128 bytes) is not a multiple of the size of 'S1' (36 bytes). | test.c:20:26:20:36 | ... * ... |  |
diff --git a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
index 0ae87f2ee8..61c2cfb1f0 100644
--- a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
+++ b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
@@ -1,3 +1,8 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:26,36-44)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:40,47-55)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:41,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:45,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:50,36-44)
 edges
 | test.c:5:10:5:22 | call to aligned_alloc | test.c:15:8:15:28 | call to aligned_alloc_wrapper | provenance |  |
 | test.c:8:29:8:31 | ptr | test.c:8:64:8:66 | ptr | provenance |  |
diff --git a/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected b/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
index 70d60c528a..713646db10 100644
--- a/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
+++ b/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
@@ -1 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:33,38-46)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:34,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:41,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:44,27-35)
 | test.c:6:24:6:30 | time_tm | The function `asctime` and `asctime_r` should be discouraged. Unsanitized input can overflow the output buffer. |
diff --git a/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected b/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
index 2b7bb2bdbc..4d4a713487 100644
--- a/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
+++ b/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
@@ -1,3 +1,10 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:38,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:39,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:44,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:47,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:68,10-18)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:69,29-37)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:70,29-37)
 | test.c:23:32:23:33 | ap | The value of ap is indeterminate after the $@. | test.c:17:7:17:19 | call to contains_zero | call to contains_zero |
 | test.c:26:10:26:11 | ap | The value of ap is indeterminate after the $@. | test.c:17:7:17:19 | call to contains_zero | call to contains_zero |
 | test.c:39:12:39:13 | ap | The value of ap is indeterminate after the $@. | test.c:35:7:35:19 | call to contains_zero | call to contains_zero |
diff --git a/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected b/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
index a601fe63f4..a5f4af8c3c 100644
--- a/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
+++ b/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
@@ -1,3 +1,6 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:105,11-19)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:105,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:106,9-17)
 | test.c:10:3:10:18 | call to log_local_unsafe | Asyncronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:16:7:16:12 | call to signal | signal handler |
 | test.c:11:3:11:6 | call to free | Asyncronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:16:7:16:12 | call to signal | signal handler |
 | test.c:46:3:46:9 | call to longjmp | Asyncronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:50:7:50:12 | call to signal | signal handler |
diff --git a/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected b/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
index 31412c466a..d4796c6ede 100644
--- a/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
+++ b/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
@@ -1 +1,2 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotReturnFromAComputationalExceptionHandler.ql:39,5-13)
 | test.c:10:1:10:1 | return ... | Do not return from a $@ signal handler. | test.c:13:10:13:15 | SIGFPE | computational exception |
diff --git a/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected b/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
index 27ef66bc7a..7215fd8603 100644
--- a/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
+++ b/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
@@ -1,3 +1,18 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:42,65-73)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:43,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:64,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:77,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,11-19)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,55-63)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,11-19)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,11-19)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,55-63)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:150,53-61)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:151,5-13)
 | test.c:7:3:7:3 | a | This operation may write to a string that may be a string literal that was $@. | test.c:6:13:6:20 | codeql | created here |
 | test.c:30:3:30:3 | a | This operation may write to a string that may be a string literal that was $@. | test.c:29:13:29:18 | call to strchr | created here |
 | test.c:36:3:36:3 | b | This operation may write to a string that may be a string literal that was $@. | test.c:35:13:35:18 | call to strchr | created here |
diff --git a/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected b/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
index 71e713d120..4c411382f0 100644
--- a/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
+++ b/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
@@ -1,3 +1,9 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,55-63)
+WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,54-62)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,5-18)
 | test.c:10:20:10:24 | Cod | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
 | test.c:16:3:16:9 | call to strncpy | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
 | test.c:26:3:26:10 | call to snprintf | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
diff --git a/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected b/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected
index 4099e3fb1a..341440d589 100644
--- a/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected
+++ b/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected
@@ -1,3 +1,12 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:55,33-41)
+WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:55,73-81)
+WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:61,33-41)
+WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:61,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:69,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:69,69-77)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:55,7-20)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:61,7-20)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:69,5-18)
 | test.c:19:3:19:8 | call to printf | String modified by $@ is passed to function expecting a null-terminated string. | test.c:7:20:7:24 | Cod | this expression |
 | test.c:20:3:20:8 | call to printf | String modified by $@ is passed to function expecting a null-terminated string. | test.c:7:20:7:24 | Cod | this expression |
 | test.c:22:3:22:8 | call to printf | String modified by $@ is passed to function expecting a null-terminated string. | test.c:13:3:13:9 | call to strncpy | this expression |
diff --git a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
index 913f6f1c34..d9cd037d42 100644
--- a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
+++ b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
@@ -1,3 +1,9 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:47,36-44)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:48,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:50,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:55,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,28-36)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,51-59)
 | test.c:18:6:18:6 | 0 | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:19:6:19:7 | ar | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:21:6:21:9 | ar2p | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
diff --git a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
index cded1a0a89..ef6703a285 100644
--- a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
+++ b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:22,54-62)
+WARNING: Module DataFlow has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:23,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:49,20-28)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:57,43-56)
 edges
 | test.c:12:13:12:15 | a | test.c:14:10:14:10 | a | provenance |  |
 | test.c:12:13:12:15 | a | test.c:23:13:23:13 | a | provenance |  |
diff --git a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
index 6111072ba8..3382b66847 100644
--- a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
+++ b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
@@ -1,3 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (FileOpenForReadAndWriteOnDifferentStreams.ql:38,9-17)
 | test.c:6:14:6:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:5:14:5:18 | call to fopen | here |
 | test.c:17:14:17:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:16:14:16:18 | call to fopen | here |
 | test.c:33:14:33:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:32:14:32:18 | call to fopen | here |
diff --git a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
index 0bfce133c5..08363e7dda 100644
--- a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
+++ b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
@@ -1,2 +1,8 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:18,32-40)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:19,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:24,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:30,21-29)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:32,6-14)
+WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:35,28-36)
 | test.c:10:3:10:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:9:14:9:18 | call to fopen | stream |
 | test.c:15:3:15:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:18:14:18:18 | call to fopen | stream |
diff --git a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
index 709d8b002c..9e975d34e4 100644
--- a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
+++ b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
@@ -1,2 +1,10 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:22,28-36)
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:23,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:27,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:36,23-31)
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:41,17-25)
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:50,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,46-54)
 | test.c:6:7:6:20 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:5:14:5:20 | call to getchar | call to getchar |
 | test.c:13:7:13:15 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:12:14:12:20 | call to getchar | call to getchar |
diff --git a/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected b/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected
index 53dc884023..11b622f271 100644
--- a/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected
+++ b/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected
@@ -1 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:27,33-41)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:28,5-13)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:27,7-20)
 | test.cpp:47:8:47:23 | operator ""_uds5 | User defined literal operator returns $@, which is not converted from a passed parameter | test.cpp:48:10:48:12 | 0.0 | expression |
diff --git a/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected b/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
index e9929173b0..4a4697facc 100644
--- a/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
+++ b/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
@@ -1,3 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (AssignmentOperatorReturnThis.ql:25,5-13)
 | test.cpp:10:12:10:20 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:10:12:10:20 | operator= |  user defined assignment operator |
 | test.cpp:17:11:17:19 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:17:11:17:19 | operator= |  user defined assignment operator |
 | test.cpp:24:12:24:20 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:24:12:24:20 | operator= |  user defined assignment operator |
diff --git a/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected b/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected
index b085736659..92504006b9 100644
--- a/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected
+++ b/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected
@@ -1,3 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ThrownExceptionsShouldBeUnique.ql:24,3-11)
 | test.cpp:6:5:6:26 | throw ... | The $@ thrown here is a possible duplicate of the $@ thrown $@. | test.cpp:6:5:6:26 | call to exception | std::exception exception | test.cpp:14:5:14:26 | call to exception | exception | test.cpp:14:5:14:26 | throw ... | here |
 | test.cpp:8:5:8:53 | throw ... | The $@ thrown here is a possible duplicate of the $@ thrown $@. | test.cpp:8:5:8:53 | call to runtime_error | std::runtime_error exception | test.cpp:16:5:16:53 | call to runtime_error | exception | test.cpp:16:5:16:53 | throw ... | here |
 | test.cpp:14:5:14:26 | throw ... | The $@ thrown here is a possible duplicate of the $@ thrown $@. | test.cpp:14:5:14:26 | call to exception | std::exception exception | test.cpp:6:5:6:26 | call to exception | exception | test.cpp:6:5:6:26 | throw ... | here |
diff --git a/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected b/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
index 941771dada..2fd57c3b20 100644
--- a/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
+++ b/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
@@ -1,3 +1,12 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:47,12-20)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,30-38)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:75,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,54-62)
 edges
 | test.cpp:12:16:12:27 | new [bad_alloc] | test.cpp:14:33:16:5 | { ... } [bad_alloc] |
 | test.cpp:13:7:13:28 | throw ... [exception] | test.cpp:14:33:16:5 | { ... } [exception] |
diff --git a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
index 5f752403dc..6babf2c883 100644
--- a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
+++ b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
@@ -1,3 +1,10 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:26,67-75)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:27,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:39,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,34-42)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:58,25-33)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:70,3-16)
 edges
 | test.cpp:3:36:3:45 | new[] | test.cpp:19:27:19:44 | call to allocate_int_array | provenance |  |
 | test.cpp:3:36:3:45 | new[] | test.cpp:23:12:23:29 | call to allocate_int_array | provenance |  |
diff --git a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
index d9dd02c054..cf611ded5b 100644
--- a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
+++ b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:55,34-42)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:57,26-34)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:71,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:76,41-54)
 | test.cpp:17:17:17:29 | new | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:21:17:21:32 | new[] | StructA[] object of size 800 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:35:20:35:44 | call to make_shared | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
diff --git a/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected b/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
index 1c72dd7bf3..2875a68f28 100644
--- a/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
+++ b/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
@@ -1 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:22,10-18)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,30-38)
 | test.cpp:8:5:8:6 | t2 | The argument $@ of `std::forward` may be indeterminate when accessed at this location. | test.cpp:7:45:7:46 | t2 | t2 |
diff --git a/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected b/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected
index f15f142b3b..03406ac254 100644
--- a/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected
+++ b/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected
@@ -1,3 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (SharedPointerUsedWithNoOwnershipSharing.ql:47,7-15)
 | test.cpp:14:24:14:26 | sp3 | The ownership of shared_ptr $@ is not shared within or passed out of the local scope of function $@. | test.cpp:14:24:14:26 | sp3 | sp3 | test.cpp:11:22:11:23 | f1 | f1 |
 | test.cpp:16:24:16:26 | sp5 | The ownership of shared_ptr $@ is not shared within or passed out of the local scope of function $@. | test.cpp:16:24:16:26 | sp5 | sp5 | test.cpp:11:22:11:23 | f1 | f1 |
 | test.cpp:17:24:17:26 | sp6 | The ownership of shared_ptr $@ is not shared within or passed out of the local scope of function $@. | test.cpp:17:24:17:26 | sp6 | sp6 | test.cpp:11:22:11:23 | f1 | f1 |
diff --git a/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected b/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected
index 6184aad74e..eaaaaac98d 100644
--- a/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected
+++ b/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected
@@ -1,3 +1,6 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,23-31)
+WARNING: Module DataFlow has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,47-55)
 | test.cpp:7:20:7:27 | CodeQL | Usage of C-style string in $@. | test.cpp:7:20:7:27 | CodeQL | expression |
 | test.cpp:7:20:7:27 | CodeQL | Usage of C-style string in $@. | test.cpp:16:16:16:17 | a1 | expression |
 | test.cpp:8:22:8:26 | call to c_str | Usage of C-style string in $@. | test.cpp:8:22:8:26 | call to c_str | expression |
diff --git a/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected b/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
index b47755725c..9f97a58467 100644
--- a/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
+++ b/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:45,62-70)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:46,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:55,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:61,3-11)
 edges
 | test.cpp:10:18:10:20 | foo | test.cpp:11:23:11:25 | foo | provenance |  |
 | test.cpp:10:18:10:20 | foo | test.cpp:11:50:11:52 | foo | provenance |  |
diff --git a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected
index 8f6447a96b..03eaab82aa 100644
--- a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected
+++ b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected
@@ -1 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:20,55-63)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:21,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:23,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:28,44-52)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:39,47-55)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:40,9-17)
 | test.cpp:14:23:14:24 | decltype(...) | Lambda $@ passed as operand to decltype. | test.cpp:5:13:5:30 | [...](...){...} | expression |
diff --git a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
index 6d65a7b5d5..916b9db113 100644
--- a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
+++ b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:21,50-58)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:22,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:24,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:27,39-47)
 edges
 | test.cpp:5:13:5:30 | [...](...){...} | test.cpp:8:38:8:39 | l1 | provenance |  |
 | test.cpp:6:13:6:30 | [...](...){...} | test.cpp:9:38:9:39 | l2 | provenance |  |
diff --git a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
index dbf223e0cf..dd499ceb57 100644
--- a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
+++ b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
@@ -1,3 +1,9 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:64,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:79,10-18)
+WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:79,44-52)
+WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:80,17-25)
+WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:81,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:82,9-17)
 | test.cpp:4:5:4:6 | g1 | Variable g1 could be marked 'constexpr'. |
 | test.cpp:6:5:6:6 | g2 | Variable g2 could be marked 'constexpr'. |
 | test.cpp:13:14:13:15 | lc | Variable lc could be marked 'constexpr'. |
diff --git a/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected b/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
index b6d9490803..0ab837454a 100644
--- a/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
+++ b/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
@@ -1,2 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,23-31)
+WARNING: Module DataFlow has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,51-59)
 | test.cpp:5:3:5:11 | return ... | Function test_refconst_return returns a reference or a pointer to $@ that is passed by reference to const. | test.cpp:4:44:4:44 | x | parameter |
 | test.cpp:8:3:8:14 | return ... | Function test_ptrconst_return returns a reference or a pointer to $@ that is passed by reference to const. | test.cpp:7:44:7:44 | x | parameter |
diff --git a/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected b/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected
index b751d81835..be4a4107fd 100644
--- a/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected
+++ b/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected
@@ -1,3 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (SmartPointerAsParameterWithoutLifetimeSemantics.ql:47,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (SmartPointerAsParameterWithoutLifetimeSemantics.ql:56,5-13)
 | test.cpp:7:41:7:43 | up1 | Function $@ takes smart pointer parameter 'up1' but does not implement any lifetime-affecting operations. | test.cpp:7:6:7:18 | smart_ptr_get | smart_ptr_get |
 | test.cpp:16:53:16:55 | sp1 | Function $@ takes smart pointer parameter 'sp1' but does not implement any lifetime-affecting operations. | test.cpp:16:6:16:29 | smart_ptr_ref_assign_ref | smart_ptr_ref_assign_ref |
 | test.cpp:28:55:28:57 | sp1 | Function $@ takes smart pointer parameter 'sp1' but does not implement any lifetime-affecting operations. | test.cpp:28:6:28:31 | smart_ptr_ref_noncompliant | smart_ptr_ref_noncompliant |
diff --git a/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected b/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected
index a01b93335d..b2273e66f3 100644
--- a/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected
+++ b/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected
@@ -1,3 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (UniquePtrPassedToFunctionWithImproperSemantics.ql:41,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UniquePtrPassedToFunctionWithImproperSemantics.ql:51,5-13)
 | test.cpp:13:55:13:56 | v1 | Parameter of type std::unique_ptr passed as lvalue reference but not used to modify underlying object. |
 | test.cpp:17:47:17:48 | v1 | Parameter of type std::unique_ptr passed as lvalue reference but not used to modify underlying object. |
 | test.cpp:22:27:22:28 | v1 | Parameter of type std::unique_ptr passed as lvalue reference but not used to modify underlying object. |
diff --git a/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected b/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected
index e3cfa71bb7..15e513c639 100644
--- a/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected
+++ b/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected
@@ -1,3 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (InOutParametersDeclaredAsTNotModified.ql:49,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (InOutParametersDeclaredAsTNotModified.ql:63,7-15)
 | test.cpp:4:13:4:13 | i | In-out parameter i that is not written to. |
 | test.cpp:7:22:7:24 | str | In-out parameter str that is not read from. |
 | test.cpp:18:14:18:14 | i | In-out parameter i that is not read from. |
diff --git a/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected b/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected
index 04c1f35a45..84d7f2d7f0 100644
--- a/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected
+++ b/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected
@@ -1,3 +1,6 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,3-11)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,23-31)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,46-54)
 | test.cpp:20:8:20:12 | getB2 | Member function A::getB2 $@ a non-const raw pointer or reference to a private or protected $@. | test.cpp:20:25:20:25 | b | returns | test.cpp:54:7:54:7 | b | field |
 | test.cpp:22:8:22:12 | getB3 | Member function A::getB3 $@ a non-const raw pointer or reference to a private or protected $@. | test.cpp:22:25:22:26 | & ... | returns | test.cpp:54:7:54:7 | b | field |
 | test.cpp:24:8:24:13 | getB33 | Member function A::getB33 $@ a non-const raw pointer or reference to a private or protected $@. | test.cpp:26:12:26:13 | bb | returns | test.cpp:54:7:54:7 | b | field |
diff --git a/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected b/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected
index 76cbcebed0..15f4e9a793 100644
--- a/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected
+++ b/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected
@@ -1 +1,4 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,9-17)
+WARNING: Module DataFlow has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,29-37)
+WARNING: Module DataFlow has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,53-61)
 | test.cpp:16:3:16:8 | call to remove | Return value is not tested for errors. |
diff --git a/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected b/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
index 9aec2314da..2545360a7b 100644
--- a/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
+++ b/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
@@ -1,2 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:27,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:36,10-18)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:37,5-13)
 | test.cpp:5:3:5:20 | ... &= ... | Modification of bit-representation of float originated at $@ | test.cpp:4:24:4:60 | reinterpret_cast<unsigned char *>... | cast |
 | test.cpp:12:3:12:14 | ... &= ... | Modification of bit-representation of float originated at $@ | test.cpp:11:18:11:30 | (uint8_t *)... | cast |
diff --git a/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected b/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
index ee9652f505..eee85d22c0 100644
--- a/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
+++ b/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
@@ -1,3 +1,5 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:53,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:55,7-15)
 | test.cpp:8:8:8:11 | getA | Const member function returns a pointer to class data $@. | test.cpp:3:8:3:8 | a | a |
 | test.cpp:9:8:9:11 | getB | Const member function returns a pointer to class data $@. | test.cpp:4:8:4:8 | b | b |
 | test.cpp:11:6:11:12 | getThis | Const member function returns a pointer to class data $@. | test.cpp:11:36:11:39 | this | this |
diff --git a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
index 4e87d1436c..06abadc4fe 100644
--- a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
+++ b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
@@ -1,3 +1,12 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:97,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:97,27-35)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:98,9-17)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:102,9-17)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:102,29-37)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:103,11-19)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:113,35-43)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:114,11-19)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:113,9-22)
 | test.cpp:8:42:8:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:8:3:8:11 | call to copy | call to copy |
 | test.cpp:17:42:17:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:17:3:17:11 | call to copy | call to copy |
 | test.cpp:55:42:55:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:55:3:55:11 | call to copy | call to copy |
diff --git a/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected b/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
index 61260a0579..5730a54b2c 100644
--- a/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
+++ b/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
@@ -1,3 +1,9 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:23,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:23,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:24,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:31,7-15)
 | test.cpp:7:3:7:15 | call to for_each | The $@ of iterator range function does not point to the end of an iterator. | test.cpp:7:28:7:32 | call to begin | argument |
 | test.cpp:7:3:7:15 | call to for_each | The $@ of iterator range function does not point to the start of an iterator. | test.cpp:7:19:7:21 | call to end | argument |
 | test.cpp:8:3:8:15 | call to for_each | The $@ of iterator range function does not point to the end of an iterator. | test.cpp:8:30:8:34 | call to begin | argument |
diff --git a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
index eabb6d7515..1f97f2ca40 100644
--- a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
+++ b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:41,62-70)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:42,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:51,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:57,3-11)
 edges
 | test.cpp:15:19:15:21 | foo | test.cpp:16:24:16:26 | foo | provenance |  |
 | test.cpp:15:19:15:21 | foo | test.cpp:16:51:16:53 | foo | provenance |  |
diff --git a/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected b/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected
index b432856e8b..243602e104 100644
--- a/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected
+++ b/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected
@@ -1,3 +1,27 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,59-67)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,33-41)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,33-41)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,59-67)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,53-61)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,55-63)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,57-65)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,31-39)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,55-63)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,7-20)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,7-20)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,5-18)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,5-18)
 | test.cpp:82:3:82:4 | call to f2 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.cpp:82:6:82:7 | call to f5 | call to f5 | test.cpp:82:12:82:13 | call to f6 | call to f6 |
 | test.cpp:84:3:84:4 | call to f2 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.cpp:84:6:84:7 | call to f5 | call to f5 | test.cpp:84:12:84:13 | call to f7 | call to f7 |
 | test.cpp:87:3:87:4 | call to f2 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.cpp:87:9:87:10 | call to m1 | call to m1 | test.cpp:87:18:87:19 | call to m1 | call to m1 |
diff --git a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
index 9c6e6dd071..a3c0c08011 100644
--- a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
+++ b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
@@ -1,3 +1,7 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:19,44-52)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:20,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:22,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:27,33-41)
 edges
 | test.cpp:6:19:6:37 | new[] | test.cpp:9:12:9:13 | l1 | provenance |  |
 | test.cpp:7:22:7:40 | new[] | test.cpp:10:12:10:13 | l2 | provenance |  |
diff --git a/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected b/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
index b7452ec199..b30e94a38e 100644
--- a/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
+++ b/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
@@ -1,2 +1,9 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:59,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:61,36-44)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:77,46-54)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:78,22-30)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:82,20-28)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:85,35-43)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:90,38-46)
 | test.cpp:24:7:24:34 | new | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:24:7:24:34 | new | StructA * |
 | test.cpp:40:17:40:38 | call to allocate_without_check | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:35:17:35:44 | new | StructA * |
diff --git a/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected b/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
index 0128221ffc..adabb21674 100644
--- a/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
+++ b/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
@@ -1,3 +1,4 @@
+WARNING: Module TaintTracking has been deprecated and may be removed in future (BadlySeededRandomNumberGenerator.ql:37,7-20)
 | test.cpp:9:33:9:33 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |
 | test.cpp:10:30:10:31 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |
 | test.cpp:11:21:11:22 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |

From e5cdb71cf7b21c1d03fa209be40fc6fb16a59087 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Thu, 23 May 2024 17:42:29 +0200
Subject: [PATCH 026/435] C++: Update expected test results after dataflow
 library changes and merge from main

---
 ...riableViaPointerOfIncompatibleType.expected |  2 +-
 ...tPointersAddressingDifferentArrays.expected |  4 ++--
 ...tionalOperatorsWithDifferingArrays.expected |  6 +++---
 ...mentOfAnArrayPassedToASmartPointer.expected |  1 +
 .../A7-1-2/VariableMissingConstexpr.expected   |  6 ------
 ...icCppLibraryFunctionsDoNotOverflow.expected | 18 +++++++++---------
 ...tUseAnAdditiveOperatorOnAnIterator.expected |  9 +++++++++
 ...tPointersAddressingDifferentArrays.expected |  4 ++--
 ...tionalOperatorsWithDifferingArrays.expected |  6 +++---
 ...ValueStoredInUnrelatedSmartPointer.expected |  5 +++--
 10 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
index 3316256acb..6cf822fa15 100644
--- a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
+++ b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
@@ -16,7 +16,7 @@ edges
 | test.c:97:32:97:37 | call to malloc | test.c:98:40:98:41 | s2 | provenance |  |
 | test.c:98:32:98:38 | call to realloc | test.c:99:3:99:4 | s3 | provenance |  |
 | test.c:98:32:98:38 | call to realloc | test.c:100:10:100:11 | s3 | provenance |  |
-| test.c:98:40:98:41 | s2 | test.c:98:32:98:38 | call to realloc | provenance |  |
+| test.c:98:40:98:41 | s2 | test.c:98:32:98:38 | call to realloc | provenance | Config |
 nodes
 | test.c:6:19:6:20 | & ... | semmle.label | & ... |
 | test.c:11:10:11:11 | & ... | semmle.label | & ... |
diff --git a/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected b/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
index c595e7e5f7..75866b8503 100644
--- a/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
+++ b/c/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
@@ -4,10 +4,10 @@ problems
 | test.c:13:10:13:11 | p4 | test.c:5:14:5:15 | l2 | test.c:13:10:13:11 | p4 | Subtraction between left operand pointing to array $@ and other operand pointing to array $@. | test.c:3:7:3:8 | l2 | l2 | test.c:2:7:2:8 | l1 | l1 |
 | test.c:13:15:13:16 | l1 | test.c:13:15:13:16 | l1 | test.c:13:15:13:16 | l1 | Subtraction between right operand pointing to array $@ and other operand pointing to array $@. | test.c:2:7:2:8 | l1 | l1 | test.c:3:7:3:8 | l2 | l2 |
 edges
-| test.c:4:14:4:15 | l1 | test.c:4:14:4:18 | access to array | provenance |  |
+| test.c:4:14:4:15 | l1 | test.c:4:14:4:18 | access to array | provenance | Config |
 | test.c:4:14:4:18 | access to array | test.c:10:10:10:11 | p1 | provenance |  |
 | test.c:4:14:4:18 | access to array | test.c:12:10:12:11 | p1 | provenance |  |
-| test.c:5:14:5:15 | l2 | test.c:5:14:5:19 | access to array | provenance |  |
+| test.c:5:14:5:15 | l2 | test.c:5:14:5:19 | access to array | provenance | Config |
 | test.c:5:14:5:19 | access to array | test.c:11:10:11:11 | p2 | provenance |  |
 | test.c:5:14:5:19 | access to array | test.c:12:15:12:16 | p2 | provenance |  |
 | test.c:5:14:5:19 | access to array | test.c:13:10:13:11 | p4 | provenance |  |
diff --git a/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected b/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
index 05c0ed4ca0..bda6c7ad05 100644
--- a/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
+++ b/c/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
@@ -11,17 +11,17 @@ problems
 | test.c:25:7:25:14 | ... >= ... | test.c:25:13:25:14 | l3 | test.c:25:13:25:14 | l3 | Compare operation >= comparing right operand pointing to array $@ and other operand pointing to array $@. | test.c:4:7:4:8 | l3 | l3 | test.c:2:7:2:8 | l1 | l1 |
 edges
 | test.c:6:13:6:14 | l1 | test.c:13:12:13:13 | p0 | provenance |  |
-| test.c:7:14:7:15 | l1 | test.c:7:14:7:18 | access to array | provenance |  |
+| test.c:7:14:7:15 | l1 | test.c:7:14:7:18 | access to array | provenance | Config |
 | test.c:7:14:7:18 | access to array | test.c:11:7:11:8 | p1 | provenance |  |
 | test.c:7:14:7:18 | access to array | test.c:13:7:13:8 | p1 | provenance |  |
 | test.c:7:14:7:18 | access to array | test.c:15:13:15:14 | p1 | provenance |  |
 | test.c:7:14:7:18 | access to array | test.c:17:7:17:8 | p1 | provenance |  |
 | test.c:7:14:7:18 | access to array | test.c:23:13:23:14 | p1 | provenance |  |
 | test.c:7:14:7:18 | access to array | test.c:25:7:25:8 | p1 | provenance |  |
-| test.c:8:14:8:15 | l1 | test.c:8:14:8:18 | access to array | provenance |  |
+| test.c:8:14:8:15 | l1 | test.c:8:14:8:18 | access to array | provenance | Config |
 | test.c:8:14:8:18 | access to array | test.c:11:12:11:13 | p2 | provenance |  |
 | test.c:8:14:8:18 | access to array | test.c:21:7:21:8 | p2 | provenance |  |
-| test.c:9:14:9:15 | l2 | test.c:9:14:9:18 | access to array | provenance |  |
+| test.c:9:14:9:15 | l2 | test.c:9:14:9:18 | access to array | provenance | Config |
 | test.c:9:14:9:18 | access to array | test.c:21:12:21:13 | p3 | provenance |  |
 nodes
 | test.c:6:13:6:14 | l1 | semmle.label | l1 |
diff --git a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
index 6babf2c883..e71e667685 100644
--- a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
+++ b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
@@ -11,6 +11,7 @@ edges
 | test.cpp:3:36:3:45 | new[] | test.cpp:27:20:27:37 | call to allocate_int_array | provenance |  |
 | test.cpp:11:29:11:41 | call to unique_ptr | test.cpp:12:27:12:28 | v2 | provenance |  |
 | test.cpp:12:27:12:28 | v2 | test.cpp:12:30:12:36 | call to release | provenance |  |
+| test.cpp:12:27:12:28 | v2 | test.cpp:12:30:12:36 | call to release | provenance | Config |
 | test.cpp:27:20:27:37 | call to allocate_int_array | test.cpp:32:12:32:20 | int_array | provenance |  |
 nodes
 | test.cpp:3:36:3:45 | new[] | semmle.label | new[] |
diff --git a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
index dd499ceb57..dbf223e0cf 100644
--- a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
+++ b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
@@ -1,9 +1,3 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:64,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:79,10-18)
-WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:79,44-52)
-WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:80,17-25)
-WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:81,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (VariableMissingConstexpr.ql:82,9-17)
 | test.cpp:4:5:4:6 | g1 | Variable g1 could be marked 'constexpr'. |
 | test.cpp:6:5:6:6 | g2 | Variable g2 could be marked 'constexpr'. |
 | test.cpp:13:14:13:15 | lc | Variable lc could be marked 'constexpr'. |
diff --git a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
index 06abadc4fe..9259112890 100644
--- a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
+++ b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
@@ -1,12 +1,12 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:97,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:97,27-35)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:98,9-17)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:102,9-17)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:102,29-37)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:103,11-19)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:113,35-43)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:114,11-19)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:113,9-22)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:88,7-15)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:88,27-35)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:89,9-17)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,9-17)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,29-37)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:94,11-19)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:104,35-43)
+WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:105,11-19)
+WARNING: Module TaintTracking has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:104,9-22)
 | test.cpp:8:42:8:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:8:3:8:11 | call to copy | call to copy |
 | test.cpp:17:42:17:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:17:3:17:11 | call to copy | call to copy |
 | test.cpp:55:42:55:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:55:3:55:11 | call to copy | call to copy |
diff --git a/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected b/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
index 0a06677b54..be69b2024d 100644
--- a/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
+++ b/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
@@ -1,3 +1,12 @@
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,51-59)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,52-60)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:74,5-13)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:74,25-33)
+WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:75,7-15)
 | test.cpp:8:7:8:7 | i | Increment of iterator may overflow since its bounds are not checked. |
 | test.cpp:9:9:9:9 | i | Increment of iterator may overflow since its bounds are not checked. |
 | test.cpp:10:9:10:9 | i | Increment of iterator may overflow since its bounds are not checked. |
diff --git a/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected b/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
index dcbc6d05bc..2d293e6928 100644
--- a/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
+++ b/cpp/common/test/rules/donotsubtractpointersaddressingdifferentarrays/DoNotSubtractPointersAddressingDifferentArrays.expected
@@ -4,10 +4,10 @@ problems
 | test.cpp:13:10:13:11 | p4 | test.cpp:5:14:5:15 | l2 | test.cpp:13:10:13:11 | p4 | Subtraction between left operand pointing to array $@ and other operand pointing to array $@. | test.cpp:3:7:3:8 | l2 | l2 | test.cpp:2:7:2:8 | l1 | l1 |
 | test.cpp:13:15:13:16 | l1 | test.cpp:13:15:13:16 | l1 | test.cpp:13:15:13:16 | l1 | Subtraction between right operand pointing to array $@ and other operand pointing to array $@. | test.cpp:2:7:2:8 | l1 | l1 | test.cpp:3:7:3:8 | l2 | l2 |
 edges
-| test.cpp:4:14:4:15 | l1 | test.cpp:4:14:4:18 | access to array | provenance |  |
+| test.cpp:4:14:4:15 | l1 | test.cpp:4:14:4:18 | access to array | provenance | Config |
 | test.cpp:4:14:4:18 | access to array | test.cpp:10:10:10:11 | p1 | provenance |  |
 | test.cpp:4:14:4:18 | access to array | test.cpp:12:10:12:11 | p1 | provenance |  |
-| test.cpp:5:14:5:15 | l2 | test.cpp:5:14:5:19 | access to array | provenance |  |
+| test.cpp:5:14:5:15 | l2 | test.cpp:5:14:5:19 | access to array | provenance | Config |
 | test.cpp:5:14:5:19 | access to array | test.cpp:11:10:11:11 | p2 | provenance |  |
 | test.cpp:5:14:5:19 | access to array | test.cpp:12:15:12:16 | p2 | provenance |  |
 | test.cpp:5:14:5:19 | access to array | test.cpp:13:10:13:11 | p4 | provenance |  |
diff --git a/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected b/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
index f02c9a5712..cab80e0fe0 100644
--- a/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
+++ b/cpp/common/test/rules/donotuserelationaloperatorswithdifferingarrays/DoNotUseRelationalOperatorsWithDifferingArrays.expected
@@ -11,17 +11,17 @@ problems
 | test.cpp:25:7:25:14 | ... >= ... | test.cpp:25:13:25:14 | l3 | test.cpp:25:13:25:14 | l3 | Compare operation >= comparing right operand pointing to array $@ and other operand pointing to array $@. | test.cpp:4:7:4:8 | l3 | l3 | test.cpp:2:7:2:8 | l1 | l1 |
 edges
 | test.cpp:6:13:6:14 | l1 | test.cpp:13:12:13:13 | p0 | provenance |  |
-| test.cpp:7:14:7:15 | l1 | test.cpp:7:14:7:18 | access to array | provenance |  |
+| test.cpp:7:14:7:15 | l1 | test.cpp:7:14:7:18 | access to array | provenance | Config |
 | test.cpp:7:14:7:18 | access to array | test.cpp:11:7:11:8 | p1 | provenance |  |
 | test.cpp:7:14:7:18 | access to array | test.cpp:13:7:13:8 | p1 | provenance |  |
 | test.cpp:7:14:7:18 | access to array | test.cpp:15:13:15:14 | p1 | provenance |  |
 | test.cpp:7:14:7:18 | access to array | test.cpp:17:7:17:8 | p1 | provenance |  |
 | test.cpp:7:14:7:18 | access to array | test.cpp:23:13:23:14 | p1 | provenance |  |
 | test.cpp:7:14:7:18 | access to array | test.cpp:25:7:25:8 | p1 | provenance |  |
-| test.cpp:8:14:8:15 | l1 | test.cpp:8:14:8:18 | access to array | provenance |  |
+| test.cpp:8:14:8:15 | l1 | test.cpp:8:14:8:18 | access to array | provenance | Config |
 | test.cpp:8:14:8:18 | access to array | test.cpp:11:12:11:13 | p2 | provenance |  |
 | test.cpp:8:14:8:18 | access to array | test.cpp:21:7:21:8 | p2 | provenance |  |
-| test.cpp:9:14:9:15 | l2 | test.cpp:9:14:9:18 | access to array | provenance |  |
+| test.cpp:9:14:9:15 | l2 | test.cpp:9:14:9:18 | access to array | provenance | Config |
 | test.cpp:9:14:9:18 | access to array | test.cpp:21:12:21:13 | p3 | provenance |  |
 nodes
 | test.cpp:6:13:6:14 | l1 | semmle.label | l1 |
diff --git a/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected b/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected
index 0b23493cfa..7790582443 100644
--- a/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected
+++ b/cpp/common/test/rules/ownedpointervaluestoredinunrelatedsmartpointer/OwnedPointerValueStoredInUnrelatedSmartPointer.expected
@@ -11,10 +11,11 @@ edges
 | test.cpp:3:14:3:15 | v1 | test.cpp:7:28:7:29 | v2 | provenance |  |
 | test.cpp:4:13:4:14 | v1 | test.cpp:7:28:7:29 | v2 | provenance |  |
 | test.cpp:5:27:5:28 | v1 | test.cpp:5:27:5:29 | call to shared_ptr | provenance |  |
+| test.cpp:5:27:5:28 | v1 | test.cpp:5:27:5:29 | call to shared_ptr | provenance | Config |
 | test.cpp:5:27:5:29 | call to shared_ptr | test.cpp:6:28:6:29 | p1 | provenance |  |
 | test.cpp:5:27:5:29 | call to shared_ptr | test.cpp:6:28:6:29 | p1 | provenance |  |
-| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get | provenance |  |
-| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get | provenance |  |
+| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get | provenance | Config |
+| test.cpp:6:28:6:29 | p1 | test.cpp:6:31:6:33 | call to get | provenance | Config |
 | test.cpp:8:8:8:14 | 0 | test.cpp:9:28:9:29 | v2 | provenance |  |
 | test.cpp:10:8:10:17 | new | test.cpp:11:28:11:29 | v2 | provenance |  |
 | test.cpp:10:8:10:17 | new | test.cpp:12:28:12:29 | v2 | provenance |  |

From 8078f8167744651ef4db0d2e795126a7ede83093 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@github.com>
Date: Wed, 19 Jun 2024 09:42:28 +0200
Subject: [PATCH 027/435] Accept new warning format in ql tests

---
 ...bleLengthArraySizeNotInValidRange.expected |  4 +-
 ...rithmeticOnNonArrayObjectPointers.expected | 10 ++--
 ...rSubtractAScaledIntegerToAPointer.expected |  8 ++--
 .../CleanUpThreadSpecificStorage.expected     | 12 ++---
 ...riateThreadObjectStorageDurations.expected | 16 +++----
 ...ectStorageDurationsNotInitialized.expected | 10 ++--
 ...ateStorageDurationsFunctionReturn.expected | 10 ++--
 .../ERR30-C/ErrnoReadBeforeReturn.expected    |  2 +-
 .../ERR30-C/SetlocaleMightSetErrno.expected   |  2 +-
 ...tRelyOnIndeterminateValuesOfErrno.expected |  8 ++--
 ...ectAndHandleStandardLibraryErrors.expected |  2 +-
 ...OfFunctionArgumentsForSideEffects.expected | 48 +++++++++----------
 ...rToMoreStrictlyAlignedPointerType.expected | 20 ++++----
 ...nctionPointerWithIncompatibleType.expected |  8 ++--
 ...iableViaPointerOfIncompatibleType.expected | 14 +++---
 .../DoNotModifyConstantObjects.expected       |  8 ++--
 ...edPointerToRestrictQualifiedParam.expected | 24 +++++-----
 ...ointerReferencesOverlappingObject.expected | 14 +++---
 ...esetStringsOnFgetsOrFgetwsFailure.expected |  6 +--
 ...FsetposThatAreReturnedFromFgetpos.expected | 10 ++--
 ...RaceConditionsWhileAccessingFiles.expected |  2 +-
 ...ufficientMemoryAllocatedForObject.expected |  4 +-
 ...odifyAlignmentOfMemoryWithRealloc.expected | 10 ++--
 ...ssInvalidDataToTheAsctimeFunction.expected |  8 ++--
 ...VaListThatHasAnIndeterminateValue.expected | 14 +++---
 ...SafeFunctionsWithinSignalHandlers.expected |  6 +--
 ...romAComputationalExceptionHandler.expected |  2 +-
 ...oNotAttemptToModifyStringLiterals.expected | 30 ++++++------
 ...fficientSpaceForTheNullTerminator.expected | 12 ++---
 ...natedToFunctionThatExpectsAString.expected | 20 ++++----
 ...yFunctionArgumentNumberOfElements.expected | 12 ++---
 ...sedToCompareNullTerminatedStrings.expected |  8 ++--
 ...ForReadAndWriteOnDifferentStreams.expected |  2 +-
 .../AttemptToWriteToAReadOnlyStream.expected  | 12 ++---
 ...omparedWithUnmodifiedReturnValues.expected | 16 +++----
 ...rformConversionOfPassedParameters.expected |  6 +--
 .../AssignmentOperatorReturnThis.expected     |  2 +-
 .../ThrownExceptionsShouldBeUnique.expected   |  2 +-
 ...orErrorLeavesObjectInInvalidState.expected | 18 +++----
 ...entOfAnArrayPassedToASmartPointer.expected | 14 +++---
 .../UnnecessaryUseOfDynamicStorage.expected   |  8 ++--
 ...ArgumentToForwardSubsequentlyUsed.expected |  6 +--
 ...PointerUsedWithNoOwnershipSharing.expected |  2 +-
 .../rules/A27-0-4/CStyleStringsUsed.expected  |  6 +--
 ...UsedWithPointersToNonFinalClasses.expected |  8 ++--
 .../A5-1-7/LambdaPassedToDecltype.expected    | 12 ++---
 .../A5-1-7/LambdaPassedToTypeid.expected      |  8 ++--
 .../A7-5-1/InvalidFunctionReturnType.expected |  6 +--
 ...ParameterWithoutLifetimeSemantics.expected |  4 +-
 ...edToFunctionWithImproperSemantics.expected |  4 +-
 ...tParametersDeclaredAsTNotModified.expected |  4 +-
 ...eferencesToPrivateOrProtectedData.expected |  6 +--
 ...tionErroneousReturnValueNotTested.expected |  6 +--
 ...ntationsOfFloatingPointValuesUsed.expected |  6 +--
 ...berFunctionReturnsNonConstPointer.expected |  4 +-
 ...cCppLibraryFunctionsDoNotOverflow.expected | 18 +++----
 .../CTR53-CPP/UseValidIteratorRanges.expected | 12 ++---
 ...UseAnAdditiveOperatorOnAnIterator.expected | 18 +++----
 ...terArithmeticOnPolymorphicObjects.expected |  8 ++--
 ...nFunctionCallsAsFunctionArguments.expected | 48 +++++++++----------
 ...ThroughAPointerOfTheIncorrectType.expected |  8 ++--
 ...ctAndHandleMemoryAllocationErrors.expected | 14 +++---
 .../BadlySeededRandomNumberGenerator.expected |  2 +-
 63 files changed, 327 insertions(+), 327 deletions(-)

diff --git a/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected b/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
index bcb1c8eddd..083e7dfb87 100644
--- a/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
+++ b/c/cert/test/rules/ARR32-C/VariableLengthArraySizeNotInValidRange.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:104,11-19)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:87,5-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:104,11-19)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (VariableLengthArraySizeNotInValidRange.ql:87,5-18)
 | test.c:14:8:14:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
 | test.c:15:8:15:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
 | test.c:16:8:16:8 | VLA declaration | Variable-length array dimension size may be in an invalid range. |
diff --git a/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected b/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
index d75db521af..ca4ef2a7a0 100644
--- a/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
+++ b/c/cert/test/rules/ARR37-C/DoNotUsePointerArithmeticOnNonArrayObjectPointers.expected
@@ -1,8 +1,8 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:23,60-68)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:24,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:36,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:44,26-34)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:65,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:23,60-68)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:24,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:36,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:44,26-34)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnNonArrayObjectPointers.ql:65,3-11)
 edges
 | test.c:14:38:14:39 | p1 | test.c:18:10:18:11 | v1 | provenance |  |
 | test.c:14:38:14:39 | p1 | test.c:19:10:19:11 | v2 | provenance |  |
diff --git a/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected b/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
index 7782984e5b..d343811aaf 100644
--- a/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
+++ b/c/cert/test/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:72,56-64)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:73,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:75,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:84,45-53)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:72,56-64)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:73,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:75,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAddOrSubtractAScaledIntegerToAPointer.ql:84,45-53)
 edges
 | test.c:7:13:7:14 | p1 | test.c:9:9:9:10 | p1 | provenance |  |
 | test.c:16:19:16:41 | ... - ... | test.c:18:26:18:31 | offset | provenance |  |
diff --git a/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected b/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
index 9b1288d578..2706474f29 100644
--- a/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
+++ b/c/cert/test/rules/CON30-C/CleanUpThreadSpecificStorage.expected
@@ -1,9 +1,9 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:21,46-54)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:22,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:31,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:41,35-43)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:49,36-44)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:51,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:21,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:22,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:31,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:41,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:49,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CleanUpThreadSpecificStorage.ql:51,36-44)
 | test.c:27:3:27:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
 | test.c:49:3:49:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
 | test.c:71:3:71:12 | call to tss_create | Resources used by thread specific storage may not be cleaned up. |
diff --git a/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected b/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected
index a513b55b73..25cb74d7fa 100644
--- a/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected
+++ b/c/cert/test/rules/CON34-C/AppropriateThreadObjectStorageDurations.expected
@@ -1,11 +1,11 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,29-37)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,54-62)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:35,62-70)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:40,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:40,30-38)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:41,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:41,30-38)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,3-16)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:35,62-70)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:40,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:40,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:41,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:41,30-38)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (AppropriateThreadObjectStorageDurations.ql:28,3-16)
 | test.c:23:3:23:13 | call to thrd_create | $@ not declared with appropriate storage duration | test.c:23:24:23:29 | & ... | Shared object |
 | test.c:74:3:74:13 | call to thrd_create | $@ not declared with appropriate storage duration | test.c:74:24:74:24 | p | Shared object |
 | test.c:85:3:85:13 | call to thrd_create | $@ not declared with appropriate storage duration | test.c:85:24:85:24 | p | Shared object |
diff --git a/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected b/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected
index 337df4c14c..d6b6548581 100644
--- a/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected
+++ b/c/cert/test/rules/CON34-C/ThreadObjectStorageDurationsNotInitialized.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:28,38-46)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:31,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:31,30-38)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:32,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:32,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:28,38-46)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:31,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:31,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:32,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ThreadObjectStorageDurationsNotInitialized.ql:32,30-38)
 | test.c:14:7:14:13 | call to tss_get | Call to a thread specific storage function from within a threaded context on an object that may not be owned by this thread. |
diff --git a/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected b/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
index 18d28b61bc..905c9cc22b 100644
--- a/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
+++ b/c/cert/test/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:22,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:26,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:39,6-14)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:39,26-34)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:45,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:22,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:26,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:39,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:39,26-34)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AppropriateStorageDurationsFunctionReturn.ql:45,3-11)
 | test.c:3:10:3:10 | a | $@ with automatic storage may be accessible outside of its lifetime. | test.c:3:10:3:10 | a | a |
 | test.c:15:4:15:8 | param [inner post update] | $@ with automatic storage may be accessible outside of its lifetime. | test.c:15:12:15:13 | a2 | a2 |
diff --git a/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected b/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
index b3e5c4b7fc..659a731d7c 100644
--- a/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
+++ b/c/cert/test/rules/ERR30-C/ErrnoReadBeforeReturn.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ErrnoReadBeforeReturn.ql:40,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ErrnoReadBeforeReturn.ql:40,7-15)
 | test.c:69:7:69:11 | * ... | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
 | test.c:69:7:69:11 | call to __errno_location | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
 | test.c:70:5:70:10 | call to perror | Do not read `errno` before checking the return value of function $@. | test.c:68:3:68:7 | call to ftell | call to ftell |
diff --git a/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected b/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
index 0ffaf56bd1..d20f4a4e34 100644
--- a/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
+++ b/c/cert/test/rules/ERR30-C/SetlocaleMightSetErrno.expected
@@ -1,3 +1,3 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (SetlocaleMightSetErrno.ql:64,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (SetlocaleMightSetErrno.ql:64,7-15)
 | test.c:98:3:98:11 | call to setlocale | Do not read `errno` before checking the return value of a call to `setlocale`. |
 | test.c:104:7:104:15 | call to setlocale | The value of `errno` may be different than `0` when `setlocale` is called. The following `errno` check might be invalid. |
diff --git a/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected b/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
index 77fa7b7ba7..a90dd6b7f5 100644
--- a/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
+++ b/c/cert/test/rules/ERR32-C/DoNotRelyOnIndeterminateValuesOfErrno.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:50,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:50,27-35)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:51,9-17)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:54,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:50,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:50,27-35)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:51,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotRelyOnIndeterminateValuesOfErrno.ql:54,9-17)
 | test.c:12:5:12:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:10:21:10:26 | call to signal | call to signal |
 | test.c:30:5:30:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:26:21:26:26 | call to signal | call to signal |
 | test.c:49:5:49:10 | call to perror | `errno` has indeterminate value after this $@. | test.c:45:21:45:26 | call to signal | call to signal |
diff --git a/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected b/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected
index a32a03a3b9..030596976e 100644
--- a/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected
+++ b/c/cert/test/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleStandardLibraryErrors.ql:453,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleStandardLibraryErrors.ql:453,5-13)
 | test.c:18:3:18:11 | call to setlocale | Missing error detection for the call to function `setlocale`. |
 | test.c:24:23:24:31 | call to setlocale | Missing error detection for the call to function `setlocale`. |
 | test.c:29:22:29:27 | call to calloc | Missing error detection for the call to function `calloc`. |
diff --git a/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected b/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected
index 6ea3499517..6567ef6fd1 100644
--- a/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected
+++ b/c/cert/test/rules/EXP30-C/DependenceOnOrderOfFunctionArgumentsForSideEffects.expected
@@ -1,25 +1,25 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,59-67)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,33-41)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,33-41)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,59-67)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,53-61)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,55-63)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,55-63)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,7-20)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,7-20)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,5-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,59-67)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,59-67)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:40,53-61)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,55-63)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:24,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:27,7-20)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:31,7-20)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:43,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:52,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:59,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DependenceOnOrderOfFunctionArgumentsForSideEffects.ql:71,5-18)
 | test.c:20:3:20:4 | call to f1 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.c:20:6:20:7 | call to f2 | call to f2 | test.c:20:12:20:13 | call to f3 | call to f3 |
diff --git a/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected b/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
index b6f96f6ea5..eed9fb4585 100644
--- a/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
+++ b/c/cert/test/rules/EXP36-C/DoNotCastPointerToMoreStrictlyAlignedPointerType.expected
@@ -1,13 +1,13 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:98,86-94)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:120,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:122,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:127,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:133,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:139,55-63)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:140,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:142,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:149,26-34)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:164,44-52)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:98,86-94)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:120,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:122,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:127,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:133,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:139,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:140,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:142,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:149,26-34)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCastPointerToMoreStrictlyAlignedPointerType.ql:164,44-52)
 edges
 | test.c:75:14:75:16 | & ... | test.c:76:11:76:12 | v1 | provenance |  |
 | test.c:75:14:75:16 | & ... | test.c:77:12:77:13 | v1 | provenance |  |
diff --git a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
index 1b6505f472..229bd74165 100644
--- a/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
+++ b/c/cert/test/rules/EXP37-C/DoNotCallFunctionPointerWithIncompatibleType.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:40,54-62)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:41,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:45,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:50,43-51)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:40,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:41,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:45,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallFunctionPointerWithIncompatibleType.ql:50,43-51)
 edges
 | test.c:48:68:48:70 | fns [f1] | test.c:49:3:49:5 | fns [f1] | provenance |  |
 | test.c:49:3:49:5 | fns [f1] | test.c:49:8:49:9 | f1 | provenance |  |
diff --git a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
index 6cf822fa15..9f0880455f 100644
--- a/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
+++ b/c/cert/test/rules/EXP39-C/DoNotAccessVariableViaPointerOfIncompatibleType.expected
@@ -1,10 +1,10 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:61,38-46)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:64,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:69,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:102,23-31)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:111,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:111,45-53)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:133,27-35)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:61,38-46)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:64,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:69,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:102,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:111,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:111,45-53)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAccessVariableViaPointerOfIncompatibleType.ql:133,27-35)
 edges
 | test.c:49:8:49:9 | s3 | test.c:50:8:50:9 | s1 | provenance |  |
 | test.c:60:16:60:18 | E1A | test.c:61:16:61:17 | e1 | provenance |  |
diff --git a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
index e7af404ec1..6dd4ec261a 100644
--- a/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
+++ b/c/cert/test/rules/EXP40-C/DoNotModifyConstantObjects.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:35,30-38)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:36,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:42,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:47,19-27)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:35,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:36,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:42,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyConstantObjects.ql:47,19-27)
 edges
 | test.c:5:8:5:9 | & ... | test.c:6:4:6:5 | aa | provenance |  |
 | test.c:26:15:26:15 | a | test.c:27:4:27:4 | a | provenance |  |
diff --git a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected
index a77a92ee81..1c8a649094 100644
--- a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected
+++ b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected
@@ -1,15 +1,15 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:103,36-44)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:118,51-59)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:119,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:121,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:127,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:132,40-48)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:146,41-49)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:147,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:150,43-51)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:151,9-17)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:158,43-51)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:159,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:103,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:118,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:119,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:121,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:127,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:132,40-48)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:146,41-49)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:147,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:150,43-51)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:151,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:158,43-51)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:159,9-17)
 | test.c:59:3:59:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:59:13:59:15 | & ... | aliased pointer | test.c:59:8:59:10 | & ... | restrict-qualified parameter | test.c:59:8:59:10 | & ... | addressof1 | test.c:59:13:59:15 | & ... | addressof2 |
 | test.c:65:3:65:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:65:15:65:19 | & ... | aliased pointer | test.c:65:8:65:12 | & ... | restrict-qualified parameter | test.c:65:8:65:12 | & ... | addressof1 | test.c:65:15:65:19 | & ... | addressof2 |
 | test.c:67:3:67:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:67:15:67:16 | px | aliased pointer | test.c:67:8:67:12 | & ... | restrict-qualified parameter | test.c:67:8:67:12 | & ... | addressof1 | test.c:63:13:63:17 | & ... | addressof2 |
diff --git a/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected b/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
index 591e17661a..b9765e77fb 100644
--- a/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
+++ b/c/cert/test/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.expected
@@ -1,10 +1,10 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:42,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:43,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:47,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:53,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:56,58-66)
-WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:72,64-72)
-WARNING: Module DataFlow has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:73,64-72)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:42,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:43,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:47,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:53,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:56,58-66)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:72,64-72)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (RestrictPointerReferencesOverlappingObject.ql:73,64-72)
 | test.c:18:22:18:23 | i2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:18:17:18:18 | i3 | i3 | test.c:18:22:18:23 | i2 | the object pointed to by i2 |
 | test.c:19:8:19:9 | g2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:5:15:5:16 | g1 | g1 | test.c:19:8:19:9 | g2 | the object pointed to by g2 |
 | test.c:20:8:20:9 | i2 | Assignment to restrict-qualified pointer $@ results in pointers aliasing $@. | test.c:16:17:16:18 | i1 | i1 | test.c:20:8:20:9 | i2 | the object pointed to by i2 |
diff --git a/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected b/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
index 6a73ee98a7..669dd829c8 100644
--- a/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
+++ b/c/cert/test/rules/FIO40-C/ResetStringsOnFgetsOrFgetwsFailure.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:42,11-19)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:42,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:43,13-21)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:42,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:42,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ResetStringsOnFgetsOrFgetwsFailure.ql:43,13-21)
 | test.c:20:10:20:12 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:15:7:15:11 | call to fgets | call to fgets |
 | test.c:57:10:57:12 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:52:7:52:11 | call to fgets | call to fgets |
 | test.c:66:18:66:20 | buf | The buffer is not reset before being referenced following a failed $@. | test.c:61:7:61:11 | call to fgets | call to fgets |
diff --git a/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected b/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected
index 637918f241..5bff6016e4 100644
--- a/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected
+++ b/c/cert/test/rules/FIO44-C/OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:25,32-40)
-WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:26,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:28,14-22)
-WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:31,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:37,21-29)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:25,32-40)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:26,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:28,14-22)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:31,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (OnlyUseValuesForFsetposThatAreReturnedFromFgetpos.ql:37,21-29)
 | test.c:7:24:7:30 | & ... | The position argument of a call to `fsetpos()` should be obtained from a call to `fgetpos()`. |
 | test.c:33:24:33:30 | & ... | The position argument of a call to `fsetpos()` should be obtained from a call to `fgetpos()`. |
diff --git a/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected b/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
index f294ce05b7..71df14e907 100644
--- a/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
+++ b/c/cert/test/rules/FIO45-C/ToctouRaceConditionsWhileAccessingFiles.expected
@@ -1,3 +1,3 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ToctouRaceConditionsWhileAccessingFiles.ql:27,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ToctouRaceConditionsWhileAccessingFiles.ql:27,35-43)
 | test.c:4:13:4:17 | call to fopen | This call is trying to prevent an existing file from being overwritten by $@. An attacker might be able to exploit the race window between the two calls. | test.c:11:9:11:13 | call to fopen | another call |
 | test.c:88:13:88:17 | call to fopen | This call is trying to prevent an existing file from being overwritten by $@. An attacker might be able to exploit the race window between the two calls. | test.c:95:9:95:13 | call to fopen | another call |
diff --git a/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected b/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected
index 73dd6ba1e0..6bfbbefc14 100644
--- a/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected
+++ b/c/cert/test/rules/MEM35-C/InsufficientMemoryAllocatedForObject.expected
@@ -1,5 +1,5 @@
-WARNING: Module TaintTracking has been deprecated and may be removed in future (InsufficientMemoryAllocatedForObject.ql:85,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (InsufficientMemoryAllocatedForObject.ql:143,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (InsufficientMemoryAllocatedForObject.ql:85,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (InsufficientMemoryAllocatedForObject.ql:143,5-18)
 | test.c:12:19:12:24 | call to malloc | Allocation size (32 bytes) is not a multiple of the size of 'S1' (36 bytes). | test.c:12:26:12:32 | 32 |  |
 | test.c:15:19:15:24 | call to malloc | Allocation size calculated from the size of a different type ($@). | test.c:15:26:15:35 | sizeof(<expr>) | sizeof(S1 *) |
 | test.c:20:19:20:24 | call to malloc | Allocation size (128 bytes) is not a multiple of the size of 'S1' (36 bytes). | test.c:20:26:20:36 | ... * ... |  |
diff --git a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
index 61c2cfb1f0..2f5889c4c6 100644
--- a/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
+++ b/c/cert/test/rules/MEM36-C/DoNotModifyAlignmentOfMemoryWithRealloc.expected
@@ -1,8 +1,8 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:26,36-44)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:40,47-55)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:41,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:45,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:50,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:26,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:40,47-55)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:41,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:45,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotModifyAlignmentOfMemoryWithRealloc.ql:50,36-44)
 edges
 | test.c:5:10:5:22 | call to aligned_alloc | test.c:15:8:15:28 | call to aligned_alloc_wrapper | provenance |  |
 | test.c:8:29:8:31 | ptr | test.c:8:64:8:66 | ptr | provenance |  |
diff --git a/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected b/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
index 713646db10..853d999d4e 100644
--- a/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
+++ b/c/cert/test/rules/MSC33-C/DoNotPassInvalidDataToTheAsctimeFunction.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:33,38-46)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:34,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:41,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:44,27-35)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:33,38-46)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:34,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:41,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassInvalidDataToTheAsctimeFunction.ql:44,27-35)
 | test.c:6:24:6:30 | time_tm | The function `asctime` and `asctime_r` should be discouraged. Unsanitized input can overflow the output buffer. |
diff --git a/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected b/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
index 4d4a713487..4eaa05b179 100644
--- a/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
+++ b/c/cert/test/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.expected
@@ -1,10 +1,10 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:38,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:39,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:44,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:47,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:68,10-18)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:69,29-37)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:70,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:38,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:39,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:44,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:47,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:68,10-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:69,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql:70,29-37)
 | test.c:23:32:23:33 | ap | The value of ap is indeterminate after the $@. | test.c:17:7:17:19 | call to contains_zero | call to contains_zero |
 | test.c:26:10:26:11 | ap | The value of ap is indeterminate after the $@. | test.c:17:7:17:19 | call to contains_zero | call to contains_zero |
 | test.c:39:12:39:13 | ap | The value of ap is indeterminate after the $@. | test.c:35:7:35:19 | call to contains_zero | call to contains_zero |
diff --git a/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected b/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
index a5f4af8c3c..6190259408 100644
--- a/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
+++ b/c/cert/test/rules/SIG30-C/CallOnlyAsyncSafeFunctionsWithinSignalHandlers.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:105,11-19)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:105,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:106,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:105,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:105,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CallOnlyAsyncSafeFunctionsWithinSignalHandlers.ql:106,9-17)
 | test.c:10:3:10:18 | call to log_local_unsafe | Asyncronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:16:7:16:12 | call to signal | signal handler |
 | test.c:11:3:11:6 | call to free | Asyncronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:16:7:16:12 | call to signal | signal handler |
 | test.c:46:3:46:9 | call to longjmp | Asyncronous-unsafe function calls within a $@ can lead to undefined behavior. | test.c:50:7:50:12 | call to signal | signal handler |
diff --git a/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected b/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
index d4796c6ede..e861e90e9e 100644
--- a/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
+++ b/c/cert/test/rules/SIG35-C/DoNotReturnFromAComputationalExceptionHandler.expected
@@ -1,2 +1,2 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotReturnFromAComputationalExceptionHandler.ql:39,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotReturnFromAComputationalExceptionHandler.ql:39,5-13)
 | test.c:10:1:10:1 | return ... | Do not return from a $@ signal handler. | test.c:13:10:13:15 | SIGFPE | computational exception |
diff --git a/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected b/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
index 7215fd8603..2a45193a17 100644
--- a/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
+++ b/c/cert/test/rules/STR30-C/DoNotAttemptToModifyStringLiterals.expected
@@ -1,18 +1,18 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:42,65-73)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:43,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:64,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:77,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,11-19)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,55-63)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,11-19)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,11-19)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,55-63)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:150,53-61)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:151,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:42,65-73)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:43,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:64,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:77,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:101,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:106,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:139,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:150,53-61)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotAttemptToModifyStringLiterals.ql:151,5-13)
 | test.c:7:3:7:3 | a | This operation may write to a string that may be a string literal that was $@. | test.c:6:13:6:20 | codeql | created here |
 | test.c:30:3:30:3 | a | This operation may write to a string that may be a string literal that was $@. | test.c:29:13:29:18 | call to strchr | created here |
 | test.c:36:3:36:3 | b | This operation may write to a string that may be a string literal that was $@. | test.c:35:13:35:18 | call to strchr | created here |
diff --git a/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected b/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
index 4c411382f0..9012a2d78a 100644
--- a/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
+++ b/c/cert/test/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.expected
@@ -1,9 +1,9 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,55-63)
-WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,54-62)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,5-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,54-62)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:57,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (StringsHasSufficientSpaceForTheNullTerminator.ql:63,5-18)
 | test.c:10:20:10:24 | Cod | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
 | test.c:16:3:16:9 | call to strncpy | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
 | test.c:26:3:26:10 | call to snprintf | Expression produces or consumes a string that may not have sufficient space for a null-terminator. |
diff --git a/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected b/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected
index e20b708dab..da86e69b88 100644
--- a/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected
+++ b/c/cert/test/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.expected
@@ -1,13 +1,13 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:64,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:66,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:74,39-47)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:75,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:81,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:83,34-42)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:83,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:123,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:123,26-34)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:120,17-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:64,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:66,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:74,39-47)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:75,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:81,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:83,34-42)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:83,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:123,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:123,26-34)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (NonNullTerminatedToFunctionThatExpectsAString.ql:120,17-30)
 | test.c:20:3:20:8 | call to printf | String modified by $@ is passed to function expecting a null-terminated string. | test.c:8:20:8:24 | Cod | this expression |
 | test.c:21:3:21:8 | call to printf | String modified by $@ is passed to function expecting a null-terminated string. | test.c:8:20:8:24 | Cod | this expression |
 | test.c:23:3:23:8 | call to printf | String modified by $@ is passed to function expecting a null-terminated string. | test.c:14:3:14:9 | call to strncpy | this expression |
diff --git a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
index d9cd037d42..cb4422f5f1 100644
--- a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
+++ b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
@@ -1,9 +1,9 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:47,36-44)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:48,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:50,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:55,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,28-36)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:47,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:48,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:50,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:55,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,51-59)
 | test.c:18:6:18:6 | 0 | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:19:6:19:7 | ar | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:21:6:21:9 | ar2p | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
diff --git a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
index ef6703a285..cf45b21eb4 100644
--- a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
+++ b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:22,54-62)
-WARNING: Module DataFlow has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:23,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:49,20-28)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:57,43-56)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:22,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:23,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:49,20-28)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:57,43-56)
 edges
 | test.c:12:13:12:15 | a | test.c:14:10:14:10 | a | provenance |  |
 | test.c:12:13:12:15 | a | test.c:23:13:23:13 | a | provenance |  |
diff --git a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
index 3382b66847..6360b21973 100644
--- a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
+++ b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (FileOpenForReadAndWriteOnDifferentStreams.ql:38,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (FileOpenForReadAndWriteOnDifferentStreams.ql:38,9-17)
 | test.c:6:14:6:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:5:14:5:18 | call to fopen | here |
 | test.c:17:14:17:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:16:14:16:18 | call to fopen | here |
 | test.c:33:14:33:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:32:14:32:18 | call to fopen | here |
diff --git a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
index 08363e7dda..88dca316a2 100644
--- a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
+++ b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
@@ -1,8 +1,8 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:18,32-40)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:19,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:24,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:30,21-29)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:32,6-14)
-WARNING: Module DataFlow has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:35,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:18,32-40)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:19,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:24,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:30,21-29)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:32,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:35,28-36)
 | test.c:10:3:10:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:9:14:9:18 | call to fopen | stream |
 | test.c:15:3:15:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:18:14:18:18 | call to fopen | stream |
diff --git a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
index 9e975d34e4..a7ee20c0b0 100644
--- a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
+++ b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
@@ -1,10 +1,10 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:22,28-36)
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:23,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:27,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:36,23-31)
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:41,17-25)
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:50,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:22,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:23,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:27,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:36,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:41,17-25)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:50,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,46-54)
 | test.c:6:7:6:20 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:5:14:5:20 | call to getchar | call to getchar |
 | test.c:13:7:13:15 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:12:14:12:20 | call to getchar | call to getchar |
diff --git a/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected b/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected
index 11b622f271..5d1d6022b5 100644
--- a/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected
+++ b/cpp/autosar/test/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:27,33-41)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:28,5-13)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:27,7-20)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:27,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:28,5-13)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql:27,7-20)
 | test.cpp:47:8:47:23 | operator ""_uds5 | User defined literal operator returns $@, which is not converted from a passed parameter | test.cpp:48:10:48:12 | 0.0 | expression |
diff --git a/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected b/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
index 4a4697facc..9c0d50ca86 100644
--- a/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
+++ b/cpp/autosar/test/rules/A13-2-1/AssignmentOperatorReturnThis.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (AssignmentOperatorReturnThis.ql:25,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AssignmentOperatorReturnThis.ql:25,5-13)
 | test.cpp:10:12:10:20 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:10:12:10:20 | operator= |  user defined assignment operator |
 | test.cpp:17:11:17:19 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:17:11:17:19 | operator= |  user defined assignment operator |
 | test.cpp:24:12:24:20 | operator= | User-defined assignment operator $@ does not return *this | test.cpp:24:12:24:20 | operator= |  user defined assignment operator |
diff --git a/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected b/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected
index 92504006b9..5db0f83985 100644
--- a/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected
+++ b/cpp/autosar/test/rules/A15-1-3/ThrownExceptionsShouldBeUnique.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ThrownExceptionsShouldBeUnique.ql:24,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ThrownExceptionsShouldBeUnique.ql:24,3-11)
 | test.cpp:6:5:6:26 | throw ... | The $@ thrown here is a possible duplicate of the $@ thrown $@. | test.cpp:6:5:6:26 | call to exception | std::exception exception | test.cpp:14:5:14:26 | call to exception | exception | test.cpp:14:5:14:26 | throw ... | here |
 | test.cpp:8:5:8:53 | throw ... | The $@ thrown here is a possible duplicate of the $@ thrown $@. | test.cpp:8:5:8:53 | call to runtime_error | std::runtime_error exception | test.cpp:16:5:16:53 | call to runtime_error | exception | test.cpp:16:5:16:53 | throw ... | here |
 | test.cpp:14:5:14:26 | throw ... | The $@ thrown here is a possible duplicate of the $@ thrown $@. | test.cpp:14:5:14:26 | call to exception | std::exception exception | test.cpp:6:5:6:26 | call to exception | exception | test.cpp:6:5:6:26 | throw ... | here |
diff --git a/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected b/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
index 2fd57c3b20..529a7ccf99 100644
--- a/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
+++ b/cpp/autosar/test/rules/A15-2-2/ConstructorErrorLeavesObjectInInvalidState.expected
@@ -1,12 +1,12 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:47,12-20)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,30-38)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:75,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:47,12-20)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:48,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:74,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:75,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstructorErrorLeavesObjectInInvalidState.ql:130,54-62)
 edges
 | test.cpp:12:16:12:27 | new [bad_alloc] | test.cpp:14:33:16:5 | { ... } [bad_alloc] |
 | test.cpp:13:7:13:28 | throw ... [exception] | test.cpp:14:33:16:5 | { ... } [exception] |
diff --git a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
index e71e667685..bd46224da6 100644
--- a/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
+++ b/cpp/autosar/test/rules/A18-1-4/PointerToAnElementOfAnArrayPassedToASmartPointer.expected
@@ -1,10 +1,10 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:26,67-75)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:27,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:39,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,34-42)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:58,25-33)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:70,3-16)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:26,67-75)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:27,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:39,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,34-42)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:50,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:58,25-33)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (PointerToAnElementOfAnArrayPassedToASmartPointer.ql:70,3-16)
 edges
 | test.cpp:3:36:3:45 | new[] | test.cpp:19:27:19:44 | call to allocate_int_array | provenance |  |
 | test.cpp:3:36:3:45 | new[] | test.cpp:23:12:23:29 | call to allocate_int_array | provenance |  |
diff --git a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
index cf611ded5b..6ab75d989e 100644
--- a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
+++ b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:55,34-42)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:57,26-34)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:71,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:76,41-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:55,34-42)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:57,26-34)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:71,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:76,41-54)
 | test.cpp:17:17:17:29 | new | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:21:17:21:32 | new[] | StructA[] object of size 800 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:35:20:35:44 | call to make_shared | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
diff --git a/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected b/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
index 2875a68f28..9e1cf41d3d 100644
--- a/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
+++ b/cpp/autosar/test/rules/A18-9-4/ArgumentToForwardSubsequentlyUsed.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:22,10-18)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,30-38)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:22,10-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArgumentToForwardSubsequentlyUsed.ql:24,30-38)
 | test.cpp:8:5:8:6 | t2 | The argument $@ of `std::forward` may be indeterminate when accessed at this location. | test.cpp:7:45:7:46 | t2 | t2 |
diff --git a/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected b/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected
index 03406ac254..5b770a1925 100644
--- a/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected
+++ b/cpp/autosar/test/rules/A20-8-4/SharedPointerUsedWithNoOwnershipSharing.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (SharedPointerUsedWithNoOwnershipSharing.ql:47,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (SharedPointerUsedWithNoOwnershipSharing.ql:47,7-15)
 | test.cpp:14:24:14:26 | sp3 | The ownership of shared_ptr $@ is not shared within or passed out of the local scope of function $@. | test.cpp:14:24:14:26 | sp3 | sp3 | test.cpp:11:22:11:23 | f1 | f1 |
 | test.cpp:16:24:16:26 | sp5 | The ownership of shared_ptr $@ is not shared within or passed out of the local scope of function $@. | test.cpp:16:24:16:26 | sp5 | sp5 | test.cpp:11:22:11:23 | f1 | f1 |
 | test.cpp:17:24:17:26 | sp6 | The ownership of shared_ptr $@ is not shared within or passed out of the local scope of function $@. | test.cpp:17:24:17:26 | sp6 | sp6 | test.cpp:11:22:11:23 | f1 | f1 |
diff --git a/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected b/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected
index eaaaaac98d..555cb412b8 100644
--- a/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected
+++ b/cpp/autosar/test/rules/A27-0-4/CStyleStringsUsed.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,23-31)
-WARNING: Module DataFlow has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,47-55)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (CStyleStringsUsed.ql:39,47-55)
 | test.cpp:7:20:7:27 | CodeQL | Usage of C-style string in $@. | test.cpp:7:20:7:27 | CodeQL | expression |
 | test.cpp:7:20:7:27 | CodeQL | Usage of C-style string in $@. | test.cpp:16:16:16:17 | a1 | expression |
 | test.cpp:8:22:8:26 | call to c_str | Usage of C-style string in $@. | test.cpp:8:22:8:26 | call to c_str | expression |
diff --git a/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected b/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
index 9f97a58467..e2b51e5fb9 100644
--- a/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
+++ b/cpp/autosar/test/rules/A5-0-4/PointerArithmeticUsedWithPointersToNonFinalClasses.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:45,62-70)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:46,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:55,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:61,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:45,62-70)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:46,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:55,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (PointerArithmeticUsedWithPointersToNonFinalClasses.ql:61,3-11)
 edges
 | test.cpp:10:18:10:20 | foo | test.cpp:11:23:11:25 | foo | provenance |  |
 | test.cpp:10:18:10:20 | foo | test.cpp:11:50:11:52 | foo | provenance |  |
diff --git a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected
index 03eaab82aa..56896d69fd 100644
--- a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected
+++ b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToDecltype.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:20,55-63)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:21,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:23,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:28,44-52)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:39,47-55)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:40,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:20,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:21,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:23,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:28,44-52)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:39,47-55)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToDecltype.ql:40,9-17)
 | test.cpp:14:23:14:24 | decltype(...) | Lambda $@ passed as operand to decltype. | test.cpp:5:13:5:30 | [...](...){...} | expression |
diff --git a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
index 916b9db113..8f86a87616 100644
--- a/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
+++ b/cpp/autosar/test/rules/A5-1-7/LambdaPassedToTypeid.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:21,50-58)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:22,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:24,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:27,39-47)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:21,50-58)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:22,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:24,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (LambdaPassedToTypeid.ql:27,39-47)
 edges
 | test.cpp:5:13:5:30 | [...](...){...} | test.cpp:8:38:8:39 | l1 | provenance |  |
 | test.cpp:6:13:6:30 | [...](...){...} | test.cpp:9:38:9:39 | l2 | provenance |  |
diff --git a/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected b/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
index 0ab837454a..3287ba88d1 100644
--- a/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
+++ b/cpp/autosar/test/rules/A7-5-1/InvalidFunctionReturnType.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,23-31)
-WARNING: Module DataFlow has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InvalidFunctionReturnType.ql:27,51-59)
 | test.cpp:5:3:5:11 | return ... | Function test_refconst_return returns a reference or a pointer to $@ that is passed by reference to const. | test.cpp:4:44:4:44 | x | parameter |
 | test.cpp:8:3:8:14 | return ... | Function test_ptrconst_return returns a reference or a pointer to $@ that is passed by reference to const. | test.cpp:7:44:7:44 | x | parameter |
diff --git a/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected b/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected
index be4a4107fd..2ce56fdce9 100644
--- a/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected
+++ b/cpp/autosar/test/rules/A8-4-11/SmartPointerAsParameterWithoutLifetimeSemantics.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (SmartPointerAsParameterWithoutLifetimeSemantics.ql:47,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (SmartPointerAsParameterWithoutLifetimeSemantics.ql:56,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (SmartPointerAsParameterWithoutLifetimeSemantics.ql:47,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (SmartPointerAsParameterWithoutLifetimeSemantics.ql:56,5-13)
 | test.cpp:7:41:7:43 | up1 | Function $@ takes smart pointer parameter 'up1' but does not implement any lifetime-affecting operations. | test.cpp:7:6:7:18 | smart_ptr_get | smart_ptr_get |
 | test.cpp:16:53:16:55 | sp1 | Function $@ takes smart pointer parameter 'sp1' but does not implement any lifetime-affecting operations. | test.cpp:16:6:16:29 | smart_ptr_ref_assign_ref | smart_ptr_ref_assign_ref |
 | test.cpp:28:55:28:57 | sp1 | Function $@ takes smart pointer parameter 'sp1' but does not implement any lifetime-affecting operations. | test.cpp:28:6:28:31 | smart_ptr_ref_noncompliant | smart_ptr_ref_noncompliant |
diff --git a/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected b/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected
index b2273e66f3..0a8ead4af8 100644
--- a/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected
+++ b/cpp/autosar/test/rules/A8-4-12/UniquePtrPassedToFunctionWithImproperSemantics.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (UniquePtrPassedToFunctionWithImproperSemantics.ql:41,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UniquePtrPassedToFunctionWithImproperSemantics.ql:51,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UniquePtrPassedToFunctionWithImproperSemantics.ql:41,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UniquePtrPassedToFunctionWithImproperSemantics.ql:51,5-13)
 | test.cpp:13:55:13:56 | v1 | Parameter of type std::unique_ptr passed as lvalue reference but not used to modify underlying object. |
 | test.cpp:17:47:17:48 | v1 | Parameter of type std::unique_ptr passed as lvalue reference but not used to modify underlying object. |
 | test.cpp:22:27:22:28 | v1 | Parameter of type std::unique_ptr passed as lvalue reference but not used to modify underlying object. |
diff --git a/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected b/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected
index 15e513c639..bafa98112f 100644
--- a/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected
+++ b/cpp/autosar/test/rules/A8-4-9/InOutParametersDeclaredAsTNotModified.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (InOutParametersDeclaredAsTNotModified.ql:49,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (InOutParametersDeclaredAsTNotModified.ql:63,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InOutParametersDeclaredAsTNotModified.ql:49,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (InOutParametersDeclaredAsTNotModified.ql:63,7-15)
 | test.cpp:4:13:4:13 | i | In-out parameter i that is not written to. |
 | test.cpp:7:22:7:24 | str | In-out parameter str that is not read from. |
 | test.cpp:18:14:18:14 | i | In-out parameter i that is not read from. |
diff --git a/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected b/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected
index 84d7f2d7f0..70892c12c8 100644
--- a/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected
+++ b/cpp/autosar/test/rules/A9-3-1/ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.expected
@@ -1,6 +1,6 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,3-11)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,23-31)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ReturnsNonConstRawPointersOrReferencesToPrivateOrProtectedData.ql:73,46-54)
 | test.cpp:20:8:20:12 | getB2 | Member function A::getB2 $@ a non-const raw pointer or reference to a private or protected $@. | test.cpp:20:25:20:25 | b | returns | test.cpp:54:7:54:7 | b | field |
 | test.cpp:22:8:22:12 | getB3 | Member function A::getB3 $@ a non-const raw pointer or reference to a private or protected $@. | test.cpp:22:25:22:26 | & ... | returns | test.cpp:54:7:54:7 | b | field |
 | test.cpp:24:8:24:13 | getB33 | Member function A::getB33 $@ a non-const raw pointer or reference to a private or protected $@. | test.cpp:26:12:26:13 | bb | returns | test.cpp:54:7:54:7 | b | field |
diff --git a/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected b/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected
index 15f4e9a793..1b2aef1b24 100644
--- a/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected
+++ b/cpp/autosar/test/rules/M0-3-2/FunctionErroneousReturnValueNotTested.expected
@@ -1,4 +1,4 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,9-17)
-WARNING: Module DataFlow has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,29-37)
-WARNING: Module DataFlow has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,53-61)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (FunctionErroneousReturnValueNotTested.ql:70,53-61)
 | test.cpp:16:3:16:8 | call to remove | Return value is not tested for errors. |
diff --git a/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected b/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
index 2545360a7b..d0fe6416ca 100644
--- a/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
+++ b/cpp/autosar/test/rules/M3-9-3/UnderlyingBitRepresentationsOfFloatingPointValuesUsed.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:27,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:36,10-18)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:37,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:27,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:36,10-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnderlyingBitRepresentationsOfFloatingPointValuesUsed.ql:37,5-13)
 | test.cpp:5:3:5:20 | ... &= ... | Modification of bit-representation of float originated at $@ | test.cpp:4:24:4:60 | reinterpret_cast<unsigned char *>... | cast |
 | test.cpp:12:3:12:14 | ... &= ... | Modification of bit-representation of float originated at $@ | test.cpp:11:18:11:30 | (uint8_t *)... | cast |
diff --git a/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected b/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
index eee85d22c0..af7e9efc36 100644
--- a/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
+++ b/cpp/autosar/test/rules/M9-3-1/ConstMemberFunctionReturnsNonConstPointer.expected
@@ -1,5 +1,5 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:53,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:55,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:53,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ConstMemberFunctionReturnsNonConstPointer.ql:55,7-15)
 | test.cpp:8:8:8:11 | getA | Const member function returns a pointer to class data $@. | test.cpp:3:8:3:8 | a | a |
 | test.cpp:9:8:9:11 | getB | Const member function returns a pointer to class data $@. | test.cpp:4:8:4:8 | b | b |
 | test.cpp:11:6:11:12 | getThis | Const member function returns a pointer to class data $@. | test.cpp:11:36:11:39 | this | this |
diff --git a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
index 9259112890..209d81ba8b 100644
--- a/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
+++ b/cpp/cert/test/rules/CTR52-CPP/GuaranteeGenericCppLibraryFunctionsDoNotOverflow.expected
@@ -1,12 +1,12 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:88,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:88,27-35)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:89,9-17)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,9-17)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,29-37)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:94,11-19)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:104,35-43)
-WARNING: Module DataFlow has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:105,11-19)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:104,9-22)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:88,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:88,27-35)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:89,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:93,29-37)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:94,11-19)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:104,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:105,11-19)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (GuaranteeGenericCppLibraryFunctionsDoNotOverflow.ql:104,9-22)
 | test.cpp:8:42:8:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:8:3:8:11 | call to copy | call to copy |
 | test.cpp:17:42:17:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:17:3:17:11 | call to copy | call to copy |
 | test.cpp:55:42:55:46 | call to begin | Output iterator for $@ is not guaranteed to be large enough for the input iterator. | test.cpp:55:3:55:11 | call to copy | call to copy |
diff --git a/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected b/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
index 5730a54b2c..b5c36727f5 100644
--- a/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
+++ b/cpp/cert/test/rules/CTR53-CPP/UseValidIteratorRanges.expected
@@ -1,9 +1,9 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:23,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:23,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:24,7-15)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (UseValidIteratorRanges.ql:31,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:23,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:23,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:24,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:30,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UseValidIteratorRanges.ql:31,7-15)
 | test.cpp:7:3:7:15 | call to for_each | The $@ of iterator range function does not point to the end of an iterator. | test.cpp:7:28:7:32 | call to begin | argument |
 | test.cpp:7:3:7:15 | call to for_each | The $@ of iterator range function does not point to the start of an iterator. | test.cpp:7:19:7:21 | call to end | argument |
 | test.cpp:8:3:8:15 | call to for_each | The $@ of iterator range function does not point to the end of an iterator. | test.cpp:8:30:8:34 | call to begin | argument |
diff --git a/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected b/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
index be69b2024d..0ba2fad433 100644
--- a/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
+++ b/cpp/cert/test/rules/CTR55-CPP/DoNotUseAnAdditiveOperatorOnAnIterator.expected
@@ -1,12 +1,12 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,51-59)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,52-60)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:74,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:74,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:75,7-15)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:38,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:39,52-60)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:74,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:74,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUseAnAdditiveOperatorOnAnIterator.ql:75,7-15)
 | test.cpp:8:7:8:7 | i | Increment of iterator may overflow since its bounds are not checked. |
 | test.cpp:9:9:9:9 | i | Increment of iterator may overflow since its bounds are not checked. |
 | test.cpp:10:9:10:9 | i | Increment of iterator may overflow since its bounds are not checked. |
diff --git a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
index 1f97f2ca40..59caaa22d8 100644
--- a/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
+++ b/cpp/cert/test/rules/CTR56-CPP/DoNotUsePointerArithmeticOnPolymorphicObjects.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:41,62-70)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:42,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:51,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:57,3-11)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:41,62-70)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:42,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:51,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotUsePointerArithmeticOnPolymorphicObjects.ql:57,3-11)
 edges
 | test.cpp:15:19:15:21 | foo | test.cpp:16:24:16:26 | foo | provenance |  |
 | test.cpp:15:19:15:21 | foo | test.cpp:16:51:16:53 | foo | provenance |  |
diff --git a/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected b/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected
index 243602e104..00f1a6ba03 100644
--- a/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected
+++ b/cpp/cert/test/rules/EXP50-CPP/DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.expected
@@ -1,27 +1,27 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,59-67)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,33-41)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,33-41)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,59-67)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,25-33)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,53-61)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,55-63)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,57-65)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,31-39)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,55-63)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,7-20)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,7-20)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,5-18)
-WARNING: Module TaintTracking has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,5-18)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,59-67)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,59-67)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:40,53-61)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,55-63)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,57-65)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,31-39)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,55-63)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:24,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:27,7-20)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:31,7-20)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:43,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:52,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:59,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (DoNotDependOnTheOrderOfEvaluationForSideEffectsInFunctionCallsAsFunctionArguments.ql:71,5-18)
 | test.cpp:82:3:82:4 | call to f2 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.cpp:82:6:82:7 | call to f5 | call to f5 | test.cpp:82:12:82:13 | call to f6 | call to f6 |
 | test.cpp:84:3:84:4 | call to f2 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.cpp:84:6:84:7 | call to f5 | call to f5 | test.cpp:84:12:84:13 | call to f7 | call to f7 |
 | test.cpp:87:3:87:4 | call to f2 | Depending on the order of evaluation for the arguments $@ and $@ for side effects on shared state is unspecified and can result in unexpected behavior. | test.cpp:87:9:87:10 | call to m1 | call to m1 | test.cpp:87:18:87:19 | call to m1 | call to m1 |
diff --git a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
index a3c0c08011..c271269ab8 100644
--- a/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
+++ b/cpp/cert/test/rules/EXP51-CPP/DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.expected
@@ -1,7 +1,7 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:19,44-52)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:20,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:22,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:27,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:19,44-52)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:20,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:22,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotDeleteAnArrayThroughAPointerOfTheIncorrectType.ql:27,33-41)
 edges
 | test.cpp:6:19:6:37 | new[] | test.cpp:9:12:9:13 | l1 | provenance |  |
 | test.cpp:7:22:7:40 | new[] | test.cpp:10:12:10:13 | l2 | provenance |  |
diff --git a/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected b/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
index b30e94a38e..b7b4891776 100644
--- a/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
+++ b/cpp/cert/test/rules/MEM52-CPP/DetectAndHandleMemoryAllocationErrors.expected
@@ -1,9 +1,9 @@
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:59,5-13)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:61,36-44)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:77,46-54)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:78,22-30)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:82,20-28)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:85,35-43)
-WARNING: Module DataFlow has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:90,38-46)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:59,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:61,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:77,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:78,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:82,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:85,35-43)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (DetectAndHandleMemoryAllocationErrors.ql:90,38-46)
 | test.cpp:24:7:24:34 | new | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:24:7:24:34 | new | StructA * |
 | test.cpp:40:17:40:38 | call to allocate_without_check | nothrow new allocation of $@ returns here without a subsequent check to see whether the pointer is valid. | test.cpp:35:17:35:44 | new | StructA * |
diff --git a/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected b/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
index adabb21674..3743c3d414 100644
--- a/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
+++ b/cpp/cert/test/rules/MSC51-CPP/BadlySeededRandomNumberGenerator.expected
@@ -1,4 +1,4 @@
-WARNING: Module TaintTracking has been deprecated and may be removed in future (BadlySeededRandomNumberGenerator.ql:37,7-20)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (BadlySeededRandomNumberGenerator.ql:37,7-20)
 | test.cpp:9:33:9:33 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |
 | test.cpp:10:30:10:31 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |
 | test.cpp:11:21:11:22 | call to linear_congruential_engine | Random number generator linear_congruential_engine is default-initialized and is therefore not properly seeded. |

From c5d1692ec82aa187866839efc182d0c1d8e4a211 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 26 Jun 2024 18:27:57 +0200
Subject: [PATCH 028/435] MISRA23 Import rules complete

---
 ...OnOrderOfScalarEvaluationForSideEffects.ql |    2 +-
 .../AssignmentsInSelectionStatements.ql       |    2 +-
 .../UnsignedIntegerOperationsWrapAround.ql    |   27 +-
 ...signedIntegerOperationsWrapAround.expected |    4 -
 .../UnsignedIntegerOperationsWrapAround.qlref |    1 -
 ...nsignedIntegerOperationsWrapAround.testref |    1 +
 ...edForGeneratingPseudorandomNumbers.testref |    2 +-
 c/common/src/codingstandards/c/Literals.qll   |    4 -
 .../VariableAccessOrdering.qll                |    2 +-
 c/common/test/library/expr/FullExpr.ql        |    2 +-
 ...rgumentSubjectToExpansion_shared.expected} |    4 +-
 ...eMacroArgumentSubjectToExpansion_shared.ql |    5 +
 .../test.c                                    |   26 +
 .../AtofAtoiAtolAndAtollUsed_shared.expected  |    4 +
 .../AtofAtoiAtolAndAtollUsed_shared.ql        |    4 +
 .../atofatoiatolandatollused_shared/test.c    |   13 +
 ...ShallHaveAnAppropriateType_shared.expected |    4 +
 ...tFieldShallHaveAnAppropriateType_shared.ql |    4 +
 .../test.c                                    |   17 +
 .../ConstLikeReturnValue.expected             |   32 +-
 .../test/rules/constlikereturnvalue/test.c    |    3 +
 .../FunctionLikeMacrosDefined_shared.expected |    2 +
 .../FunctionLikeMacrosDefined_shared.ql       |    4 +
 .../functionlikemacrosdefined_shared/test.c   |   42 +
 ...ceALabelInSurroundingBlock_shared.expected |    3 +
 ...eferenceALabelInSurroundingBlock_shared.ql |    4 +
 .../test.c                                    |    2 +
 .../GotoStatementCondition.expected           |    7 +-
 .../test/rules/gotostatementcondition/test.c  |   38 +-
 ...toStatementShouldNotBeUsed_shared.expected |    1 +
 .../GotoStatementShouldNotBeUsed_shared.ql    |    4 +
 .../test.c                                    |   11 +
 .../InvalidatedEnvStringPointers.expected     |   12 +-
 .../rules/invalidatedenvstringpointers/test.c |    2 +
 .../InvalidatedEnvStringPointersWarn.expected |    4 +-
 .../invalidatedenvstringpointerswarn/test.c   |    2 +
 ...caseLStartsInLiteralSuffix_shared.expected |   16 +
 .../LowercaseLStartsInLiteralSuffix_shared.ql |    4 +
 .../test.c                                    |   46 +
 ...acroParameterFollowingHash_shared.expected |    1 +
 .../MacroParameterFollowingHash_shared.ql     |    4 +
 .../macroparameterfollowinghash_shared/test.c |   29 +
 ...sNotSequencedAppropriately_shared.expected |    6 +
 ...rationsNotSequencedAppropriately_shared.ql |    5 +
 .../test.c                                    |   39 +
 ...ieldsWithSignedIntegerType_shared.expected |    5 +
 ...edBitFieldsWithSignedIntegerType_shared.ql |    4 +
 .../test.c                                    |   28 +
 ...nTerminatedEscapeSequences_shared.expected |   21 +
 .../NonTerminatedEscapeSequences_shared.ql    |    4 +
 .../test.c                                    |   81 ++
 ...nUniqueEnumerationConstant_shared.expected |    1 +
 .../NonUniqueEnumerationConstant_shared.ql    |    4 +
 .../test.c                                    |    2 +
 ...entOperatorShouldNotBeUsed_shared.expected |    3 +
 ...ssignmentOperatorShouldNotBeUsed_shared.ql |    5 +
 .../test.c                                    |   16 +
 ...nWithConstantOperandsWraps_shared.expected |    4 +
 ...erationWithConstantOperandsWraps_shared.ql |    5 +
 .../test.c                                    |   83 ++
 .../DIR-4-9/FunctionOverFunctionLikeMacro.ql  |   22 +-
 ...plicitPrecedenceOfOperatorsInExpression.ql |    2 +-
 .../rules/RULE-13-2/UnsequencedSideEffects.ql |  235 +---
 .../SideEffectAndCrementInFullExpression.ql   |    4 +-
 ...ltOfAnAssignmentOperatorShouldNotBeUsed.ql |   11 +-
 .../src/rules/RULE-15-1/GotoStatementUsed.ql  |   11 +-
 .../RULE-15-3/GotoLabelBlockCondition.ql      |   49 +-
 .../RULE-15-6/SelectionCompoundCondition.ql   |    2 +-
 ...oreThanOneHashOperatorInMacroDefinition.ql |   16 +-
 .../MacroParameterUsedAsHashOperand.ql        |   24 +-
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.ql      |   15 +-
 ...HexadecimalEscapeSequencesNotTerminated.ql |   34 +-
 ...hallOnlyBeDeclaredWithAnAppropriateType.ql |   33 +-
 .../SingleBitNamedBitFieldsOfASignedType.ql   |   25 +-
 .../LowercaseCharacterLUsedInLiteralSuffix.ql |    2 +-
 ...lueImplicitEnumerationConstantNotUnique.ql |   23 +-
 ...AssemblyLanguageShouldBeDocumented.testref |    2 +-
 ...ctionsOfCodeShallNotBeCommentedOut.testref |    2 +-
 ...fiersInTheSameNameSpaceUnambiguous.testref |    2 +-
 .../FunctionOverFunctionLikeMacro.testref     |    1 +
 .../RULE-13-2/UnsequencedSideEffects.expected |    6 -
 .../RULE-13-2/UnsequencedSideEffects.qlref    |    1 -
 .../RULE-13-2/UnsequencedSideEffects.testref  |    1 +
 ...AssignmentOperatorShouldNotBeUsed.expected |    3 -
 ...fAnAssignmentOperatorShouldNotBeUsed.qlref |    1 -
 ...nAssignmentOperatorShouldNotBeUsed.testref |    1 +
 .../RULE-15-1/GotoStatementUsed.expected      |    1 -
 .../rules/RULE-15-1/GotoStatementUsed.qlref   |    1 -
 .../rules/RULE-15-1/GotoStatementUsed.testref |    1 +
 c/misra/test/rules/RULE-15-1/test.c           |    9 -
 .../GotoLabelBlockCondition.expected          |    3 -
 .../RULE-15-3/GotoLabelBlockCondition.qlref   |    1 -
 .../RULE-15-3/GotoLabelBlockCondition.testref |    1 +
 ...nOneHashOperatorInMacroDefinition.expected |    1 -
 ...ThanOneHashOperatorInMacroDefinition.qlref |    1 -
 ...anOneHashOperatorInMacroDefinition.testref |    1 +
 .../MacroParameterUsedAsHashOperand.qlref     |    1 -
 .../MacroParameterUsedAsHashOperand.testref   |    1 +
 ...AtofAtoiAtolAndAtollOfStdlibhUsed.expected |    4 -
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.qlref   |    1 -
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.testref |    1 +
 ...cimalEscapeSequencesNotTerminated.expected |   21 -
 ...adecimalEscapeSequencesNotTerminated.qlref |    1 -
 ...ecimalEscapeSequencesNotTerminated.testref |    1 +
 ...nlyBeDeclaredWithAnAppropriateType.testref |    1 +
 ...gleBitNamedBitFieldsOfASignedType.expected |    4 -
 ...SingleBitNamedBitFieldsOfASignedType.qlref |    1 -
 ...ngleBitNamedBitFieldsOfASignedType.testref |    1 +
 ...caseCharacterLUsedInLiteralSuffix.expected |   16 -
 ...wercaseCharacterLUsedInLiteralSuffix.qlref |    1 -
 ...rcaseCharacterLUsedInLiteralSuffix.testref |    1 +
 ...wercaseCharacterLUsedInLiteralSuffix.qlref |    1 -
 c/misra/test/rules/RULE-7-3/cpp/options       |    1 -
 c/misra/test/rules/RULE-7-3/cpp/test.cpp      |    1 -
 ...licitEnumerationConstantNotUnique.expected |    1 -
 ...ImplicitEnumerationConstantNotUnique.qlref |    1 -
 ...plicitEnumerationConstantNotUnique.testref |    1 +
 ...licitConstructorBaseClassInitialization.ql |   31 +-
 ...yAssignmentAndAMoveHandleSelfAssignment.ql |   43 +-
 ...tSpecializationsOfFunctionTemplatesUsed.ql |   10 +-
 .../rules/A15-1-2/PointerExceptionObject.ql   |   12 +-
 .../rules/A15-4-2/NoExceptFunctionThrows.ql   |   23 +-
 .../A18-1-2/VectorboolSpecializationUsed.ql   |   23 +-
 .../GlobalSizedOperatorDeleteNotDefined.ql    |   17 +-
 .../GlobalUnsizedOperatorDeleteNotDefined.ql  |   17 +-
 .../ForwardingValuesToOtherFunctions.ql       |   21 +-
 .../rules/A2-13-1/EscapeSequenceOutsideISO.ql |   13 +-
 .../A2-7-1/SingleLineCommentEndsWithSlash.ql  |   11 +-
 .../A4-10-1/NullPointerConstantNotNullptr.ql  |   19 +-
 ...rVirtualFunctionWithNullPointerConstant.ql |   34 -
 ...ualPointerOnlyComparesToNullptrConstant.ql |   25 +
 .../src/rules/A5-2-4/ReinterpretCastUsed.ql   |    9 +-
 .../src/rules/A6-6-1/GotoStatementUsed.ql     |   11 +-
 ...nUnderlyingBaseTypeNotExplicitlyDefined.ql |   11 +-
 ...nitionNotConsideredForUnqualifiedLookup.ql |   56 +-
 ...enInheritedNonOverridableMemberFunction.ql |   45 +-
 ...iddenInheritedOverridableMemberFunction.ql |   44 +-
 .../src/rules/A7-4-1/AsmDeclarationUsed.ql    |    9 +-
 .../src/rules/A7-5-2/RecursiveFunctions.ql    |   19 +-
 ...nfusingUseOfInitializerListConstructors.ql |   48 +-
 ...ssibleBaseClassBothVirtualAndNonVirtual.ql |   23 +
 ...lassBothVirtualAndNonVirtualInHierarchy.ql |   37 -
 ...peOfThisUsedFromConstructorOrDestructor.ql |   77 +-
 .../NameNotReferredUsingAQualifiedIdOrThis.ql |   29 +-
 ...NotReferredUsingAQualifiedIdOrThisAudit.ql |   29 +-
 .../rules/M15-1-3/EmptyThrowOutsideCatch.ql   |   11 +-
 .../src/rules/M18-2-1/MacroOffsetofUsed.ql    |   11 +-
 .../src/rules/M18-7-1/CsignalFunctionsUsed.ql |   12 +-
 .../src/rules/M18-7-1/CsignalTypesUsed.ql     |   12 +-
 .../rules/M2-13-2/UseOfNonZeroOctalLiteral.ql |   12 +-
 .../src/rules/M2-13-3/MissingUSuffix.ql       |   20 +-
 .../SlashStarUsedWithinACStyleComment.ql      |   11 +-
 .../src/rules/M27-0-1/CstdioFunctionsUsed.ql  |   28 +-
 .../src/rules/M27-0-1/CstdioMacrosUsed.ql     |   14 +-
 .../src/rules/M27-0-1/CstdioTypesUsed.ql      |   12 +-
 ...PassedAsFunctionArgumentDecayToAPointer.ql |   24 +
 ...PassedAsFunctionArgumentDecayToAPointer.ql |   47 -
 .../M5-2-6/CastNotConvertPointerToFunction.ql |   13 +-
 ...sOperatorAppliedToAnUnsignedExpression.ql} |   17 +-
 .../rules/M5-3-3/UnaryOperatorOverloaded.ql   |    8 +-
 .../src/rules/M6-3-1/LoopCompoundCondition.ql |   11 +-
 .../rules/M6-3-1/SwitchCompoundCondition.ql   |   34 +-
 .../GlobalNamespaceMembershipViolation.ql     |   15 +-
 ...ainUsedForAFunctionOtherThanGlobalMain.ql} |   15 +-
 .../FunctionReturnAutomaticVarCondition.ql    |   21 +-
 .../MultipleGlobalOrMemberDeclarators.ql      |   55 +-
 .../rules/M8-0-1/MultipleLocalDeclarators.ql  |   13 +-
 ...nctionParametersUseSameDefaultArguments.ql |   25 +
 ...ionParametersUseTheSameDefaultArguments.ql |   44 -
 ...gerTypeShallHaveALengthOfMoreThanOneBit.ql |    2 +-
 ...itConstructorBaseClassInitialization.qlref |    1 -
 ...ConstructorBaseClassInitialization.testref |    1 +
 ...signmentAndAMoveHandleSelfAssignment.qlref |    1 -
 ...gnmentAndAMoveHandleSelfAssignment.testref |    1 +
 ...ecializationsOfFunctionTemplatesUsed.qlref |    1 -
 ...ializationsOfFunctionTemplatesUsed.testref |    1 +
 .../A15-1-2/PointerExceptionObject.qlref      |    1 -
 .../A15-1-2/PointerExceptionObject.testref    |    1 +
 .../A15-4-2/NoExceptFunctionThrows.qlref      |    1 -
 .../A15-4-2/NoExceptFunctionThrows.testref    |    1 +
 .../VectorboolSpecializationUsed.qlref        |    1 -
 .../VectorboolSpecializationUsed.testref      |    1 +
 .../GlobalSizedOperatorDeleteNotDefined.qlref |    1 -
 ...lobalSizedOperatorDeleteNotDefined.testref |    1 +
 ...alUnsizedOperatorDeleteNotDefined.expected |    0
 ...lobalUnsizedOperatorDeleteNotDefined.qlref |    1 -
 ...balUnsizedOperatorDeleteNotDefined.testref |    1 +
 .../ForwardingValuesToOtherFunctions.qlref    |    1 -
 .../ForwardingValuesToOtherFunctions.testref  |    1 +
 .../A2-13-1/EscapeSequenceOutsideISO.qlref    |    1 -
 .../A2-13-1/EscapeSequenceOutsideISO.testref  |    1 +
 .../SingleLineCommentEndsWithSlash.qlref      |    1 -
 .../SingleLineCommentEndsWithSlash.testref    |    1 +
 .../NullPointerConstantNotNullptr.qlref       |    1 -
 .../NullPointerConstantNotNullptr.testref     |    1 +
 ...rtualFunctionWithNullPointerConstant.qlref |    1 -
 ...ualFunctionWithNullPointerConstant.testref |    1 +
 ...irtualPointerOnlyComparesToNullptr.testref |    1 +
 ...interOnlyComparesToNullptrConstant.testref |    1 +
 .../rules/A5-2-4/ReinterpretCastUsed.qlref    |    1 -
 .../rules/A5-2-4/ReinterpretCastUsed.testref  |    1 +
 .../rules/A6-6-1/GotoStatementUsed.expected   |    1 -
 .../test/rules/A6-6-1/GotoStatementUsed.qlref |    1 -
 .../rules/A6-6-1/GotoStatementUsed.testref    |    1 +
 cpp/autosar/test/rules/A6-6-1/test.cpp        |    9 -
 ...derlyingBaseTypeNotExplicitlyDefined.qlref |    1 -
 ...rlyingBaseTypeNotExplicitlyDefined.testref |    1 +
 ...ionNotConsideredForUnqualifiedLookup.qlref |    1 -
 ...nNotConsideredForUnqualifiedLookup.testref |    1 +
 ...nheritedNonOverridableMemberFunction.qlref |    1 -
 ...eritedNonOverridableMemberFunction.testref |    1 +
 ...enInheritedOverridableMemberFunction.qlref |    1 -
 ...InheritedOverridableMemberFunction.testref |    1 +
 .../rules/A7-4-1/AsmDeclarationUsed.qlref     |    1 -
 .../rules/A7-4-1/AsmDeclarationUsed.testref   |    1 +
 .../rules/A7-5-2/RecursiveFunctions.qlref     |    1 -
 .../rules/A7-5-2/RecursiveFunctions.testref   |    1 +
 ...singUseOfInitializerListConstructors.qlref |    1 -
 ...ngUseOfInitializerListConstructors.testref |    1 +
 ...eBaseClassBothVirtualAndNonVirtual.testref |    1 +
 ...sBothVirtualAndNonVirtualInHierarchy.qlref |    1 -
 ...othVirtualAndNonVirtualInHierarchy.testref |    1 +
 ...fThisUsedFromConstructorOrDestructor.qlref |    1 -
 ...hisUsedFromConstructorOrDestructor.testref |    1 +
 ...meNotReferredUsingAQualifiedIdOrThis.qlref |    1 -
 ...NotReferredUsingAQualifiedIdOrThis.testref |    1 +
 ...ReferredUsingAQualifiedIdOrThisAudit.qlref |    1 -
 ...ferredUsingAQualifiedIdOrThisAudit.testref |    1 +
 .../M15-1-3/EmptyThrowOutsideCatch.qlref      |    1 -
 .../M15-1-3/EmptyThrowOutsideCatch.testref    |    1 +
 .../rules/M18-2-1/MacroOffsetofUsed.qlref     |    1 -
 .../rules/M18-2-1/MacroOffsetofUsed.testref   |    1 +
 .../rules/M18-7-1/CsignalFunctionsUsed.qlref  |    1 -
 .../M18-7-1/CsignalFunctionsUsed.testref      |    1 +
 .../test/rules/M18-7-1/CsignalTypesUsed.qlref |    1 -
 .../rules/M18-7-1/CsignalTypesUsed.testref    |    1 +
 .../M2-13-2/UseOfNonZeroOctalEscape.expected  |    6 -
 .../M2-13-2/UseOfNonZeroOctalEscape.qlref     |    1 -
 .../M2-13-2/UseOfNonZeroOctalLiteral.qlref    |    1 -
 .../M2-13-2/UseOfNonZeroOctalLiteral.testref  |    1 +
 .../test/rules/M2-13-3/MissingUSuffix.qlref   |    1 -
 .../test/rules/M2-13-3/MissingUSuffix.testref |    1 +
 .../SlashStarUsedWithinACStyleComment.qlref   |    1 -
 .../SlashStarUsedWithinACStyleComment.testref |    1 +
 .../rules/M27-0-1/CstdioFunctionsUsed.qlref   |    1 -
 .../rules/M27-0-1/CstdioFunctionsUsed.testref |    1 +
 .../test/rules/M27-0-1/CstdioMacrosUsed.qlref |    1 -
 .../rules/M27-0-1/CstdioMacrosUsed.testref    |    1 +
 .../test/rules/M27-0-1/CstdioTypesUsed.qlref  |    1 -
 .../rules/M27-0-1/CstdioTypesUsed.testref     |    1 +
 ...dAsFunctionArgumentDecayToAPointer.testref |    1 +
 ...sedAsFunctionArgumentDecayToAPointer.qlref |    1 -
 .../CastNotConvertPointerToFunction.expected  |    2 -
 .../CastNotConvertPointerToFunction.qlref     |    1 -
 .../CastNotConvertPointerToFunction.testref   |    1 +
 ...ressionWhoseUnderlyingTypeIsUnsigned.qlref |    1 -
 ...ratorAppliedToAnUnsignedExpression.testref |    1 +
 .../M5-3-3/UnaryOperatorOverloaded.qlref      |    1 -
 .../M5-3-3/UnaryOperatorOverloaded.testref    |    1 +
 .../rules/M6-3-1/LoopCompoundCondition.qlref  |    1 -
 .../M6-3-1/LoopCompoundCondition.testref      |    1 +
 .../M6-3-1/SwitchCompoundCondition.qlref      |    1 -
 .../M6-3-1/SwitchCompoundCondition.testref    |    1 +
 ...GlobalNamespaceMembershipViolation.testref |    1 +
 ...sedForAFunctionOtherThanGlobalMain.testref |    1 +
 ...nctionOtherThanTheGlobalFunctionMain.qlref |    1 -
 ...tionOtherThanTheGlobalFunctionMain.testref |    1 +
 .../FunctionReturnAutomaticVarCondition.qlref |    1 -
 ...unctionReturnAutomaticVarCondition.testref |    1 +
 .../MultipleGlobalOrMemberDeclarators.qlref   |    1 -
 .../MultipleGlobalOrMemberDeclarators.testref |    1 +
 .../M8-0-1/MultipleLocalDeclarators.qlref     |    1 -
 .../M8-0-1/MultipleLocalDeclarators.testref   |    1 +
 ...nParametersUseSameDefaultArguments.testref |    1 +
 ...ametersUseTheSameDefaultArguments.expected |    2 -
 ...ParametersUseTheSameDefaultArguments.qlref |    1 -
 ...rametersUseTheSameDefaultArguments.testref |    1 +
 ...eShallHaveALengthOfMoreThanOneBit.expected |    1 -
 ...TypeShallHaveALengthOfMoreThanOneBit.qlref |    1 -
 ...peShallHaveALengthOfMoreThanOneBit.testref |    1 +
 cpp/autosar/test/rules/M9-6-4/test.cpp        |    8 -
 .../common/src/codingstandards/cpp/CExpr.qll  |    0
 .../src/codingstandards/cpp/COrdering.qll     |    2 +-
 .../cpp}/IrreplaceableFunctionLikeMacro.qll   |    0
 .../src/codingstandards/cpp/Literals.qll      |    2 +
 .../cpp}/NameInDependentBase.qll              |    1 -
 .../codingstandards/cpp}/OperatorDelete.qll   |    1 -
 .../src/codingstandards/cpp}/SideEffects.qll  |    0
 .../cpp/exclusions/cpp/ImportMisra23.qll      | 1056 +++++++++++++-
 .../cpp/exclusions/cpp/Inheritance.qll        |   16 +-
 .../cpp/exclusions/cpp/Naming.qll             |   16 +-
 .../cpp/exclusions/cpp/Operators.qll          |   16 +-
 .../cpp/exclusions/cpp/Pointers.qll           |   32 +-
 .../cpp/exclusions/cpp/VirtualFunctions.qll   |   16 +-
 .../AddressOfOperatorOverloaded_shared.qll    |   16 +
 ...MacroArgumentSubjectToExpansion_shared.qll |   32 +
 ...FunctionArgumentDecayToAPointer_shared.qll |   47 +
 .../AsmDeclarationUsed_shared.qll             |   15 +
 .../AtofAtoiAtolAndAtollUsed_shared.qll       |   23 +
 .../BackslashCharacterMisuse_shared.qll       |   21 +
 ...FieldShallHaveAnAppropriateType_shared.qll |   40 +
 ...atorAppliedToUnsignedExpression_shared.qll |   25 +
 ...ointerToFunctionAndAnyOtherType_shared.qll |   21 +
 ...equenceUsedWithinACStyleComment_shared.qll |   17 +
 ...nmentsShallHandleSelfAssignment_shared.qll |   53 +
 .../CsignalFunctionsUsed_shared.qll           |   20 +
 .../CsignalTypesUsed_shared.qll               |   20 +
 .../CstdioFunctionsUsed_shared.qll            |   36 +
 .../CstdioMacrosUsed_shared.qll               |   20 +
 .../CstdioTypesUsed_shared.qll                |   25 +
 ...tConsideredForUnqualifiedLookup_shared.qll |   67 +
 ...ptyThrowOnlyWithinACatchHandler_shared.qll |   17 +
 ...NotDefinedWithAnExplicitUnderlyingType.qll |   15 +
 ...nedWithAnExplicitUnderlyingType_shared.qll |   19 +
 .../ExceptionObjectHavePointerType_shared.qll |   18 +
 ...rencesAndForwardNotUsedTogether_shared.qll |   29 +
 .../FunctionLikeMacrosDefined_shared.qll      |   30 +
 ...elvesEitherDirectlyOrIndirectly_shared.qll |   35 +
 ...nTemplatesExplicitlySpecialized_shared.qll |   20 +
 .../GlobalNamespaceDeclarations_shared.qll    |   21 +
 ...alSizedOperatorDeleteNotDefined_shared.qll |   22 +
 ...UnsizedOperatorDeleteNotDefined_shared.qll |   22 +
 ...ferenceALabelInSurroundingBlock_shared.qll |   59 +
 .../GotoStatementShouldNotBeUsed_shared.qll   |   17 +
 ...tedNonOverridableMemberFunction_shared.qll |   56 +
 ...eritedOverridableMemberFunction_shared.qll |   54 +
 ...InitializeAllVirtualBaseClasses_shared.qll |   44 +
 ...ConstructorIsTheOnlyConstructor_shared.qll |   65 +
 .../LineSplicingUsedInComments_shared.qll     |   17 +
 .../LoopCompoundCondition_shared.qll          |   17 +
 ...LowercaseLStartsInLiteralSuffix_shared.qll |   18 +
 .../MacroOffsetofUsed_shared.qll              |   15 +
 .../MacroParameterFollowingHash_shared.qll    |   22 +
 ...ationsNotSequencedAppropriately_shared.qll |  251 ++++
 ...ltipleGlobalOrMemberDeclarators_shared.qll |   65 +
 .../MultipleLocalDeclarators_shared.qll       |   19 +
 ...dBitFieldsWithSignedIntegerType_shared.qll |   19 +
 ...ReferredUsingAQualifiedIdOrThis_shared.qll |   35 +
 ...redUsingAQualifiedIdOrThisAudit_shared.qll |   36 +
 ...onShouldNotPropagateToTheCaller_shared.qll |   38 +
 .../NonGlobalFunctionMain_shared.qll          |   18 +
 .../NonTerminatedEscapeSequences_shared.qll   |   42 +
 .../NonUniqueEnumerationConstant_shared.qll   |   36 +
 ...nlyFormOfTheNullPointerConstant_shared.qll |   26 +
 ...UsedFromConstructorOrDestructor_shared.qll |   91 ++
 ...pecifyDifferentDefaultArguments_shared.qll |   37 +
 ...ualPointerOnlyComparesToNullptr_shared.qll |   32 +
 .../ReinterpretCastUsed_shared.qll            |   15 +
 ...signmentOperatorShouldNotBeUsed_shared.qll |   17 +
 ...PointerToAutomaticLocalVariable_shared.qll |   36 +
 .../SwitchCompoundCondition_shared.qll        |   44 +
 ...iteralsNotAppropriatelySuffixed_shared.qll |   30 +
 ...rationWithConstantOperandsWraps_shared.qll |   32 +
 .../UseOfNonZeroOctalLiteral_shared.qll       |   18 +
 ...rShouldNotBeSpecializedWithBool_shared.qll |   33 +
 ...ndNonVirtualClassInTheHierarchy_shared.qll |   38 +
 .../test/includes/standard-library/assert.h   |    1 +
 .../test/includes/standard-library/ctime      |   40 +-
 .../test/includes/standard-library/locale.h   |   36 +-
 .../test/includes/standard-library/stddef.h   |    6 +
 .../test/includes/standard-library/stdlib.h   |    2 +
 .../test/includes/standard-library/string.h   |    2 +
 .../test/includes/standard-library/time.h     |   32 +
 ...dressOfOperatorOverloaded_shared.expected} |    0
 .../AddressOfOperatorOverloaded_shared.ql     |    4 +
 .../test.cpp                                  |    0
 ...ArgumentSubjectToExpansion_shared.expected |    2 +
 ...eMacroArgumentSubjectToExpansion_shared.ql |    5 +
 .../test.cpp                                  |    3 +-
 ...onArgumentDecayToAPointer_shared.expected} |    0
 ...sFunctionArgumentDecayToAPointer_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../AsmDeclarationUsed_shared.expected}       |    0
 .../AsmDeclarationUsed_shared.ql              |    4 +
 .../rules/asmdeclarationused_shared}/test.cpp |    0
 .../AtofAtoiAtolAndAtollUsed_shared.expected  |    4 +
 .../AtofAtoiAtolAndAtollUsed_shared.ql        |    4 +
 .../atofatoiatolandatollused_shared/test.cpp  |    4 +-
 .../BackslashCharacterMisuse_shared.expected} |    0
 .../BackslashCharacterMisuse_shared.ql        |    4 +
 .../backslashcharactermisuse_shared}/test.cpp |    0
 ...ShallHaveAnAppropriateType_shared.expected |    4 +
 ...tFieldShallHaveAnAppropriateType_shared.ql |    4 +
 .../test.cpp                                  |   18 +
 ...pliedToUnsignedExpression_shared.expected} |    0
 ...ratorAppliedToUnsignedExpression_shared.ql |    6 +
 .../test.cpp                                  |    0
 ...rToFunctionAndAnyOtherType_shared.expected |    2 +
 ...PointerToFunctionAndAnyOtherType_shared.ql |    6 +
 .../test.cpp                                  |    1 +
 ...eUsedWithinACStyleComment_shared.expected} |    0
 ...SequenceUsedWithinACStyleComment_shared.ql |    5 +
 .../test.cpp                                  |    0
 .../ConstLikeReturnValue.expected             |   20 +
 .../ConstLikeReturnValue.ql                   |    4 +
 .../test/rules/constlikereturnvalue/test.cpp  |   96 ++
 ...ShallHandleSelfAssignment_shared.expected} |    0
 ...gnmentsShallHandleSelfAssignment_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../CsignalFunctionsUsed_shared.expected}     |    0
 .../CsignalFunctionsUsed_shared.ql            |    4 +
 .../csignalfunctionsused_shared}/test.cpp     |    0
 .../CsignalTypesUsed_shared.expected}         |    0
 .../CsignalTypesUsed_shared.ql                |    4 +
 .../rules/csignaltypesused_shared/test.cpp    |   13 +
 .../CstdioFunctionsUsed_shared.expected}      |    0
 .../CstdioFunctionsUsed_shared.ql             |    4 +
 .../cstdiofunctionsused_shared}/test.cpp      |    0
 .../CstdioMacrosUsed_shared.expected}         |    0
 .../CstdioMacrosUsed_shared.ql                |    4 +
 .../rules/cstdiomacrosused_shared/test.cpp    |   61 +
 .../CstdioTypesUsed_shared.expected}          |    0
 .../CstdioTypesUsed_shared.ql                 |    4 +
 .../rules/cstdiotypesused_shared/test.cpp     |   61 +
 ...deredForUnqualifiedLookup_shared.expected} |    0
 ...otConsideredForUnqualifiedLookup_shared.ql |    5 +
 .../test.cpp                                  |    0
 ...owOnlyWithinACatchHandler_shared.expected} |    0
 ...mptyThrowOnlyWithinACatchHandler_shared.ql |    4 +
 .../test.cpp                                  |    0
 ...hAnExplicitUnderlyingType_shared.expected} |    0
 ...inedWithAnExplicitUnderlyingType_shared.ql |    6 +
 .../test.cpp                                  |    0
 ...tionObjectHavePointerType_shared.expected} |    0
 .../ExceptionObjectHavePointerType_shared.ql  |    4 +
 .../test.cpp                                  |    0
 ...AndForwardNotUsedTogether_shared.expected} |    0
 ...erencesAndForwardNotUsedTogether_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../FunctionLikeMacrosDefined_shared.expected |    2 +
 .../FunctionLikeMacrosDefined_shared.ql       |    4 +
 .../functionlikemacrosdefined_shared/test.cpp |   42 +
 ...itherDirectlyOrIndirectly_shared.expected} |    0
 ...selvesEitherDirectlyOrIndirectly_shared.ql |    6 +
 .../test.cpp                                  |    0
 ...atesExplicitlySpecialized_shared.expected} |    0
 ...onTemplatesExplicitlySpecialized_shared.ql |    4 +
 .../test.cpp                                  |    0
 ...obalNamespaceDeclarations_shared.expected} |    0
 .../GlobalNamespaceDeclarations_shared.ql     |    4 +
 .../test.cpp                                  |    0
 ...dOperatorDeleteNotDefined_shared.expected} |    0
 ...balSizedOperatorDeleteNotDefined_shared.ql |    4 +
 .../test.cpp                                  |    0
 ...edOperatorDeleteNotDefined_shared.expected |    0
 ...lUnsizedOperatorDeleteNotDefined_shared.ql |    4 +
 .../test.cpp                                  |    3 +
 ...ceALabelInSurroundingBlock_shared.expected |    2 +
 ...eferenceALabelInSurroundingBlock_shared.ql |    4 +
 .../test.cpp                                  |   87 ++
 .../GotoStatementCondition.expected           |    8 +-
 .../rules/gotostatementcondition/test.cpp     |    2 +
 ...toStatementShouldNotBeUsed_shared.expected |    1 +
 .../GotoStatementShouldNotBeUsed_shared.ql    |    4 +
 .../test.cpp                                  |   11 +
 ...OverridableMemberFunction_shared.expected} |    0
 ...itedNonOverridableMemberFunction_shared.ql |    5 +
 .../test.cpp                                  |   94 ++
 ...OverridableMemberFunction_shared.expected} |    0
 ...heritedOverridableMemberFunction_shared.ql |    5 +
 .../test.cpp                                  |   94 ++
 ...lizeAllVirtualBaseClasses_shared.expected} |    0
 .../InitializeAllVirtualBaseClasses_shared.ql |    4 +
 .../test.cpp                                  |    0
 ...uctorIsTheOnlyConstructor_shared.expected} |    0
 ...tConstructorIsTheOnlyConstructor_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../InvalidatedEnvStringPointers.expected     |    6 +
 .../InvalidatedEnvStringPointers.ql           |    4 +
 .../invalidatedenvstringpointers/test.cpp     |  209 +++
 .../InvalidatedEnvStringPointersWarn.expected |    2 +
 .../InvalidatedEnvStringPointersWarn.ql       |    4 +
 .../invalidatedenvstringpointerswarn/test.cpp |   21 +
 ...ineSplicingUsedInComments_shared.expected} |    0
 .../LineSplicingUsedInComments_shared.ql      |    4 +
 .../test.cpp                                  |    0
 .../LoopCompoundCondition_shared.expected}    |    0
 .../LoopCompoundCondition_shared.ql           |    4 +
 .../loopcompoundcondition_shared}/test.cpp    |    0
 ...caseLStartsInLiteralSuffix_shared.expected |   16 +
 .../LowercaseLStartsInLiteralSuffix_shared.ql |    4 +
 .../README.md                                 |    0
 .../test.cpp                                  |    4 +-
 .../MacroOffsetofUsed.expected                |    0
 .../MacroOffsetofUsed.expected.gcc            |    0
 .../MacroOffsetofUsed.expected.qcc            |    0
 .../MacroOffsetofUsed_shared.expected         |    1 +
 .../MacroOffsetofUsed_shared.ql               |    4 +
 .../rules/macrooffsetofused_shared}/test.cpp  |    0
 ...acroParameterFollowingHash_shared.expected |    1 +
 .../MacroParameterFollowingHash_shared.ql     |    4 +
 .../test.cpp                                  |    2 +
 ...sNotSequencedAppropriately_shared.expected |    6 +
 ...rationsNotSequencedAppropriately_shared.ql |    5 +
 .../test.cpp                                  |    4 +-
 ...GlobalOrMemberDeclarators_shared.expected} |    0
 ...ultipleGlobalOrMemberDeclarators_shared.ql |    4 +
 .../test.cpp                                  |    0
 .../MultipleLocalDeclarators_shared.expected} |    0
 .../MultipleLocalDeclarators_shared.ql        |    4 +
 .../multiplelocaldeclarators_shared/test.cpp  |   24 +
 ...ieldsWithSignedIntegerType_shared.expected |    5 +
 ...edBitFieldsWithSignedIntegerType_shared.ql |    4 +
 .../test.cpp                                  |   11 +
 ...edUsingAQualifiedIdOrThis_shared.expected} |    0
 ...tReferredUsingAQualifiedIdOrThis_shared.ql |    4 +
 .../test.cpp                                  |    0
 ...ngAQualifiedIdOrThisAudit_shared.expected} |    0
 ...rredUsingAQualifiedIdOrThisAudit_shared.ql |    5 +
 .../test.cpp                                  |   87 ++
 ...ldNotPropagateToTheCaller_shared.expected} |   12 +-
 ...ionShouldNotPropagateToTheCaller_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../NonGlobalFunctionMain_shared.expected}    |    0
 .../NonGlobalFunctionMain_shared.ql           |    4 +
 .../nonglobalfunctionmain_shared}/test.cpp    |    0
 ...nTerminatedEscapeSequences_shared.expected |   21 +
 .../NonTerminatedEscapeSequences_shared.ql    |    4 +
 .../test.cpp                                  |   28 +
 ...nUniqueEnumerationConstant_shared.expected |    1 +
 .../NonUniqueEnumerationConstant_shared.ql    |    4 +
 .../test.cpp                                  |    6 +
 ...mOfTheNullPointerConstant_shared.expected} |    0
 ...NullPointerConstant_shared.expected.clang} |    0
 ...heNullPointerConstant_shared.expected.gcc} |    0
 ...heNullPointerConstant_shared.expected.qcc} |    0
 ...OnlyFormOfTheNullPointerConstant_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../test.cpp.clang                            |    0
 .../test.cpp.gcc                              |    0
 .../test.cpp.qcc                              |    0
 ...omConstructorOrDestructor_shared.expected} |    0
 ...eUsedFromConstructorOrDestructor_shared.ql |    6 +
 .../test.cpp                                  |    0
 ...yDifferentDefaultArguments_shared.expected |    2 +
 ...SpecifyDifferentDefaultArguments_shared.ql |    6 +
 .../test.cpp                                  |    0
 ...nterOnlyComparesToNullptr_shared.expected} |    4 +-
 ...tualPointerOnlyComparesToNullptr_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../ReinterpretCastUsed_shared.expected}      |    0
 .../ReinterpretCastUsed_shared.ql             |    4 +
 .../reinterpretcastused_shared}/test.cpp      |    0
 ...entOperatorShouldNotBeUsed_shared.expected |    3 +
 ...ssignmentOperatorShouldNotBeUsed_shared.ql |    5 +
 .../test.cpp                                  |    2 +
 ...rToAutomaticLocalVariable_shared.expected} |    0
 ...rPointerToAutomaticLocalVariable_shared.ql |    6 +
 .../test.cpp                                  |    0
 .../SwitchCompoundCondition_shared.expected}  |    0
 .../SwitchCompoundCondition_shared.ql         |    4 +
 .../switchcompoundcondition_shared/test.cpp   |   56 +
 ...sNotAppropriatelySuffixed_shared.expected} |    0
 ...LiteralsNotAppropriatelySuffixed_shared.ql |    6 +
 .../test.cpp                                  |    0
 ...nWithConstantOperandsWraps_shared.expected |    4 +
 ...erationWithConstantOperandsWraps_shared.ql |    5 +
 .../test.cpp                                  |    3 +
 .../UseOfNonZeroOctalLiteral_shared.expected} |    0
 .../UseOfNonZeroOctalLiteral_shared.ql        |    4 +
 .../useofnonzerooctalliteral_shared}/test.cpp |    0
 ...dNotBeSpecializedWithBool_shared.expected} |    0
 ...BeSpecializedWithBool_shared.expected.qcc} |    0
 ...orShouldNotBeSpecializedWithBool_shared.ql |    4 +
 .../test.cpp                                  |    0
 ...irtualClassInTheHierarchy_shared.expected} |    0
 ...AndNonVirtualClassInTheHierarchy_shared.ql |    4 +
 .../test.cpp                                  |    0
 ...oveAssignmentsShallHandleSelfAssignment.ql |   23 +
 .../UseSingleGlobalOrMemberDeclarators.ql     |   24 +
 .../RULE-10-0-1/UseSingleLocalDeclarators.ql  |   24 +
 ...nNotDefinedWithAnExplicitUnderlyingType.ql |   22 +
 .../AsmDeclarationShallNotBeUsed.ql           |   22 +
 .../NonUniqueEnumerationConstant.ql           |   23 +
 .../BitFieldShallHaveAnAppropriateType.ql     |   22 +
 ...IntegerNamedBitFieldHaveALengthOfOneBit.ql |   22 +
 ...VirtualAndNonVirtualClassInTheHierarchy.ql |   23 +
 ...ngShallSpecifyDifferentDefaultArguments.ql |   23 +
 ...allyVirtualPointerOnlyComparesToNullptr.ql |   23 +
 ...amicTypeUsedFromConstructorOrDestructor.ql |   23 +
 .../InitializeAllVirtualBaseClasses.ql        |   23 +
 ...izerListConstructorIsTheOnlyConstructor.ql |   23 +
 .../AddressOfOperatorOverloaded.ql            |   22 +
 .../FunctionTemplatesExplicitlySpecialized.ql |   22 +
 .../ExceptionObjectHavePointerType.ql         |   22 +
 .../EmptyThrowOnlyWithinACatchHandler.ql      |   22 +
 ...ptFunctionShouldNotPropagateToTheCaller.ql |   23 +
 .../RULE-19-0-2/FunctionLikeMacrosDefined.ql  |   22 +
 .../MacroParameterFollowingHash.ql            |   23 +
 ...MixedUseMacroArgumentSubjectToExpansion.ql |   23 +
 .../RULE-21-10-3/CsignalFacilitiesUsed.ql     |   24 +
 .../CsignalTypesShallNotBeUsed.ql             |   24 +
 .../RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql   |   22 +
 .../MacroOffsetofShallNotBeUsed.ql            |   22 +
 ...GlobalSizedOperatorDeleteShallBeDefined.ql |   24 +
 ...obalUnsizedOperatorDeleteShallBeDefined.ql |   24 +
 .../VectorShouldNotBeSpecializedWithBool.ql   |   22 +
 ...dingReferencesAndForwardNotUsedTogether.ql |   22 +
 .../CstdioFunctionsShallNotBeUsed.ql          |   24 +
 .../RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql |   24 +
 .../RULE-30-0-1/CstdioTypesShallNotBeUsed.ql  |   24 +
 ...moryOperationsNotSequencedAppropriately.ql |   22 +
 .../RULE-5-13-1/BackslashCharacterMisuse.ql   |   23 +
 .../NonTerminatedEscapeSequences.ql           |   23 +
 .../rules/RULE-5-13-3/OctalConstantsUsed.ql   |   22 +
 ...IntegerLiteralsNotAppropriatelySuffixed.ql |   22 +
 .../LowercaseLStartsInLiteralSuffix.ql        |   23 +
 ...aracterSequenceUsedWithinACStyleComment.ql |   22 +
 .../RULE-5-7-3/LineSplicingUsedInComments.ql  |   22 +
 .../RULE-6-0-3/GlobalNamespaceDeclarations.ql |   23 +
 .../rules/RULE-6-0-4/NonGlobalFunctionMain.ql |   23 +
 ...onShallBeConsideredForUnqualifiedLookup.ql |   26 +
 .../InheritedNonOverridableMemberFunction.ql  |   24 +
 .../InheritedOverridableMemberFunction.ql     |   24 +
 ...eShallBeReferredUsingAQualifiedIdOrThis.ql |   25 +
 ...lBeReferredUsingAQualifiedIdOrThisAudit.ql |   25 +
 ...erenceOrPointerToAutomaticLocalVariable.ql |   23 +
 ...rNotTheOnlyFormOfTheNullPointerConstant.ql |   22 +
 ...PassedAsFunctionArgumentDecayToAPointer.ql |   22 +
 ...ltOfAnAssignmentOperatorShouldNotBeUsed.ql |   22 +
 .../CommaOperatorShouldNotBeUsed.ql           |   22 +
 ...allThemselvesEitherDirectlyOrIndirectly.ql |   22 +
 ...etweenAPointerToFunctionAndAnyOtherType.ql |   22 +
 .../ReinterpretCastShallNotBeUsed.ql          |   22 +
 ...ignedOperationWithConstantOperandsWraps.ql |   22 +
 ...naryOperatorAppliedToUnsignedExpression.ql |   23 +
 .../RULE-9-3-1/LoopBodyCompoundCondition.ql   |   25 +
 .../RULE-9-3-1/SwitchBodyCompoundCondition.ql |   25 +
 .../GotoStatementShouldNotBeUsed.ql           |   22 +
 .../GotoReferenceALabelInSurroundingBlock.ql  |   22 +
 ...signmentsShallHandleSelfAssignment.testref |    1 +
 .../MultipleGlobalOrMemberDeclarators.testref |    1 +
 .../MultipleLocalDeclarators.testref          |    1 +
 ...UseSingleGlobalOrMemberDeclarators.testref |    1 +
 .../UseSingleLocalDeclarators.testref         |    1 +
 ...efinedWithAnExplicitUnderlyingType.testref |    1 +
 .../AsmDeclarationShallNotBeUsed.testref      |    1 +
 .../NonUniqueEnumerationConstant.testref      |    1 +
 ...BitFieldShallHaveAnAppropriateType.testref |    1 +
 ...erNamedBitFieldHaveALengthOfOneBit.testref |    1 +
 ...alAndNonVirtualClassInTheHierarchy.testref |    1 +
 ...llSpecifyDifferentDefaultArguments.testref |    1 +
 ...irtualPointerOnlyComparesToNullptr.testref |    1 +
 ...ypeUsedFromConstructorOrDestructor.testref |    1 +
 .../InitializeAllVirtualBaseClasses.testref   |    1 +
 ...istConstructorIsTheOnlyConstructor.testref |    1 +
 .../AddressOfOperatorOverloaded.testref       |    1 +
 ...tionTemplatesExplicitlySpecialized.testref |    1 +
 .../ExceptionObjectHavePointerType.testref    |    1 +
 .../EmptyThrowOnlyWithinACatchHandler.testref |    1 +
 ...ctionShouldNotPropagateToTheCaller.testref |    1 +
 .../FunctionLikeMacrosDefined.testref         |    1 +
 .../MacroParameterFollowingHash.testref       |    1 +
 ...UseMacroArgumentSubjectToExpansion.testref |    1 +
 .../CsignalFacilitiesUsed.testref             |    1 +
 .../CsignalTypesShallNotBeUsed.testref        |    1 +
 .../RULE-21-10-3/CsignalTypesUsed.testref     |    1 +
 .../AtofAtoiAtolAndAtollUsed.testref          |    1 +
 .../MacroOffsetofShallNotBeUsed.testref       |    1 +
 ...lSizedOperatorDeleteShallBeDefined.testref |    1 +
 ...nsizedOperatorDeleteShallBeDefined.testref |    1 +
 ...ctorShouldNotBeSpecializedWithBool.testref |    1 +
 ...eferencesAndForwardNotUsedTogether.testref |    1 +
 .../CstdioFunctionsShallNotBeUsed.testref     |    1 +
 .../CstdioMacrosShallNotBeUsed.testref        |    1 +
 .../CstdioTypesShallNotBeUsed.testref         |    1 +
 ...perationsNotSequencedAppropriately.testref |    1 +
 .../BackslashCharacterMisuse.testref          |    1 +
 .../NonTerminatedEscapeSequences.testref      |    1 +
 .../RULE-5-13-3/OctalConstantsUsed.testref    |    1 +
 ...erLiteralsNotAppropriatelySuffixed.testref |    1 +
 .../LowercaseLStartsInLiteralSuffix.testref   |    1 +
 ...erSequenceUsedWithinACStyleComment.testref |    1 +
 .../LineSplicingUsedInComments.testref        |    1 +
 .../GlobalNamespaceDeclarations.testref       |    1 +
 .../RULE-6-0-4/NonGlobalFunctionMain.testref  |    1 +
 ...llBeConsideredForUnqualifiedLookup.testref |    1 +
 ...eritedNonOverridableMemberFunction.testref |    1 +
 ...InheritedOverridableMemberFunction.testref |    1 +
 ...lBeReferredUsingAQualifiedIdOrThis.testref |    1 +
 ...ferredUsingAQualifiedIdOrThisAudit.testref |    1 +
 ...eOrPointerToAutomaticLocalVariable.testref |    1 +
 ...heOnlyFormOfTheNullPointerConstant.testref |    1 +
 ...dAsFunctionArgumentDecayToAPointer.testref |    1 +
 ...nAssignmentOperatorShouldNotBeUsed.testref |    1 +
 .../CommaOperatorShouldNotBeUsed.testref      |    1 +
 ...emselvesEitherDirectlyOrIndirectly.testref |    1 +
 ...nAPointerToFunctionAndAnyOtherType.testref |    1 +
 .../ReinterpretCastShallNotBeUsed.testref     |    1 +
 ...OperationWithConstantOperandsWraps.testref |    1 +
 ...peratorAppliedToUnsignedExpression.testref |    1 +
 .../LoopBodyCompoundCondition.testref         |    1 +
 .../SwitchBodyCompoundCondition.testref       |    1 +
 .../GotoStatementShouldNotBeUsed.testref      |    1 +
 ...oReferenceALabelInSurroundingBlock.testref |    1 +
 rule_packages/c/Banned.json                   |    1 +
 rule_packages/c/BitfieldTypes.json            |    2 +
 rule_packages/c/Declarations7.json            |    1 +
 rule_packages/c/IntegerOverflow.json          |    1 +
 rule_packages/c/Preprocessor2.json            |   10 +-
 rule_packages/c/Preprocessor6.json            |    1 +
 rule_packages/c/SideEffects1.json             |    1 +
 rule_packages/c/SideEffects3.json             |    1 +
 rule_packages/c/Statements2.json              |    3 +-
 rule_packages/c/Statements3.json              |    2 +-
 rule_packages/c/Statements6.json              |    1 +
 rule_packages/c/Syntax.json                   |    6 +-
 rule_packages/cpp/BannedFunctions.json        |    1 +
 rule_packages/cpp/BannedLibraries.json        |    5 +
 rule_packages/cpp/BannedSyntax.json           |    3 +
 rule_packages/cpp/BannedTypes.json            |    1 +
 rule_packages/cpp/Comments.json               |    2 +
 rule_packages/cpp/Conditionals.json           |    2 +
 rule_packages/cpp/Declarations.json           |    3 +
 rule_packages/cpp/Exceptions1.json            |    3 +
 rule_packages/cpp/Functions.json              |    4 +-
 rule_packages/cpp/ImportMisra23.json          | 1249 +++++++++++++++++
 rule_packages/cpp/Inheritance.json            |    4 +-
 rule_packages/cpp/Initialization.json         |    4 +
 rule_packages/cpp/Literals.json               |    4 +
 rule_packages/cpp/MoveForward.json            |    1 +
 rule_packages/cpp/Naming.json                 |    5 +-
 rule_packages/cpp/OperatorInvariants.json     |    1 +
 rule_packages/cpp/Operators.json              |    4 +-
 rule_packages/cpp/Pointers.json               |    7 +-
 rule_packages/cpp/Representation.json         |    1 +
 rule_packages/cpp/Scope.json                  |    4 +
 rule_packages/cpp/Templates.json              |   29 +-
 rule_packages/cpp/VirtualFunctions.json       |    3 +-
 rules.csv                                     |  108 +-
 730 files changed, 8787 insertions(+), 1754 deletions(-)
 delete mode 100644 c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.expected
 delete mode 100644 c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.qlref
 create mode 100644 c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref
 delete mode 100644 c/common/src/codingstandards/c/Literals.qll
 rename c/{misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.expected => common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected} (58%)
 create mode 100644 c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
 create mode 100644 c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.c
 create mode 100644 c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
 create mode 100644 c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
 create mode 100644 c/common/test/rules/atofatoiatolandatollused_shared/test.c
 create mode 100644 c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
 create mode 100644 c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
 create mode 100644 c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.c
 create mode 100644 c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
 create mode 100644 c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
 create mode 100644 c/common/test/rules/functionlikemacrosdefined_shared/test.c
 create mode 100644 c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
 create mode 100644 c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
 rename c/{misra/test/rules/RULE-15-3 => common/test/rules/gotoreferencealabelinsurroundingblock_shared}/test.c (88%)
 create mode 100644 c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
 create mode 100644 c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
 create mode 100644 c/common/test/rules/gotostatementshouldnotbeused_shared/test.c
 create mode 100644 c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
 create mode 100644 c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
 create mode 100644 c/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.c
 create mode 100644 c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
 create mode 100644 c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
 create mode 100644 c/common/test/rules/macroparameterfollowinghash_shared/test.c
 create mode 100644 c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
 create mode 100644 c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
 create mode 100644 c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.c
 create mode 100644 c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
 create mode 100644 c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
 create mode 100644 c/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.c
 create mode 100644 c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
 create mode 100644 c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
 create mode 100644 c/common/test/rules/nonterminatedescapesequences_shared/test.c
 create mode 100644 c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
 create mode 100644 c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
 rename c/{misra/test/rules/RULE-8-12 => common/test/rules/nonuniqueenumerationconstant_shared}/test.c (62%)
 create mode 100644 c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
 create mode 100644 c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
 create mode 100644 c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.c
 create mode 100644 c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
 create mode 100644 c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
 create mode 100644 c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.c
 create mode 100644 c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref
 delete mode 100644 c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected
 delete mode 100644 c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref
 create mode 100644 c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
 delete mode 100644 c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected
 delete mode 100644 c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
 delete mode 100644 c/misra/test/rules/RULE-15-1/GotoStatementUsed.expected
 delete mode 100644 c/misra/test/rules/RULE-15-1/GotoStatementUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref
 delete mode 100644 c/misra/test/rules/RULE-15-1/test.c
 delete mode 100644 c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected
 delete mode 100644 c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.qlref
 create mode 100644 c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref
 delete mode 100644 c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.expected
 delete mode 100644 c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.qlref
 create mode 100644 c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref
 delete mode 100644 c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.qlref
 create mode 100644 c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref
 delete mode 100644 c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.expected
 delete mode 100644 c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref
 delete mode 100644 c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.expected
 delete mode 100644 c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.qlref
 create mode 100644 c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref
 create mode 100644 c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref
 delete mode 100644 c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.expected
 delete mode 100644 c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.qlref
 create mode 100644 c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref
 delete mode 100644 c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.expected
 delete mode 100644 c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.qlref
 create mode 100644 c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref
 delete mode 100644 c/misra/test/rules/RULE-7-3/cpp/LowercaseCharacterLUsedInLiteralSuffix.qlref
 delete mode 100644 c/misra/test/rules/RULE-7-3/cpp/options
 delete mode 100644 c/misra/test/rules/RULE-7-3/cpp/test.cpp
 delete mode 100644 c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.expected
 delete mode 100644 c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.qlref
 create mode 100644 c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref
 delete mode 100644 cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
 create mode 100644 cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
 create mode 100644 cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
 delete mode 100644 cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
 create mode 100644 cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
 delete mode 100644 cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
 rename cpp/autosar/src/rules/M5-3-2/{UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql => UnaryMinusOperatorAppliedToAnUnsignedExpression.ql} (51%)
 rename cpp/autosar/src/rules/M7-3-2/{IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql => IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql} (62%)
 create mode 100644 cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
 delete mode 100644 cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
 delete mode 100644 cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.qlref
 create mode 100644 cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref
 delete mode 100644 cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.qlref
 create mode 100644 cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref
 delete mode 100644 cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.qlref
 create mode 100644 cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref
 delete mode 100644 cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.qlref
 create mode 100644 cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref
 delete mode 100644 cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.qlref
 create mode 100644 cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref
 delete mode 100644 cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.qlref
 create mode 100644 cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref
 delete mode 100644 cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.qlref
 create mode 100644 cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref
 delete mode 100644 cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.expected
 delete mode 100644 cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.qlref
 create mode 100644 cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref
 delete mode 100644 cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.qlref
 create mode 100644 cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref
 delete mode 100644 cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.qlref
 create mode 100644 cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref
 delete mode 100644 cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.qlref
 create mode 100644 cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref
 delete mode 100644 cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.qlref
 create mode 100644 cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref
 delete mode 100644 cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.qlref
 create mode 100644 cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref
 create mode 100644 cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
 create mode 100644 cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
 delete mode 100644 cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.qlref
 create mode 100644 cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref
 delete mode 100644 cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.expected
 delete mode 100644 cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.qlref
 create mode 100644 cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref
 delete mode 100644 cpp/autosar/test/rules/A6-6-1/test.cpp
 delete mode 100644 cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.qlref
 create mode 100644 cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.testref
 delete mode 100644 cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.qlref
 create mode 100644 cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref
 delete mode 100644 cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.qlref
 create mode 100644 cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref
 delete mode 100644 cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.qlref
 create mode 100644 cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref
 delete mode 100644 cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.qlref
 create mode 100644 cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref
 delete mode 100644 cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.qlref
 create mode 100644 cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref
 delete mode 100644 cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.qlref
 create mode 100644 cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref
 create mode 100644 cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
 delete mode 100644 cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.qlref
 create mode 100644 cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref
 delete mode 100644 cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.qlref
 create mode 100644 cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref
 delete mode 100644 cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.qlref
 create mode 100644 cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref
 delete mode 100644 cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.qlref
 create mode 100644 cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref
 delete mode 100644 cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.qlref
 create mode 100644 cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref
 delete mode 100644 cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.qlref
 create mode 100644 cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref
 delete mode 100644 cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.qlref
 create mode 100644 cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref
 delete mode 100644 cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.qlref
 create mode 100644 cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref
 delete mode 100644 cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected
 delete mode 100644 cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref
 delete mode 100644 cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.qlref
 create mode 100644 cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref
 delete mode 100644 cpp/autosar/test/rules/M2-13-3/MissingUSuffix.qlref
 create mode 100644 cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref
 delete mode 100644 cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.qlref
 create mode 100644 cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref
 delete mode 100644 cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.qlref
 create mode 100644 cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref
 delete mode 100644 cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.qlref
 create mode 100644 cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref
 delete mode 100644 cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.qlref
 create mode 100644 cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref
 create mode 100644 cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
 delete mode 100644 cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.qlref
 delete mode 100644 cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.expected
 delete mode 100644 cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.qlref
 create mode 100644 cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref
 delete mode 100644 cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.qlref
 create mode 100644 cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
 delete mode 100644 cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.qlref
 create mode 100644 cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref
 delete mode 100644 cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.qlref
 create mode 100644 cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref
 delete mode 100644 cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.qlref
 create mode 100644 cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref
 create mode 100644 cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref
 create mode 100644 cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
 delete mode 100644 cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.qlref
 create mode 100644 cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref
 delete mode 100644 cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.qlref
 create mode 100644 cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref
 delete mode 100644 cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.qlref
 create mode 100644 cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref
 delete mode 100644 cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.qlref
 create mode 100644 cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref
 create mode 100644 cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
 delete mode 100644 cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.expected
 delete mode 100644 cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.qlref
 create mode 100644 cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref
 delete mode 100644 cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.expected
 delete mode 100644 cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.qlref
 create mode 100644 cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref
 delete mode 100644 cpp/autosar/test/rules/M9-6-4/test.cpp
 rename c/common/src/codingstandards/c/Expr.qll => cpp/common/src/codingstandards/cpp/CExpr.qll (100%)
 rename c/common/src/codingstandards/c/Ordering.qll => cpp/common/src/codingstandards/cpp/COrdering.qll (99%)
 rename {c/common/src/codingstandards/c => cpp/common/src/codingstandards/cpp}/IrreplaceableFunctionLikeMacro.qll (100%)
 rename cpp/{autosar/src/rules/M14-6-1 => common/src/codingstandards/cpp}/NameInDependentBase.qll (99%)
 rename cpp/{autosar/src/rules/A18-5-4 => common/src/codingstandards/cpp}/OperatorDelete.qll (96%)
 rename {c/common/src/codingstandards/c => cpp/common/src/codingstandards/cpp}/SideEffects.qll (100%)
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/csignaltypesused_shared/CsignalTypesUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll
 rename cpp/{autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.expected => common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
 rename cpp/{autosar/test/rules/M5-3-3 => common/test/rules/addressofoperatoroverloaded_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
 create mode 100644 cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
 rename c/misra/test/rules/RULE-20-12/test.c => cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.cpp (86%)
 rename cpp/{autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.expected => common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
 rename cpp/{autosar/test/rules/M5-2-12 => common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A7-4-1/AsmDeclarationUsed.expected => common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
 rename cpp/{autosar/test/rules/A7-4-1 => common/test/rules/asmdeclarationused_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
 create mode 100644 cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
 rename c/misra/test/rules/RULE-21-7/test.c => cpp/common/test/rules/atofatoiatolandatollused_shared/test.cpp (66%)
 rename cpp/{autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.expected => common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
 rename cpp/{autosar/test/rules/A2-13-1 => common/test/rules/backslashcharactermisuse_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
 create mode 100644 cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
 create mode 100644 cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.cpp
 rename cpp/{autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.expected => common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
 rename cpp/{autosar/test/rules/M5-3-2 => common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.expected
 create mode 100644 cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
 rename cpp/{autosar/test/rules/M5-2-6 => common/test/rules/castsbetweenapointertofunctionandanyothertype_shared}/test.cpp (99%)
 rename cpp/{autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.expected => common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
 rename cpp/{autosar/test/rules/M2-7-1 => common/test/rules/charactersequenceusedwithinacstylecomment_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
 create mode 100644 cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql
 create mode 100644 cpp/common/test/rules/constlikereturnvalue/test.cpp
 rename cpp/{autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.expected => common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
 rename cpp/{autosar/test/rules/A12-8-5 => common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M18-7-1/CsignalFunctionsUsed.expected => common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
 rename cpp/{autosar/test/rules/M18-7-1 => common/test/rules/csignalfunctionsused_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M18-7-1/CsignalTypesUsed.expected => common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
 create mode 100644 cpp/common/test/rules/csignaltypesused_shared/test.cpp
 rename cpp/{autosar/test/rules/M27-0-1/CstdioFunctionsUsed.expected => common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
 rename cpp/{autosar/test/rules/M27-0-1 => common/test/rules/cstdiofunctionsused_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M27-0-1/CstdioMacrosUsed.expected => common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
 create mode 100644 cpp/common/test/rules/cstdiomacrosused_shared/test.cpp
 rename cpp/{autosar/test/rules/M27-0-1/CstdioTypesUsed.expected => common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
 create mode 100644 cpp/common/test/rules/cstdiotypesused_shared/test.cpp
 rename cpp/{autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.expected => common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
 rename cpp/{autosar/test/rules/A7-3-1 => common/test/rules/definitionnotconsideredforunqualifiedlookup_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.expected => common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
 rename cpp/{autosar/test/rules/M15-1-3 => common/test/rules/emptythrowonlywithinacatchhandler_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.expected => common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql
 rename cpp/{autosar/test/rules/A7-2-2 => common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A15-1-2/PointerExceptionObject.expected => common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
 rename cpp/{autosar/test/rules/A15-1-2 => common/test/rules/exceptionobjecthavepointertype_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.expected => common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
 rename cpp/{autosar/test/rules/A18-9-2 => common/test/rules/forwardingreferencesandforwardnotusedtogether_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
 create mode 100644 cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
 create mode 100644 cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp
 rename cpp/{autosar/test/rules/A7-5-2/RecursiveFunctions.expected => common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
 rename cpp/{autosar/test/rules/A7-5-2 => common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.expected => common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
 rename cpp/{autosar/test/rules/A14-8-2 => common/test/rules/functiontemplatesexplicitlyspecialized_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.expected => common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
 rename cpp/{autosar/test/rules/M7-3-1 => common/test/rules/globalnamespacedeclarations_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.expected => common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
 rename cpp/{autosar/test/rules/A18-5-4 => common/test/rules/globalsizedoperatordeletenotdefined_shared}/test.cpp (100%)
 rename c/misra/test/rules/RULE-7-3/cpp/LowercaseCharacterLUsedInLiteralSuffix.expected => cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.expected (100%)
 create mode 100644 cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
 create mode 100644 cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/test.cpp
 create mode 100644 cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
 create mode 100644 cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
 create mode 100644 cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.cpp
 create mode 100644 cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
 create mode 100644 cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
 create mode 100644 cpp/common/test/rules/gotostatementshouldnotbeused_shared/test.cpp
 rename cpp/{autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.expected => common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
 create mode 100644 cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/test.cpp
 rename cpp/{autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.expected => common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
 create mode 100644 cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/test.cpp
 rename cpp/{autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.expected => common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
 rename cpp/{autosar/test/rules/A12-1-1 => common/test/rules/initializeallvirtualbaseclasses_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.expected => common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
 rename cpp/{autosar/test/rules/A8-5-4 => common/test/rules/initializerlistconstructoristheonlyconstructor_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected
 create mode 100644 cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql
 create mode 100644 cpp/common/test/rules/invalidatedenvstringpointers/test.cpp
 create mode 100644 cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected
 create mode 100644 cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql
 create mode 100644 cpp/common/test/rules/invalidatedenvstringpointerswarn/test.cpp
 rename cpp/{autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.expected => common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
 rename cpp/{autosar/test/rules/A2-7-1 => common/test/rules/linesplicingusedincomments_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M6-3-1/LoopCompoundCondition.expected => common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
 rename cpp/{autosar/test/rules/M6-3-1 => common/test/rules/loopcompoundcondition_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
 create mode 100644 cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
 rename {c/misra/test/rules/RULE-7-3/cpp => cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared}/README.md (100%)
 rename c/misra/test/rules/RULE-7-3/test.c => cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp (86%)
 rename cpp/{autosar/test/rules/M18-2-1 => common/test/rules/macrooffsetofused_shared}/MacroOffsetofUsed.expected (100%)
 rename cpp/{autosar/test/rules/M18-2-1 => common/test/rules/macrooffsetofused_shared}/MacroOffsetofUsed.expected.gcc (100%)
 rename cpp/{autosar/test/rules/M18-2-1 => common/test/rules/macrooffsetofused_shared}/MacroOffsetofUsed.expected.qcc (100%)
 create mode 100644 cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected
 create mode 100644 cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
 rename cpp/{autosar/test/rules/M18-2-1 => common/test/rules/macrooffsetofused_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
 create mode 100644 cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
 rename c/misra/test/rules/RULE-20-11/test.c => cpp/common/test/rules/macroparameterfollowinghash_shared/test.cpp (83%)
 create mode 100644 cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
 create mode 100644 cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
 rename c/misra/test/rules/RULE-13-2/test.c => cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.cpp (86%)
 rename cpp/{autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.expected => common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
 rename cpp/{autosar/test/rules/M8-0-1 => common/test/rules/multipleglobalormemberdeclarators_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M8-0-1/MultipleLocalDeclarators.expected => common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
 create mode 100644 cpp/common/test/rules/multiplelocaldeclarators_shared/test.cpp
 create mode 100644 cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
 create mode 100644 cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
 rename c/misra/test/rules/RULE-6-2/test.c => cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.cpp (70%)
 rename cpp/{autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.expected => common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
 rename cpp/{autosar/test/rules/M14-6-1 => common/test/rules/namenotreferredusingaqualifiedidorthis_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.expected => common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
 create mode 100644 cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/test.cpp
 rename cpp/{autosar/test/rules/A15-4-2/NoExceptFunctionThrows.expected => common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.expected} (99%)
 create mode 100644 cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
 rename cpp/{autosar/test/rules/A15-4-2 => common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.expected => common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
 rename cpp/{autosar/test/rules/M7-3-2 => common/test/rules/nonglobalfunctionmain_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
 create mode 100644 cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
 rename c/misra/test/rules/RULE-4-1/test.c => cpp/common/test/rules/nonterminatedescapesequences_shared/test.cpp (61%)
 create mode 100644 cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
 create mode 100644 cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
 create mode 100644 cpp/common/test/rules/nonuniqueenumerationconstant_shared/test.cpp
 rename cpp/{autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected} (100%)
 rename cpp/{autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.clang => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.clang} (100%)
 rename cpp/{autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.gcc => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.gcc} (100%)
 rename cpp/{autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.qcc => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.qcc} (100%)
 create mode 100644 cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
 rename cpp/{autosar/test/rules/A4-10-1 => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A4-10-1 => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared}/test.cpp.clang (100%)
 rename cpp/{autosar/test/rules/A4-10-1 => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared}/test.cpp.gcc (100%)
 rename cpp/{autosar/test/rules/A4-10-1 => common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared}/test.cpp.qcc (100%)
 rename cpp/{autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.expected => common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
 rename cpp/{autosar/test/rules/M12-1-1 => common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.expected
 create mode 100644 cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
 rename cpp/{autosar/test/rules/M8-3-1 => common/test/rules/overridingshallspecifydifferentdefaultarguments_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.expected => common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.expected} (63%)
 create mode 100644 cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
 rename cpp/{autosar/test/rules/A5-10-1 => common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A5-2-4/ReinterpretCastUsed.expected => common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
 rename cpp/{autosar/test/rules/A5-2-4 => common/test/rules/reinterpretcastused_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
 create mode 100644 cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
 rename c/misra/test/rules/RULE-13-4/test.c => cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.cpp (59%)
 rename cpp/{autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.expected => common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
 rename cpp/{autosar/test/rules/M7-5-1 => common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M6-3-1/SwitchCompoundCondition.expected => common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
 create mode 100644 cpp/common/test/rules/switchcompoundcondition_shared/test.cpp
 rename cpp/{autosar/test/rules/M2-13-3/MissingUSuffix.expected => common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
 rename cpp/{autosar/test/rules/M2-13-3 => common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared}/test.cpp (100%)
 create mode 100644 cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
 create mode 100644 cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
 rename c/cert/test/rules/INT30-C/test.c => cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.cpp (94%)
 rename cpp/{autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.expected => common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
 rename cpp/{autosar/test/rules/M2-13-2 => common/test/rules/useofnonzerooctalliteral_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.expected => common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected} (100%)
 rename cpp/{autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.expected.qcc => common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected.qcc} (100%)
 create mode 100644 cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
 rename cpp/{autosar/test/rules/A18-1-2 => common/test/rules/vectorshouldnotbespecializedwithbool_shared}/test.cpp (100%)
 rename cpp/{autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.expected => common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.expected} (100%)
 create mode 100644 cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
 rename cpp/{autosar/test/rules/M10-1-3 => common/test/rules/virtualandnonvirtualclassinthehierarchy_shared}/test.cpp (100%)
 create mode 100644 cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
 create mode 100644 cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
 create mode 100644 cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
 create mode 100644 cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
 create mode 100644 cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql
 create mode 100644 cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
 create mode 100644 cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
 create mode 100644 cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
 create mode 100644 cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
 create mode 100644 cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
 create mode 100644 cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
 create mode 100644 cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
 create mode 100644 cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
 create mode 100644 cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql
 create mode 100644 cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
 create mode 100644 cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql
 create mode 100644 cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
 create mode 100644 cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
 create mode 100644 cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
 create mode 100644 cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql
 create mode 100644 cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
 create mode 100644 cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
 create mode 100644 cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
 create mode 100644 cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
 create mode 100644 cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
 create mode 100644 cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
 create mode 100644 cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
 create mode 100644 cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql
 create mode 100644 cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
 create mode 100644 cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
 create mode 100644 cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
 create mode 100644 cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
 create mode 100644 cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
 create mode 100644 cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
 create mode 100644 cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
 create mode 100644 cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
 create mode 100644 cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
 create mode 100644 cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
 create mode 100644 cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
 create mode 100644 cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
 create mode 100644 cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql
 create mode 100644 cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql
 create mode 100644 cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
 create mode 100644 cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref
 create mode 100644 cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
 create mode 100644 cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
 create mode 100644 cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref
 create mode 100644 cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref
 create mode 100644 cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref
 create mode 100644 cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref
 create mode 100644 cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref
 create mode 100644 cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref
 create mode 100644 cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref
 create mode 100644 cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref
 create mode 100644 cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
 create mode 100644 cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref
 create mode 100644 cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref
 create mode 100644 cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref
 create mode 100644 cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref
 create mode 100644 cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref
 create mode 100644 cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref
 create mode 100644 cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref
 create mode 100644 cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref
 create mode 100644 cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref
 create mode 100644 cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref
 create mode 100644 cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref
 create mode 100644 cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref
 create mode 100644 cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref
 create mode 100644 cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref
 create mode 100644 cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref
 create mode 100644 cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
 create mode 100644 cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref
 create mode 100644 cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref
 create mode 100644 cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref
 create mode 100644 cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref
 create mode 100644 cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref
 create mode 100644 cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref
 create mode 100644 cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref
 create mode 100644 cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref
 create mode 100644 cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref
 create mode 100644 cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref
 create mode 100644 cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref
 create mode 100644 cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref
 create mode 100644 cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref
 create mode 100644 cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref
 create mode 100644 cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref
 create mode 100644 cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref
 create mode 100644 cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref

diff --git a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
index c478a3d51e..ff616277cd 100644
--- a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
+++ b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.SideEffect
-import codingstandards.c.Ordering
+import codingstandards.cpp.COrdering
 import codingstandards.c.orderofevaluation.VariableAccessOrdering
 
 from
diff --git a/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql b/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql
index f6e29eb28c..8d65bb0088 100644
--- a/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql
+++ b/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.c.Expr
+import codingstandards.cpp.CExpr
 
 Expr getRightMostOperand(CommaExpr e) {
   result = e.getRightOperand() and not result instanceof CommaExpr
diff --git a/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql b/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql
index 3d25313915..6019b7b0d6 100644
--- a/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql
+++ b/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql
@@ -15,24 +15,11 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.Overflow
-import semmle.code.cpp.controlflow.Guards
-import semmle.code.cpp.valuenumbering.GlobalValueNumbering
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
 
-from InterestingOverflowingOperation op
-where
-  not isExcluded(op, IntegerOverflowPackage::unsignedIntegerOperationsWrapAroundQuery()) and
-  op.getType().getUnderlyingType().(IntegralType).isUnsigned() and
-  // Not within a guard condition
-  not exists(GuardCondition gc | gc.getAChild*() = op) and
-  // Not guarded by a check, where the check is not an invalid overflow check
-  not op.hasValidPreCheck() and
-  // Is not checked after the operation
-  not op.hasValidPostCheck() and
-  // Permitted by exception 3
-  not op instanceof LShiftExpr and
-  // Permitted by exception 2 - zero case is handled in separate query
-  not op instanceof DivExpr and
-  not op instanceof RemExpr
-select op,
-  "Operation " + op.getOperator() + " of type " + op.getType().getUnderlyingType() + " may wrap."
+class UnsignedIntegerOperationsWrapAroundQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery
+{
+  UnsignedIntegerOperationsWrapAroundQuery() {
+    this = IntegerOverflowPackage::unsignedIntegerOperationsWrapAroundQuery()
+  }
+}
diff --git a/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.expected b/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.expected
deleted file mode 100644
index 76594d944b..0000000000
--- a/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| test.c:4:3:4:9 | ... + ... | Operation + of type unsigned int may wrap. |
-| test.c:5:3:5:10 | ... += ... | Operation += of type unsigned int may wrap. |
-| test.c:58:3:58:9 | ... - ... | Operation - of type unsigned int may wrap. |
-| test.c:59:3:59:10 | ... -= ... | Operation -= of type unsigned int may wrap. |
diff --git a/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.qlref b/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.qlref
deleted file mode 100644
index 045890904c..0000000000
--- a/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql
\ No newline at end of file
diff --git a/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref b/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref
new file mode 100644
index 0000000000..2cc69bff5a
--- /dev/null
+++ b/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref
@@ -0,0 +1 @@
+c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
\ No newline at end of file
diff --git a/c/cert/test/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.testref b/c/cert/test/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.testref
index 31cba60b74..726f27535d 100644
--- a/c/cert/test/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.testref
+++ b/c/cert/test/rules/MSC30-C/RandUsedForGeneratingPseudorandomNumbers.testref
@@ -1 +1 @@
-cpp/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
\ No newline at end of file
+c/common/test/rules/donotuserandforgeneratingpseudorandomnumbers/DoNotUseRandForGeneratingPseudorandomNumbers.ql
\ No newline at end of file
diff --git a/c/common/src/codingstandards/c/Literals.qll b/c/common/src/codingstandards/c/Literals.qll
deleted file mode 100644
index beeeccb8cc..0000000000
--- a/c/common/src/codingstandards/c/Literals.qll
+++ /dev/null
@@ -1,4 +0,0 @@
-// Reuse the `IntegerLiteral` class
-import codingstandards.cpp.Cpp14Literal
-
-class IntegerLiteral = Cpp14Literal::IntegerLiteral;
diff --git a/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll b/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll
index 4c041e8e4c..6293a67d32 100644
--- a/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll
+++ b/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.c.Ordering
+import codingstandards.cpp.COrdering
 
 class VariableAccessInFullExpressionOrdering extends Ordering::Configuration {
   VariableAccessInFullExpressionOrdering() { this = "VariableAccessInFullExpressionOrdering" }
diff --git a/c/common/test/library/expr/FullExpr.ql b/c/common/test/library/expr/FullExpr.ql
index de7edf85c1..8760ed1a15 100644
--- a/c/common/test/library/expr/FullExpr.ql
+++ b/c/common/test/library/expr/FullExpr.ql
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.c.Expr
+import codingstandards.cpp.CExpr
 
 from FullExpr e
 select e
diff --git a/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.expected b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
similarity index 58%
rename from c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.expected
rename to c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
index be347218b3..d5f6f296d9 100644
--- a/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.expected
+++ b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
@@ -1,2 +1,2 @@
-| test.c:4:1:4:41 | #define BAD_MACRO_WITH_ARG(x) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG contains use of parameter x used in multiple contexts. |
-| test.c:5:1:5:48 | #define BAD_MACRO_WITH_ARG_TWO(x,y) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG_TWO contains use of parameter x used in multiple contexts. |
+| test.c:5:1:5:41 | #define BAD_MACRO_WITH_ARG(x) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG contains use of parameter x used in multiple contexts. |
+| test.c:6:1:6:48 | #define BAD_MACRO_WITH_ARG_TWO(x,y) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG_TWO contains use of parameter x used in multiple contexts. |
diff --git a/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
new file mode 100644
index 0000000000..8fc299b7f3
--- /dev/null
+++ b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
+
+class TestFileQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery, TestQuery {
+}
diff --git a/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.c b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.c
new file mode 100644
index 0000000000..7eb5e204c7
--- /dev/null
+++ b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.c
@@ -0,0 +1,26 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#define GOOD_MACRO_WITH_ARG(X) ((X)*X##_scale) // COMPLIANT
+#define MACRO 1
+#define BAD_MACRO_WITH_ARG(x) (x) + wow##x        // NON_COMPLIANT
+#define BAD_MACRO_WITH_ARG_TWO(x, y) (x) + wow##x // NON_COMPLIANT
+#define MACROONE(x) #x                            // COMPLIANT
+#define MACROTWO(x) x *x                          // COMPLIANT
+#define MACROTHREE(x) "##\"\"'" + (x)             // COMPLIANT
+#define FOO(x) #x MACROONE(x) // COMPLIANT - no further arg expansion
+
+void f() {
+
+  int x;
+  int x_scale;
+  int y;
+  int wowMACRO = 0;
+
+  y = GOOD_MACRO_WITH_ARG(x);
+  wowMACRO = BAD_MACRO_WITH_ARG(MACRO);
+  wowMACRO = BAD_MACRO_WITH_ARG_TWO(MACRO, 1);
+  char s[] = MACROONE(MACRO);
+  y = MACROTWO(MACRO);
+  MACROTHREE(MACRO);
+  FOO(x);
+}
\ No newline at end of file
diff --git a/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected b/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
new file mode 100644
index 0000000000..489a990582
--- /dev/null
+++ b/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
@@ -0,0 +1,4 @@
+| test.c:8:14:8:17 | call to atof | Call to banned function atof. |
+| test.c:9:12:9:15 | call to atoi | Call to banned function atoi. |
+| test.c:10:13:10:16 | call to atol | Call to banned function atol. |
+| test.c:11:18:11:22 | call to atoll | Call to banned function atoll. |
diff --git a/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql b/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
new file mode 100644
index 0000000000..75b1a7ea10
--- /dev/null
+++ b/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
+
+class TestFileQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/atofatoiatolandatollused_shared/test.c b/c/common/test/rules/atofatoiatolandatollused_shared/test.c
new file mode 100644
index 0000000000..f8140af79a
--- /dev/null
+++ b/c/common/test/rules/atofatoiatolandatollused_shared/test.c
@@ -0,0 +1,13 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <float.h>
+#include <stdlib.h>
+void f2();
+void f1() {
+  char l1[5] = "abcd";
+  float l2 = atof(l1);      // NON_COMLIANT
+  int l3 = atoi(l1);        // NON_COMPLIANT
+  long l4 = atol(l1);       // NON_COMPLIANT
+  long long l5 = atoll(l1); // NON_COMPLIANT
+  f2();                     // COMPLIANT
+}
diff --git a/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected b/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
new file mode 100644
index 0000000000..f04b1b6ce9
--- /dev/null
+++ b/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
@@ -0,0 +1,4 @@
+| test.c:8:7:8:8 | x1 | Bit-field 'x1' is declared on type 'int'. |
+| test.c:12:15:12:16 | x5 | Bit-field 'x5' is declared on type 'signed long'. |
+| test.c:14:15:14:16 | x6 | Bit-field 'x6' is declared on type 'signed char'. |
+| test.c:16:14:16:15 | x7 | Bit-field 'x7' is declared on type 'Color'. |
diff --git a/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql b/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
new file mode 100644
index 0000000000..e460832dc7
--- /dev/null
+++ b/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
+
+class TestFileQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.c b/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.c
new file mode 100644
index 0000000000..c418e0e4fc
--- /dev/null
+++ b/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.c
@@ -0,0 +1,17 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+typedef unsigned int UINT16;
+
+enum Color { R, G, B };
+
+struct SampleStruct {
+  int x1 : 2;          // NON_COMPLIANT - not explicitly signed or unsigned
+  unsigned int x2 : 2; // COMPLIANT - explicitly unsigned
+  signed int x3 : 2;   // COMPLIANT - explicitly signed
+  UINT16 x4 : 2;       // COMPLIANT - type alias resolves to a compliant type
+  signed long x5 : 2; // NON_COMPLIANT - cannot declare bit field for long, even
+                      // if it's signed
+  signed char x6 : 2; // NON_COMPLIANT - cannot declare bit field for char, even
+                      // if it's signed
+  enum Color x7 : 3;  // NON_COMPLIANT - cannot declare bit field for enum
+} sample_struct;
diff --git a/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected b/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
index 94e63062c5..99d91f7575 100644
--- a/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
+++ b/c/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
@@ -1,20 +1,20 @@
 problems
-| test.c:8:8:8:12 | c_str | test.c:15:16:15:21 | call to getenv | test.c:8:8:8:12 | c_str | The object returned by the function getenv should not be modified. |
-| test.c:64:5:64:9 | conv4 | test.c:61:11:61:20 | call to localeconv | test.c:64:5:64:9 | conv4 | The object returned by the function localeconv should not be modified. |
-| test.c:73:5:73:8 | conv | test.c:69:25:69:34 | call to localeconv | test.c:73:5:73:8 | conv | The object returned by the function localeconv should not be modified. |
+| test.c:11:8:11:12 | c_str | test.c:18:16:18:21 | call to getenv | test.c:11:8:11:12 | c_str | The object returned by the function getenv should not be modified. |
+| test.c:67:5:67:9 | conv4 | test.c:64:11:64:20 | call to localeconv | test.c:67:5:67:9 | conv4 | The object returned by the function localeconv should not be modified. |
+| test.c:76:5:76:8 | conv | test.c:72:25:72:34 | call to localeconv | test.c:76:5:76:8 | conv | The object returned by the function localeconv should not be modified. |
 edges
-| test.c:5:18:5:22 | c_str | test.c:8:8:8:12 | c_str |
-| test.c:15:16:15:21 | call to getenv | test.c:21:9:21:12 | env1 |
-| test.c:21:9:21:12 | env1 | test.c:5:18:5:22 | c_str |
-| test.c:61:11:61:20 | call to localeconv | test.c:64:5:64:9 | conv4 |
-| test.c:69:25:69:34 | call to localeconv | test.c:73:5:73:8 | conv |
+| test.c:8:18:8:22 | c_str | test.c:11:8:11:12 | c_str |
+| test.c:18:16:18:21 | call to getenv | test.c:24:9:24:12 | env1 |
+| test.c:24:9:24:12 | env1 | test.c:8:18:8:22 | c_str |
+| test.c:64:11:64:20 | call to localeconv | test.c:67:5:67:9 | conv4 |
+| test.c:72:25:72:34 | call to localeconv | test.c:76:5:76:8 | conv |
 nodes
-| test.c:5:18:5:22 | c_str | semmle.label | c_str |
-| test.c:8:8:8:12 | c_str | semmle.label | c_str |
-| test.c:15:16:15:21 | call to getenv | semmle.label | call to getenv |
-| test.c:21:9:21:12 | env1 | semmle.label | env1 |
-| test.c:61:11:61:20 | call to localeconv | semmle.label | call to localeconv |
-| test.c:64:5:64:9 | conv4 | semmle.label | conv4 |
-| test.c:69:25:69:34 | call to localeconv | semmle.label | call to localeconv |
-| test.c:73:5:73:8 | conv | semmle.label | conv |
+| test.c:8:18:8:22 | c_str | semmle.label | c_str |
+| test.c:11:8:11:12 | c_str | semmle.label | c_str |
+| test.c:18:16:18:21 | call to getenv | semmle.label | call to getenv |
+| test.c:24:9:24:12 | env1 | semmle.label | env1 |
+| test.c:64:11:64:20 | call to localeconv | semmle.label | call to localeconv |
+| test.c:67:5:67:9 | conv4 | semmle.label | conv4 |
+| test.c:72:25:72:34 | call to localeconv | semmle.label | call to localeconv |
+| test.c:76:5:76:8 | conv | semmle.label | conv |
 subpaths
diff --git a/c/common/test/rules/constlikereturnvalue/test.c b/c/common/test/rules/constlikereturnvalue/test.c
index cd7c101898..35e68b4aa8 100644
--- a/c/common/test/rules/constlikereturnvalue/test.c
+++ b/c/common/test/rules/constlikereturnvalue/test.c
@@ -1,6 +1,9 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stddef.h>
 
 void trstr(char *c_str, char orig, char rep) {
   while (*c_str != '\0') {
diff --git a/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected b/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
new file mode 100644
index 0000000000..c9a9eb0d48
--- /dev/null
+++ b/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
@@ -0,0 +1,2 @@
+| test.c:8:1:8:25 | #define MACRO4(x) (x + 1) | Macro used instead of a function. |
+| test.c:13:1:13:48 | #define MACRO9() printf_custom("output = %d", 7) | Macro used instead of a function. |
diff --git a/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql b/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
new file mode 100644
index 0000000000..062cce047c
--- /dev/null
+++ b/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
+
+class TestFileQuery extends FunctionLikeMacrosDefined_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/functionlikemacrosdefined_shared/test.c b/c/common/test/rules/functionlikemacrosdefined_shared/test.c
new file mode 100644
index 0000000000..0bae4f1c22
--- /dev/null
+++ b/c/common/test/rules/functionlikemacrosdefined_shared/test.c
@@ -0,0 +1,42 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <assert.h>
+
+#define MACRO(OP, L, R) ((L)OP(R))                      // COMPLIANT
+#define MACRO2(L, R) (L + R)                            // COMPLIANT
+#define MACRO3(L, R) (L " " R " " L)                    // COMPLIANT
+#define MACRO4(x) (x + 1)                               // NON_COMPLIANT
+#define MACRO5(L, LR) (LR + 1)                          // COMPLIANT
+#define MACRO6(x) printf_custom("output = %d", test##x) // COMPLIANT
+#define MACRO7(x) #x                                    // COMPLIANT
+#define MACRO8(x) "NOP"                                 // COMPLIANT
+#define MACRO9() printf_custom("output = %d", 7)        // NON_COMPLIANT
+#define MACRO10(x)                                      // COMPLIANT
+#define MY_ASSERT(X) assert(X) // NON_COMPLIANT[FALSE_NEGATIVE]
+
+char a1[MACRO2(1, 1) + 6];
+extern int printf_custom(char*, int);
+int test1;
+
+void f() {
+  int i = MACRO(+, 1, 1);
+  int i2 = MACRO2(7, 10);
+
+  static int i3 = MACRO2(1, 1);
+
+  char *i4 = MACRO3("prefix", "suffix");
+
+  int i5 = MACRO4(1);
+
+  int i6 = MACRO4(MACRO2(1, 1));
+
+  int i7 = MACRO5(1, 1);
+
+  MACRO6(1);
+
+  char *i10 = MACRO7("prefix");
+
+  asm(MACRO8(1));
+
+  MY_ASSERT(1);
+}
\ No newline at end of file
diff --git a/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected b/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
new file mode 100644
index 0000000000..7fd94b47f3
--- /dev/null
+++ b/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
@@ -0,0 +1,3 @@
+| test.c:4:3:4:10 | goto ... | The goto statement and its $@ are not declared or enclosed in the same block. | test.c:6:3:6:5 | label ...: | label |
+| test.c:42:3:42:10 | goto ... | The goto statement and its $@ are not declared or enclosed in the same block. | test.c:46:3:46:5 | label ...: | label |
+| test.c:57:5:57:12 | goto ... | The goto statement and its $@ are not declared or enclosed in the same block. | test.c:60:3:60:5 | label ...: | label |
diff --git a/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql b/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
new file mode 100644
index 0000000000..f905b9a46c
--- /dev/null
+++ b/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
+
+class TestFileQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-15-3/test.c b/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.c
similarity index 88%
rename from c/misra/test/rules/RULE-15-3/test.c
rename to c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.c
index 739affcfc1..083e0fe57b 100644
--- a/c/misra/test/rules/RULE-15-3/test.c
+++ b/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.c
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void f1() {
   goto L1;
   for (int i = 0; i < 100; i++) {
diff --git a/c/common/test/rules/gotostatementcondition/GotoStatementCondition.expected b/c/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
index e522289c7b..c42642c343 100644
--- a/c/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
+++ b/c/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
@@ -1,3 +1,4 @@
-| test.c:5:3:5:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.c:5:3:5:10 | goto ... | L1 | test.c:2:1:2:3 | label ...: | label ...: |
-| test.c:14:3:14:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.c:14:3:14:10 | goto ... | L2 | test.c:12:1:12:3 | label ...: | label ...: |
-| test.c:16:3:16:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.c:16:3:16:10 | goto ... | L1 | test.c:11:1:11:3 | label ...: | label ...: |
+| test.c:9:3:9:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.c:9:3:9:10 | goto ... | l1 | test.c:5:1:5:3 | label ...: | label ...: |
+| test.c:21:3:21:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.c:21:3:21:10 | goto ... | l2 | test.c:17:1:17:3 | label ...: | label ...: |
+| test.c:23:3:23:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.c:23:3:23:10 | goto ... | l1 | test.c:16:1:16:3 | label ...: | label ...: |
+| test.c:28:3:28:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.c:28:3:28:10 | goto ... | l1 | test.c:27:1:27:3 | label ...: | label ...: |
diff --git a/c/common/test/rules/gotostatementcondition/test.c b/c/common/test/rules/gotostatementcondition/test.c
index 2c189cd433..48426261fe 100644
--- a/c/common/test/rules/gotostatementcondition/test.c
+++ b/c/common/test/rules/gotostatementcondition/test.c
@@ -1,17 +1,29 @@
-void f1() {
-L1:;
-  goto L2; // COMPLIANT
-  ;
-  goto L1; // NON_COMPLIANT
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+void f1(int p1) {
 
-L2:;
+l1:
+  if (p1) {
+    goto l2; // COMPLIANT
+  }
+  goto l1; // NON_COMPLIANT
+
+l2:;
 }
 
-void f2() {
-L1:;
-L2:
-  goto L3; // COMPLIANT
-  goto L2; // NON_COMPLIANT
-L3:
-  goto L1; // NON_COMPLIANT
+void f2(int p1) {
+
+l1:;
+l2:
+  if (p1) {
+    goto l3; // COMPLIANT
+  }
+  goto l2; // NON_COMPLIANT
+l3:
+  goto l1; // NON_COMPLIANT
 }
+
+void f3() {
+l1:
+  goto l1; // NON_COMPLIANT
+}
\ No newline at end of file
diff --git a/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected b/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
new file mode 100644
index 0000000000..15dc49ee37
--- /dev/null
+++ b/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
@@ -0,0 +1 @@
+| test.c:6:3:6:14 | goto ... | Use of goto. |
diff --git a/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql b/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
new file mode 100644
index 0000000000..e7ae4fcebb
--- /dev/null
+++ b/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
+
+class TestFileQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/gotostatementshouldnotbeused_shared/test.c b/c/common/test/rules/gotostatementshouldnotbeused_shared/test.c
new file mode 100644
index 0000000000..4ecc1789c7
--- /dev/null
+++ b/c/common/test/rules/gotostatementshouldnotbeused_shared/test.c
@@ -0,0 +1,11 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+void test_goto() {
+  int x = 1;
+
+  goto label1; // NON_COMPLIANT
+
+label1:
+
+  x = 2;
+}
\ No newline at end of file
diff --git a/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected b/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected
index c52544450f..9270a5ac15 100644
--- a/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected
+++ b/c/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected
@@ -1,6 +1,6 @@
-| test.c:19:14:19:19 | tmpvar | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:11:12:11:17 | call to getenv | call to getenv | test.c:15:13:15:18 | call to getenv | call to getenv |
-| test.c:132:14:132:17 | temp | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:128:12:128:17 | call to getenv | call to getenv | test.c:129:11:129:16 | call to getenv | call to getenv |
-| test.c:132:20:132:22 | tmp | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:129:11:129:16 | call to getenv | call to getenv | test.c:128:12:128:17 | call to getenv | call to getenv |
-| test.c:163:14:163:26 | tmpvar_global | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:155:19:155:24 | call to getenv | call to getenv | test.c:159:20:159:25 | call to getenv | call to getenv |
-| test.c:186:18:186:18 | r | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:183:7:183:15 | call to setlocale | call to setlocale | test.c:185:8:185:17 | call to localeconv | call to localeconv |
-| test.c:206:10:206:15 | tmpvar | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:200:12:200:17 | call to getenv | call to getenv | test.c:204:3:204:8 | call to f11fun | call to f11fun |
+| test.c:21:14:21:19 | tmpvar | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:13:12:13:17 | call to getenv | call to getenv | test.c:17:13:17:18 | call to getenv | call to getenv |
+| test.c:134:14:134:17 | temp | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:130:12:130:17 | call to getenv | call to getenv | test.c:131:11:131:16 | call to getenv | call to getenv |
+| test.c:134:20:134:22 | tmp | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:131:11:131:16 | call to getenv | call to getenv | test.c:130:12:130:17 | call to getenv | call to getenv |
+| test.c:165:14:165:26 | tmpvar_global | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:157:19:157:24 | call to getenv | call to getenv | test.c:161:20:161:25 | call to getenv | call to getenv |
+| test.c:188:18:188:18 | r | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:185:7:185:15 | call to setlocale | call to setlocale | test.c:187:8:187:17 | call to localeconv | call to localeconv |
+| test.c:208:10:208:15 | tmpvar | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.c:202:12:202:17 | call to getenv | call to getenv | test.c:206:3:206:8 | call to f11fun | call to f11fun |
diff --git a/c/common/test/rules/invalidatedenvstringpointers/test.c b/c/common/test/rules/invalidatedenvstringpointers/test.c
index 59c9593d21..183a4891c1 100644
--- a/c/common/test/rules/invalidatedenvstringpointers/test.c
+++ b/c/common/test/rules/invalidatedenvstringpointers/test.c
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected b/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected
index 556a3fe4a8..628a4f99d6 100644
--- a/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected
+++ b/c/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected
@@ -1,2 +1,2 @@
-| test.c:13:19:13:24 | call to getenv | The value of variable $@ might become invalid after a subsequent call to function `getenv`. | test.c:10:7:10:19 | tmpvar_global | tmpvar_global |
-| test.c:16:20:16:25 | call to getenv | The value of variable $@ might become invalid after a subsequent call to function `getenv`. | test.c:7:9:7:20 | tmpvar_field | tmpvar_field |
+| test.c:15:19:15:24 | call to getenv | The value of variable $@ might become invalid after a subsequent call to function `getenv`. | test.c:12:7:12:19 | tmpvar_global | tmpvar_global |
+| test.c:18:20:18:25 | call to getenv | The value of variable $@ might become invalid after a subsequent call to function `getenv`. | test.c:9:9:9:20 | tmpvar_field | tmpvar_field |
diff --git a/c/common/test/rules/invalidatedenvstringpointerswarn/test.c b/c/common/test/rules/invalidatedenvstringpointerswarn/test.c
index 2b678df6ac..6d4cec1d8d 100644
--- a/c/common/test/rules/invalidatedenvstringpointerswarn/test.c
+++ b/c/common/test/rules/invalidatedenvstringpointerswarn/test.c
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected b/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
new file mode 100644
index 0000000000..a381fdb7e8
--- /dev/null
+++ b/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
@@ -0,0 +1,16 @@
+| test.c:5:10:5:11 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:6:10:6:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:9:10:9:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:10:10:10:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:15:11:15:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:16:11:16:13 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:19:11:19:13 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:20:11:20:13 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.c:25:10:25:14 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.c:26:10:26:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.c:29:10:29:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.c:30:10:30:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.c:35:11:35:14 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.c:36:11:36:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.c:39:11:39:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.c:40:11:40:15 | 1 | Lowercase 'l' used as a literal suffix. |
diff --git a/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql b/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
new file mode 100644
index 0000000000..8d7d9f0be8
--- /dev/null
+++ b/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix_shared.LowercaseLStartsInLiteralSuffix_shared
+
+class TestFileQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.c b/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.c
new file mode 100644
index 0000000000..549e90bd7d
--- /dev/null
+++ b/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.c
@@ -0,0 +1,46 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+// int x = false; // COMPLIANT - reported as C++ FP in #319
+int a1 = 0L;  // COMPLIANT
+int a2 = 0l;  // NON_COMPLIANT
+int a3 = 0ll; // NON_COMPLIANT
+int a4 = 0LL; // COMPLIANT
+int a5 = 0uL; // COMPLIANT
+int a6 = 0ul; // NON_COMPLIANT
+int a7 = 0lu; // NON_COMPLIANT
+int a8 = 0Lu; // COMPLIANT
+int a9 = 0LU; // COMPLIANT
+
+long b1 = 0L;  // COMPLIANT
+long b2 = 0l;  // NON_COMPLIANT
+long b3 = 0ll; // NON_COMPLIANT
+long b4 = 0LL; // COMPLIANT
+long b5 = 0uL; // COMPLIANT
+long b6 = 0ul; // NON_COMPLIANT
+long b7 = 0lu; // NON_COMPLIANT
+long b8 = 0Lu; // COMPLIANT
+long b9 = 0LU; // COMPLIANT
+
+int c1 = 0x01L;  // COMPLIANT
+int c2 = 0x01l;  // NON_COMPLIANT
+int c3 = 0x01ll; // NON_COMPLIANT
+int c4 = 0x01LL; // COMPLIANT
+int c5 = 0x01uL; // COMPLIANT
+int c6 = 0x01ul; // NON_COMPLIANT
+int c7 = 0x01lu; // NON_COMPLIANT
+int c8 = 0x01Lu; // COMPLIANT
+int c9 = 0x01LU; // COMPLIANT
+
+long d1 = 001L;  // COMPLIANT
+long d2 = 001l;  // NON_COMPLIANT
+long d3 = 001ll; // NON_COMPLIANT
+long d4 = 001LL; // COMPLIANT
+long d5 = 001uL; // COMPLIANT
+long d6 = 001ul; // NON_COMPLIANT
+long d7 = 001lu; // NON_COMPLIANT
+long d8 = 001Lu; // COMPLIANT
+long d9 = 001LU; // COMPLIANT
+
+char *e1 = "";
+char *e2 = "ul";
+char *e3 = "UL";
\ No newline at end of file
diff --git a/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected b/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
new file mode 100644
index 0000000000..715bbe781d
--- /dev/null
+++ b/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
@@ -0,0 +1 @@
+| test.c:27:1:27:29 | #define MACROTHIRTEEN(X) #X ## X | Macro definition uses an # operator followed by a ## operator. |
diff --git a/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql b/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
new file mode 100644
index 0000000000..8c3dd270d0
--- /dev/null
+++ b/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
+
+class TestFileQuery extends MacroParameterFollowingHash_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/macroparameterfollowinghash_shared/test.c b/c/common/test/rules/macroparameterfollowinghash_shared/test.c
new file mode 100644
index 0000000000..d998ce8106
--- /dev/null
+++ b/c/common/test/rules/macroparameterfollowinghash_shared/test.c
@@ -0,0 +1,29 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#define MACROONE 1 // COMPLIANT
+
+#define MACROTWO '#\'-#' + '#' // COMPLIANT
+
+#define MACROTHREE "##" // COMPLIANT
+
+#define MACROFOUR "##" + "#" // COMPLIANT
+
+#define MACROFIVE(X) #X // COMPLIANT
+
+#define MACROSIX(X, Y) X##Y // COMPLIANT
+
+#define MACROSEVEN "##'" #"#" // COMPLIANT
+
+#define MACROEIGHT '##' #"#" // COMPLIANT
+
+#define MACRONINE "##\"\"" + "#" // COMPLIANT
+
+#define MACROTEN "##\"\"'" + "#" // COMPLIANT
+
+#define MACROELEVEN(X) X #X #X // COMPLIANT
+
+#define MACROTWELVE(X) X##X##X // COMPLIANT
+
+#define MACROTHIRTEEN(X) #X##X // NON_COMPLIANT
+
+#define MACROFOURTEEN '#\'-#' + 1 #1 #1 + '#' // COMPLIANT
\ No newline at end of file
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected b/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
new file mode 100644
index 0000000000..4ea36edc69
--- /dev/null
+++ b/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
@@ -0,0 +1,6 @@
+| test.c:8:12:8:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:8:12:8:13 | l1 | side effect | test.c:8:17:8:18 | l1 | side effect | test.c:8:12:8:13 | l1 | l1 | test.c:8:17:8:18 | l1 | l1 |
+| test.c:9:12:9:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:9:12:9:13 | l1 | side effect | test.c:9:17:9:18 | l2 | side effect | test.c:9:12:9:13 | l1 | l1 | test.c:9:17:9:18 | l2 | l2 |
+| test.c:19:3:19:21 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:19:8:19:9 | l1 | side effect | test.c:19:13:19:14 | l1 | side effect | test.c:19:8:19:9 | l1 | l1 | test.c:19:13:19:14 | l1 | l1 |
+| test.c:21:3:21:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:21:7:21:8 | l1 | side effect | test.c:21:11:21:12 | l2 | side effect | test.c:21:7:21:8 | l1 | l1 | test.c:21:11:21:12 | l2 | l2 |
+| test.c:27:3:27:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:27:7:27:10 | ... ++ | side effect | test.c:27:13:27:14 | l8 | read | test.c:27:7:27:8 | l8 | l8 | test.c:27:13:27:14 | l8 | l8 |
+| test.c:37:5:37:13 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:37:10:37:12 | ... ++ | side effect | test.c:37:10:37:12 | ... ++ | side effect | test.c:37:10:37:10 | i | i | test.c:37:10:37:10 | i | i |
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql b/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
new file mode 100644
index 0000000000..e49f82c8fd
--- /dev/null
+++ b/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
+
+class TestFileQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery, TestQuery {
+}
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.c b/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.c
new file mode 100644
index 0000000000..ac04ce01d1
--- /dev/null
+++ b/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.c
@@ -0,0 +1,39 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+void foo(int, int);
+
+void unsequenced_sideeffects1() {
+  volatile int l1, l2;
+
+  int l3 = l1 + l1; // NON_COMPLIANT
+  int l4 = l1 + l2; // NON_COMPLIANT
+
+  // Store value of volatile object in temporary non-volatile object.
+  int l5 = l1;
+  // Store value of volatile object in temporary non-volatile object.
+  int l6 = l2;
+  int l7 = l5 + l6; // COMPLIANT
+
+  int l8, l9;
+  l1 = l1 & 0x80;      // COMPLIANT
+  l8 = l1 = l1 & 0x80; // NON_COMPLIANT
+
+  foo(l1, l2); // NON_COMPLIANT
+  // Store value of volatile object in temporary non-volatile object.
+  l8 = l1;
+  // Store value of volatile object in temporary non-volatile object.
+  l9 = l2;
+  foo(l8, l9);   // COMPLIANT
+  foo(l8++, l8); // NON_COMPLIANT
+
+  int l10 = l8++, l11 = l8++; // COMPLIANT
+}
+
+int g1[10], g2[10];
+#define test(i) (g1[i] = g2[i])
+void unsequenced_sideeffects2() {
+  int i;
+  for (i = 0; i < 10; i++) {
+    test(i++); // NON_COMPLIANT
+  }
+}
\ No newline at end of file
diff --git a/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected b/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
new file mode 100644
index 0000000000..7a6b7c33a5
--- /dev/null
+++ b/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
@@ -0,0 +1,5 @@
+| test.c:6:7:6:8 | x1 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.c:9:14:9:15 | x2 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.c:11:7:11:8 | x3 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.c:13:7:13:8 | x4 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.c:22:14:22:14 | x | A named bit-field with signed integral type should have at least 2 bits of storage. |
diff --git a/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql b/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
new file mode 100644
index 0000000000..09b98ff226
--- /dev/null
+++ b/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
+
+class TestFileQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.c b/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.c
new file mode 100644
index 0000000000..8fae6812fe
--- /dev/null
+++ b/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.c
@@ -0,0 +1,28 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <stdint.h>
+
+struct SampleStruct {
+  int x1 : 1; // NON_COMPLIANT: very likely be signed, but if it's not, the
+              // query will automatically handle it since we use signed(), not
+              // isExplicitlySigned().
+  signed int x2 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  signed char
+      x3 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  signed short
+      x4 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  unsigned int
+      x5 : 1; // COMPLIANT: single-bit named field but with an unsigned type
+  signed int x6 : 2; // COMPLIANT: named field with a signed type but declared
+                     // to carry more than 1 bit
+  signed char : 1;   // COMPLIANT: single-bit bit-field but unnamed
+} sample_struct;
+
+struct S {
+  signed int x : 1; // NON-COMPLIANT
+  signed int y : 5; // COMPLIANT
+  signed int z : 7; // COMPLIANT
+  signed int : 0;   // COMPLIANT
+  signed int : 1;   // COMPLIANT
+  signed int : 2;   // COMPLIANT
+};
\ No newline at end of file
diff --git a/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected b/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
new file mode 100644
index 0000000000..26401472ac
--- /dev/null
+++ b/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
@@ -0,0 +1,21 @@
+| test.c:37:18:37:24 | \u001aG | Invalid hexadecimal escape in string literal at '\\x1AG"'. |
+| test.c:40:18:40:23 | \u00029 | Invalid octal escape in string literal at '\\029"'. |
+| test.c:43:18:43:24 | \n7 | Invalid octal escape in string literal at '\\0127"'. |
+| test.c:44:18:44:24 | \r7 | Invalid octal escape in string literal at '\\0157"'. |
+| test.c:46:19:46:29 | \n\n9 | Invalid octal escape in string literal at '\\0129"'. |
+| test.c:47:19:47:28 | \n\u00019 | Invalid octal escape in string literal at '\\019"'. |
+| test.c:50:19:50:31 | \nAAA\u000f | Invalid octal escape in string literal at '\\012AAA\\017"'. |
+| test.c:53:19:53:39 | Some Data \n\u000fA | Invalid octal escape in string literal at '\\017A"'. |
+| test.c:54:19:55:21 | Some Data \n\u000fA5 | Invalid octal escape in string literal at '\\017A"\n                  "5"'. |
+| test.c:56:19:58:25 | Some Data \n\u000fA\n1 | Invalid octal escape in string literal at '\\0121"'. |
+| test.c:62:19:63:26 | \u0011G\u00012 | Invalid octal escape in string literal at '\\0012"'. |
+| test.c:64:19:65:25 | \u0011GG\u0001 | Invalid hexadecimal escape in string literal at '\\x11G"\n                  "G\\001"'. |
+| test.c:66:19:67:26 | \u0011GG\u00013 | Invalid hexadecimal escape in string literal at '\\x11G"\n                  "G\\0013"'. |
+| test.c:66:19:67:26 | \u0011GG\u00013 | Invalid octal escape in string literal at '\\0013"'. |
+| test.c:73:18:73:42 | Some Data \n\u000fA5 | Invalid octal escape in string literal at '\\017A" "5"'. |
+| test.c:74:18:74:49 | Some Data \n\u000fA\n1 | Invalid octal escape in string literal at '\\0121"'. |
+| test.c:76:18:76:32 | \u0011G\u00012 | Invalid octal escape in string literal at '\\0012"'. |
+| test.c:77:18:77:32 | \u0011GG\u0001 | Invalid hexadecimal escape in string literal at '\\x11G" "G\\001"'. |
+| test.c:78:18:78:33 | \u0011GG\u00013 | Invalid hexadecimal escape in string literal at '\\x11G" "G\\0013"'. |
+| test.c:78:18:78:33 | \u0011GG\u00013 | Invalid octal escape in string literal at '\\0013"'. |
+| test.c:81:11:81:16 | 10 | Invalid hexadecimal escape in string literal at '\\x0a''. |
diff --git a/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql b/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
new file mode 100644
index 0000000000..6cbb2220bb
--- /dev/null
+++ b/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
+
+class TestFileQuery extends NonTerminatedEscapeSequences_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonterminatedescapesequences_shared/test.c b/c/common/test/rules/nonterminatedescapesequences_shared/test.c
new file mode 100644
index 0000000000..67c6e3d5a3
--- /dev/null
+++ b/c/common/test/rules/nonterminatedescapesequences_shared/test.c
@@ -0,0 +1,81 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <stdint.h>
+
+struct SampleStruct {
+  int x1 : 1; // NON_COMPLIANT: very likely be signed, but if it's not, the
+              // query will automatically handle it since we use signed(), not
+              // isExplicitlySigned().
+  signed int x2 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  signed char
+      x3 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  signed short
+      x4 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  unsigned int
+      x5 : 1; // COMPLIANT: single-bit named field but with an unsigned type
+  signed int x6 : 2; // COMPLIANT: named field with a signed type but declared
+                     // to carry more than 1 bit
+  signed char : 1;   // COMPLIANT: single-bit bit-field but unnamed
+} sample_struct;
+
+struct S {
+  signed int x : 1; // NON-COMPLIANT
+  signed int y : 5; // COMPLIANT
+  signed int z : 7; // COMPLIANT
+  signed int : 0;   // COMPLIANT
+  signed int : 1;   // COMPLIANT
+  signed int : 2;   // COMPLIANT
+};
+const char *a1 = "\x11"
+                 "G"; // COMPLIANT
+
+const char *a2 = "\x1"
+                 "G"; // COMPLIANT
+
+const char *a3 = "\x1A"; // COMPLIANT
+
+const char *a4 = "\x1AG"; // NON_COMPLIANT
+
+const char *a5 = "\021"; // COMPLIANT
+const char *a6 = "\029"; // NON_COMPLIANT
+const char *a7 = "\0"
+                 "0";     // COMPLIANT
+const char *a8 = "\0127"; // NON_COMPLIANT
+const char *a9 = "\0157"; // NON_COMPLIANT
+
+const char *a10 = "\012\0129"; // NON_COMPLIANT (1x)
+const char *a11 = "\012\019";  // NON_COMPLIANT
+const char *a12 = "\012\017";  // COMPLIANT
+
+const char *a13 = "\012AAA\017"; // NON_COMPLIANT (1x)
+
+const char *a14 = "Some Data \012\017";  // COMPLIANT
+const char *a15 = "Some Data \012\017A"; // NON_COMPLIANT (1x)
+const char *a16 = "Some Data \012\017A"
+                  "5"; // NON_COMPLIANT (1x)
+const char *a17 = "Some Data \012\017"
+                  "A"
+                  "\0121"; // NON_COMPLIANT (1x)
+
+const char *a18 = "\x11"
+                  "G\001"; // COMPLIANT
+const char *a19 = "\x11"
+                  "G\0012"; // NON_COMPLIANT (1x)
+const char *a20 = "\x11G"
+                  "G\001"; // NON_COMPLIANT (1x)
+const char *a21 = "\x11G"
+                  "G\0013"; // NON_COMPLIANT (2x)
+
+// clang-format off
+const char *b1 = "\x11" "G"; // COMPLIANT
+const char *b2 = "\x1" "G"; // COMPLIANT
+const char *b3 = "\0" "0";     // COMPLIANT
+const char *b4 = "Some Data \012\017A" "5"; // NON_COMPLIANT (1x)
+const char *b5 = "Some Data \012\017" "A" "\0121"; // NON_COMPLIANT (1x)
+const char *b6 = "\x11" "G\001"; // COMPLIANT
+const char *b7 = "\x11" "G\0012"; // NON_COMPLIANT (1x)
+const char *b8 = "\x11G" "G\001"; // NON_COMPLIANT (1x)
+const char *b9 = "\x11G" "G\0013"; // NON_COMPLIANT (2x)
+
+char c1 = '\023'; // COMPLIANT
+char c2 = '\x0a'; // COMPLIANT
diff --git a/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected b/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
new file mode 100644
index 0000000000..65e57e3575
--- /dev/null
+++ b/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
@@ -0,0 +1 @@
+| test.c:5:19:5:20 | c4 | Nonunique value of enum constant compared to $@ | test.c:5:23:5:24 | c5 | c5 |
diff --git a/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql b/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
new file mode 100644
index 0000000000..f01ef52853
--- /dev/null
+++ b/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
+
+class TestFileQuery extends NonUniqueEnumerationConstant_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-8-12/test.c b/c/common/test/rules/nonuniqueenumerationconstant_shared/test.c
similarity index 62%
rename from c/misra/test/rules/RULE-8-12/test.c
rename to c/common/test/rules/nonuniqueenumerationconstant_shared/test.c
index 349bb7867c..0712cb59e4 100644
--- a/c/misra/test/rules/RULE-8-12/test.c
+++ b/c/common/test/rules/nonuniqueenumerationconstant_shared/test.c
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 enum e { c = 3 };                   // COMPLIANT
 enum e1 { c1 = 3, c2 };             // COMPLIANT
 enum e3 { c3 = 3, c4, c5 = 4 };     // NON_COMPLIANT
diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
new file mode 100644
index 0000000000..c0a8359320
--- /dev/null
+++ b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
@@ -0,0 +1,3 @@
+| test.c:9:7:9:12 | ... = ... | Use of an assignment operator's result. |
+| test.c:13:11:13:16 | ... = ... | Use of an assignment operator's result. |
+| test.c:15:8:15:13 | ... = ... | Use of an assignment operator's result. |
diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
new file mode 100644
index 0000000000..e4928beb62
--- /dev/null
+++ b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
+
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
+}
diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.c b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.c
new file mode 100644
index 0000000000..db0a45384e
--- /dev/null
+++ b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.c
@@ -0,0 +1,16 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+void test() {
+  int l1, l2;
+  int l3[1];
+
+  l1 = l2; // COMPLIANT
+
+  if (l1 = 1) // NON_COMPLIANT
+  {
+  }
+
+  l1 = l3[l2 = 0]; // NON_COMPLIANT
+
+  l1 = l2 = 0; // NON_COMPLIANT
+}
diff --git a/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected b/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
new file mode 100644
index 0000000000..33ec8d6995
--- /dev/null
+++ b/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
@@ -0,0 +1,4 @@
+| test.c:7:3:7:9 | ... + ... | Operation + of type unsigned int may wrap. |
+| test.c:8:3:8:10 | ... += ... | Operation += of type unsigned int may wrap. |
+| test.c:61:3:61:9 | ... - ... | Operation - of type unsigned int may wrap. |
+| test.c:62:3:62:10 | ... -= ... | Operation -= of type unsigned int may wrap. |
diff --git a/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql b/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
new file mode 100644
index 0000000000..24780bcc5d
--- /dev/null
+++ b/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
+
+class TestFileQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery, TestQuery {
+}
diff --git a/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.c b/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.c
new file mode 100644
index 0000000000..214b18a44f
--- /dev/null
+++ b/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.c
@@ -0,0 +1,83 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+
+#include <limits.h>
+
+void test_add_simple(unsigned int i1, unsigned int i2) {
+  i1 + i2;  // NON_COMPLIANT - not bounds checked
+  i1 += i2; // NON_COMPLIANT - not bounds checked
+}
+
+void test_add_precheck(unsigned int i1, unsigned int i2) {
+  if (UINT_MAX - i1 < i2) {
+    // handle error
+  } else {
+    i1 + i2;  // COMPLIANT - bounds checked
+    i1 += i2; // COMPLIANT - bounds checked
+  }
+}
+
+void test_add_precheck_2(unsigned int i1, unsigned int i2) {
+  if (i1 + i2 < i1) {
+    // handle error
+  } else {
+    i1 + i2;  // COMPLIANT - bounds checked
+    i1 += i2; // COMPLIANT - bounds checked
+  }
+}
+
+void test_add_postcheck(unsigned int i1, unsigned int i2) {
+  unsigned int i3 = i1 + i2; // COMPLIANT - checked for overflow afterwards
+  if (i3 < i1) {
+    // handle error
+  }
+  i1 += i2; // COMPLIANT - checked for overflow afterwards
+  if (i1 < i2) {
+    // handle error
+  }
+}
+
+void test_ex2(unsigned int i1, unsigned int i2) {
+  unsigned int ci1 = 2;
+  unsigned int ci2 = 3;
+  ci1 + ci2;     // COMPLIANT, compile time constants
+  i1 + 0;        // COMPLIANT
+  i1 += 0;       // COMPLIANT
+  i1 - 0;        // COMPLIANT
+  i1 -= 0;       // COMPLIANT
+  UINT_MAX - i1; // COMPLIANT - cannot be smaller than 0
+  i1 * 1;        // COMPLIANT
+  i1 *= 1;       // COMPLIANT
+  if (0 <= i1 && i1 < 32) {
+    UINT_MAX >> i1; // COMPLIANT
+  }
+}
+
+void test_ex3(unsigned int i1, unsigned int i2) {
+  i1 << i2; // COMPLIANT - by EX3
+}
+
+void test_sub_simple(unsigned int i1, unsigned int i2) {
+  i1 - i2;  // NON_COMPLIANT - not bounds checked
+  i1 -= i2; // NON_COMPLIANT - not bounds checked
+}
+
+void test_sub_precheck(unsigned int i1, unsigned int i2) {
+  if (i1 < i2) {
+    // handle error
+  } else {
+    i1 - i2;  // COMPLIANT - bounds checked
+    i1 -= i2; // COMPLIANT - bounds checked
+  }
+}
+
+void test_sub_postcheck(unsigned int i1, unsigned int i2) {
+  unsigned int i3 = i1 - i2; // COMPLIANT - checked for wrap afterwards
+  if (i3 > i1) {
+    // handle error
+  }
+  i1 -= i2; // COMPLIANT - checked for wrap afterwards
+  if (i1 > i2) {
+    // handle error
+  }
+}
\ No newline at end of file
diff --git a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
index e53294fba5..64a62e495e 100644
--- a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
+++ b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
@@ -15,22 +15,10 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.IrreplaceableFunctionLikeMacro
+import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
 
-predicate partOfConstantExpr(MacroInvocation i) {
-  exists(Expr e |
-    e.isConstant() and
-    not i.getExpr() = e and
-    i.getExpr().getParent+() = e
-  )
+class FunctionOverFunctionLikeMacroQuery extends FunctionLikeMacrosDefined_sharedSharedQuery {
+  FunctionOverFunctionLikeMacroQuery() {
+    this = Preprocessor6Package::functionOverFunctionLikeMacroQuery()
+  }
 }
-
-from FunctionLikeMacro m
-where
-  not isExcluded(m, Preprocessor6Package::functionOverFunctionLikeMacroQuery()) and
-  not m instanceof IrreplaceableFunctionLikeMacro and
-  //macros can have empty body
-  not m.getBody().length() = 0 and
-  //function call not allowed in a constant expression (where constant expr is parent)
-  forall(MacroInvocation i | i = m.getAnInvocation() | not partOfConstantExpr(i))
-select m, "Macro used instead of a function."
diff --git a/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql b/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
index 005fffa32d..7e9362d62a 100644
--- a/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
+++ b/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
@@ -14,7 +14,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Expr
+import codingstandards.cpp.CExpr
 
 int getPrecedence(Expr e) {
   e instanceof PrimaryExpr and result = 16
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index c1ac4d4b40..ec002e172f 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -13,237 +13,10 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Expr
-import codingstandards.c.SideEffects
-import codingstandards.c.Ordering
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
 
-class VariableEffectOrAccess extends Expr {
-  VariableEffectOrAccess() {
-    this instanceof VariableEffect or
-    this instanceof VariableAccess
+class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery {
+  UnsequencedSideEffectsQuery() {
+    this = SideEffects3Package::unsequencedSideEffectsQuery()
   }
 }
-
-pragma[noinline]
-predicate partOfFullExpr(VariableEffectOrAccess e, FullExpr fe) {
-  (
-    exists(VariableEffect ve | e = ve and ve.getAnAccess() = fe.getAChild+() and not ve.isPartial())
-    or
-    e.(VariableAccess) = fe.getAChild+()
-  )
-}
-
-class ConstituentExprOrdering extends Ordering::Configuration {
-  ConstituentExprOrdering() { this = "ConstituentExprOrdering" }
-
-  override predicate isCandidate(Expr e1, Expr e2) {
-    exists(FullExpr fe |
-      partOfFullExpr(e1, fe) and
-      partOfFullExpr(e2, fe)
-    )
-  }
-}
-
-predicate sameFullExpr(FullExpr fe, VariableAccess va1, VariableAccess va2) {
-  partOfFullExpr(va1, fe) and
-  partOfFullExpr(va2, fe) and
-  va1 != va2 and
-  exists(Variable v1, Variable v2 |
-    // Use `pragma[only_bind_into]` to prevent CP between variable accesses.
-    va1.getTarget() = pragma[only_bind_into](v1) and va2.getTarget() = pragma[only_bind_into](v2)
-  |
-    v1.isVolatile() and v2.isVolatile()
-    or
-    not (v1.isVolatile() and v2.isVolatile()) and
-    v1 = v2
-  )
-}
-
-int getLeafCount(LeftRightOperation bop) {
-  if
-    not bop.getLeftOperand() instanceof BinaryOperation and
-    not bop.getRightOperand() instanceof BinaryOperation
-  then result = 2
-  else
-    if
-      bop.getLeftOperand() instanceof BinaryOperation and
-      not bop.getRightOperand() instanceof BinaryOperation
-    then result = 1 + getLeafCount(bop.getLeftOperand())
-    else
-      if
-        not bop.getLeftOperand() instanceof BinaryOperation and
-        bop.getRightOperand() instanceof BinaryOperation
-      then result = 1 + getLeafCount(bop.getRightOperand())
-      else result = getLeafCount(bop.getLeftOperand()) + getLeafCount(bop.getRightOperand())
-}
-
-class LeftRightOperation extends Expr {
-  LeftRightOperation() {
-    this instanceof BinaryOperation or
-    this instanceof AssignOperation or
-    this instanceof AssignExpr
-  }
-
-  Expr getLeftOperand() {
-    result = this.(BinaryOperation).getLeftOperand()
-    or
-    result = this.(AssignOperation).getLValue()
-    or
-    result = this.(AssignExpr).getLValue()
-  }
-
-  Expr getRightOperand() {
-    result = this.(BinaryOperation).getRightOperand()
-    or
-    result = this.(AssignOperation).getRValue()
-    or
-    result = this.(AssignExpr).getRValue()
-  }
-
-  Expr getAnOperand() {
-    result = getLeftOperand() or
-    result = getRightOperand()
-  }
-}
-
-int getOperandIndexIn(FullExpr fullExpr, Expr operand) {
-  result = getOperandIndex(fullExpr, operand)
-  or
-  fullExpr.(Call).getArgument(result).getAChild*() = operand
-}
-
-int getOperandIndex(LeftRightOperation binop, Expr operand) {
-  if operand = binop.getAnOperand()
-  then
-    operand = binop.getLeftOperand() and
-    result = 0
-    or
-    operand = binop.getRightOperand() and
-    result = getLeafCount(binop.getLeftOperand()) + 1
-    or
-    operand = binop.getRightOperand() and
-    not binop.getLeftOperand() instanceof LeftRightOperation and
-    result = 1
-  else (
-    // Child of left operand that is a binary operation.
-    result = getOperandIndex(binop.getLeftOperand(), operand)
-    or
-    // Child of left operand that is not a binary operation.
-    result = 0 and
-    not binop.getLeftOperand() instanceof LeftRightOperation and
-    binop.getLeftOperand().getAChild+() = operand
-    or
-    // Child of right operand and both left and right operands are binary operations.
-    result =
-      getLeafCount(binop.getLeftOperand()) + getOperandIndex(binop.getRightOperand(), operand)
-    or
-    // Child of right operand and left operand is not a binary operation.
-    result = 1 + getOperandIndex(binop.getRightOperand(), operand) and
-    not binop.getLeftOperand() instanceof LeftRightOperation
-    or
-    // Child of right operand that is not a binary operation and the left operand is a binary operation.
-    result = getLeafCount(binop.getLeftOperand()) + 1 and
-    binop.getRightOperand().getAChild+() = operand and
-    not binop.getRightOperand() instanceof LeftRightOperation
-    or
-    // Child of right operand that is not a binary operation and the left operand is not a binary operation.
-    result = 1 and
-    not binop.getLeftOperand() instanceof LeftRightOperation and
-    not binop.getRightOperand() instanceof LeftRightOperation and
-    binop.getRightOperand().getAChild+() = operand
-  )
-}
-
-predicate inConditionalThen(ConditionalExpr ce, Expr e) {
-  e = ce.getThen()
-  or
-  exists(Expr parent |
-    inConditionalThen(ce, parent) and
-    parent.getAChild() = e
-  )
-}
-
-predicate inConditionalElse(ConditionalExpr ce, Expr e) {
-  e = ce.getElse()
-  or
-  exists(Expr parent |
-    inConditionalElse(ce, parent) and
-    parent.getAChild() = e
-  )
-}
-
-predicate isUnsequencedEffect(
-  ConstituentExprOrdering orderingConfig, FullExpr fullExpr, VariableEffect variableEffect1,
-  VariableAccess va1, VariableAccess va2, Locatable placeHolder, string label
-) {
-  // The two access are scoped to the same full expression.
-  sameFullExpr(fullExpr, va1, va2) and
-  // We are only interested in effects that change an object,
-  // i.e., exclude patterns suchs as `b->data[b->cursor++]` where `b` is considered modified and read or `foo.bar = 1` where `=` modifies to both `foo` and `bar`.
-  not variableEffect1.isPartial() and
-  variableEffect1.getAnAccess() = va1 and
-  (
-    exists(VariableEffect variableEffect2 |
-      not variableEffect2.isPartial() and
-      variableEffect2.getAnAccess() = va2 and
-      // If the effect is not local (happens in a different function) we use the call with the access as a proxy.
-      (
-        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
-        orderingConfig.isUnsequenced(variableEffect1, variableEffect2)
-        or
-        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-        not va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
-        exists(Call call |
-          call.getAnArgument() = va2 and call.getEnclosingStmt() = va1.getEnclosingStmt()
-        |
-          orderingConfig.isUnsequenced(variableEffect1, call)
-        )
-        or
-        not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
-        exists(Call call |
-          call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
-        |
-          orderingConfig.isUnsequenced(call, variableEffect2)
-        )
-      ) and
-      // Break the symmetry of the ordering relation by requiring that the first expression is located before the second.
-      // This builds upon the assumption that the expressions are part of the same full expression as specified in the ordering configuration.
-      getOperandIndexIn(fullExpr, va1) < getOperandIndexIn(fullExpr, va2) and
-      placeHolder = variableEffect2 and
-      label = "side effect"
-    )
-    or
-    placeHolder = va2 and
-    label = "read" and
-    not exists(VariableEffect variableEffect2 | variableEffect1 != variableEffect2 |
-      variableEffect2.getAnAccess() = va2
-    ) and
-    (
-      va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-      orderingConfig.isUnsequenced(variableEffect1, va2)
-      or
-      not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-      exists(Call call |
-        call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
-      |
-        orderingConfig.isUnsequenced(call, va2)
-      )
-    ) and
-    // The read is not used to compute the effect on the variable.
-    // E.g., exclude x = x + 1
-    not variableEffect1.getAChild+() = va2
-  ) and
-  // Both are evaluated
-  not exists(ConditionalExpr ce | inConditionalThen(ce, va1) and inConditionalElse(ce, va2))
-}
-
-from
-  ConstituentExprOrdering orderingConfig, FullExpr fullExpr, VariableEffect variableEffect1,
-  VariableAccess va1, VariableAccess va2, Locatable placeHolder, string label
-where
-  not isExcluded(fullExpr, SideEffects3Package::unsequencedSideEffectsQuery()) and
-  isUnsequencedEffect(orderingConfig, fullExpr, variableEffect1, va1, va2, placeHolder, label)
-select fullExpr, "The expression contains unsequenced $@ to $@ and $@ to $@.", variableEffect1,
-  "side effect", va1, va1.getTarget().getName(), placeHolder, label, va2, va2.getTarget().getName()
diff --git a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
index 3dd03120c8..c04b9a39ca 100644
--- a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
+++ b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Expr
-import codingstandards.c.SideEffects
+import codingstandards.cpp.CExpr
+import codingstandards.cpp.SideEffects
 
 from FullExpr e, SideEffect se, CrementOperation op
 where
diff --git a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index 6938f8e627..2582518d78 100644
--- a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -14,9 +14,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-from AssignExpr e
-where
-  not isExcluded(e, SideEffects1Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery()) and
-  not exists(ExprStmt s | s.getExpr() = e)
-select e, "Use of an assignment operator's result."
+class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery {
+  ResultOfAnAssignmentOperatorShouldNotBeUsedQuery() {
+    this = SideEffects1Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
index ddc85c305c..f8862713b0 100644
--- a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
+++ b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
@@ -13,9 +13,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
 
-from Stmt s
-where
-  not isExcluded(s, Statements6Package::gotoStatementUsedQuery()) and
-  (s instanceof GotoStmt or s instanceof ComputedGotoStmt)
-select s, "Use of goto."
+class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
+  GotoStatementUsedQuery() {
+    this = Statements6Package::gotoStatementUsedQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
index aeb356b501..7151e367bc 100644
--- a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
+++ b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
@@ -14,49 +14,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
 
-predicate isPartOfSwitch(Stmt goto) {
-  exists(SwitchStmt switch | switch.getStmt() = goto.getParent())
+class GotoLabelBlockConditionQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery {
+  GotoLabelBlockConditionQuery() {
+    this = Statements2Package::gotoLabelBlockConditionQuery()
+  }
 }
-
-SwitchCase getSwitchCase(Stmt stmt) {
-  exists(int index, SwitchStmt switch |
-    getStmtInSwitch(switch, stmt, index) and getStmtInSwitch(switch, result, index - 1)
-  )
-  or
-  exists(int index, SwitchStmt switch, Stmt other |
-    getStmtInSwitch(switch, stmt, index) and
-    getStmtInSwitch(switch, other, index - 1) and
-    not other instanceof SwitchCase and
-    result = getSwitchCase(other)
-  )
-}
-
-predicate getStmtInSwitch(SwitchStmt switch, Stmt s, int index) {
-  switch.getStmt().(BlockStmt).getStmt(index) = s
-}
-
-int statementDepth(Stmt statement) {
-  statement.getParent() = statement.getEnclosingFunction().getBlock() and result = 1
-  or
-  statementDepth(statement.getParent()) + 1 = result
-}
-
-from GotoStmt goto, Stmt target, int gotoDepth, int targetDepth
-where
-  not isExcluded(goto, Statements2Package::gotoLabelBlockConditionQuery()) and
-  goto.getTarget() = target and
-  gotoDepth = statementDepth(goto) and
-  targetDepth = statementDepth(target) and
-  targetDepth >= gotoDepth and
-  (
-    targetDepth = gotoDepth
-    implies
-    (
-      not isPartOfSwitch(goto) and not goto.getParent() = target.getParent()
-      or
-      isPartOfSwitch(goto) and not getSwitchCase(goto) = getSwitchCase(target)
-    )
-  )
-select goto, "The $@ statement and its $@ are not declared or enclosed in the same block.", goto,
-  "goto", target, "label"
diff --git a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
index 0c97b3ea5a..8f7b37f0d4 100644
--- a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
@@ -1,6 +1,6 @@
 /**
  * @id c/misra/selection-compound-condition
- * @name RULE-15-6: the statement forming the body of a loop shall be a compound statement
+ * @name RULE-15-6: the statement forming the body of a slection statement shall be a compound statement
  * @description if the body of a selection statement is not enclosed in braces, then this can lead
  *              to incorrect execution, and is hard for developers to maintain.
  * @kind problem
diff --git a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
index 6ea7aa0a13..c951968506 100644
--- a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
+++ b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
@@ -13,14 +13,10 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.Macro
+import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
 
-from Macro m
-where
-  not isExcluded(m, Preprocessor2Package::moreThanOneHashOperatorInMacroDefinitionQuery()) and
-  exists(StringizingOperator one, TokenPastingOperator two |
-    one.getMacro() = m and
-    two.getMacro() = m and
-    one.getOffset() < two.getOffset()
-  )
-select m, "Macro definition uses an # operator followed by a ## operator."
+class MoreThanOneHashOperatorInMacroDefinitionQuery extends MacroParameterFollowingHash_sharedSharedQuery {
+  MoreThanOneHashOperatorInMacroDefinitionQuery() {
+    this = Preprocessor2Package::moreThanOneHashOperatorInMacroDefinitionQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
index 6a66afb74b..3730a65ecd 100644
--- a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
+++ b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
@@ -15,22 +15,10 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.Macro
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
 
-from FunctionLikeMacro m, MacroInvocation mi, int i, string expanded, string param
-where
-  not isExcluded(mi, Preprocessor2Package::macroParameterUsedAsHashOperandQuery()) and
-  mi = m.getAnInvocation() and
-  param = m.getParameter(i) and
-  (
-    exists(TokenPastingOperator op | op.getMacro() = m and op.getOperand() = param)
-    or
-    exists(StringizingOperator op | op.getMacro() = m and op.getOperand() = param)
-  ) and
-  // An expansion that is equal to "" means the expansion is not used and is optimized away by EDG. This happens when the expanded argument is an operand to `#` or `##`.
-  // This check ensure there is an expansion that is used.
-  expanded = mi.getExpandedArgument(i) and
-  not expanded = "" and
-  not mi.getUnexpandedArgument(i) = mi.getExpandedArgument(i)
-select m,
-  "Macro " + m.getName() + " contains use of parameter " + param + " used in multiple contexts."
+class MacroParameterUsedAsHashOperandQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery {
+  MacroParameterUsedAsHashOperandQuery() {
+    this = Preprocessor2Package::macroParameterUsedAsHashOperandQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
index f834201cbd..69733b6308 100644
--- a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
@@ -13,13 +13,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
 
-private string atoi() { result = ["atof", "atoi", "atol", "atoll"] }
-
-from FunctionCall fc, Function f
-where
-  not isExcluded(fc, BannedPackage::atofAtoiAtolAndAtollOfStdlibhUsedQuery()) and
-  f = fc.getTarget() and
-  f.getName() = atoi() and
-  f.getFile().getBaseName() = "stdlib.h"
-select fc, "Call to banned function " + f.getName() + "."
+class AtofAtoiAtolAndAtollOfStdlibhUsedQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery {
+  AtofAtoiAtolAndAtollOfStdlibhUsedQuery() {
+    this = BannedPackage::atofAtoiAtolAndAtollOfStdlibhUsedQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
index a7fdf080a7..80a4490470 100644
--- a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
+++ b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
@@ -15,34 +15,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
 
-bindingset[s]
-predicate isOctalEscape(string s) {
-  s.charAt(0) = "\\" and
-  exists(int i | i = [0 .. 7] | i.toString() = s.charAt(1))
+class OctalAndHexadecimalEscapeSequencesNotTerminatedQuery extends NonTerminatedEscapeSequences_sharedSharedQuery {
+  OctalAndHexadecimalEscapeSequencesNotTerminatedQuery() {
+    this = SyntaxPackage::octalAndHexadecimalEscapeSequencesNotTerminatedQuery()
+  }
 }
-
-bindingset[s]
-predicate isHexEscape(string s) { s.indexOf("\\x") = 0 }
-
-from Literal l, string escapeKind, string s
-where
-  not isExcluded(l, SyntaxPackage::octalAndHexadecimalEscapeSequencesNotTerminatedQuery()) and
-  exists(int idx, string sl |
-    sl = l.getValueText() and
-    idx = sl.indexOf("\\") and
-    s = sl.substring(idx, sl.length()) and
-    // Note: Octal representations must be 1-3 digits. There is no limitation on a
-    // Hex literal as long as the characters are valid. This query does not consider
-    // if the hex literal being constructed will overflow.
-    (
-      isHexEscape(s) and
-      not s.regexpMatch("^((\\\\x[0-9A-F]+(?=[\"'\\\\])))[\\s\\S]*") and
-      escapeKind = "hexadecimal"
-      or
-      isOctalEscape(s) and
-      not s.regexpMatch("^(((\\\\[0-7]{1,3})(?=[\"'\\\\])))[\\s\\S]*") and
-      escapeKind = "octal"
-    )
-  )
-select l, "Invalid " + escapeKind + " escape in string literal at '" + s + "'."
diff --git a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
index fce1d9ad1a..932e85087a 100644
--- a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
+++ b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
@@ -12,33 +12,10 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.Compiler
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
 
-Type getSupportedBitFieldType(Compiler compiler) {
-  compiler instanceof UnsupportedCompiler and
-  (
-    result instanceof IntType and
-    (
-      result.(IntegralType).isExplicitlySigned() or
-      result.(IntegralType).isExplicitlyUnsigned()
-    )
-    or
-    result instanceof BoolType
-  )
-  or
-  (compiler instanceof Gcc or compiler instanceof Clang) and
-  (
-    result instanceof IntegralOrEnumType
-    or
-    result instanceof BoolType
-  )
+class BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery {
+  BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery() {
+    this = BitfieldTypesPackage::bitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery()
+  }
 }
-
-from BitField bitField
-where
-  not isExcluded(bitField,
-    BitfieldTypesPackage::bitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery()) and
-  /* A violation would neither be an appropriate primitive type nor an appropriate typedef. */
-  not getSupportedBitFieldType(getCompiler(bitField.getFile())) =
-    bitField.getType().resolveTypedefs()
-select bitField, "Bit-field '" + bitField + "' is declared on type '" + bitField.getType() + "'."
diff --git a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
index d4be3d6dd2..9eb0b672fb 100644
--- a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
+++ b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
@@ -12,23 +12,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
 
-/*
- * Check if the DECLARED bit-fields is a single bit, because Rule 6.2 also intends to catch confusion on the programmers' part. Consider:
- *
- * struct S {
- *  int32_t x: 1;
- * }
- *
- * In this case, field x is essentially of 32 bits, but is declared as 1 bit and its type int32_t is signed. Therefore, it indicates confusion by the programmer, which is exactly what this rule intends to find.
- */
-
-from BitField bitField
-where
-  not isExcluded(bitField, BitfieldTypesPackage::singleBitNamedBitFieldsOfASignedTypeQuery()) and
-  bitField.getDeclaredNumBits() = 1 and // Single-bit,
-  not bitField.isAnonymous() and // named,
-  bitField.getType().(IntegralType).isSigned() // but its type is signed.
-select bitField,
-  "Single-bit bit-field named " + bitField.toString() + " has a signed type " + bitField.getType() +
-    "."
+class SingleBitNamedBitFieldsOfASignedTypeQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery {
+  SingleBitNamedBitFieldsOfASignedTypeQuery() {
+    this = BitfieldTypesPackage::singleBitNamedBitFieldsOfASignedTypeQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql b/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
index 4fc257578b..85c14ff419 100644
--- a/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
+++ b/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
@@ -14,7 +14,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Literals
+import codingstandards.cpp.Literals
 
 from IntegerLiteral l
 where
diff --git a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
index 0772da9b05..91a8a9c021 100644
--- a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
+++ b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
@@ -14,25 +14,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
 
-/**
- * An `EnumConstant` that has an implicitly specified value:
- * `enum e { explicit = 1, implicit }`
- */
-class ImplicitlySpecifiedEnumConstant extends EnumConstant {
-  ImplicitlySpecifiedEnumConstant() {
-    //implicitly specified have an initializer with location: `file://:0:0:0:0`
-    not this.getInitializer().getLocation().getFile() = this.getFile()
+class ValueImplicitEnumerationConstantNotUniqueQuery extends NonUniqueEnumerationConstant_sharedSharedQuery {
+  ValueImplicitEnumerationConstantNotUniqueQuery() {
+    this = Declarations7Package::valueImplicitEnumerationConstantNotUniqueQuery()
   }
 }
-
-from EnumConstant exp, ImplicitlySpecifiedEnumConstant imp
-where
-  not isExcluded(exp, Declarations7Package::valueImplicitEnumerationConstantNotUniqueQuery()) and
-  not isExcluded(imp, Declarations7Package::valueImplicitEnumerationConstantNotUniqueQuery()) and
-  not exp = imp and
-  imp.getValue() = exp.getValue() and
-  imp.getDeclaringEnum() = exp.getDeclaringEnum() and
-  //can technically be the same declared enum across multiple headers but those are not relevant to this rule
-  imp.getFile() = exp.getFile()
-select imp, "Nonunique value of enum constant compared to $@", exp, exp.getName()
diff --git a/c/misra/test/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.testref b/c/misra/test/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.testref
index ea9ce384ea..3b0dc2fe5a 100644
--- a/c/misra/test/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.testref
+++ b/c/misra/test/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.testref
@@ -1 +1 @@
-cpp/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
\ No newline at end of file
+c/common/test/rules/usageofassemblernotdocumented/UsageOfAssemblerNotDocumented.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.testref b/c/misra/test/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.testref
index 303a38a19b..4460b5ed53 100644
--- a/c/misra/test/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.testref
+++ b/c/misra/test/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.testref
@@ -1 +1 @@
-cpp/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
\ No newline at end of file
+c/common/test/rules/sectionsofcodeshallnotbecommentedout/SectionsOfCodeShallNotBeCommentedOut.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.testref b/c/misra/test/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.testref
index dffdbb26b8..2dc788dd11 100644
--- a/c/misra/test/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.testref
+++ b/c/misra/test/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.testref
@@ -1 +1 @@
-cpp/common/test/rules/differentidentifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.ql
\ No newline at end of file
+c/common/test/rules/differentidentifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref b/c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref
new file mode 100644
index 0000000000..cd897ee364
--- /dev/null
+++ b/c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref
@@ -0,0 +1 @@
+c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected
deleted file mode 100644
index 17b89c2f01..0000000000
--- a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| test.c:6:12:6:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:6:12:6:13 | l1 | side effect | test.c:6:12:6:13 | l1 | l1 | test.c:6:17:6:18 | l1 | side effect | test.c:6:17:6:18 | l1 | l1 |
-| test.c:7:12:7:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:7:12:7:13 | l1 | side effect | test.c:7:12:7:13 | l1 | l1 | test.c:7:17:7:18 | l2 | side effect | test.c:7:17:7:18 | l2 | l2 |
-| test.c:17:3:17:21 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:17:8:17:9 | l1 | side effect | test.c:17:8:17:9 | l1 | l1 | test.c:17:13:17:14 | l1 | side effect | test.c:17:13:17:14 | l1 | l1 |
-| test.c:19:3:19:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:19:7:19:8 | l1 | side effect | test.c:19:7:19:8 | l1 | l1 | test.c:19:11:19:12 | l2 | side effect | test.c:19:11:19:12 | l2 | l2 |
-| test.c:25:3:25:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:25:7:25:10 | ... ++ | side effect | test.c:25:7:25:8 | l8 | l8 | test.c:25:13:25:14 | l8 | read | test.c:25:13:25:14 | l8 | l8 |
-| test.c:35:5:35:13 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:35:10:35:12 | ... ++ | side effect | test.c:35:10:35:10 | i | i | test.c:35:10:35:12 | ... ++ | side effect | test.c:35:10:35:10 | i | i |
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref
deleted file mode 100644
index 0cb8d40dbb..0000000000
--- a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-13-2/UnsequencedSideEffects.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
new file mode 100644
index 0000000000..6131c93357
--- /dev/null
+++ b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
@@ -0,0 +1 @@
+c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected b/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected
deleted file mode 100644
index 57f90043e1..0000000000
--- a/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| test.c:7:7:7:12 | ... = ... | Use of an assignment operator's result. |
-| test.c:11:11:11:16 | ... = ... | Use of an assignment operator's result. |
-| test.c:13:8:13:13 | ... = ... | Use of an assignment operator's result. |
diff --git a/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.qlref b/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.qlref
deleted file mode 100644
index 16d027d915..0000000000
--- a/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref b/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
new file mode 100644
index 0000000000..0bda23895c
--- /dev/null
+++ b/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
@@ -0,0 +1 @@
+c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-15-1/GotoStatementUsed.expected b/c/misra/test/rules/RULE-15-1/GotoStatementUsed.expected
deleted file mode 100644
index 7e06759159..0000000000
--- a/c/misra/test/rules/RULE-15-1/GotoStatementUsed.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.c:4:3:4:14 | goto ... | Use of goto. |
diff --git a/c/misra/test/rules/RULE-15-1/GotoStatementUsed.qlref b/c/misra/test/rules/RULE-15-1/GotoStatementUsed.qlref
deleted file mode 100644
index 338455d28f..0000000000
--- a/c/misra/test/rules/RULE-15-1/GotoStatementUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-15-1/GotoStatementUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref b/c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref
new file mode 100644
index 0000000000..94fa27a461
--- /dev/null
+++ b/c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref
@@ -0,0 +1 @@
+c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-15-1/test.c b/c/misra/test/rules/RULE-15-1/test.c
deleted file mode 100644
index d13f01961c..0000000000
--- a/c/misra/test/rules/RULE-15-1/test.c
+++ /dev/null
@@ -1,9 +0,0 @@
-void test_goto() {
-  int x = 1;
-
-  goto label1; // NON_COMPLIANT
-
-label1:
-
-  x = 2;
-}
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected
deleted file mode 100644
index 730403cbd7..0000000000
--- a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| test.c:2:3:2:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:2:3:2:10 | goto ... | goto | test.c:4:3:4:5 | label ...: | label |
-| test.c:40:3:40:10 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:40:3:40:10 | goto ... | goto | test.c:44:3:44:5 | label ...: | label |
-| test.c:55:5:55:12 | goto ... | The $@ statement and its $@ are not declared or enclosed in the same block. | test.c:55:5:55:12 | goto ... | goto | test.c:58:3:58:5 | label ...: | label |
diff --git a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.qlref b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.qlref
deleted file mode 100644
index 5f430f0790..0000000000
--- a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-15-3/GotoLabelBlockCondition.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref
new file mode 100644
index 0000000000..81d6739cb7
--- /dev/null
+++ b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref
@@ -0,0 +1 @@
+c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.expected b/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.expected
deleted file mode 100644
index 406010428c..0000000000
--- a/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.c:25:1:25:29 | #define MACROTHIRTEEN(X) #X ## X | Macro definition uses an # operator followed by a ## operator. |
diff --git a/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.qlref b/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.qlref
deleted file mode 100644
index 35ef457cac..0000000000
--- a/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref b/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref
new file mode 100644
index 0000000000..ff0bf76291
--- /dev/null
+++ b/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref
@@ -0,0 +1 @@
+c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.qlref b/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.qlref
deleted file mode 100644
index a2edc3acc4..0000000000
--- a/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref b/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref
new file mode 100644
index 0000000000..4c511bd34e
--- /dev/null
+++ b/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref
@@ -0,0 +1 @@
+c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.expected b/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.expected
deleted file mode 100644
index 29a0c6fac1..0000000000
--- a/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| test.c:6:14:6:17 | call to atof | Call to banned function atof. |
-| test.c:7:12:7:15 | call to atoi | Call to banned function atoi. |
-| test.c:8:13:8:16 | call to atol | Call to banned function atol. |
-| test.c:9:18:9:22 | call to atoll | Call to banned function atoll. |
diff --git a/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.qlref b/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.qlref
deleted file mode 100644
index 52e70db92b..0000000000
--- a/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref b/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref
new file mode 100644
index 0000000000..441b3f33c2
--- /dev/null
+++ b/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref
@@ -0,0 +1 @@
+c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.expected b/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.expected
deleted file mode 100644
index 39d5aa5d85..0000000000
--- a/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.expected
+++ /dev/null
@@ -1,21 +0,0 @@
-| test.c:9:18:9:24 | \u001aG | Invalid hexadecimal escape in string literal at '\\x1AG"'. |
-| test.c:12:18:12:23 | \u00029 | Invalid octal escape in string literal at '\\029"'. |
-| test.c:15:18:15:24 | \n7 | Invalid octal escape in string literal at '\\0127"'. |
-| test.c:16:18:16:24 | \r7 | Invalid octal escape in string literal at '\\0157"'. |
-| test.c:18:19:18:29 | \n\n9 | Invalid octal escape in string literal at '\\0129"'. |
-| test.c:19:19:19:28 | \n\u00019 | Invalid octal escape in string literal at '\\019"'. |
-| test.c:22:19:22:31 | \nAAA\u000f | Invalid octal escape in string literal at '\\012AAA\\017"'. |
-| test.c:25:19:25:39 | Some Data \n\u000fA | Invalid octal escape in string literal at '\\017A"'. |
-| test.c:26:19:27:21 | Some Data \n\u000fA5 | Invalid octal escape in string literal at '\\017A"\n                  "5"'. |
-| test.c:28:19:30:25 | Some Data \n\u000fA\n1 | Invalid octal escape in string literal at '\\0121"'. |
-| test.c:34:19:35:26 | \u0011G\u00012 | Invalid octal escape in string literal at '\\0012"'. |
-| test.c:36:19:37:25 | \u0011GG\u0001 | Invalid hexadecimal escape in string literal at '\\x11G"\n                  "G\\001"'. |
-| test.c:38:19:39:26 | \u0011GG\u00013 | Invalid hexadecimal escape in string literal at '\\x11G"\n                  "G\\0013"'. |
-| test.c:38:19:39:26 | \u0011GG\u00013 | Invalid octal escape in string literal at '\\0013"'. |
-| test.c:45:18:45:42 | Some Data \n\u000fA5 | Invalid octal escape in string literal at '\\017A" "5"'. |
-| test.c:46:18:46:49 | Some Data \n\u000fA\n1 | Invalid octal escape in string literal at '\\0121"'. |
-| test.c:48:18:48:32 | \u0011G\u00012 | Invalid octal escape in string literal at '\\0012"'. |
-| test.c:49:18:49:32 | \u0011GG\u0001 | Invalid hexadecimal escape in string literal at '\\x11G" "G\\001"'. |
-| test.c:50:18:50:33 | \u0011GG\u00013 | Invalid hexadecimal escape in string literal at '\\x11G" "G\\0013"'. |
-| test.c:50:18:50:33 | \u0011GG\u00013 | Invalid octal escape in string literal at '\\0013"'. |
-| test.c:53:11:53:16 | 10 | Invalid hexadecimal escape in string literal at '\\x0a''. |
diff --git a/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.qlref b/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.qlref
deleted file mode 100644
index fbdd187532..0000000000
--- a/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref b/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref
new file mode 100644
index 0000000000..7cece164a3
--- /dev/null
+++ b/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref
@@ -0,0 +1 @@
+c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref b/c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref
new file mode 100644
index 0000000000..7b535ba5ce
--- /dev/null
+++ b/c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref
@@ -0,0 +1 @@
+c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.expected b/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.expected
deleted file mode 100644
index df7677961a..0000000000
--- a/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| test.c:4:7:4:8 | x1 | Single-bit bit-field named x1 has a signed type int. |
-| test.c:7:14:7:15 | x2 | Single-bit bit-field named x2 has a signed type signed int. |
-| test.c:9:7:9:8 | x3 | Single-bit bit-field named x3 has a signed type signed char. |
-| test.c:11:7:11:8 | x4 | Single-bit bit-field named x4 has a signed type signed short. |
diff --git a/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.qlref b/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.qlref
deleted file mode 100644
index 50c34f70a7..0000000000
--- a/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref b/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref
new file mode 100644
index 0000000000..a068a4ff61
--- /dev/null
+++ b/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref
@@ -0,0 +1 @@
+c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.expected b/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.expected
deleted file mode 100644
index 279fd7e621..0000000000
--- a/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-| test.c:3:10:3:11 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:4:10:4:12 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:7:10:7:12 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:8:10:8:12 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:13:11:13:12 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:14:11:14:13 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:17:11:17:13 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:18:11:18:13 | 0 | Lowercase 'l' used as a literal suffix. |
-| test.c:23:10:23:14 | 1 | Lowercase 'l' used as a literal suffix. |
-| test.c:24:10:24:15 | 1 | Lowercase 'l' used as a literal suffix. |
-| test.c:27:10:27:15 | 1 | Lowercase 'l' used as a literal suffix. |
-| test.c:28:10:28:15 | 1 | Lowercase 'l' used as a literal suffix. |
-| test.c:33:11:33:14 | 1 | Lowercase 'l' used as a literal suffix. |
-| test.c:34:11:34:15 | 1 | Lowercase 'l' used as a literal suffix. |
-| test.c:37:11:37:15 | 1 | Lowercase 'l' used as a literal suffix. |
-| test.c:38:11:38:15 | 1 | Lowercase 'l' used as a literal suffix. |
diff --git a/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.qlref b/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.qlref
deleted file mode 100644
index 464efc3b2f..0000000000
--- a/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref b/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref
new file mode 100644
index 0000000000..e9f0d150e9
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref
@@ -0,0 +1 @@
+c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-3/cpp/LowercaseCharacterLUsedInLiteralSuffix.qlref b/c/misra/test/rules/RULE-7-3/cpp/LowercaseCharacterLUsedInLiteralSuffix.qlref
deleted file mode 100644
index 464efc3b2f..0000000000
--- a/c/misra/test/rules/RULE-7-3/cpp/LowercaseCharacterLUsedInLiteralSuffix.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-3/cpp/options b/c/misra/test/rules/RULE-7-3/cpp/options
deleted file mode 100644
index 8dbed822c6..0000000000
--- a/c/misra/test/rules/RULE-7-3/cpp/options
+++ /dev/null
@@ -1 +0,0 @@
-semmle-extractor-options:--clang -std=c++14 --edg --diag_error=implicit_func_decl -nostdinc -I../../../../../cpp/common/test/includes/standard-library
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-3/cpp/test.cpp b/c/misra/test/rules/RULE-7-3/cpp/test.cpp
deleted file mode 100644
index ba3ca4f14e..0000000000
--- a/c/misra/test/rules/RULE-7-3/cpp/test.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int x = false; // COMPLIANT - reported as FP in #319
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.expected b/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.expected
deleted file mode 100644
index 55abb72b57..0000000000
--- a/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.c:3:19:3:20 | c4 | Nonunique value of enum constant compared to $@ | test.c:3:23:3:24 | c5 | c5 |
diff --git a/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.qlref b/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.qlref
deleted file mode 100644
index e43c765d37..0000000000
--- a/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref b/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref
new file mode 100644
index 0000000000..bf49fc0b00
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref
@@ -0,0 +1 @@
+c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql b/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
index e1aeec46a0..2fc8fcd976 100644
--- a/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
+++ b/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
@@ -16,29 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Constructor
+import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
 
-from Constructor c, Class declaringType, Class baseClass, string type
-where
-  not isExcluded(c, InitializationPackage::explicitConstructorBaseClassInitializationQuery()) and
-  declaringType = c.getDeclaringType() and
-  (
-    declaringType.getABaseClass() = baseClass and type = ""
-    or
-    baseClass.(VirtualBaseClass).getAVirtuallyDerivedClass().getADerivedClass+() = declaringType and
-    type = " virtual"
-  ) and
-  // There is not an initializer on the constructor for this particular base class
-  not exists(ConstructorBaseClassInit init |
-    c.getAnInitializer() = init and
-    init.getInitializedClass() = baseClass and
-    not init.isCompilerGenerated()
-  ) and
-  // Must be a defined constructor
-  c.hasDefinition() and
-  // Not a compiler-generated constructor
-  not c.isCompilerGenerated() and
-  // Not a defaulted constructor
-  not c.isDefaulted()
-select c, "Constructor for $@ does not explicitly call constructor for" + type + " base class $@.",
-  declaringType, declaringType.getSimpleName(), baseClass, baseClass.getSimpleName()
+class ExplicitConstructorBaseClassInitializationQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery {
+  ExplicitConstructorBaseClassInitializationQuery() {
+    this = InitializationPackage::explicitConstructorBaseClassInitializationQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql b/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
index a2ce643784..8919a4e46a 100644
--- a/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
+++ b/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
@@ -17,43 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Operator
+import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
 
-predicate isUserCopyOrUserMove(Operator o) {
-  o instanceof UserCopyOperator or
-  o instanceof UserMoveOperator
+class CopyAssignmentAndAMoveHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery {
+  CopyAssignmentAndAMoveHandleSelfAssignmentQuery() {
+    this = OperatorInvariantsPackage::copyAssignmentAndAMoveHandleSelfAssignmentQuery()
+  }
 }
-
-predicate callsStdSwap(Function f) {
-  exists(FunctionCall fc |
-    fc.getTarget().hasGlobalOrStdName("swap") and
-    fc.getEnclosingFunction() = f
-  )
-}
-
-predicate callsNoExceptSwap(Operator o) {
-  exists(Function f, FunctionCall fc |
-    callsStdSwap(f) and
-    fc.getEnclosingFunction() = o and
-    fc.getTarget() = f
-  )
-}
-
-predicate checksForSelfAssignment(Operator o) {
-  exists(IfStmt i, ComparisonOperation c |
-    i.getEnclosingFunction() = o and
-    i.getCondition() = c and
-    (
-      c.getLeftOperand().toString() = "this" or
-      c.getRightOperand().toString() = "this"
-    )
-  )
-}
-
-from Operator o
-where
-  not isExcluded(o, OperatorInvariantsPackage::copyAssignmentAndAMoveHandleSelfAssignmentQuery()) and
-  isUserCopyOrUserMove(o) and
-  not callsNoExceptSwap(o) and
-  not checksForSelfAssignment(o)
-select o, "User defined copy or user defined move does not handle self-assignment correctly."
diff --git a/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql b/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
index e53b532493..f2cbecb7dc 100644
--- a/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
+++ b/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
@@ -16,8 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
 
-from FunctionTemplateSpecialization f
-where not isExcluded(f, TemplatesPackage::explicitSpecializationsOfFunctionTemplatesUsedQuery())
-select f, "Specialization of function template from primary template located in $@.",
-  f.getPrimaryTemplate(), f.getPrimaryTemplate().getFile().getBaseName()
+class ExplicitSpecializationsOfFunctionTemplatesUsedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery {
+  ExplicitSpecializationsOfFunctionTemplatesUsedQuery() {
+    this = TemplatesPackage::explicitSpecializationsOfFunctionTemplatesUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
index 348e02609c..1747d1245c 100644
--- a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
+++ b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
@@ -15,10 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.exceptionobjecthavepointertype_shared.ExceptionObjectHavePointerType_shared
 
-from Expr thrownExpr
-where
-  not isExcluded(thrownExpr, Exceptions1Package::pointerExceptionObjectQuery()) and
-  thrownExpr = any(ThrowExpr te).getExpr() and
-  thrownExpr.getType().getUnspecifiedType() instanceof PointerType
-select thrownExpr, "Exception object with pointer type " + thrownExpr.getType() + " is thrown here."
+class PointerExceptionObjectQuery extends ExceptionObjectHavePointerType_sharedSharedQuery {
+  PointerExceptionObjectQuery() {
+    this = Exceptions1Package::pointerExceptionObjectQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
index 0c5bbb6011..4197e5f7dd 100644
--- a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
+++ b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
@@ -15,25 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.exceptions.ExceptionFlow
-import ExceptionPathGraph
-import codingstandards.cpp.exceptions.ExceptionSpecifications
+import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
 
-class NoExceptThrowingFunction extends ExceptionThrowingFunction {
-  NoExceptThrowingFunction() {
-    // Can exit with an exception
-    exists(getAFunctionThrownType(_, _)) and
-    // But is marked noexcept(true) or equivalent
-    isNoExceptTrue(this)
+class NoExceptFunctionThrowsQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery {
+  NoExceptFunctionThrowsQuery() {
+    this = Exceptions1Package::noExceptFunctionThrowsQuery()
   }
 }
-
-from
-  NoExceptThrowingFunction f, ExceptionFlowNode exceptionSource, ExceptionFlowNode functionNode,
-  ExceptionType exceptionType
-where
-  not isExcluded(f, Exceptions1Package::noExceptFunctionThrowsQuery()) and
-  f.hasExceptionFlow(exceptionSource, functionNode, exceptionType)
-select f, exceptionSource, functionNode,
-  "Function " + f.getName() + " is declared noexcept(true) but can throw exceptions of type " +
-    exceptionType.getExceptionName() + "."
diff --git a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
index 2d94fde98c..9b4855fc8f 100644
--- a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
@@ -17,23 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.StdNamespace
+import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
 
-predicate isVectorBool(ClassTemplateInstantiation c) {
-  c.getNamespace() instanceof StdNS and
-  c.getTemplateArgument(0) instanceof BoolType and
-  c.getSimpleName() = "vector"
+class VectorboolSpecializationUsedQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery {
+  VectorboolSpecializationUsedQuery() {
+    this = BannedTypesPackage::vectorboolSpecializationUsedQuery()
+  }
 }
-
-predicate isUsingVectorBool(ClassTemplateInstantiation c) {
-  isVectorBool(c) or
-  isUsingVectorBool(c.getTemplateArgument(_))
-}
-
-from Variable v, ClassTemplateInstantiation c
-where
-  v.getUnderlyingType() = c and
-  not v.isFromTemplateInstantiation(_) and
-  isUsingVectorBool(c) and
-  not isExcluded(v, BannedTypesPackage::vectorboolSpecializationUsedQuery())
-select v, "Use of std::vector<bool> specialization."
diff --git a/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql b/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql
index 7819cfad4d..c701c154cd 100644
--- a/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql
+++ b/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql
@@ -15,14 +15,11 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import OperatorDelete
+import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined_shared.GlobalSizedOperatorDeleteNotDefined_shared
 
-from OperatorDelete unsized_delete
-where
-  not isExcluded(unsized_delete, DeclarationsPackage::globalSizedOperatorDeleteNotDefinedQuery()) and
-  not unsized_delete.isSizeDelete() and
-  not exists(OperatorDelete od | unsized_delete.isNoThrowDelete() = od.isNoThrowDelete() |
-    od.isSizeDelete()
-  )
-select unsized_delete,
-  "Unsized function '" + unsized_delete.getName() + "' defined globally without sized version."
+class GlobalSizedOperatorDeleteNotDefinedQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery
+{
+  GlobalSizedOperatorDeleteNotDefinedQuery() {
+    this = DeclarationsPackage::globalSizedOperatorDeleteNotDefinedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql b/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql
index 2c96660704..c4ee4a6569 100644
--- a/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql
+++ b/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql
@@ -15,14 +15,11 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import OperatorDelete
+import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined_shared.GlobalUnsizedOperatorDeleteNotDefined_shared
 
-from OperatorDelete sized_delete
-where
-  not isExcluded(sized_delete, DeclarationsPackage::globalUnsizedOperatorDeleteNotDefinedQuery()) and
-  sized_delete.isSizeDelete() and
-  not exists(OperatorDelete od | sized_delete.isNoThrowDelete() = od.isNoThrowDelete() |
-    not od.isSizeDelete()
-  )
-select sized_delete,
-  "Sized function '" + sized_delete.getName() + "' defined globally without unsized version."
+class GlobalUnsizedOperatorDeleteNotDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery
+{
+  GlobalUnsizedOperatorDeleteNotDefinedQuery() {
+    this = DeclarationsPackage::globalUnsizedOperatorDeleteNotDefinedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
index b0dd714209..105e1e1289 100644
--- a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
+++ b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
@@ -14,20 +14,11 @@
  */
 
 import cpp
-import codingstandards.cpp.standardlibrary.Utility
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
 
-from FunctionCall c, Parameter a, string message
-where
-  not isExcluded(c, MoveForwardPackage::forwardingValuesToOtherFunctionsQuery()) and
-  a.getAnAccess() = c.getAnArgument() and
-  (
-    c instanceof StdMoveCall and
-    a instanceof ForwardParameter and
-    message = "Function `std::forward` should be used for forwarding the forward reference $@."
-    or
-    c instanceof StdForwardCall and
-    a instanceof ConsumeParameter and
-    message = "Function `std::move` should be used for forwarding rvalue reference $@."
-  )
-select c, message, a, a.getName()
+class ForwardingValuesToOtherFunctionsQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery {
+  ForwardingValuesToOtherFunctionsQuery() {
+    this = MoveForwardPackage::forwardingValuesToOtherFunctionsQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
index d8382f51c8..5649c9765a 100644
--- a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
+++ b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
@@ -16,11 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
 
-from StringLiteral l, string es
-where
-  not isExcluded(l, LiteralsPackage::escapeSequenceOutsideISOQuery()) and
-  es = l.getANonStandardEscapeSequence(_, _) and
-  // Exclude universal-character-names, which begin with \u or \U
-  not es.toLowerCase().matches("\\u")
-select l, "This literal contains the non-standard escape sequence " + es + "."
+class EscapeSequenceOutsideISOQuery extends BackslashCharacterMisuse_sharedSharedQuery {
+  EscapeSequenceOutsideISOQuery() {
+    this = LiteralsPackage::escapeSequenceOutsideISOQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
index adbb1dccea..eee2d6fa6d 100644
--- a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
+++ b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
@@ -17,9 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.linesplicingusedincomments_shared.LineSplicingUsedInComments_shared
 
-from CppStyleComment c
-where
-  not isExcluded(c, CommentsPackage::singleLineCommentEndsWithSlashQuery()) and
-  exists(c.getContents().regexpFind("\\\n", _, _))
-select c, "C++ comment includes \\ as the last character of a line"
+class SingleLineCommentEndsWithSlashQuery extends LineSplicingUsedInComments_sharedSharedQuery {
+  SingleLineCommentEndsWithSlashQuery() {
+    this = CommentsPackage::singleLineCommentEndsWithSlashQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql b/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
index e77c8265d5..dd23f6a03b 100644
--- a/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
+++ b/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
@@ -16,17 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import semmle.code.cpp.commons.NULL
+import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
 
-from Literal l
-where
-  not isExcluded(l, LiteralsPackage::nullPointerConstantNotNullptrQuery()) and
-  // Not the type of the nullptr literal
-  not l.getType() instanceof NullPointerType and
-  // Converted to a pointer type
-  l.getConversion().getType().getUnspecifiedType() instanceof PointerType and
-  // Value of zero
-  l.getValue() = "0" and
-  // Not the StringLiteral "0"
-  not l instanceof StringLiteral
-select l, l.getValueText() + " is used as the null-pointer-constant but is not nullptr."
+class NullPointerConstantNotNullptrQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery {
+  NullPointerConstantNotNullptrQuery() {
+    this = LiteralsPackage::nullPointerConstantNotNullptrQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
deleted file mode 100644
index 2289dc4e79..0000000000
--- a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @id cpp/autosar/pointer-to-member-virtual-function-with-null-pointer-constant
- * @name A5-10-1: A pointer to member virtual function shall only be tested for equality with null-pointer-constant
- * @description A pointer to member virtual function shall only be tested for equality with
- *              null-pointer-constant, because an equality comparison with anything other than a
- *              null-pointer-constant is unspecified.
- * @kind problem
- * @precision very-high
- * @problem.severity error
- * @tags external/autosar/id/a5-10-1
- *       correctness
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-
-from
-  EqualityOperation equalityComparison, MemberFunction virtualFunction,
-  FunctionAccess accessOperand, Expr otherOperand
-where
-  not isExcluded(equalityComparison,
-    PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()) and
-  virtualFunction.isVirtual() and
-  equalityComparison.getAnOperand() = accessOperand and
-  accessOperand.getTarget() = virtualFunction and
-  otherOperand = equalityComparison.getAnOperand() and
-  not otherOperand = accessOperand and
-  not otherOperand.getType() instanceof NullPointerType
-select equalityComparison,
-  "A pointer to member virtual function $@ is tested for equality with non-null-pointer-constant $@. ",
-  virtualFunction, virtualFunction.getName(), otherOperand, otherOperand.toString()
diff --git a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
new file mode 100644
index 0000000000..efa3d605b3
--- /dev/null
+++ b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/autosar/virtual-pointer-only-compares-to-nullptr-constant
+ * @name A5-10-1: A pointer to member virtual function shall only be tested for equality with null-pointer-constant
+ * @description A pointer to member virtual function shall only be tested for equality with
+ *              null-pointer-constant, because an equality comparison with anything other than a
+ *              null-pointer-constant is unspecified.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/autosar/id/a5-10-1
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
+
+class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery {
+  VirtualPointerOnlyComparesToNullptrConstantQuery() {
+    this = PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql b/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
index 92cf12d8a0..938b0aa36a 100644
--- a/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
+++ b/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
@@ -16,7 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.reinterpretcastused_shared.ReinterpretCastUsed_shared
 
-from ReinterpretCast rc
-where not isExcluded(rc, BannedSyntaxPackage::reinterpretCastUsedQuery())
-select rc, "Use of reinterpret_cast."
+class ReinterpretCastUsedQuery extends ReinterpretCastUsed_sharedSharedQuery {
+  ReinterpretCastUsedQuery() {
+    this = BannedSyntaxPackage::reinterpretCastUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
index 5e1c10e4c7..c7c8e16d9a 100644
--- a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
+++ b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
@@ -16,9 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
 
-from Stmt s
-where
-  not isExcluded(s, BannedSyntaxPackage::gotoStatementUsedQuery()) and
-  (s instanceof GotoStmt or s instanceof ComputedGotoStmt)
-select s, "Use of goto."
+class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
+  GotoStatementUsedQuery() {
+    this = BannedSyntaxPackage::gotoStatementUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
index cf5273f45d..9227c4cc6d 100644
--- a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
+++ b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
@@ -17,9 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
 
-from Enum e
-where
-  not isExcluded(e, DeclarationsPackage::enumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery()) and
-  not e.hasExplicitUnderlyingType()
-select e, "Base type of enumeration is not explicitly specified."
+class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery {
+  EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery() {
+    this = DeclarationsPackage::enumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql b/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
index ac6e1b6ff9..2dd634e971 100644
--- a/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
+++ b/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
@@ -16,56 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
 
-/**
- * Holds if `functionDecl` is a possible intended target of the `usingDecl`.
- */
-pragma[noinline]
-predicate isPossibleIntendedTarget(
-  FunctionDeclarationEntry functionDecl, UsingDeclarationEntry usingDecl
-) {
-  // Extracted to improve the join order. With this approach, we first compute a set of using
-  // declarations and a set of possible intended targets
-  functionDecl.getDeclaration().isTopLevel() and
-  functionDecl.getDeclaration().getQualifiedName() = usingDecl.getDeclaration().getQualifiedName() and
-  functionDecl.getDeclaration().getNamespace().getParentNamespace*() = usingDecl.getParentScope()
+class DefinitionNotConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery {
+  DefinitionNotConsideredForUnqualifiedLookupQuery() {
+    this = ScopePackage::definitionNotConsideredForUnqualifiedLookupQuery()
+  }
 }
-
-/**
- * Holds if `functionDecl` is a possible intended target of the `usingDecl`, and they exist at the
- * given locations.
- */
-pragma[noinline]
-predicate isPossibleIntendedTargetLocation(
-  FunctionDeclarationEntry functionDecl, UsingDeclarationEntry usingDecl, File usingsFile,
-  File unavailableFile, int usingsStartLine, int unavailableStartLine
-) {
-  // Extracted to improve the join order. With this approach, we take the set of possible intended
-  // targets computed in isPossibleIntendedTargets, and compute the files and start lines.
-  // This helps avoid the join order preferred by the optimiser if this is all written directly in
-  // the from-where-select, where it will eagerly join:
-  //
-  // usingDeclarationEntries -> enclosing files -> all other elements in those files
-  //
-  // which is expensive when there are a lot of files with using declarations
-  isPossibleIntendedTarget(functionDecl, usingDecl) and
-  usingsFile = usingDecl.getFile() and
-  unavailableFile = functionDecl.getFile() and
-  usingsStartLine = usingDecl.getLocation().getStartLine() and
-  unavailableStartLine = functionDecl.getLocation().getStartLine()
-}
-
-from FunctionDeclarationEntry unavailableDecl, UsingDeclarationEntry usingDecl
-where
-  not isExcluded(unavailableDecl, ScopePackage::definitionNotConsideredForUnqualifiedLookupQuery()) and
-  exists(File usingsFile, File unavailableFile, int usingsStartLine, int unavailableStartLine |
-    isPossibleIntendedTargetLocation(unavailableDecl, usingDecl, usingsFile, unavailableFile,
-      usingsStartLine, unavailableStartLine) and
-    // An approximation of order where we want the using to preceed the new declaration.
-    usingsFile = unavailableFile and
-    usingsStartLine < unavailableStartLine
-  )
-select unavailableDecl,
-  "Definition for '" + unavailableDecl.getName() +
-    "' is not available for unqualified lookup because it is declared after $@", usingDecl,
-  "using-declaration"
diff --git a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
index fa1859c229..780a0c0997 100644
--- a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
+++ b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
@@ -15,45 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Class
+import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
 
-/**
- * Holds if the class has a non-virtual member function with the given name.
- */
-pragma[noinline, nomagic]
-predicate hasNonVirtualMemberFunction(Class clazz, MemberFunction mf, string name) {
-  mf.getDeclaringType() = clazz and
-  mf.getName() = name and
-  not mf.isVirtual() and
-  // Exclude private member functions, which cannot be inherited.
-  not mf.isPrivate()
+class HiddenInheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery {
+  HiddenInheritedNonOverridableMemberFunctionQuery() {
+    this = ScopePackage::hiddenInheritedNonOverridableMemberFunctionQuery()
+  }
 }
-
-/**
- * Holds if the member function is in a class with the given base class, and has the given name.
- */
-pragma[noinline, nomagic]
-predicate hasDeclarationBaseClass(MemberFunction mf, Class baseClass, string functionName) {
-  baseClass = mf.getDeclaringType().getABaseClass() and
-  functionName = mf.getName()
-}
-
-from MemberFunction overridingDecl, MemberFunction hiddenDecl, Class baseClass, string name
-where
-  not isExcluded(overridingDecl, ScopePackage::hiddenInheritedNonOverridableMemberFunctionQuery()) and
-  // Check if we are overriding a non-virtual inherited member function
-  hasNonVirtualMemberFunction(baseClass, hiddenDecl, name) and
-  hasDeclarationBaseClass(overridingDecl, baseClass, name) and
-  // Where the hidden member function isn't explicitly brought in scope through a using declaration.
-  not exists(UsingDeclarationEntry ude |
-    ude.getDeclaration() = hiddenDecl and
-    ude.getEnclosingElement() = overridingDecl.getDeclaringType()
-  ) and
-  // Exclude compiler generated member functions which include things like copy constructor that hide base class
-  // copy constructors.
-  not overridingDecl.isCompilerGenerated() and
-  // Exclude special member functions, which cannot be inherited.
-  not overridingDecl instanceof SpecialMemberFunction
-select overridingDecl,
-  "Declaration for member '" + name + "' hides non-overridable inherited member function $@",
-  hiddenDecl, hiddenDecl.getName()
diff --git a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
index 437c8798f9..e59a76093e 100644
--- a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
+++ b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
@@ -15,42 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
 
-from FunctionDeclarationEntry overridingDecl, FunctionDeclarationEntry hiddenDecl
-where
-  not isExcluded(overridingDecl, ScopePackage::hiddenInheritedOverridableMemberFunctionQuery()) and
-  // Check if we are overriding a virtual inherited member function
-  hiddenDecl.getDeclaration().isVirtual() and
-  // Exclude private member functions, which cannot be inherited.
-  not hiddenDecl.getDeclaration().(MemberFunction).isPrivate() and
-  // The overriding declaration hides the hidden declaration if:
-  (
-    // 1. the overriding declaration overrides a function in a base class that is an overload of the hidden declaration
-    // and the hidden declaration isn't overriden in the same class.
-    exists(FunctionDeclarationEntry overridenDecl |
-      overridingDecl.getDeclaration().(MemberFunction).overrides(overridenDecl.getDeclaration()) and
-      overridenDecl.getDeclaration().getAnOverload() = hiddenDecl.getDeclaration() and
-      not exists(MemberFunction overridingFunc |
-        hiddenDecl.getDeclaration().(MemberFunction).getAnOverridingFunction() = overridingFunc and
-        overridingFunc.getDeclaringType() = overridingDecl.getDeclaration().getDeclaringType()
-      )
-    ) and
-    // and the hidden declaration isn't explicitly brought in scope through a using declaration.
-    not exists(UsingDeclarationEntry ude |
-      ude.getDeclaration() = hiddenDecl.getDeclaration() and
-      ude.getEnclosingElement() = overridingDecl.getDeclaration().getDeclaringType()
-    )
-    or
-    // 2. if the overriding declaration doesn't override a base member function but has the same name
-    // as the hidden declaration
-    not overridingDecl.getDeclaration().(MemberFunction).overrides(_) and
-    overridingDecl.getName() = hiddenDecl.getName() and
-    overridingDecl.getDeclaration().getDeclaringType().getABaseClass() =
-      hiddenDecl.getDeclaration().getDeclaringType()
-  ) and
-  // Limit the results to the declarations and not the definitions, if any.
-  (overridingDecl.getDeclaration().hasDefinition() implies not overridingDecl.isDefinition()) and
-  (hiddenDecl.getDeclaration().hasDefinition() implies not hiddenDecl.isDefinition())
-select overridingDecl,
-  "Declaration for member '" + overridingDecl.getName() +
-    "' hides overridable inherited member function $@", hiddenDecl, hiddenDecl.getName()
+class HiddenInheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery {
+  HiddenInheritedOverridableMemberFunctionQuery() {
+    this = ScopePackage::hiddenInheritedOverridableMemberFunctionQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql b/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
index d94811ff18..37521be2b8 100644
--- a/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
+++ b/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
@@ -15,7 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.asmdeclarationused_shared.AsmDeclarationUsed_shared
 
-from AsmStmt a
-where not isExcluded(a, BannedSyntaxPackage::asmDeclarationUsedQuery())
-select a, "Use of asm declaration"
+class AsmDeclarationUsedQuery extends AsmDeclarationUsed_sharedSharedQuery {
+  AsmDeclarationUsedQuery() {
+    this = BannedSyntaxPackage::asmDeclarationUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql b/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
index 13883624b3..8b9818ab59 100644
--- a/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
+++ b/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
@@ -16,21 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
 
-class RecursiveCall extends FunctionCall {
-  RecursiveCall() {
-    this.getTarget().calls*(this.getEnclosingFunction()) and
-    not this.getTarget().hasSpecifier("is_constexpr")
+class RecursiveFunctionsQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery {
+  RecursiveFunctionsQuery() {
+    this = FunctionsPackage::recursiveFunctionsQuery()
   }
 }
-
-from RecursiveCall call, string msg, FunctionCall fc
-where
-  not isExcluded(fc, FunctionsPackage::recursiveFunctionsQuery()) and
-  fc.getTarget() = call.getTarget() and
-  if fc.getTarget() = fc.getEnclosingFunction()
-  then msg = "This call directly invokes its containing function $@."
-  else
-    msg =
-      "The function " + fc.getEnclosingFunction() + " is indirectly recursive via this call to $@."
-select fc, msg, fc.getTarget(), fc.getTarget().getName()
diff --git a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
index 2a44ca650e..124346a23d 100644
--- a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
+++ b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
@@ -17,50 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
 
-class StdInitializerList extends Class {
-  StdInitializerList() { hasQualifiedName("std", "initializer_list") }
-}
-
-/**
- * An _initializer-list constructor_ according to `[dcl.init.list]`.
- *
- * A `Constructor` where the first parameter refers to `std::initializer_list`, and any remaining
- * parameters have default arguments.
- */
-class InitializerListConstructor extends Constructor {
-  InitializerListConstructor() {
-    // The first parameter is a `std::intializer_list` parameter
-    exists(Type firstParamType | firstParamType = getParameter(0).getType() |
-      // Either directly `std::initializer_list`
-      firstParamType instanceof StdInitializerList
-      or
-      //A reference to `std::initializer_list`
-      firstParamType.(ReferenceType).getBaseType().getUnspecifiedType() instanceof
-        StdInitializerList
-    ) and
-    // All parameters other than the fi
-    forall(Parameter other | other = getParameter([1 .. (getNumberOfParameters() - 1)]) |
-      exists(other.getInitializer())
-    )
+class ConfusingUseOfInitializerListConstructorsQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery {
+  ConfusingUseOfInitializerListConstructorsQuery() {
+    this = InitializationPackage::confusingUseOfInitializerListConstructorsQuery()
   }
 }
-
-from Constructor c, InitializerListConstructor stdInitializerConstructor, string paramList
-where
-  not isExcluded(c, InitializationPackage::confusingUseOfInitializerListConstructorsQuery()) and
-  // Not an initializer-list constructor
-  not c instanceof InitializerListConstructor and
-  // Constructor is not a special member function constructor
-  not c instanceof CopyConstructor and
-  not c instanceof MoveConstructor and
-  not c.getNumberOfParameters() = 0 and // default constructor
-  // And there is an initalizer-list constructor
-  stdInitializerConstructor = c.getDeclaringType().getAConstructor() and
-  // Determine the parameter type list of the constructor
-  paramList =
-    concat(string parameter | parameter = c.getAParameter().getType().getName() | parameter, ",")
-select c,
-  "The constructor " + c.getQualifiedName() + "(" + paramList +
-    ") may be ignored in favour of $@ when using braced initialization.", stdInitializerConstructor,
-  "the constructor accepting std::initializer_list"
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
new file mode 100644
index 0000000000..f9b6a082cf
--- /dev/null
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/autosar/accessible-base-class-both-virtual-and-non-virtual
+ * @name M10-1-3: An accessible base class shall not be both virtual and non-virtual in the same hierarchy
+ * @description A base class must not be virtual and non-virtual in the same hierarchy to avoid
+ *              copies of the object and confusing behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m10-1-3
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
+
+class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery {
+  AccessibleBaseClassBothVirtualAndNonVirtualQuery() {
+    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
deleted file mode 100644
index 6b6cead0ea..0000000000
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @id cpp/autosar/accessible-base-class-both-virtual-and-non-virtual-in-hierarchy
- * @name M10-1-3: An accessible base class shall not be both virtual and non-virtual in the same hierarchy
- * @description A base class must not be virtual and non-virtual in the same hierarchy to avoid
- *              copies of the object and confusing behavior.
- * @kind problem
- * @precision very-high
- * @problem.severity warning
- * @tags external/autosar/id/m10-1-3
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-
-from Class c1, Class c2, Class c3, Class base, ClassDerivation cd1, ClassDerivation cd2
-where
-  not isExcluded(c3,
-    InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()) and
-  // for each pair of classes, get all of their derivations
-  cd1 = c1.getADerivation() and
-  cd2 = c2.getADerivation() and
-  // where they share the same base class
-  base = cd1.getBaseClass() and
-  base = cd2.getBaseClass() and
-  // but one is virtual, and one is not, and the derivations are in different classes
-  cd1.isVirtual() and
-  not cd2.isVirtual() and
-  // and there is some 'other class' that derives from both of these classes
-  c3.derivesFrom*(c1) and
-  c3.derivesFrom*(c2) and
-  // and the base class is accessible from the 'other class'
-  c3.getAMemberFunction().getEnclosingAccessHolder().canAccessClass(base, c3)
-select c3, "Class inherits base class $@, which is derived virtual by $@ and non-virtual by $@.",
-  base, base.getName(), cd1, cd1.getDerivedClass().toString(), c2, cd2.getDerivedClass().toString()
diff --git a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
index 35f41c179a..ebca52df84 100644
--- a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
+++ b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
@@ -14,79 +14,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
 
-predicate thisCall(FunctionCall c) {
-  c.getQualifier() instanceof ThisExpr or
-  c.getQualifier().(PointerDereferenceExpr).getChild(0) instanceof ThisExpr
-}
-
-predicate virtualThisCall(FunctionCall c, Function overridingFunction) {
-  c.isVirtual() and
-  thisCall(c) and
-  overridingFunction = c.getTarget().(VirtualFunction).getAnOverridingFunction()
-}
-
-class DynamicTypeExpr extends Expr {
-  DynamicTypeExpr() {
-    this instanceof TypeidOperator and
-    this.getEnclosingFunction().getDeclaringType().isPolymorphic()
-    or
-    this instanceof DynamicCast
-    or
-    virtualThisCall(this.(FunctionCall), _)
+class DynamicTypeOfThisUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery {
+  DynamicTypeOfThisUsedFromConstructorOrDestructorQuery() {
+    this = InheritancePackage::dynamicTypeOfThisUsedFromConstructorOrDestructorQuery()
   }
 }
-
-/*
- * Catch most cases: go into functions in the same class, but only catch direct
- * references to "this".
- */
-
-predicate nonVirtualMemberFunction(MemberFunction mf, Class c) {
-  mf = c.getAMemberFunction() and
-  not mf instanceof Constructor and
-  not mf instanceof Destructor and
-  not mf.isVirtual()
-}
-
-predicate callFromNonVirtual(MemberFunction source, Class c, MemberFunction targ) {
-  exists(FunctionCall fc |
-    fc.getEnclosingFunction() = source and fc.getTarget() = targ and thisCall(fc)
-  ) and
-  targ = c.getAMemberFunction() and
-  nonVirtualMemberFunction(source, c)
-}
-
-predicate indirectlyInvokesDynamicTypeExpr(MemberFunction caller, DynamicTypeExpr target) {
-  target =
-    any(DynamicTypeExpr expr |
-      expr.getEnclosingFunction() = caller and
-      nonVirtualMemberFunction(caller, caller.getDeclaringType())
-    )
-  or
-  exists(MemberFunction mid |
-    indirectlyInvokesDynamicTypeExpr(mid, target) and
-    callFromNonVirtual(caller, caller.getDeclaringType(), mid)
-  )
-}
-
-from DynamicTypeExpr expr, FunctionCall call, MemberFunction mf, string explanation
-where
-  not isExcluded(expr, InheritancePackage::dynamicTypeOfThisUsedFromConstructorOrDestructorQuery()) and
-  (
-    mf instanceof Constructor or
-    mf instanceof Destructor
-  ) and
-  (
-    mf = expr.getEnclosingFunction() and
-    explanation = "$@ uses the dynamic type of its own object."
-    or
-    mf != expr.getEnclosingFunction() and
-    mf = call.getEnclosingFunction() and
-    thisCall(call) and
-    indirectlyInvokesDynamicTypeExpr(call.getTarget(), expr) and
-    explanation =
-      "$@ calls " + call.getTarget().getQualifiedName() +
-        ", which uses the dynamic type of its own object."
-  )
-select expr, explanation, mf, mf.getQualifiedName()
diff --git a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
index 2736d39290..1d4754745c 100644
--- a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
+++ b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
@@ -16,27 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import NameInDependentBase
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
 
-from
-  TemplateClass c, NameQualifiableElement fn, string targetName, Element actualTarget,
-  Element dependentTypeMemberWithSameName
-where
-  not isExcluded(fn, TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisQuery()) and
-  not isCustomExcluded(fn) and
-  missingNameQualifier(fn) and
-  (
-    fn = getConfusingFunctionAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName)
-    or
-    fn = getConfusingFunctionCall(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
-    not exists(Expr e | e = fn.(FunctionCall).getQualifier())
-    or
-    fn =
-      getConfusingMemberVariableAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
-    not exists(Expr e | e = fn.(VariableAccess).getQualifier())
-  ) and
-  not fn.isAffectedByMacro()
-select fn,
-  "Use of unqualified identifier " + targetName +
-    " targets $@ but a member with the name also exists $@.", actualTarget, targetName,
-  dependentTypeMemberWithSameName, "in the dependent base class"
+class NameNotReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery {
+  NameNotReferredUsingAQualifiedIdOrThisQuery() {
+    this = TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
index 401edf3b61..15bacca423 100644
--- a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
+++ b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
@@ -16,27 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import NameInDependentBase
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
 
-from
-  TemplateClass c, NameQualifiableElement fn, string targetName, Element actualTarget,
-  Element dependentTypeMemberWithSameName
-where
-  not isExcluded(fn, TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisAuditQuery()) and
-  not isCustomExcluded(fn) and
-  missingNameQualifier(fn) and
-  (
-    fn = getConfusingFunctionAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName)
-    or
-    fn = getConfusingFunctionCall(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
-    not exists(Expr e | e = fn.(FunctionCall).getQualifier())
-    or
-    not fn.(VariableAccess).getTarget() instanceof Parameter and
-    fn =
-      getConfusingMemberVariableAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
-    not exists(Expr e | e = fn.(VariableAccess).getQualifier())
-  )
-select fn,
-  "Use of unqualified identifier " + targetName +
-    " targets $@ but a member with the name also exists $@.", actualTarget, targetName,
-  dependentTypeMemberWithSameName, "in the dependent base class"
+class NameNotReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery {
+  NameNotReferredUsingAQualifiedIdOrThisAuditQuery() {
+    this = TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisAuditQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
index 7e263d66bb..a207de0392 100644
--- a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
+++ b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
@@ -15,9 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
 
-from ReThrowExpr re
-where
-  not isExcluded(re, Exceptions1Package::emptyThrowOutsideCatchQuery()) and
-  not re.getEnclosingElement+() instanceof CatchBlock
-select re, "Rethrow outside catch block"
+class EmptyThrowOutsideCatchQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery {
+  EmptyThrowOutsideCatchQuery() {
+    this = Exceptions1Package::emptyThrowOutsideCatchQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql b/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
index a572497418..75be69c70b 100644
--- a/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
+++ b/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
@@ -15,9 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.macrooffsetofused_shared.MacroOffsetofUsed_shared
 
-from MacroInvocation mi
-where
-  not isExcluded(mi, BannedFunctionsPackage::macroOffsetofUsedQuery()) and
-  mi.getMacroName() = "offsetof"
-select mi, "Use of banned macro " + mi.getMacroName() + "."
+class MacroOffsetofUsedQuery extends MacroOffsetofUsed_sharedSharedQuery {
+  MacroOffsetofUsedQuery() {
+    this = BannedFunctionsPackage::macroOffsetofUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql b/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
index ff264baffc..8f176b14af 100644
--- a/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
+++ b/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
@@ -16,10 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
 
-from FunctionCall fc, Function f
-where
-  not isExcluded(fc, BannedLibrariesPackage::csignalFunctionsUsedQuery()) and
-  f = fc.getTarget() and
-  f.hasGlobalOrStdName(["signal", "raise"])
-select fc, "Use of <csignal> function '" + f.getQualifiedName() + "'."
+class CsignalFunctionsUsedQuery extends CsignalFunctionsUsed_sharedSharedQuery {
+  CsignalFunctionsUsedQuery() {
+    this = BannedLibrariesPackage::csignalFunctionsUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql b/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
index c91d56c572..f18a68fea8 100644
--- a/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
+++ b/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
@@ -16,10 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.csignaltypesused_shared.CsignalTypesUsed_shared
 
-from TypeMention tm, UserType ut
-where
-  not isExcluded(tm, BannedLibrariesPackage::csignalTypesUsedQuery()) and
-  ut = tm.getMentionedType() and
-  ut.hasGlobalOrStdName("sig_atomic_t")
-select tm, "Use of <csignal> type '" + ut.getQualifiedName() + "'."
+class CsignalTypesUsedQuery extends CsignalTypesUsed_sharedSharedQuery {
+  CsignalTypesUsedQuery() {
+    this = BannedLibrariesPackage::csignalTypesUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
index 2bd35e2484..81d293b43f 100644
--- a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
+++ b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
@@ -16,10 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Cpp14Literal
+import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
 
-from Cpp14Literal::OctalLiteral octalLiteral
-where
-  not isExcluded(octalLiteral, LiteralsPackage::useOfNonZeroOctalLiteralQuery()) and
-  not octalLiteral.getValue() = "0"
-select octalLiteral, "Non zero octal literal " + octalLiteral.getValueText() + "."
+class UseOfNonZeroOctalLiteralQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery {
+  UseOfNonZeroOctalLiteralQuery() {
+    this = LiteralsPackage::useOfNonZeroOctalLiteralQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql b/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
index 25cae1e03f..6b5fe3e0ae 100644
--- a/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
+++ b/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
@@ -18,18 +18,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Cpp14Literal
+import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
 
-from Cpp14Literal::NumericLiteral nl, string literalKind
-where
-  not isExcluded(nl, LiteralsPackage::missingUSuffixQuery()) and
-  (
-    nl instanceof Cpp14Literal::OctalLiteral and literalKind = "Octal"
-    or
-    nl instanceof Cpp14Literal::HexLiteral and literalKind = "Hex"
-  ) and
-  // This either directly has an unsigned integer type, or it is converted to an unsigned integer type
-  nl.getType().getUnspecifiedType().(IntegralType).isUnsigned() and
-  // The literal already has a `u` or `U` suffix.
-  not nl.getValueText().regexpMatch(".*[lL]*[uU][lL]*")
-select nl, literalKind + " literal is an unsigned integer but does not include a 'U' suffix."
+class MissingUSuffixQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery {
+  MissingUSuffixQuery() {
+    this = LiteralsPackage::missingUSuffixQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql b/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
index 768acb0532..db23f3fb0b 100644
--- a/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
+++ b/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
@@ -16,9 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
 
-from CStyleComment c
-where
-  not isExcluded(c, CommentsPackage::slashStarUsedWithinACStyleCommentQuery()) and
-  exists(c.getContents().regexpFind("./\\*", _, _))
-select c, "C-style /* comment includes nested /*."
+class SlashStarUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery {
+  SlashStarUsedWithinACStyleCommentQuery() {
+    this = CommentsPackage::slashStarUsedWithinACStyleCommentQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
index 55254581a6..6868a8047a 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
@@ -17,26 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.cstdiofunctionsused_shared.CstdioFunctionsUsed_shared
 
-from FunctionCall fc, Function f
-where
-  not isExcluded(fc, BannedLibrariesPackage::cstdioFunctionsUsedQuery()) and
-  f = fc.getTarget() and
-  f.hasGlobalOrStdName([
-      "remove", "rename", "tmpfile", "tmpnam",
-      // File access
-      "fclose", "fflush", "fopen", "freopen", "setbuf", "setvbuf",
-      // Formatted input/output
-      "fprintf", "fscanf", "printf", "scanf", "snprintf", "sprintf", "sscanf", "vfprintf",
-      "vfscanf", "vprintf", "vscanf", "vsnprintf", "vsprintf", "vsscanf",
-      // Character input/output
-      "fgetc", "fgets", "fputc", "fputs", "getc", "getchar", "gets", "putc", "putchar", "puts",
-      "ungetc",
-      // Direct input/output
-      "fread", "fwrite",
-      // File positioning
-      "fgetpos", "fseek", "fsetpos", "ftell", "rewind",
-      // Error handling
-      "clearerr", "feof", "ferror", "perror"
-    ])
-select fc, "Use of <cstdio> function '" + f.getQualifiedName() + "'."
+class CstdioFunctionsUsedQuery extends CstdioFunctionsUsed_sharedSharedQuery {
+  CstdioFunctionsUsedQuery() {
+    this = BannedLibrariesPackage::cstdioFunctionsUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
index ccf633488e..a44ea3dd26 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
@@ -17,12 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.cstdiomacrosused_shared.CstdioMacrosUsed_shared
 
-from MacroInvocation mi
-where
-  not isExcluded(mi, BannedLibrariesPackage::cstdioMacrosUsedQuery()) and
-  mi.getMacroName() in [
-      "BUFSIZ", "EOF", "FILENAME_MAX", "FOPEN_MAX", "L_tmpnam", "TMP_MAX", "_IOFBF", "IOLBF",
-      "_IONBF", "SEEK_CUR", "SEEK_END", "SEEK_SET"
-    ]
-select mi, "Use of <cstdio> macro '" + mi.getMacroName() + "'."
+class CstdioMacrosUsedQuery extends CstdioMacrosUsed_sharedSharedQuery {
+  CstdioMacrosUsedQuery() {
+    this = BannedLibrariesPackage::cstdioMacrosUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
index 6fc2adaffb..f939370984 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
@@ -17,10 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
 
-from TypeMention tm, UserType ut
-where
-  not isExcluded(tm, BannedLibrariesPackage::cstdioTypesUsedQuery()) and
-  ut = tm.getMentionedType() and
-  ut.hasGlobalOrStdName(["FILE", "fpos_t"])
-select tm, "Use of <cstdio> type '" + ut.getQualifiedName() + "'."
+class CstdioTypesUsedQuery extends CstdioTypesUsed_sharedSharedQuery {
+  CstdioTypesUsedQuery() {
+    this = BannedLibrariesPackage::cstdioTypesUsedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
new file mode 100644
index 0000000000..25472efad7
--- /dev/null
+++ b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/autosar/identifier-passed-as-function-argument-decay-to-a-pointer
+ * @name M5-2-12: An identifier with array type passed as a function argument shall not decay to a pointer
+ * @description An identifier with array type passed as a function argument shall not decay to a
+ *              pointer to prevent loss of its bounds.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m5-2-12
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
+
+class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery {
+  IdentifierPassedAsFunctionArgumentDecayToAPointerQuery() {
+    this = PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
deleted file mode 100644
index 4207b4d56c..0000000000
--- a/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @id cpp/autosar/identifier-with-array-type-passed-as-function-argument-decay-to-a-pointer
- * @name M5-2-12: An identifier with array type passed as a function argument shall not decay to a pointer
- * @description An identifier with array type passed as a function argument shall not decay to a
- *              pointer to prevent loss of its bounds.
- * @kind problem
- * @precision very-high
- * @problem.severity warning
- * @tags external/autosar/id/m5-2-12
- *       correctness
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-
-predicate arrayToPointerDecay(Access ae, Parameter p) {
-  (
-    p.getType() instanceof PointerType and
-    // exclude parameters of void* because then it assumed the caller can pass in dimensions through other means.
-    // examples are uses in `memset` or `memcpy`
-    not p.getType() instanceof VoidPointerType
-    or
-    p.getType() instanceof ArrayType
-  ) and
-  ae.getType() instanceof ArrayType and
-  // exclude char[] arrays because we assume that we can determine its dimension by looking for a NULL byte.
-  not ae.getType().(ArrayType).getBaseType() instanceof CharType
-}
-
-from
-  FunctionCall fc, Function f, Parameter decayedArray, Variable array, VariableAccess arrayAccess,
-  int i
-where
-  not isExcluded(fc,
-    PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()) and
-  arrayAccess = array.getAnAccess() and
-  f = fc.getTarget() and
-  arrayAccess = fc.getArgument(i) and
-  decayedArray = f.getParameter(i) and
-  arrayToPointerDecay(arrayAccess, decayedArray) and
-  not arrayAccess.isAffectedByMacro()
-select fc.getArgument(i),
-  "The array $@ decays to the pointer $@ when passed as an argument to the function $@.", array,
-  array.getName(), decayedArray, decayedArray.getName(), f, f.getName()
diff --git a/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql b/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
index b6a51dc0ab..80135df172 100644
--- a/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
+++ b/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
@@ -15,11 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
 
-from Cast c
-where
-  not isExcluded(c, PointersPackage::castNotConvertPointerToFunctionQuery()) and
-  not c.isImplicit() and
-  not c.isAffectedByMacro() and
-  c.getExpr().getType() instanceof FunctionPointerType
-select c, "Cast converting a pointer to function."
+class CastNotConvertPointerToFunctionQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery {
+  CastNotConvertPointerToFunctionQuery() {
+    this = PointersPackage::castNotConvertPointerToFunctionQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
similarity index 51%
rename from cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
rename to cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
index 0367f0aebe..b57a309394 100644
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
@@ -1,5 +1,5 @@
 /**
- * @id cpp/autosar/unary-minus-operator-applied-to-an-expression-whose-underlying-type-is-unsigned
+ * @id cpp/autosar/unary-minus-operator-applied-to-an-unsigned-expression
  * @name M5-3-2: The unary minus operator shall not be applied to an expression whose underlying type is unsigned
  * @description The unary minus operator shall not be applied to an expression whose underlying type
  *              is unsigned.
@@ -14,13 +14,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
 
-from UnaryMinusExpr e, IntegralType t
-where
-  not isExcluded(e,
-    OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()) and
-  t = e.getOperand().getExplicitlyConverted().getType().getUnderlyingType() and
-  t.isUnsigned() and
-  not e.isAffectedByMacro()
-select e.getOperand(),
-  "The unary minus operator shall not be applied to an expression whose underlying type is unsigned."
+class UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery {
+  UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
+    this = OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
index 7e9511cf7e..216388c448 100644
--- a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
+++ b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
@@ -13,8 +13,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Operator
+import codingstandards.cpp.rules.addressofoperatoroverloaded_shared.AddressOfOperatorOverloaded_shared
 
-from UnaryAddressOfOperator o
-where not isExcluded(o, OperatorsPackage::unaryOperatorOverloadedQuery())
-select o, "The unary & operator overloaded."
+class UnaryOperatorOverloadedQuery extends AddressOfOperatorOverloaded_sharedSharedQuery {
+  UnaryOperatorOverloadedQuery() { this = OperatorsPackage::unaryOperatorOverloadedQuery() }
+}
diff --git a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
index 1c6c0b980e..d5756cabd9 100644
--- a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
@@ -16,9 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
 
-from Loop loop
-where
-  not isExcluded(loop, ConditionalsPackage::loopCompoundConditionQuery()) and
-  not loop.getStmt() instanceof BlockStmt
-select loop, "Loop body not enclosed within braces."
+class LoopCompoundConditionQuery extends LoopCompoundCondition_sharedSharedQuery {
+  LoopCompoundConditionQuery() {
+    this = ConditionalsPackage::loopCompoundConditionQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
index ee83f44ccf..1b8e9839f8 100644
--- a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
@@ -16,36 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.switchcompoundcondition_shared.SwitchCompoundCondition_shared
 
-/**
- * Class to differentiate between extractor generated blockstmt and actual blockstmt. The extractor
- * will generate an artificial blockstmt when there is a single case and statement, e.g.
- * ```
- * switch(x)
- *   case 1:
- *     f();
- * ```
- * This is because our AST model considers the `case` to be a statement in its own right, so the
- * extractor needs an aritifical block to hold both the case and the statement.
- */
-class ArtificialBlock extends BlockStmt {
-  ArtificialBlock() {
-    exists(Location block, Location firstStatement |
-      block = getLocation() and firstStatement = getStmt(0).getLocation()
-    |
-      // We can identify artificial blocks as those where the start of the statement is at the same
-      // location as the start of the first statement in the block i.e. there was no opening brace.
-      block.getStartLine() = firstStatement.getStartLine() and
-      block.getStartColumn() = firstStatement.getStartColumn()
-    )
+class SwitchCompoundConditionQuery extends SwitchCompoundCondition_sharedSharedQuery {
+  SwitchCompoundConditionQuery() {
+    this = ConditionalsPackage::switchCompoundConditionQuery()
   }
 }
-
-from SwitchStmt switch
-where
-  not isExcluded(switch, ConditionalsPackage::switchCompoundConditionQuery()) and
-  (
-    switch.getStmt() instanceof ArtificialBlock or
-    not switch.getStmt() instanceof BlockStmt
-  )
-select switch, "Switch body not enclosed within braces."
diff --git a/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql b/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql
index cb714a65f2..edc09e074b 100644
--- a/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql
+++ b/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql
@@ -16,13 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.globalnamespacedeclarations_shared.GlobalNamespaceDeclarations_shared
 
-from DeclarationEntry de
-where
-  not isExcluded(de, ScopePackage::globalNamespaceMembershipViolationQuery()) and
-  de.getDeclaration().getNamespace() instanceof GlobalNamespace and
-  de.getDeclaration().isTopLevel() and
-  not exists(Function f | f = de.getDeclaration() | f.hasGlobalName("main") or f.hasCLinkage())
-select de,
-  "Declaration " + de.getName() +
-    " is in the global namespace and is not a main, a namespace, or an extern \"C\" declaration."
+class GlobalNamespaceMembershipViolationQuery extends GlobalNamespaceDeclarations_sharedSharedQuery {
+  GlobalNamespaceMembershipViolationQuery() {
+    this = ScopePackage::globalNamespaceMembershipViolationQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
similarity index 62%
rename from cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
rename to cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
index 9d86bd3637..d3876527d8 100644
--- a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
+++ b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
@@ -1,5 +1,5 @@
 /**
- * @id cpp/autosar/identifier-main-used-for-a-function-other-than-the-global-function-main
+ * @id cpp/autosar/identifier-main-used-for-a-function-other-than-global-main
  * @name M7-3-2: The identifier main shall not be used for a function other than the global function main
  * @description Reusing the name main in non-main contexts can lead to developer confusion.
  * @kind problem
@@ -15,11 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
 
-from Function f
-where
-  not isExcluded(f,
-    NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()) and
-  f.hasName("main") and
-  not f.hasGlobalName("main")
-select f, "Identifier main used for a function other than the global function main."
+class IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery extends NonGlobalFunctionMain_sharedSharedQuery {
+  IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
+    this = NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
index e35858f40b..bf94412b9a 100644
--- a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
+++ b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
@@ -16,19 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
 
-from ReturnStmt rs, StackVariable auto, Function f, VariableAccess va, string returnType
-where
-  f = rs.getEnclosingFunction() and
-  (
-    f.getType() instanceof ReferenceType and va = rs.getExpr() and returnType = "reference"
-    or
-    f.getType() instanceof PointerType and
-    va = rs.getExpr().(AddressOfExpr).getOperand() and
-    returnType = "pointer"
-  ) and
-  auto = va.getTarget() and
-  not auto.isStatic() and
-  not f.isCompilerGenerated() and
-  not auto.getType() instanceof ReferenceType
-select rs, "The $@ returns a " + returnType + "to an $@ variable", f, f.getName(), auto, "automatic"
+class FunctionReturnAutomaticVarConditionQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery {
+  FunctionReturnAutomaticVarConditionQuery() {
+    this = FunctionsPackage::functionReturnAutomaticVarConditionQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
index 8d16fccd94..d99fcbe48f 100644
--- a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
+++ b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
@@ -16,57 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
 
-/*
- * Unfortunately, we do not have an equivalent of `DeclStmt` for non-local declarations, so we
- * cannot determine whether a declaration was declared with another declaration.
- *
- * However, we can use location trickery to figure out if the declaration occurs close enough to
- * another declaration that it _must_ have been declared within the same declaration sequence.
- *
- * We do this by requiring that the end location of a previous declaration is within a certain
- * number of characters of the start location of the current declaration.
- */
-
-/**
- * A `Declaration` which is not in a local scope, and is written directly by the user.
- *
- * These act as "candidates" for declarations that could plausibly occur in a declaration sequence
- * with other candidates.
- */
-class NonLocalUserDeclaration extends Declaration {
-  NonLocalUserDeclaration() {
-    not this instanceof StackVariable and
-    not this instanceof TemplateParameter and
-    not this instanceof EnumConstant and
-    not this instanceof TypedefType and
-    not any(LambdaCapture lc).getField() = this and
-    not this.(Function).isCompilerGenerated() and
-    not this.(Variable).isCompilerGenerated() and
-    not this.(Parameter).getFunction().isCompilerGenerated() and
-    not this.isInMacroExpansion() and
-    not exists(Struct s, TypedefType t |
-      s.isAnonymous() and
-      t.getBaseType() = s and
-      this = s.getAMemberVariable()
-    )
+class MultipleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery {
+  MultipleGlobalOrMemberDeclaratorsQuery() {
+    this = InitializationPackage::multipleGlobalOrMemberDeclaratorsQuery()
   }
 }
-
-/**
- * Holds if `d1` is followed directly by `d2`.
- */
-predicate isFollowingDeclaration(NonLocalUserDeclaration d1, NonLocalUserDeclaration d2) {
-  exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
-    d1.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-    d2.getLocation().hasLocationInfo(filepath, startline, endcolumn + [2 .. 3], endline, _)
-  ) and
-  not d1.(UserType).stripType() = d2.(Variable).getType().stripType()
-}
-
-from NonLocalUserDeclaration d1
-where
-  not isExcluded(d1, InitializationPackage::multipleGlobalOrMemberDeclaratorsQuery()) and
-  isFollowingDeclaration(d1, _) and
-  not isFollowingDeclaration(_, d1)
-select d1, "Multiple declarations after " + d1.getName() + " in this declaration sequence."
diff --git a/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql b/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
index 7545315b7e..a84832ceda 100644
--- a/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
+++ b/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
@@ -16,11 +16,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
 
-from DeclStmt ds
-where
-  not isExcluded(ds, InitializationPackage::multipleLocalDeclaratorsQuery()) and
-  count(Declaration d | d = ds.getADeclaration()) > 1 and
-  // Not a compiler generated `DeclStmt`, such as in the range-based for loop
-  not ds.isCompilerGenerated()
-select ds, "Declaration list contains more than one declaration."
+class MultipleLocalDeclaratorsQuery extends MultipleLocalDeclarators_sharedSharedQuery {
+  MultipleLocalDeclaratorsQuery() {
+    this = InitializationPackage::multipleLocalDeclaratorsQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
new file mode 100644
index 0000000000..e5908a5520
--- /dev/null
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/autosar/virtual-function-parameters-use-same-default-arguments
+ * @name M8-3-1: Parameters in an overriding virtual function shall have the same default arguments or no default arguments
+ * @description Parameters in an overriding virtual function shall either use the same default
+ *              arguments as the function they override, or else shall not specify any default
+ *              arguments.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m8-3-1
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
+
+class VirtualFunctionParametersUseSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery {
+  VirtualFunctionParametersUseSameDefaultArgumentsQuery() {
+    this = VirtualFunctionsPackage::virtualFunctionParametersUseSameDefaultArgumentsQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
deleted file mode 100644
index 9d2b2d2006..0000000000
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @id cpp/autosar/virtual-function-parameters-use-the-same-default-arguments
- * @name M8-3-1: Parameters in an overriding virtual function shall have the same default arguments or no default arguments
- * @description Parameters in an overriding virtual function shall either use the same default
- *              arguments as the function they override, or else shall not specify any default
- *              arguments.
- * @kind problem
- * @precision very-high
- * @problem.severity warning
- * @tags external/autosar/id/m8-3-1
- *       correctness
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-
-from VirtualFunction f1, VirtualFunction f2
-where
-  not isExcluded(f1,
-    VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()) and
-  not isExcluded(f2,
-    VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()) and
-  f2 = f1.getAnOverridingFunction() and
-  exists(Parameter p1, Parameter p2 |
-    p1 = f1.getAParameter() and
-    p2 = f2.getParameter(p1.getIndex())
-  |
-    if p1.hasInitializer()
-    then
-      // if there is no initializer
-      not p2.hasInitializer()
-      or
-      // if there is one and it doesn't match
-      not p1.getInitializer().getExpr().getValueText() =
-        p2.getInitializer().getExpr().getValueText()
-    else
-      // if p1 doesn't have an initializer p2 shouldn't either
-      p2.hasInitializer()
-  )
-select f2, "$@ does not have the same default parameters as $@", f2, "overriding function", f1,
-  "overridden function"
diff --git a/cpp/autosar/src/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.ql b/cpp/autosar/src/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.ql
index 7748f26ec1..96e434633e 100644
--- a/cpp/autosar/src/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.ql
+++ b/cpp/autosar/src/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.ql
@@ -22,4 +22,4 @@ where
   bf.getType().getUnderlyingType().(IntegralType).isSigned() and
   bf.getNumBits() < 2 and
   bf.getName() != "(unnamed bitfield)"
-select bf, "A named bit-field with signed integral type should have at least 2 bits of storage "
+select bf, "A named bit-field with signed integral type should have at least 2 bits of storage."
diff --git a/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.qlref b/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.qlref
deleted file mode 100644
index 9d356add77..0000000000
--- a/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref b/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref
new file mode 100644
index 0000000000..1bf7e7fffb
--- /dev/null
+++ b/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.qlref b/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.qlref
deleted file mode 100644
index 686462e15f..0000000000
--- a/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref b/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref
new file mode 100644
index 0000000000..23e38dba55
--- /dev/null
+++ b/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.qlref b/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.qlref
deleted file mode 100644
index b2f19b3af3..0000000000
--- a/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref b/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref
new file mode 100644
index 0000000000..04c3f5a724
--- /dev/null
+++ b/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.qlref b/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.qlref
deleted file mode 100644
index 68c8e7af9a..0000000000
--- a/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A15-1-2/PointerExceptionObject.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref b/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref
new file mode 100644
index 0000000000..41eabfe5a6
--- /dev/null
+++ b/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.qlref b/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.qlref
deleted file mode 100644
index 80fbc7365c..0000000000
--- a/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A15-4-2/NoExceptFunctionThrows.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref b/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref
new file mode 100644
index 0000000000..089cce1ccf
--- /dev/null
+++ b/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.qlref b/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.qlref
deleted file mode 100644
index 9f78cda4c6..0000000000
--- a/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A18-1-2/VectorboolSpecializationUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref b/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref
new file mode 100644
index 0000000000..96d8385f5f
--- /dev/null
+++ b/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.qlref b/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.qlref
deleted file mode 100644
index 1f1e8258e4..0000000000
--- a/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref b/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref
new file mode 100644
index 0000000000..bd7e582a38
--- /dev/null
+++ b/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.expected b/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.expected
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.qlref b/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.qlref
deleted file mode 100644
index 04cc5622dd..0000000000
--- a/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref b/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref
new file mode 100644
index 0000000000..781d037067
--- /dev/null
+++ b/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.qlref b/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.qlref
deleted file mode 100644
index 05bcab607a..0000000000
--- a/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref b/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref
new file mode 100644
index 0000000000..16fd01273f
--- /dev/null
+++ b/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.qlref b/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.qlref
deleted file mode 100644
index ce6347c955..0000000000
--- a/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A2-13-1/EscapeSequenceOutsideISO.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref b/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref
new file mode 100644
index 0000000000..a257ad6ab7
--- /dev/null
+++ b/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.qlref b/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.qlref
deleted file mode 100644
index 876f24be61..0000000000
--- a/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref b/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref
new file mode 100644
index 0000000000..d4f66ed35e
--- /dev/null
+++ b/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.qlref b/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.qlref
deleted file mode 100644
index d836b834b3..0000000000
--- a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A4-10-1/NullPointerConstantNotNullptr.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref b/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref
new file mode 100644
index 0000000000..495d8eddba
--- /dev/null
+++ b/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.qlref b/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.qlref
deleted file mode 100644
index 5f588b44ab..0000000000
--- a/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref b/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref
new file mode 100644
index 0000000000..2a9e8b2eef
--- /dev/null
+++ b/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref b/cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
new file mode 100644
index 0000000000..2a9e8b2eef
--- /dev/null
+++ b/cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref b/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
new file mode 100644
index 0000000000..2a9e8b2eef
--- /dev/null
+++ b/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.qlref b/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.qlref
deleted file mode 100644
index 3cfb0444cc..0000000000
--- a/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A5-2-4/ReinterpretCastUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref b/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref
new file mode 100644
index 0000000000..a553240f19
--- /dev/null
+++ b/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.expected b/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.expected
deleted file mode 100644
index 9f4343cf1c..0000000000
--- a/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.cpp:4:3:4:14 | goto ... | Use of goto. |
diff --git a/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.qlref b/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.qlref
deleted file mode 100644
index d3516aa03b..0000000000
--- a/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A6-6-1/GotoStatementUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref b/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref
new file mode 100644
index 0000000000..3f2f4508b1
--- /dev/null
+++ b/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A6-6-1/test.cpp b/cpp/autosar/test/rules/A6-6-1/test.cpp
deleted file mode 100644
index d13f01961c..0000000000
--- a/cpp/autosar/test/rules/A6-6-1/test.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-void test_goto() {
-  int x = 1;
-
-  goto label1; // NON_COMPLIANT
-
-label1:
-
-  x = 2;
-}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.qlref b/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.qlref
deleted file mode 100644
index 1ed510a506..0000000000
--- a/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.testref b/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.testref
new file mode 100644
index 0000000000..d7a73fd488
--- /dev/null
+++ b/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.qlref b/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.qlref
deleted file mode 100644
index 0fe94e847c..0000000000
--- a/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref b/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref
new file mode 100644
index 0000000000..3b04b2950f
--- /dev/null
+++ b/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.qlref b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.qlref
deleted file mode 100644
index d94c3c0b0a..0000000000
--- a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref
new file mode 100644
index 0000000000..371b80ead3
--- /dev/null
+++ b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.qlref b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.qlref
deleted file mode 100644
index 57d16c4e90..0000000000
--- a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref
new file mode 100644
index 0000000000..3fcc2ed7e7
--- /dev/null
+++ b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.qlref b/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.qlref
deleted file mode 100644
index 286e62bd18..0000000000
--- a/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A7-4-1/AsmDeclarationUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref b/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref
new file mode 100644
index 0000000000..d0a190a3eb
--- /dev/null
+++ b/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.qlref b/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.qlref
deleted file mode 100644
index 10fccea7f7..0000000000
--- a/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A7-5-2/RecursiveFunctions.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref b/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref
new file mode 100644
index 0000000000..1ebf3d5742
--- /dev/null
+++ b/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.qlref b/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.qlref
deleted file mode 100644
index eb351d9e36..0000000000
--- a/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref b/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref
new file mode 100644
index 0000000000..b9075dec6f
--- /dev/null
+++ b/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
new file mode 100644
index 0000000000..966337628d
--- /dev/null
+++ b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.qlref b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.qlref
deleted file mode 100644
index 208baa8d08..0000000000
--- a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref
new file mode 100644
index 0000000000..966337628d
--- /dev/null
+++ b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.qlref b/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.qlref
deleted file mode 100644
index 4235959d77..0000000000
--- a/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref b/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref
new file mode 100644
index 0000000000..985c209460
--- /dev/null
+++ b/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.qlref b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.qlref
deleted file mode 100644
index f0e2ebd711..0000000000
--- a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref
new file mode 100644
index 0000000000..34df16815b
--- /dev/null
+++ b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.qlref b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.qlref
deleted file mode 100644
index 442eb62675..0000000000
--- a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref
new file mode 100644
index 0000000000..0bef5586dd
--- /dev/null
+++ b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.qlref b/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.qlref
deleted file mode 100644
index 3643376e59..0000000000
--- a/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M15-1-3/EmptyThrowOutsideCatch.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref b/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref
new file mode 100644
index 0000000000..01a7dde1dd
--- /dev/null
+++ b/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.qlref b/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.qlref
deleted file mode 100644
index a69e18549f..0000000000
--- a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M18-2-1/MacroOffsetofUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref b/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref
new file mode 100644
index 0000000000..f53f8d6f9f
--- /dev/null
+++ b/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.qlref b/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.qlref
deleted file mode 100644
index 445ccd5bd4..0000000000
--- a/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M18-7-1/CsignalFunctionsUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref b/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref
new file mode 100644
index 0000000000..b48ce80edb
--- /dev/null
+++ b/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.qlref b/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.qlref
deleted file mode 100644
index 34c83d741a..0000000000
--- a/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M18-7-1/CsignalTypesUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref b/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref
new file mode 100644
index 0000000000..3ea4c7008d
--- /dev/null
+++ b/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected
deleted file mode 100644
index 17a0016fec..0000000000
--- a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| test.cpp:3:3:3:8 | 10 | This literal contains the non-zero octal escape code \\012. |
-| test.cpp:4:3:4:8 | 44 | This literal contains the non-zero octal escape code \\054. |
-| test.cpp:5:3:5:9 | 3129 | This literal contains the non-zero octal escape code \\014. |
-| test.cpp:10:3:10:8 | \n | This literal contains the non-zero octal escape code \\012. |
-| test.cpp:11:3:11:8 | , | This literal contains the non-zero octal escape code \\054. |
-| test.cpp:12:3:12:9 | \u000c9 | This literal contains the non-zero octal escape code \\014. |
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref
deleted file mode 100644
index f2ff9c2aef..0000000000
--- a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M2-13-2/UseOfNonZeroOctalEscape.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.qlref b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.qlref
deleted file mode 100644
index 67900e54f7..0000000000
--- a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref
new file mode 100644
index 0000000000..5b23b86826
--- /dev/null
+++ b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.qlref b/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.qlref
deleted file mode 100644
index ffb71066d5..0000000000
--- a/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M2-13-3/MissingUSuffix.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref b/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref
new file mode 100644
index 0000000000..1a58c1eee1
--- /dev/null
+++ b/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.qlref b/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.qlref
deleted file mode 100644
index 3f146ebeaf..0000000000
--- a/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref b/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref
new file mode 100644
index 0000000000..8073a976cd
--- /dev/null
+++ b/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.qlref b/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.qlref
deleted file mode 100644
index 7d97c146c9..0000000000
--- a/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M27-0-1/CstdioFunctionsUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref b/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref
new file mode 100644
index 0000000000..595b7fcffa
--- /dev/null
+++ b/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.qlref b/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.qlref
deleted file mode 100644
index 20bf876eba..0000000000
--- a/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M27-0-1/CstdioMacrosUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref b/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref
new file mode 100644
index 0000000000..8bc3a8fcde
--- /dev/null
+++ b/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.qlref b/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.qlref
deleted file mode 100644
index 10beab7eaa..0000000000
--- a/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M27-0-1/CstdioTypesUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref b/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref
new file mode 100644
index 0000000000..4020d6427e
--- /dev/null
+++ b/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref b/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
new file mode 100644
index 0000000000..97edef0af2
--- /dev/null
+++ b/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.qlref b/cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.qlref
deleted file mode 100644
index 3a513b4cbe..0000000000
--- a/cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.expected b/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.expected
deleted file mode 100644
index 63c33f26d7..0000000000
--- a/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| test.cpp:2:3:2:34 | reinterpret_cast<..(*)(..)>... | Cast converting a pointer to function. |
-| test.cpp:3:3:3:30 | reinterpret_cast<void *>... | Cast converting a pointer to function. |
diff --git a/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.qlref b/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.qlref
deleted file mode 100644
index 7f4d4c1161..0000000000
--- a/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M5-2-6/CastNotConvertPointerToFunction.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref b/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref
new file mode 100644
index 0000000000..5eeeea570a
--- /dev/null
+++ b/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.qlref b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.qlref
deleted file mode 100644
index 37d8a72ce5..0000000000
--- a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
new file mode 100644
index 0000000000..48a20b03f1
--- /dev/null
+++ b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.qlref b/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.qlref
deleted file mode 100644
index 9e6cb1d0f8..0000000000
--- a/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M5-3-3/UnaryOperatorOverloaded.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref b/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref
new file mode 100644
index 0000000000..f9c1d69467
--- /dev/null
+++ b/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.qlref b/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.qlref
deleted file mode 100644
index 4ee6239a13..0000000000
--- a/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M6-3-1/LoopCompoundCondition.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref b/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref
new file mode 100644
index 0000000000..e301b04020
--- /dev/null
+++ b/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.qlref b/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.qlref
deleted file mode 100644
index eff312aa30..0000000000
--- a/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M6-3-1/SwitchCompoundCondition.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref b/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref
new file mode 100644
index 0000000000..e48ef207a0
--- /dev/null
+++ b/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref b/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref
new file mode 100644
index 0000000000..93764c480e
--- /dev/null
+++ b/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
new file mode 100644
index 0000000000..528412284f
--- /dev/null
+++ b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.qlref b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.qlref
deleted file mode 100644
index 36bc86bb79..0000000000
--- a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref
new file mode 100644
index 0000000000..528412284f
--- /dev/null
+++ b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.qlref b/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.qlref
deleted file mode 100644
index 4cb410e095..0000000000
--- a/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref b/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref
new file mode 100644
index 0000000000..676e414381
--- /dev/null
+++ b/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.qlref b/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.qlref
deleted file mode 100644
index 2703512673..0000000000
--- a/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref b/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref
new file mode 100644
index 0000000000..b848fce94f
--- /dev/null
+++ b/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.qlref b/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.qlref
deleted file mode 100644
index 2375201bf3..0000000000
--- a/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M8-0-1/MultipleLocalDeclarators.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref b/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref
new file mode 100644
index 0000000000..2d7784cea0
--- /dev/null
+++ b/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
new file mode 100644
index 0000000000..c89e908ada
--- /dev/null
+++ b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.expected b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.expected
deleted file mode 100644
index b5cdd76a2b..0000000000
--- a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| test.cpp:16:8:16:8 | f | $@ does not have the same default parameters as $@ | test.cpp:16:8:16:8 | f | overriding function | test.cpp:4:16:4:16 | f | overridden function |
-| test.cpp:21:8:21:8 | f | $@ does not have the same default parameters as $@ | test.cpp:21:8:21:8 | f | overriding function | test.cpp:4:16:4:16 | f | overridden function |
diff --git a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.qlref b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.qlref
deleted file mode 100644
index ae0c1df157..0000000000
--- a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref
new file mode 100644
index 0000000000..c89e908ada
--- /dev/null
+++ b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.expected b/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.expected
deleted file mode 100644
index 26b9aac563..0000000000
--- a/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.cpp:2:14:2:14 | x | A named bit-field with signed integral type should have at least 2 bits of storage  |
diff --git a/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.qlref b/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.qlref
deleted file mode 100644
index cdb9677f5f..0000000000
--- a/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref b/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref
new file mode 100644
index 0000000000..a2543b0769
--- /dev/null
+++ b/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M9-6-4/test.cpp b/cpp/autosar/test/rules/M9-6-4/test.cpp
deleted file mode 100644
index d3939b71ee..0000000000
--- a/cpp/autosar/test/rules/M9-6-4/test.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-struct S {
-  signed int x : 1; // NON-COMPLIANT
-  signed int y : 5; // COMPLIANT
-  signed int z : 7; // COMPLIANT
-  signed int : 0;   // COMPLIANT
-  signed int : 1;   // COMPLIANT
-  signed int : 2;   // COMPLIANT
-};
\ No newline at end of file
diff --git a/c/common/src/codingstandards/c/Expr.qll b/cpp/common/src/codingstandards/cpp/CExpr.qll
similarity index 100%
rename from c/common/src/codingstandards/c/Expr.qll
rename to cpp/common/src/codingstandards/cpp/CExpr.qll
diff --git a/c/common/src/codingstandards/c/Ordering.qll b/cpp/common/src/codingstandards/cpp/COrdering.qll
similarity index 99%
rename from c/common/src/codingstandards/c/Ordering.qll
rename to cpp/common/src/codingstandards/cpp/COrdering.qll
index 575dc6f3fd..be8254aae9 100644
--- a/c/common/src/codingstandards/c/Ordering.qll
+++ b/cpp/common/src/codingstandards/cpp/COrdering.qll
@@ -1,6 +1,6 @@
 import cpp
 import codingstandards.cpp.SideEffect
-import codingstandards.c.Expr
+import codingstandards.cpp.CExpr
 import codingstandards.cpp.Variable
 
 module Ordering {
diff --git a/c/common/src/codingstandards/c/IrreplaceableFunctionLikeMacro.qll b/cpp/common/src/codingstandards/cpp/IrreplaceableFunctionLikeMacro.qll
similarity index 100%
rename from c/common/src/codingstandards/c/IrreplaceableFunctionLikeMacro.qll
rename to cpp/common/src/codingstandards/cpp/IrreplaceableFunctionLikeMacro.qll
diff --git a/cpp/common/src/codingstandards/cpp/Literals.qll b/cpp/common/src/codingstandards/cpp/Literals.qll
index c6845b181d..66e15b28dc 100644
--- a/cpp/common/src/codingstandards/cpp/Literals.qll
+++ b/cpp/common/src/codingstandards/cpp/Literals.qll
@@ -5,6 +5,8 @@
 import cpp
 import codingstandards.cpp.Cpp14Literal
 
+class IntegerLiteral = Cpp14Literal::IntegerLiteral;
+
 /** Gets `Literal.getValueText()` truncated to at most 20 characters. */
 string getTruncatedLiteralText(Literal l) {
   exists(string text | text = l.getValueText() |
diff --git a/cpp/autosar/src/rules/M14-6-1/NameInDependentBase.qll b/cpp/common/src/codingstandards/cpp/NameInDependentBase.qll
similarity index 99%
rename from cpp/autosar/src/rules/M14-6-1/NameInDependentBase.qll
rename to cpp/common/src/codingstandards/cpp/NameInDependentBase.qll
index b3d12c044b..e599f286ae 100644
--- a/cpp/autosar/src/rules/M14-6-1/NameInDependentBase.qll
+++ b/cpp/common/src/codingstandards/cpp/NameInDependentBase.qll
@@ -1,5 +1,4 @@
 import cpp
-import codingstandards.cpp.autosar
 
 /**
  * Gets a dependent base type of the given template class.
diff --git a/cpp/autosar/src/rules/A18-5-4/OperatorDelete.qll b/cpp/common/src/codingstandards/cpp/OperatorDelete.qll
similarity index 96%
rename from cpp/autosar/src/rules/A18-5-4/OperatorDelete.qll
rename to cpp/common/src/codingstandards/cpp/OperatorDelete.qll
index ada7d109cd..c9ff315866 100644
--- a/cpp/autosar/src/rules/A18-5-4/OperatorDelete.qll
+++ b/cpp/common/src/codingstandards/cpp/OperatorDelete.qll
@@ -1,5 +1,4 @@
 import cpp
-import codingstandards.cpp.autosar
 
 class StdNoThrow extends Class {
   StdNoThrow() { hasQualifiedName("std", "nothrow_t") }
diff --git a/c/common/src/codingstandards/c/SideEffects.qll b/cpp/common/src/codingstandards/cpp/SideEffects.qll
similarity index 100%
rename from c/common/src/codingstandards/c/SideEffects.qll
rename to cpp/common/src/codingstandards/cpp/SideEffects.qll
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll
index 86b4b9c5ae..fe0c6ea6e3 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll
@@ -26,7 +26,69 @@ newtype ImportMisra23Query =
   TCallToSetlocaleInvalidatesOldPointersMisraQuery() or
   TCallToSetlocaleInvalidatesOldPointersWarnMisraQuery() or
   TObjectUsedWhileInPotentiallyMovedFromStateQuery() or
-  TReadsAndWritesOnStreamNotSeparatedByPositioningQuery()
+  TReadsAndWritesOnStreamNotSeparatedByPositioningQuery() or
+  TCommaOperatorShouldNotBeUsedQuery() or
+  TCopyAndMoveAssignmentsShallHandleSelfAssignmentQuery() or
+  TUseSingleLocalDeclaratorsQuery() or
+  TUseSingleGlobalOrMemberDeclaratorsQuery() or
+  TEnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery() or
+  TAsmDeclarationShallNotBeUsedQuery() or
+  TNonUniqueEnumerationConstantQuery() or
+  TBitFieldShallHaveAnAppropriateTypeQuery() or
+  TSignedIntegerNamedBitFieldHaveALengthOfOneBitQuery() or
+  TVirtualAndNonVirtualClassInTheHierarchyQuery() or
+  TOverridingShallSpecifyDifferentDefaultArgumentsQuery() or
+  TPotentiallyVirtualPointerOnlyComparesToNullptrQuery() or
+  TObjectsDynamicTypeUsedFromConstructorOrDestructorQuery() or
+  TInitializeAllVirtualBaseClassesQuery() or
+  TInitializerListConstructorIsTheOnlyConstructorQuery() or
+  TAddressOfOperatorOverloadedQuery() or
+  TFunctionTemplatesExplicitlySpecializedQuery() or
+  TExceptionObjectHavePointerTypeQuery() or
+  TEmptyThrowOnlyWithinACatchHandlerQuery() or
+  TNoexceptFunctionShouldNotPropagateToTheCallerQuery() or
+  TFunctionLikeMacrosDefinedQuery() or
+  TMacroParameterFollowingHashQuery() or
+  TAMixedUseMacroArgumentSubjectToExpansionQuery() or
+  TCsignalFacilitiesUsedQuery() or
+  TCsignalTypesShallNotBeUsedQuery() or
+  TAtofAtoiAtolAndAtollUsedQuery() or
+  TMacroOffsetofShallNotBeUsedQuery() or
+  TGlobalSizedOperatorDeleteShallBeDefinedQuery() or
+  TGlobalUnsizedOperatorDeleteShallBeDefinedQuery() or
+  TVectorShouldNotBeSpecializedWithBoolQuery() or
+  TForwardingReferencesAndForwardNotUsedTogetherQuery() or
+  TCstdioFunctionsShallNotBeUsedQuery() or
+  TCstdioMacrosShallNotBeUsedQuery() or
+  TCstdioTypesShallNotBeUsedQuery() or
+  TMemoryOperationsNotSequencedAppropriatelyQuery() or
+  TBackslashCharacterMisuseQuery() or
+  TNonTerminatedEscapeSequencesQuery() or
+  TOctalConstantsUsedQuery() or
+  TUnsignedIntegerLiteralsNotAppropriatelySuffixedQuery() or
+  TLowercaseLStartsInLiteralSuffixQuery() or
+  TCharacterSequenceUsedWithinACStyleCommentQuery() or
+  TLineSplicingUsedInCommentsQuery() or
+  TGlobalNamespaceDeclarationsQuery() or
+  TNonGlobalFunctionMainQuery() or
+  TInheritedNonOverridableMemberFunctionQuery() or
+  TInheritedOverridableMemberFunctionQuery() or
+  TDefinitionShallBeConsideredForUnqualifiedLookupQuery() or
+  TNameShallBeReferredUsingAQualifiedIdOrThisQuery() or
+  TNameShallBeReferredUsingAQualifiedIdOrThisAuditQuery() or
+  TReturnReferenceOrPointerToAutomaticLocalVariableQuery() or
+  TNullptrNotTheOnlyFormOfTheNullPointerConstantQuery() or
+  TArrayPassedAsFunctionArgumentDecayToAPointerQuery() or
+  TResultOfAnAssignmentOperatorShouldNotBeUsedQuery() or
+  TFunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery() or
+  TCastsBetweenAPointerToFunctionAndAnyOtherTypeQuery() or
+  TReinterpretCastShallNotBeUsedQuery() or
+  TUnsignedOperationWithConstantOperandsWrapsQuery() or
+  TBuiltInUnaryOperatorAppliedToUnsignedExpressionQuery() or
+  TSwitchBodyCompoundConditionQuery() or
+  TLoopBodyCompoundConditionQuery() or
+  TGotoStatementShouldNotBeUsedQuery() or
+  TGotoReferenceALabelInSurroundingBlockQuery()
 
 predicate isImportMisra23QueryMetadata(Query query, string queryId, string ruleId, string category) {
   query =
@@ -235,6 +297,564 @@ predicate isImportMisra23QueryMetadata(Query query, string queryId, string ruleI
     "cpp/misra/reads-and-writes-on-stream-not-separated-by-positioning" and
   ruleId = "RULE-30-0-2" and
   category = "required"
+  or
+  query =
+    // `Query` instance for the `commaOperatorShouldNotBeUsed` query
+    ImportMisra23Package::commaOperatorShouldNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `commaOperatorShouldNotBeUsed` query
+    "cpp/misra/comma-operator-should-not-be-used" and
+  ruleId = "RULE-8-19-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `copyAndMoveAssignmentsShallHandleSelfAssignment` query
+    ImportMisra23Package::copyAndMoveAssignmentsShallHandleSelfAssignmentQuery() and
+  queryId =
+    // `@id` for the `copyAndMoveAssignmentsShallHandleSelfAssignment` query
+    "cpp/misra/copy-and-move-assignments-shall-handle-self-assignment" and
+  ruleId = "DIR-15-8-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `useSingleLocalDeclarators` query
+    ImportMisra23Package::useSingleLocalDeclaratorsQuery() and
+  queryId =
+    // `@id` for the `useSingleLocalDeclarators` query
+    "cpp/misra/use-single-local-declarators" and
+  ruleId = "RULE-10-0-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `useSingleGlobalOrMemberDeclarators` query
+    ImportMisra23Package::useSingleGlobalOrMemberDeclaratorsQuery() and
+  queryId =
+    // `@id` for the `useSingleGlobalOrMemberDeclarators` query
+    "cpp/misra/use-single-global-or-member-declarators" and
+  ruleId = "RULE-10-0-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `enumerationNotDefinedWithAnExplicitUnderlyingType` query
+    ImportMisra23Package::enumerationNotDefinedWithAnExplicitUnderlyingTypeQuery() and
+  queryId =
+    // `@id` for the `enumerationNotDefinedWithAnExplicitUnderlyingType` query
+    "cpp/misra/enumeration-not-defined-with-an-explicit-underlying-type" and
+  ruleId = "RULE-10-2-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `asmDeclarationShallNotBeUsed` query
+    ImportMisra23Package::asmDeclarationShallNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `asmDeclarationShallNotBeUsed` query
+    "cpp/misra/asm-declaration-shall-not-be-used" and
+  ruleId = "RULE-10-4-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `nonUniqueEnumerationConstant` query
+    ImportMisra23Package::nonUniqueEnumerationConstantQuery() and
+  queryId =
+    // `@id` for the `nonUniqueEnumerationConstant` query
+    "cpp/misra/non-unique-enumeration-constant" and
+  ruleId = "RULE-11-6-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `bitFieldShallHaveAnAppropriateType` query
+    ImportMisra23Package::bitFieldShallHaveAnAppropriateTypeQuery() and
+  queryId =
+    // `@id` for the `bitFieldShallHaveAnAppropriateType` query
+    "cpp/misra/bit-field-shall-have-an-appropriate-type" and
+  ruleId = "RULE-12-2-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `signedIntegerNamedBitFieldHaveALengthOfOneBit` query
+    ImportMisra23Package::signedIntegerNamedBitFieldHaveALengthOfOneBitQuery() and
+  queryId =
+    // `@id` for the `signedIntegerNamedBitFieldHaveALengthOfOneBit` query
+    "cpp/misra/signed-integer-named-bit-field-have-a-length-of-one-bit" and
+  ruleId = "RULE-12-2-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `virtualAndNonVirtualClassInTheHierarchy` query
+    ImportMisra23Package::virtualAndNonVirtualClassInTheHierarchyQuery() and
+  queryId =
+    // `@id` for the `virtualAndNonVirtualClassInTheHierarchy` query
+    "cpp/misra/virtual-and-non-virtual-class-in-the-hierarchy" and
+  ruleId = "RULE-13-1-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `overridingShallSpecifyDifferentDefaultArguments` query
+    ImportMisra23Package::overridingShallSpecifyDifferentDefaultArgumentsQuery() and
+  queryId =
+    // `@id` for the `overridingShallSpecifyDifferentDefaultArguments` query
+    "cpp/misra/overriding-shall-specify-different-default-arguments" and
+  ruleId = "RULE-13-3-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `potentiallyVirtualPointerOnlyComparesToNullptr` query
+    ImportMisra23Package::potentiallyVirtualPointerOnlyComparesToNullptrQuery() and
+  queryId =
+    // `@id` for the `potentiallyVirtualPointerOnlyComparesToNullptr` query
+    "cpp/misra/potentially-virtual-pointer-only-compares-to-nullptr" and
+  ruleId = "RULE-13-3-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `objectsDynamicTypeUsedFromConstructorOrDestructor` query
+    ImportMisra23Package::objectsDynamicTypeUsedFromConstructorOrDestructorQuery() and
+  queryId =
+    // `@id` for the `objectsDynamicTypeUsedFromConstructorOrDestructor` query
+    "cpp/misra/objects-dynamic-type-used-from-constructor-or-destructor" and
+  ruleId = "RULE-15-1-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `initializeAllVirtualBaseClasses` query
+    ImportMisra23Package::initializeAllVirtualBaseClassesQuery() and
+  queryId =
+    // `@id` for the `initializeAllVirtualBaseClasses` query
+    "cpp/misra/initialize-all-virtual-base-classes" and
+  ruleId = "RULE-15-1-2" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `initializerListConstructorIsTheOnlyConstructor` query
+    ImportMisra23Package::initializerListConstructorIsTheOnlyConstructorQuery() and
+  queryId =
+    // `@id` for the `initializerListConstructorIsTheOnlyConstructor` query
+    "cpp/misra/initializer-list-constructor-is-the-only-constructor" and
+  ruleId = "RULE-15-1-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `addressOfOperatorOverloaded` query
+    ImportMisra23Package::addressOfOperatorOverloadedQuery() and
+  queryId =
+    // `@id` for the `addressOfOperatorOverloaded` query
+    "cpp/misra/address-of-operator-overloaded" and
+  ruleId = "RULE-16-5-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `functionTemplatesExplicitlySpecialized` query
+    ImportMisra23Package::functionTemplatesExplicitlySpecializedQuery() and
+  queryId =
+    // `@id` for the `functionTemplatesExplicitlySpecialized` query
+    "cpp/misra/function-templates-explicitly-specialized" and
+  ruleId = "RULE-17-8-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `exceptionObjectHavePointerType` query
+    ImportMisra23Package::exceptionObjectHavePointerTypeQuery() and
+  queryId =
+    // `@id` for the `exceptionObjectHavePointerType` query
+    "cpp/misra/exception-object-have-pointer-type" and
+  ruleId = "RULE-18-1-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `emptyThrowOnlyWithinACatchHandler` query
+    ImportMisra23Package::emptyThrowOnlyWithinACatchHandlerQuery() and
+  queryId =
+    // `@id` for the `emptyThrowOnlyWithinACatchHandler` query
+    "cpp/misra/empty-throw-only-within-a-catch-handler" and
+  ruleId = "RULE-18-1-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `noexceptFunctionShouldNotPropagateToTheCaller` query
+    ImportMisra23Package::noexceptFunctionShouldNotPropagateToTheCallerQuery() and
+  queryId =
+    // `@id` for the `noexceptFunctionShouldNotPropagateToTheCaller` query
+    "cpp/misra/noexcept-function-should-not-propagate-to-the-caller" and
+  ruleId = "RULE-18-5-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `functionLikeMacrosDefined` query
+    ImportMisra23Package::functionLikeMacrosDefinedQuery() and
+  queryId =
+    // `@id` for the `functionLikeMacrosDefined` query
+    "cpp/misra/function-like-macros-defined" and
+  ruleId = "RULE-19-0-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `macroParameterFollowingHash` query
+    ImportMisra23Package::macroParameterFollowingHashQuery() and
+  queryId =
+    // `@id` for the `macroParameterFollowingHash` query
+    "cpp/misra/macro-parameter-following-hash" and
+  ruleId = "RULE-19-3-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `aMixedUseMacroArgumentSubjectToExpansion` query
+    ImportMisra23Package::aMixedUseMacroArgumentSubjectToExpansionQuery() and
+  queryId =
+    // `@id` for the `aMixedUseMacroArgumentSubjectToExpansion` query
+    "cpp/misra/a-mixed-use-macro-argument-subject-to-expansion" and
+  ruleId = "RULE-19-3-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `csignalFacilitiesUsed` query
+    ImportMisra23Package::csignalFacilitiesUsedQuery() and
+  queryId =
+    // `@id` for the `csignalFacilitiesUsed` query
+    "cpp/misra/csignal-facilities-used" and
+  ruleId = "RULE-21-10-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `csignalTypesShallNotBeUsed` query
+    ImportMisra23Package::csignalTypesShallNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `csignalTypesShallNotBeUsed` query
+    "cpp/misra/csignal-types-shall-not-be-used" and
+  ruleId = "RULE-21-10-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `atofAtoiAtolAndAtollUsed` query
+    ImportMisra23Package::atofAtoiAtolAndAtollUsedQuery() and
+  queryId =
+    // `@id` for the `atofAtoiAtolAndAtollUsed` query
+    "cpp/misra/atof-atoi-atol-and-atoll-used" and
+  ruleId = "RULE-21-2-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `macroOffsetofShallNotBeUsed` query
+    ImportMisra23Package::macroOffsetofShallNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `macroOffsetofShallNotBeUsed` query
+    "cpp/misra/macro-offsetof-shall-not-be-used" and
+  ruleId = "RULE-21-2-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `globalSizedOperatorDeleteShallBeDefined` query
+    ImportMisra23Package::globalSizedOperatorDeleteShallBeDefinedQuery() and
+  queryId =
+    // `@id` for the `globalSizedOperatorDeleteShallBeDefined` query
+    "cpp/misra/global-sized-operator-delete-shall-be-defined" and
+  ruleId = "RULE-21-6-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `globalUnsizedOperatorDeleteShallBeDefined` query
+    ImportMisra23Package::globalUnsizedOperatorDeleteShallBeDefinedQuery() and
+  queryId =
+    // `@id` for the `globalUnsizedOperatorDeleteShallBeDefined` query
+    "cpp/misra/global-unsized-operator-delete-shall-be-defined" and
+  ruleId = "RULE-21-6-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `vectorShouldNotBeSpecializedWithBool` query
+    ImportMisra23Package::vectorShouldNotBeSpecializedWithBoolQuery() and
+  queryId =
+    // `@id` for the `vectorShouldNotBeSpecializedWithBool` query
+    "cpp/misra/vector-should-not-be-specialized-with-bool" and
+  ruleId = "RULE-26-3-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `forwardingReferencesAndForwardNotUsedTogether` query
+    ImportMisra23Package::forwardingReferencesAndForwardNotUsedTogetherQuery() and
+  queryId =
+    // `@id` for the `forwardingReferencesAndForwardNotUsedTogether` query
+    "cpp/misra/forwarding-references-and-forward-not-used-together" and
+  ruleId = "RULE-28-6-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `cstdioFunctionsShallNotBeUsed` query
+    ImportMisra23Package::cstdioFunctionsShallNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `cstdioFunctionsShallNotBeUsed` query
+    "cpp/misra/cstdio-functions-shall-not-be-used" and
+  ruleId = "RULE-30-0-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `cstdioMacrosShallNotBeUsed` query
+    ImportMisra23Package::cstdioMacrosShallNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `cstdioMacrosShallNotBeUsed` query
+    "cpp/misra/cstdio-macros-shall-not-be-used" and
+  ruleId = "RULE-30-0-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `cstdioTypesShallNotBeUsed` query
+    ImportMisra23Package::cstdioTypesShallNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `cstdioTypesShallNotBeUsed` query
+    "cpp/misra/cstdio-types-shall-not-be-used" and
+  ruleId = "RULE-30-0-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `memoryOperationsNotSequencedAppropriately` query
+    ImportMisra23Package::memoryOperationsNotSequencedAppropriatelyQuery() and
+  queryId =
+    // `@id` for the `memoryOperationsNotSequencedAppropriately` query
+    "cpp/misra/memory-operations-not-sequenced-appropriately" and
+  ruleId = "RULE-4-6-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `backslashCharacterMisuse` query
+    ImportMisra23Package::backslashCharacterMisuseQuery() and
+  queryId =
+    // `@id` for the `backslashCharacterMisuse` query
+    "cpp/misra/backslash-character-misuse" and
+  ruleId = "RULE-5-13-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `nonTerminatedEscapeSequences` query
+    ImportMisra23Package::nonTerminatedEscapeSequencesQuery() and
+  queryId =
+    // `@id` for the `nonTerminatedEscapeSequences` query
+    "cpp/misra/non-terminated-escape-sequences" and
+  ruleId = "RULE-5-13-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `octalConstantsUsed` query
+    ImportMisra23Package::octalConstantsUsedQuery() and
+  queryId =
+    // `@id` for the `octalConstantsUsed` query
+    "cpp/misra/octal-constants-used" and
+  ruleId = "RULE-5-13-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `unsignedIntegerLiteralsNotAppropriatelySuffixed` query
+    ImportMisra23Package::unsignedIntegerLiteralsNotAppropriatelySuffixedQuery() and
+  queryId =
+    // `@id` for the `unsignedIntegerLiteralsNotAppropriatelySuffixed` query
+    "cpp/misra/unsigned-integer-literals-not-appropriately-suffixed" and
+  ruleId = "RULE-5-13-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `lowercaseLStartsInLiteralSuffix` query
+    ImportMisra23Package::lowercaseLStartsInLiteralSuffixQuery() and
+  queryId =
+    // `@id` for the `lowercaseLStartsInLiteralSuffix` query
+    "cpp/misra/lowercase-l-starts-in-literal-suffix" and
+  ruleId = "RULE-5-13-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `characterSequenceUsedWithinACStyleComment` query
+    ImportMisra23Package::characterSequenceUsedWithinACStyleCommentQuery() and
+  queryId =
+    // `@id` for the `characterSequenceUsedWithinACStyleComment` query
+    "cpp/misra/character-sequence-used-within-ac-style-comment" and
+  ruleId = "RULE-5-7-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `lineSplicingUsedInComments` query
+    ImportMisra23Package::lineSplicingUsedInCommentsQuery() and
+  queryId =
+    // `@id` for the `lineSplicingUsedInComments` query
+    "cpp/misra/line-splicing-used-in-comments" and
+  ruleId = "RULE-5-7-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `globalNamespaceDeclarations` query
+    ImportMisra23Package::globalNamespaceDeclarationsQuery() and
+  queryId =
+    // `@id` for the `globalNamespaceDeclarations` query
+    "cpp/misra/global-namespace-declarations" and
+  ruleId = "RULE-6-0-3" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `nonGlobalFunctionMain` query
+    ImportMisra23Package::nonGlobalFunctionMainQuery() and
+  queryId =
+    // `@id` for the `nonGlobalFunctionMain` query
+    "cpp/misra/non-global-function-main" and
+  ruleId = "RULE-6-0-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `inheritedNonOverridableMemberFunction` query
+    ImportMisra23Package::inheritedNonOverridableMemberFunctionQuery() and
+  queryId =
+    // `@id` for the `inheritedNonOverridableMemberFunction` query
+    "cpp/misra/inherited-non-overridable-member-function" and
+  ruleId = "RULE-6-4-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `inheritedOverridableMemberFunction` query
+    ImportMisra23Package::inheritedOverridableMemberFunctionQuery() and
+  queryId =
+    // `@id` for the `inheritedOverridableMemberFunction` query
+    "cpp/misra/inherited-overridable-member-function" and
+  ruleId = "RULE-6-4-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `definitionShallBeConsideredForUnqualifiedLookup` query
+    ImportMisra23Package::definitionShallBeConsideredForUnqualifiedLookupQuery() and
+  queryId =
+    // `@id` for the `definitionShallBeConsideredForUnqualifiedLookup` query
+    "cpp/misra/definition-shall-be-considered-for-unqualified-lookup" and
+  ruleId = "RULE-6-4-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `nameShallBeReferredUsingAQualifiedIdOrThis` query
+    ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisQuery() and
+  queryId =
+    // `@id` for the `nameShallBeReferredUsingAQualifiedIdOrThis` query
+    "cpp/misra/name-shall-be-referred-using-a-qualified-id-or-this" and
+  ruleId = "RULE-6-4-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `nameShallBeReferredUsingAQualifiedIdOrThisAudit` query
+    ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisAuditQuery() and
+  queryId =
+    // `@id` for the `nameShallBeReferredUsingAQualifiedIdOrThisAudit` query
+    "cpp/misra/name-shall-be-referred-using-a-qualified-id-or-this-audit" and
+  ruleId = "RULE-6-4-3" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `returnReferenceOrPointerToAutomaticLocalVariable` query
+    ImportMisra23Package::returnReferenceOrPointerToAutomaticLocalVariableQuery() and
+  queryId =
+    // `@id` for the `returnReferenceOrPointerToAutomaticLocalVariable` query
+    "cpp/misra/return-reference-or-pointer-to-automatic-local-variable" and
+  ruleId = "RULE-6-8-2" and
+  category = "mandatory"
+  or
+  query =
+    // `Query` instance for the `nullptrNotTheOnlyFormOfTheNullPointerConstant` query
+    ImportMisra23Package::nullptrNotTheOnlyFormOfTheNullPointerConstantQuery() and
+  queryId =
+    // `@id` for the `nullptrNotTheOnlyFormOfTheNullPointerConstant` query
+    "cpp/misra/nullptr-not-the-only-form-of-the-null-pointer-constant" and
+  ruleId = "RULE-7-11-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `arrayPassedAsFunctionArgumentDecayToAPointer` query
+    ImportMisra23Package::arrayPassedAsFunctionArgumentDecayToAPointerQuery() and
+  queryId =
+    // `@id` for the `arrayPassedAsFunctionArgumentDecayToAPointer` query
+    "cpp/misra/array-passed-as-function-argument-decay-to-a-pointer" and
+  ruleId = "RULE-7-11-2" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `resultOfAnAssignmentOperatorShouldNotBeUsed` query
+    ImportMisra23Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `resultOfAnAssignmentOperatorShouldNotBeUsed` query
+    "cpp/misra/result-of-an-assignment-operator-should-not-be-used" and
+  ruleId = "RULE-8-18-2" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `functionsCallThemselvesEitherDirectlyOrIndirectly` query
+    ImportMisra23Package::functionsCallThemselvesEitherDirectlyOrIndirectlyQuery() and
+  queryId =
+    // `@id` for the `functionsCallThemselvesEitherDirectlyOrIndirectly` query
+    "cpp/misra/functions-call-themselves-either-directly-or-indirectly" and
+  ruleId = "RULE-8-2-10" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `castsBetweenAPointerToFunctionAndAnyOtherType` query
+    ImportMisra23Package::castsBetweenAPointerToFunctionAndAnyOtherTypeQuery() and
+  queryId =
+    // `@id` for the `castsBetweenAPointerToFunctionAndAnyOtherType` query
+    "cpp/misra/casts-between-a-pointer-to-function-and-any-other-type" and
+  ruleId = "RULE-8-2-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `reinterpretCastShallNotBeUsed` query
+    ImportMisra23Package::reinterpretCastShallNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `reinterpretCastShallNotBeUsed` query
+    "cpp/misra/reinterpret-cast-shall-not-be-used" and
+  ruleId = "RULE-8-2-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `unsignedOperationWithConstantOperandsWraps` query
+    ImportMisra23Package::unsignedOperationWithConstantOperandsWrapsQuery() and
+  queryId =
+    // `@id` for the `unsignedOperationWithConstantOperandsWraps` query
+    "cpp/misra/unsigned-operation-with-constant-operands-wraps" and
+  ruleId = "RULE-8-20-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `builtInUnaryOperatorAppliedToUnsignedExpression` query
+    ImportMisra23Package::builtInUnaryOperatorAppliedToUnsignedExpressionQuery() and
+  queryId =
+    // `@id` for the `builtInUnaryOperatorAppliedToUnsignedExpression` query
+    "cpp/misra/built-in-unary-operator-applied-to-unsigned-expression" and
+  ruleId = "RULE-8-3-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `switchBodyCompoundCondition` query
+    ImportMisra23Package::switchBodyCompoundConditionQuery() and
+  queryId =
+    // `@id` for the `switchBodyCompoundCondition` query
+    "cpp/misra/switch-body-compound-condition" and
+  ruleId = "RULE-9-3-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `loopBodyCompoundCondition` query
+    ImportMisra23Package::loopBodyCompoundConditionQuery() and
+  queryId =
+    // `@id` for the `loopBodyCompoundCondition` query
+    "cpp/misra/loop-body-compound-condition" and
+  ruleId = "RULE-9-3-1" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `gotoStatementShouldNotBeUsed` query
+    ImportMisra23Package::gotoStatementShouldNotBeUsedQuery() and
+  queryId =
+    // `@id` for the `gotoStatementShouldNotBeUsed` query
+    "cpp/misra/goto-statement-should-not-be-used" and
+  ruleId = "RULE-9-6-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `gotoReferenceALabelInSurroundingBlock` query
+    ImportMisra23Package::gotoReferenceALabelInSurroundingBlockQuery() and
+  queryId =
+    // `@id` for the `gotoReferenceALabelInSurroundingBlock` query
+    "cpp/misra/goto-reference-a-label-in-surrounding-block" and
+  ruleId = "RULE-9-6-2" and
+  category = "required"
 }
 
 module ImportMisra23Package {
@@ -398,4 +1018,438 @@ module ImportMisra23Package {
       // `Query` type for `readsAndWritesOnStreamNotSeparatedByPositioning` query
       TQueryCPP(TImportMisra23PackageQuery(TReadsAndWritesOnStreamNotSeparatedByPositioningQuery()))
   }
+
+  Query commaOperatorShouldNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `commaOperatorShouldNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TCommaOperatorShouldNotBeUsedQuery()))
+  }
+
+  Query copyAndMoveAssignmentsShallHandleSelfAssignmentQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `copyAndMoveAssignmentsShallHandleSelfAssignment` query
+      TQueryCPP(TImportMisra23PackageQuery(TCopyAndMoveAssignmentsShallHandleSelfAssignmentQuery()))
+  }
+
+  Query useSingleLocalDeclaratorsQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `useSingleLocalDeclarators` query
+      TQueryCPP(TImportMisra23PackageQuery(TUseSingleLocalDeclaratorsQuery()))
+  }
+
+  Query useSingleGlobalOrMemberDeclaratorsQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `useSingleGlobalOrMemberDeclarators` query
+      TQueryCPP(TImportMisra23PackageQuery(TUseSingleGlobalOrMemberDeclaratorsQuery()))
+  }
+
+  Query enumerationNotDefinedWithAnExplicitUnderlyingTypeQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `enumerationNotDefinedWithAnExplicitUnderlyingType` query
+      TQueryCPP(TImportMisra23PackageQuery(TEnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery()))
+  }
+
+  Query asmDeclarationShallNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `asmDeclarationShallNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TAsmDeclarationShallNotBeUsedQuery()))
+  }
+
+  Query nonUniqueEnumerationConstantQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `nonUniqueEnumerationConstant` query
+      TQueryCPP(TImportMisra23PackageQuery(TNonUniqueEnumerationConstantQuery()))
+  }
+
+  Query bitFieldShallHaveAnAppropriateTypeQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `bitFieldShallHaveAnAppropriateType` query
+      TQueryCPP(TImportMisra23PackageQuery(TBitFieldShallHaveAnAppropriateTypeQuery()))
+  }
+
+  Query signedIntegerNamedBitFieldHaveALengthOfOneBitQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `signedIntegerNamedBitFieldHaveALengthOfOneBit` query
+      TQueryCPP(TImportMisra23PackageQuery(TSignedIntegerNamedBitFieldHaveALengthOfOneBitQuery()))
+  }
+
+  Query virtualAndNonVirtualClassInTheHierarchyQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `virtualAndNonVirtualClassInTheHierarchy` query
+      TQueryCPP(TImportMisra23PackageQuery(TVirtualAndNonVirtualClassInTheHierarchyQuery()))
+  }
+
+  Query overridingShallSpecifyDifferentDefaultArgumentsQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `overridingShallSpecifyDifferentDefaultArguments` query
+      TQueryCPP(TImportMisra23PackageQuery(TOverridingShallSpecifyDifferentDefaultArgumentsQuery()))
+  }
+
+  Query potentiallyVirtualPointerOnlyComparesToNullptrQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `potentiallyVirtualPointerOnlyComparesToNullptr` query
+      TQueryCPP(TImportMisra23PackageQuery(TPotentiallyVirtualPointerOnlyComparesToNullptrQuery()))
+  }
+
+  Query objectsDynamicTypeUsedFromConstructorOrDestructorQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `objectsDynamicTypeUsedFromConstructorOrDestructor` query
+      TQueryCPP(TImportMisra23PackageQuery(TObjectsDynamicTypeUsedFromConstructorOrDestructorQuery()))
+  }
+
+  Query initializeAllVirtualBaseClassesQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `initializeAllVirtualBaseClasses` query
+      TQueryCPP(TImportMisra23PackageQuery(TInitializeAllVirtualBaseClassesQuery()))
+  }
+
+  Query initializerListConstructorIsTheOnlyConstructorQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `initializerListConstructorIsTheOnlyConstructor` query
+      TQueryCPP(TImportMisra23PackageQuery(TInitializerListConstructorIsTheOnlyConstructorQuery()))
+  }
+
+  Query addressOfOperatorOverloadedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `addressOfOperatorOverloaded` query
+      TQueryCPP(TImportMisra23PackageQuery(TAddressOfOperatorOverloadedQuery()))
+  }
+
+  Query functionTemplatesExplicitlySpecializedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `functionTemplatesExplicitlySpecialized` query
+      TQueryCPP(TImportMisra23PackageQuery(TFunctionTemplatesExplicitlySpecializedQuery()))
+  }
+
+  Query exceptionObjectHavePointerTypeQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `exceptionObjectHavePointerType` query
+      TQueryCPP(TImportMisra23PackageQuery(TExceptionObjectHavePointerTypeQuery()))
+  }
+
+  Query emptyThrowOnlyWithinACatchHandlerQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `emptyThrowOnlyWithinACatchHandler` query
+      TQueryCPP(TImportMisra23PackageQuery(TEmptyThrowOnlyWithinACatchHandlerQuery()))
+  }
+
+  Query noexceptFunctionShouldNotPropagateToTheCallerQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `noexceptFunctionShouldNotPropagateToTheCaller` query
+      TQueryCPP(TImportMisra23PackageQuery(TNoexceptFunctionShouldNotPropagateToTheCallerQuery()))
+  }
+
+  Query functionLikeMacrosDefinedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `functionLikeMacrosDefined` query
+      TQueryCPP(TImportMisra23PackageQuery(TFunctionLikeMacrosDefinedQuery()))
+  }
+
+  Query macroParameterFollowingHashQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `macroParameterFollowingHash` query
+      TQueryCPP(TImportMisra23PackageQuery(TMacroParameterFollowingHashQuery()))
+  }
+
+  Query aMixedUseMacroArgumentSubjectToExpansionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `aMixedUseMacroArgumentSubjectToExpansion` query
+      TQueryCPP(TImportMisra23PackageQuery(TAMixedUseMacroArgumentSubjectToExpansionQuery()))
+  }
+
+  Query csignalFacilitiesUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `csignalFacilitiesUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TCsignalFacilitiesUsedQuery()))
+  }
+
+  Query csignalTypesShallNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `csignalTypesShallNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TCsignalTypesShallNotBeUsedQuery()))
+  }
+
+  Query atofAtoiAtolAndAtollUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `atofAtoiAtolAndAtollUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TAtofAtoiAtolAndAtollUsedQuery()))
+  }
+
+  Query macroOffsetofShallNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `macroOffsetofShallNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TMacroOffsetofShallNotBeUsedQuery()))
+  }
+
+  Query globalSizedOperatorDeleteShallBeDefinedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `globalSizedOperatorDeleteShallBeDefined` query
+      TQueryCPP(TImportMisra23PackageQuery(TGlobalSizedOperatorDeleteShallBeDefinedQuery()))
+  }
+
+  Query globalUnsizedOperatorDeleteShallBeDefinedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `globalUnsizedOperatorDeleteShallBeDefined` query
+      TQueryCPP(TImportMisra23PackageQuery(TGlobalUnsizedOperatorDeleteShallBeDefinedQuery()))
+  }
+
+  Query vectorShouldNotBeSpecializedWithBoolQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `vectorShouldNotBeSpecializedWithBool` query
+      TQueryCPP(TImportMisra23PackageQuery(TVectorShouldNotBeSpecializedWithBoolQuery()))
+  }
+
+  Query forwardingReferencesAndForwardNotUsedTogetherQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `forwardingReferencesAndForwardNotUsedTogether` query
+      TQueryCPP(TImportMisra23PackageQuery(TForwardingReferencesAndForwardNotUsedTogetherQuery()))
+  }
+
+  Query cstdioFunctionsShallNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `cstdioFunctionsShallNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TCstdioFunctionsShallNotBeUsedQuery()))
+  }
+
+  Query cstdioMacrosShallNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `cstdioMacrosShallNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TCstdioMacrosShallNotBeUsedQuery()))
+  }
+
+  Query cstdioTypesShallNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `cstdioTypesShallNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TCstdioTypesShallNotBeUsedQuery()))
+  }
+
+  Query memoryOperationsNotSequencedAppropriatelyQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `memoryOperationsNotSequencedAppropriately` query
+      TQueryCPP(TImportMisra23PackageQuery(TMemoryOperationsNotSequencedAppropriatelyQuery()))
+  }
+
+  Query backslashCharacterMisuseQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `backslashCharacterMisuse` query
+      TQueryCPP(TImportMisra23PackageQuery(TBackslashCharacterMisuseQuery()))
+  }
+
+  Query nonTerminatedEscapeSequencesQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `nonTerminatedEscapeSequences` query
+      TQueryCPP(TImportMisra23PackageQuery(TNonTerminatedEscapeSequencesQuery()))
+  }
+
+  Query octalConstantsUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `octalConstantsUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TOctalConstantsUsedQuery()))
+  }
+
+  Query unsignedIntegerLiteralsNotAppropriatelySuffixedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `unsignedIntegerLiteralsNotAppropriatelySuffixed` query
+      TQueryCPP(TImportMisra23PackageQuery(TUnsignedIntegerLiteralsNotAppropriatelySuffixedQuery()))
+  }
+
+  Query lowercaseLStartsInLiteralSuffixQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `lowercaseLStartsInLiteralSuffix` query
+      TQueryCPP(TImportMisra23PackageQuery(TLowercaseLStartsInLiteralSuffixQuery()))
+  }
+
+  Query characterSequenceUsedWithinACStyleCommentQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `characterSequenceUsedWithinACStyleComment` query
+      TQueryCPP(TImportMisra23PackageQuery(TCharacterSequenceUsedWithinACStyleCommentQuery()))
+  }
+
+  Query lineSplicingUsedInCommentsQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `lineSplicingUsedInComments` query
+      TQueryCPP(TImportMisra23PackageQuery(TLineSplicingUsedInCommentsQuery()))
+  }
+
+  Query globalNamespaceDeclarationsQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `globalNamespaceDeclarations` query
+      TQueryCPP(TImportMisra23PackageQuery(TGlobalNamespaceDeclarationsQuery()))
+  }
+
+  Query nonGlobalFunctionMainQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `nonGlobalFunctionMain` query
+      TQueryCPP(TImportMisra23PackageQuery(TNonGlobalFunctionMainQuery()))
+  }
+
+  Query inheritedNonOverridableMemberFunctionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `inheritedNonOverridableMemberFunction` query
+      TQueryCPP(TImportMisra23PackageQuery(TInheritedNonOverridableMemberFunctionQuery()))
+  }
+
+  Query inheritedOverridableMemberFunctionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `inheritedOverridableMemberFunction` query
+      TQueryCPP(TImportMisra23PackageQuery(TInheritedOverridableMemberFunctionQuery()))
+  }
+
+  Query definitionShallBeConsideredForUnqualifiedLookupQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `definitionShallBeConsideredForUnqualifiedLookup` query
+      TQueryCPP(TImportMisra23PackageQuery(TDefinitionShallBeConsideredForUnqualifiedLookupQuery()))
+  }
+
+  Query nameShallBeReferredUsingAQualifiedIdOrThisQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `nameShallBeReferredUsingAQualifiedIdOrThis` query
+      TQueryCPP(TImportMisra23PackageQuery(TNameShallBeReferredUsingAQualifiedIdOrThisQuery()))
+  }
+
+  Query nameShallBeReferredUsingAQualifiedIdOrThisAuditQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `nameShallBeReferredUsingAQualifiedIdOrThisAudit` query
+      TQueryCPP(TImportMisra23PackageQuery(TNameShallBeReferredUsingAQualifiedIdOrThisAuditQuery()))
+  }
+
+  Query returnReferenceOrPointerToAutomaticLocalVariableQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `returnReferenceOrPointerToAutomaticLocalVariable` query
+      TQueryCPP(TImportMisra23PackageQuery(TReturnReferenceOrPointerToAutomaticLocalVariableQuery()))
+  }
+
+  Query nullptrNotTheOnlyFormOfTheNullPointerConstantQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `nullptrNotTheOnlyFormOfTheNullPointerConstant` query
+      TQueryCPP(TImportMisra23PackageQuery(TNullptrNotTheOnlyFormOfTheNullPointerConstantQuery()))
+  }
+
+  Query arrayPassedAsFunctionArgumentDecayToAPointerQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `arrayPassedAsFunctionArgumentDecayToAPointer` query
+      TQueryCPP(TImportMisra23PackageQuery(TArrayPassedAsFunctionArgumentDecayToAPointerQuery()))
+  }
+
+  Query resultOfAnAssignmentOperatorShouldNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `resultOfAnAssignmentOperatorShouldNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TResultOfAnAssignmentOperatorShouldNotBeUsedQuery()))
+  }
+
+  Query functionsCallThemselvesEitherDirectlyOrIndirectlyQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `functionsCallThemselvesEitherDirectlyOrIndirectly` query
+      TQueryCPP(TImportMisra23PackageQuery(TFunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery()))
+  }
+
+  Query castsBetweenAPointerToFunctionAndAnyOtherTypeQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `castsBetweenAPointerToFunctionAndAnyOtherType` query
+      TQueryCPP(TImportMisra23PackageQuery(TCastsBetweenAPointerToFunctionAndAnyOtherTypeQuery()))
+  }
+
+  Query reinterpretCastShallNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `reinterpretCastShallNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TReinterpretCastShallNotBeUsedQuery()))
+  }
+
+  Query unsignedOperationWithConstantOperandsWrapsQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `unsignedOperationWithConstantOperandsWraps` query
+      TQueryCPP(TImportMisra23PackageQuery(TUnsignedOperationWithConstantOperandsWrapsQuery()))
+  }
+
+  Query builtInUnaryOperatorAppliedToUnsignedExpressionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `builtInUnaryOperatorAppliedToUnsignedExpression` query
+      TQueryCPP(TImportMisra23PackageQuery(TBuiltInUnaryOperatorAppliedToUnsignedExpressionQuery()))
+  }
+
+  Query switchBodyCompoundConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `switchBodyCompoundCondition` query
+      TQueryCPP(TImportMisra23PackageQuery(TSwitchBodyCompoundConditionQuery()))
+  }
+
+  Query loopBodyCompoundConditionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `loopBodyCompoundCondition` query
+      TQueryCPP(TImportMisra23PackageQuery(TLoopBodyCompoundConditionQuery()))
+  }
+
+  Query gotoStatementShouldNotBeUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `gotoStatementShouldNotBeUsed` query
+      TQueryCPP(TImportMisra23PackageQuery(TGotoStatementShouldNotBeUsedQuery()))
+  }
+
+  Query gotoReferenceALabelInSurroundingBlockQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `gotoReferenceALabelInSurroundingBlock` query
+      TQueryCPP(TImportMisra23PackageQuery(TGotoReferenceALabelInSurroundingBlockQuery()))
+  }
 }
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll
index a3775b87d6..9cb8aa8e03 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll
@@ -10,7 +10,7 @@ newtype InheritanceQuery =
   THierarchiesShouldBeBasedOnInterfaceClassesQuery() or
   TClassesShouldNotBeDerivedFromVirtualBasesQuery() or
   TBaseClassCanBeVirtualOnlyInDiamondHierarchyQuery() or
-  TAccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() or
+  TAccessibleBaseClassBothVirtualAndNonVirtualQuery() or
   TUniqueAccessibleEntityNamesInMultipleInheritanceQuery() or
   TDynamicTypeOfThisUsedFromConstructorOrDestructorQuery() or
   TDowncastingShouldNotBePerformedOnPolymorphicTypesQuery() or
@@ -74,11 +74,11 @@ predicate isInheritanceQueryMetadata(Query query, string queryId, string ruleId,
   category = "required"
   or
   query =
-    // `Query` instance for the `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
-    InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() and
+    // `Query` instance for the `accessibleBaseClassBothVirtualAndNonVirtual` query
+    InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery() and
   queryId =
-    // `@id` for the `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
-    "cpp/autosar/accessible-base-class-both-virtual-and-non-virtual-in-hierarchy" and
+    // `@id` for the `accessibleBaseClassBothVirtualAndNonVirtual` query
+    "cpp/autosar/accessible-base-class-both-virtual-and-non-virtual" and
   ruleId = "M10-1-3" and
   category = "required"
   or
@@ -180,11 +180,11 @@ module InheritancePackage {
       TQueryCPP(TInheritancePackageQuery(TBaseClassCanBeVirtualOnlyInDiamondHierarchyQuery()))
   }
 
-  Query accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
+  Query accessibleBaseClassBothVirtualAndNonVirtualQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
-      TQueryCPP(TInheritancePackageQuery(TAccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()))
+      // `Query` type for `accessibleBaseClassBothVirtualAndNonVirtual` query
+      TQueryCPP(TInheritancePackageQuery(TAccessibleBaseClassBothVirtualAndNonVirtualQuery()))
   }
 
   Query uniqueAccessibleEntityNamesInMultipleInheritanceQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll
index 18f03e9c66..ddb58d7deb 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll
@@ -20,7 +20,7 @@ newtype NamingQuery =
   TNameOfStandardLibraryMacroOrObjectReusedQuery() or
   TNameOfStandardLibraryFunctionIsOverriddenQuery() or
   TDifferentIdentifiersNotTypographicallyUnambiguousQuery() or
-  TIdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() or
+  TIdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() or
   TUnnamedNamespacesInHeaderFileQuery() or
   TNonIdenticalIdentifierUsedForTheParameterInReDeclarationOfAFunctionQuery() or
   TRedefiningOfStandardLibraryNameQuery() or
@@ -178,11 +178,11 @@ predicate isNamingQueryMetadata(Query query, string queryId, string ruleId, stri
   category = "required"
   or
   query =
-    // `Query` instance for the `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
-    NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() and
+    // `Query` instance for the `identifierMainUsedForAFunctionOtherThanGlobalMain` query
+    NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery() and
   queryId =
-    // `@id` for the `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
-    "cpp/autosar/identifier-main-used-for-a-function-other-than-the-global-function-main" and
+    // `@id` for the `identifierMainUsedForAFunctionOtherThanGlobalMain` query
+    "cpp/autosar/identifier-main-used-for-a-function-other-than-global-main" and
   ruleId = "M7-3-2" and
   category = "required"
   or
@@ -390,11 +390,11 @@ module NamingPackage {
       TQueryCPP(TNamingPackageQuery(TDifferentIdentifiersNotTypographicallyUnambiguousQuery()))
   }
 
-  Query identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
+  Query identifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
-      TQueryCPP(TNamingPackageQuery(TIdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()))
+      // `Query` type for `identifierMainUsedForAFunctionOtherThanGlobalMain` query
+      TQueryCPP(TNamingPackageQuery(TIdentifierMainUsedForAFunctionOtherThanGlobalMainQuery()))
   }
 
   Query unnamedNamespacesInHeaderFileQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll
index fe71289dbc..29febc4430 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll
@@ -17,7 +17,7 @@ newtype OperatorsQuery =
   TUnsignedBitwiseOperatorWithoutCastQuery() or
   TCommaOperatorAndOperatorAndTheOperatorOverloadedQuery() or
   TEachOperandOfTheOperatorTheLogicalAndOrTheLogicalOperatorsShallHaveTypeBoolQuery() or
-  TUnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() or
+  TUnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() or
   TUnaryOperatorOverloadedQuery()
 
 predicate isOperatorsQueryMetadata(Query query, string queryId, string ruleId, string category) {
@@ -139,11 +139,11 @@ predicate isOperatorsQueryMetadata(Query query, string queryId, string ruleId, s
   category = "required"
   or
   query =
-    // `Query` instance for the `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
-    OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() and
+    // `Query` instance for the `unaryMinusOperatorAppliedToAnUnsignedExpression` query
+    OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery() and
   queryId =
-    // `@id` for the `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
-    "cpp/autosar/unary-minus-operator-applied-to-an-expression-whose-underlying-type-is-unsigned" and
+    // `@id` for the `unaryMinusOperatorAppliedToAnUnsignedExpression` query
+    "cpp/autosar/unary-minus-operator-applied-to-an-unsigned-expression" and
   ruleId = "M5-3-2" and
   category = "required"
   or
@@ -249,11 +249,11 @@ module OperatorsPackage {
       TQueryCPP(TOperatorsPackageQuery(TEachOperandOfTheOperatorTheLogicalAndOrTheLogicalOperatorsShallHaveTypeBoolQuery()))
   }
 
-  Query unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
+  Query unaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
-      TQueryCPP(TOperatorsPackageQuery(TUnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()))
+      // `Query` type for `unaryMinusOperatorAppliedToAnUnsignedExpression` query
+      TQueryCPP(TOperatorsPackageQuery(TUnaryMinusOperatorAppliedToAnUnsignedExpressionQuery()))
   }
 
   Query unaryOperatorOverloadedQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll
index 1dd5bef4c8..fda7ecb0ed 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll
@@ -7,7 +7,7 @@ newtype PointersQuery =
   TPointerToAnElementOfAnArrayPassedToASmartPointerQuery() or
   TDeclarationContainLessThanTwoLevelsOfIndirectionQuery() or
   TPointerArithmeticUsedWithPointersToNonFinalClassesQuery() or
-  TPointerToMemberVirtualFunctionWithNullPointerConstantQuery() or
+  TVirtualPointerOnlyComparesToNullptrConstantQuery() or
   TDeletingPointerToIncompleteTypeQuery() or
   TPointerToMemberAccessNonExistentClassMembersQuery() or
   TNullPointerToMemberAccessNonExistentClassMembersQuery() or
@@ -16,7 +16,7 @@ newtype PointersQuery =
   TPointerAndDerivedPointerAccessDifferentArrayQuery() or
   TPointerSubtractionOnDifferentArraysQuery() or
   TAppliedToObjectsOfPointerTypeQuery() or
-  TIdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() or
+  TIdentifierPassedAsFunctionArgumentDecayToAPointerQuery() or
   TPointerToAVirtualBaseClassCastToAPointerQuery() or
   TCastNotConvertPointerToFunctionQuery() or
   TIntegerOrPointerToVoidConvertedToPointerTypeQuery() or
@@ -57,11 +57,11 @@ predicate isPointersQueryMetadata(Query query, string queryId, string ruleId, st
   category = "required"
   or
   query =
-    // `Query` instance for the `pointerToMemberVirtualFunctionWithNullPointerConstant` query
-    PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery() and
+    // `Query` instance for the `virtualPointerOnlyComparesToNullptrConstant` query
+    PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery() and
   queryId =
-    // `@id` for the `pointerToMemberVirtualFunctionWithNullPointerConstant` query
-    "cpp/autosar/pointer-to-member-virtual-function-with-null-pointer-constant" and
+    // `@id` for the `virtualPointerOnlyComparesToNullptrConstant` query
+    "cpp/autosar/virtual-pointer-only-compares-to-nullptr-constant" and
   ruleId = "A5-10-1" and
   category = "required"
   or
@@ -138,11 +138,11 @@ predicate isPointersQueryMetadata(Query query, string queryId, string ruleId, st
   category = "required"
   or
   query =
-    // `Query` instance for the `identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer` query
-    PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() and
+    // `Query` instance for the `identifierPassedAsFunctionArgumentDecayToAPointer` query
+    PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery() and
   queryId =
-    // `@id` for the `identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer` query
-    "cpp/autosar/identifier-with-array-type-passed-as-function-argument-decay-to-a-pointer" and
+    // `@id` for the `identifierPassedAsFunctionArgumentDecayToAPointer` query
+    "cpp/autosar/identifier-passed-as-function-argument-decay-to-a-pointer" and
   ruleId = "M5-2-12" and
   category = "required"
   or
@@ -259,11 +259,11 @@ module PointersPackage {
       TQueryCPP(TPointersPackageQuery(TPointerArithmeticUsedWithPointersToNonFinalClassesQuery()))
   }
 
-  Query pointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
+  Query virtualPointerOnlyComparesToNullptrConstantQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `pointerToMemberVirtualFunctionWithNullPointerConstant` query
-      TQueryCPP(TPointersPackageQuery(TPointerToMemberVirtualFunctionWithNullPointerConstantQuery()))
+      // `Query` type for `virtualPointerOnlyComparesToNullptrConstant` query
+      TQueryCPP(TPointersPackageQuery(TVirtualPointerOnlyComparesToNullptrConstantQuery()))
   }
 
   Query deletingPointerToIncompleteTypeQuery() {
@@ -322,11 +322,11 @@ module PointersPackage {
       TQueryCPP(TPointersPackageQuery(TAppliedToObjectsOfPointerTypeQuery()))
   }
 
-  Query identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
+  Query identifierPassedAsFunctionArgumentDecayToAPointerQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer` query
-      TQueryCPP(TPointersPackageQuery(TIdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()))
+      // `Query` type for `identifierPassedAsFunctionArgumentDecayToAPointer` query
+      TQueryCPP(TPointersPackageQuery(TIdentifierPassedAsFunctionArgumentDecayToAPointerQuery()))
   }
 
   Query pointerToAVirtualBaseClassCastToAPointerQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll
index e2c73fc33d..e11ce49f1f 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll
@@ -11,7 +11,7 @@ newtype VirtualFunctionsQuery =
   TDestructorOfABaseClassNotPublicVirtualQuery() or
   TNonVirtualPublicDestructorInNonFinalClassQuery() or
   TVirtualFunctionOverriddenByAPureVirtualFunctionQuery() or
-  TVirtualFunctionParametersUseTheSameDefaultArgumentsQuery()
+  TVirtualFunctionParametersUseSameDefaultArgumentsQuery()
 
 predicate isVirtualFunctionsQueryMetadata(
   Query query, string queryId, string ruleId, string category
@@ -80,11 +80,11 @@ predicate isVirtualFunctionsQueryMetadata(
   category = "required"
   or
   query =
-    // `Query` instance for the `virtualFunctionParametersUseTheSameDefaultArguments` query
-    VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery() and
+    // `Query` instance for the `virtualFunctionParametersUseSameDefaultArguments` query
+    VirtualFunctionsPackage::virtualFunctionParametersUseSameDefaultArgumentsQuery() and
   queryId =
-    // `@id` for the `virtualFunctionParametersUseTheSameDefaultArguments` query
-    "cpp/autosar/virtual-function-parameters-use-the-same-default-arguments" and
+    // `@id` for the `virtualFunctionParametersUseSameDefaultArguments` query
+    "cpp/autosar/virtual-function-parameters-use-same-default-arguments" and
   ruleId = "M8-3-1" and
   category = "required"
 }
@@ -139,10 +139,10 @@ module VirtualFunctionsPackage {
       TQueryCPP(TVirtualFunctionsPackageQuery(TVirtualFunctionOverriddenByAPureVirtualFunctionQuery()))
   }
 
-  Query virtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
+  Query virtualFunctionParametersUseSameDefaultArgumentsQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `virtualFunctionParametersUseTheSameDefaultArguments` query
-      TQueryCPP(TVirtualFunctionsPackageQuery(TVirtualFunctionParametersUseTheSameDefaultArgumentsQuery()))
+      // `Query` type for `virtualFunctionParametersUseSameDefaultArguments` query
+      TQueryCPP(TVirtualFunctionsPackageQuery(TVirtualFunctionParametersUseSameDefaultArgumentsQuery()))
   }
 }
diff --git a/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll b/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
new file mode 100644
index 0000000000..a187e8bfa8
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
@@ -0,0 +1,16 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Operator
+
+abstract class AddressOfOperatorOverloaded_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof AddressOfOperatorOverloaded_sharedSharedQuery }
+
+query predicate problems(UnaryAddressOfOperator e, string message) {
+not isExcluded(e, getQuery()) and message = "The unary & operator overloaded."
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll b/cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll
new file mode 100644
index 0000000000..bf2ff2fbae
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll
@@ -0,0 +1,32 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Macro
+
+abstract class AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery }
+
+query predicate problems(FunctionLikeMacro m, string message) {
+  exists(MacroInvocation mi, int i, string expanded, string param |
+    not isExcluded(m, getQuery()) and
+    mi = m.getAnInvocation() and
+    param = m.getParameter(i) and
+    (
+      exists(TokenPastingOperator op | op.getMacro() = m and op.getOperand() = param)
+      or
+      exists(StringizingOperator op | op.getMacro() = m and op.getOperand() = param)
+    ) and
+    // An expansion that is equal to "" means the expansion is not used and is optimized away by EDG. This happens when the expanded argument is an operand to `#` or `##`.
+    // This check ensure there is an expansion that is used.
+    expanded = mi.getExpandedArgument(i) and
+    not expanded = "" and
+    not mi.getUnexpandedArgument(i) = mi.getExpandedArgument(i) and
+    message =
+      "Macro " + m.getName() + " contains use of parameter " + param + " used in multiple contexts."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll b/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll
new file mode 100644
index 0000000000..fa61d89aea
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll
@@ -0,0 +1,47 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery
+}
+
+predicate arrayToPointerDecay(Access ae, Parameter p) {
+  (
+    p.getType() instanceof PointerType and
+    // exclude parameters of void* because then it assumed the caller can pass in dimensions through other means.
+    // examples are uses in `memset` or `memcpy`
+    not p.getType() instanceof VoidPointerType
+    or
+    p.getType() instanceof ArrayType
+  ) and
+  ae.getType() instanceof ArrayType and
+  // exclude char[] arrays because we assume that we can determine its dimension by looking for a NULL byte.
+  not ae.getType().(ArrayType).getBaseType() instanceof CharType
+}
+
+query predicate problems(
+  Element e, string message, Variable array, string array_string, Parameter decayedArray,
+  string decayedArray_string, Function f, string f_string
+) {
+  exists(FunctionCall fc, VariableAccess arrayAccess, int i |
+    not isExcluded(e, getQuery()) and
+    arrayAccess = array.getAnAccess() and
+    f = fc.getTarget() and
+    arrayAccess = fc.getArgument(i) and
+    decayedArray = f.getParameter(i) and
+    arrayToPointerDecay(arrayAccess, decayedArray) and
+    not arrayAccess.isAffectedByMacro() and
+    e = fc.getArgument(i) and
+    array_string = array.getName() and
+    decayedArray_string = decayedArray.getName() and
+    f_string = f.getName() and
+    message = "The array $@ decays to the pointer $@ when passed as an argument to the function $@."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll
new file mode 100644
index 0000000000..cce1de8cee
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll
@@ -0,0 +1,15 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class AsmDeclarationUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof AsmDeclarationUsed_sharedSharedQuery }
+
+query predicate problems(AsmStmt e, string message) {
+  not isExcluded(e, getQuery()) and message = "Use of asm declaration"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll
new file mode 100644
index 0000000000..a187b586b1
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll
@@ -0,0 +1,23 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+private string atoi() { result = ["atof", "atoi", "atol", "atoll"] }
+
+abstract class AtofAtoiAtolAndAtollUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof AtofAtoiAtolAndAtollUsed_sharedSharedQuery }
+
+query predicate problems(FunctionCall fc, string message) {
+  exists(Function f |
+    not isExcluded(fc, getQuery()) and
+    f = fc.getTarget() and
+    f.getName() = atoi() and
+    f.getFile().getBaseName() = "stdlib.h" and
+    message = "Call to banned function " + f.getName() + "."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll b/cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll
new file mode 100644
index 0000000000..ffad0f540b
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll
@@ -0,0 +1,21 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class BackslashCharacterMisuse_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof BackslashCharacterMisuse_sharedSharedQuery }
+
+query predicate problems(StringLiteral l, string message) {
+  exists(string es |
+    not isExcluded(l, getQuery()) and
+    es = l.getANonStandardEscapeSequence(_, _) and
+    // Exclude universal-character-names, which begin with \u or \U
+    not es.toLowerCase().matches("\\u") and
+    message = "This literal contains the non-standard escape sequence " + es + "."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll
new file mode 100644
index 0000000000..766913db58
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll
@@ -0,0 +1,40 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Compiler
+
+abstract class BitFieldShallHaveAnAppropriateType_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof BitFieldShallHaveAnAppropriateType_sharedSharedQuery }
+
+Type getSupportedBitFieldType(Compiler compiler) {
+  compiler instanceof UnsupportedCompiler and
+  (
+    result instanceof IntType and
+    (
+      result.(IntegralType).isExplicitlySigned() or
+      result.(IntegralType).isExplicitlyUnsigned()
+    )
+    or
+    result instanceof BoolType
+  )
+  or
+  (compiler instanceof Gcc or compiler instanceof Clang) and
+  (
+    result instanceof IntegralOrEnumType
+    or
+    result instanceof BoolType
+  )
+}
+
+query predicate problems(BitField bitField, string message) {
+  not isExcluded(bitField, getQuery()) and
+  /* A violation would neither be an appropriate primitive type nor an appropriate typedef. */
+  not getSupportedBitFieldType(getCompiler(bitField.getFile())) =
+    bitField.getType().resolveTypedefs() and
+  message = "Bit-field '" + bitField + "' is declared on type '" + bitField.getType() + "'."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll b/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll
new file mode 100644
index 0000000000..a1e7d5b490
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll
@@ -0,0 +1,25 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery
+}
+
+query predicate problems(Element e, string message) {
+  exists(UnaryMinusExpr ex, IntegralType t |
+    t = ex.getOperand().getExplicitlyConverted().getType().getUnderlyingType() and
+    t.isUnsigned() and
+    not ex.isAffectedByMacro() and
+    e = ex.getOperand() and
+    not isExcluded(e, getQuery()) and
+    message =
+      "The unary minus operator shall not be applied to an expression whose underlying type is unsigned."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll
new file mode 100644
index 0000000000..d09009cc29
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll
@@ -0,0 +1,21 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery
+}
+
+query predicate problems(Cast c, string message) {
+  not isExcluded(c, getQuery()) and
+  not c.isImplicit() and
+  not c.isAffectedByMacro() and
+  c.getExpr().getType() instanceof FunctionPointerType and
+  message = "Cast converting a pointer to function."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll b/cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll
new file mode 100644
index 0000000000..a6719c3c4e
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery }
+
+query predicate problems(CStyleComment c, string message) {
+  not isExcluded(c, getQuery()) and
+  exists(c.getContents().regexpFind("./\\*", _, _)) and
+  message = "C-style /* comment includes nested /*."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll b/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll
new file mode 100644
index 0000000000..8e8c35365d
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll
@@ -0,0 +1,53 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Operator
+
+abstract class CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery
+}
+
+predicate isUserCopyOrUserMove(Operator o) {
+  o instanceof UserCopyOperator or
+  o instanceof UserMoveOperator
+}
+
+predicate callsStdSwap(Function f) {
+  exists(FunctionCall fc |
+    fc.getTarget().hasGlobalOrStdName("swap") and
+    fc.getEnclosingFunction() = f
+  )
+}
+
+predicate callsNoExceptSwap(Operator o) {
+  exists(Function f, FunctionCall fc |
+    callsStdSwap(f) and
+    fc.getEnclosingFunction() = o and
+    fc.getTarget() = f
+  )
+}
+
+predicate checksForSelfAssignment(Operator o) {
+  exists(IfStmt i, ComparisonOperation c |
+    i.getEnclosingFunction() = o and
+    i.getCondition() = c and
+    (
+      c.getLeftOperand().toString() = "this" or
+      c.getRightOperand().toString() = "this"
+    )
+  )
+}
+
+query predicate problems(Operator o, string message) {
+  not isExcluded(o, getQuery()) and
+  isUserCopyOrUserMove(o) and
+  not callsNoExceptSwap(o) and
+  not checksForSelfAssignment(o) and
+  message = "User defined copy or user defined move does not handle self-assignment correctly."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll
new file mode 100644
index 0000000000..6a1e2270ff
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll
@@ -0,0 +1,20 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CsignalFunctionsUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CsignalFunctionsUsed_sharedSharedQuery }
+
+query predicate problems(FunctionCall fc, string message) {
+  exists(Function f |
+    not isExcluded(fc, getQuery()) and
+    f = fc.getTarget() and
+    f.hasGlobalOrStdName(["signal", "raise"]) and
+    message = "Use of <csignal> function '" + f.getQualifiedName() + "'."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/csignaltypesused_shared/CsignalTypesUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/csignaltypesused_shared/CsignalTypesUsed_shared.qll
new file mode 100644
index 0000000000..07293c9e75
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/csignaltypesused_shared/CsignalTypesUsed_shared.qll
@@ -0,0 +1,20 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CsignalTypesUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CsignalTypesUsed_sharedSharedQuery }
+
+query predicate problems(TypeMention tm, string message) {
+  exists(UserType ut |
+    not isExcluded(tm, getQuery()) and
+    ut = tm.getMentionedType() and
+    ut.hasGlobalOrStdName("sig_atomic_t") and
+    message = "Use of <csignal> type '" + ut.getQualifiedName() + "'."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll
new file mode 100644
index 0000000000..b89a2349a4
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll
@@ -0,0 +1,36 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CstdioFunctionsUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CstdioFunctionsUsed_sharedSharedQuery }
+
+query predicate problems(FunctionCall fc, string message) {
+  exists(Function f |
+    not isExcluded(fc, getQuery()) and
+    f = fc.getTarget() and
+    f.hasGlobalOrStdName([
+        "remove", "rename", "tmpfile", "tmpnam",
+        // File access
+        "fclose", "fflush", "fopen", "freopen", "setbuf", "setvbuf",
+        // Formatted input/output
+        "fprintf", "fscanf", "printf", "scanf", "snprintf", "sprintf", "sscanf", "vfprintf",
+        "vfscanf", "vprintf", "vscanf", "vsnprintf", "vsprintf", "vsscanf",
+        // Character input/output
+        "fgetc", "fgets", "fputc", "fputs", "getc", "getchar", "gets", "putc", "putchar", "puts",
+        "ungetc",
+        // Direct input/output
+        "fread", "fwrite",
+        // File positioning
+        "fgetpos", "fseek", "fsetpos", "ftell", "rewind",
+        // Error handling
+        "clearerr", "feof", "ferror", "perror"
+      ]) and
+    message = "Use of <cstdio> function '" + f.getQualifiedName() + "'."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll
new file mode 100644
index 0000000000..0f56127110
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll
@@ -0,0 +1,20 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CstdioMacrosUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CstdioMacrosUsed_sharedSharedQuery }
+
+query predicate problems(MacroInvocation mi, string message) {
+  not isExcluded(mi, getQuery()) and
+  mi.getMacroName() in [
+      "BUFSIZ", "EOF", "FILENAME_MAX", "FOPEN_MAX", "L_tmpnam", "TMP_MAX", "_IOFBF", "IOLBF",
+      "_IONBF", "SEEK_CUR", "SEEK_END", "SEEK_SET"
+    ] and
+  message = "Use of <cstdio> macro '" + mi.getMacroName() + "'."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.qll
new file mode 100644
index 0000000000..f4d4529fe2
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.qll
@@ -0,0 +1,25 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CstdioTypesUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CstdioTypesUsed_sharedSharedQuery }
+
+query predicate problems(TypeMention tm, string message) {
+  exists(UserType ut |
+    not isExcluded(tm, getQuery()) and
+    ut = tm.getMentionedType() and
+    ut.hasGlobalOrStdName(["FILE", "fpos_t"]) and
+    // Not in the standard library
+    exists(tm.getFile().getRelativePath()) and
+    // Not in our tests copy of the standard library
+    not tm.getFile().getRelativePath() =
+      ["includes/standard-library/stddef.h", "includes/standard-library/stdio.h"] and
+    message = "Use of <cstdio> type '" + ut.getQualifiedName() + "'."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll b/cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll
new file mode 100644
index 0000000000..e85491f271
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll
@@ -0,0 +1,67 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery }
+
+/**
+ * Holds if `functionDecl` is a possible intended target of the `usingDecl`.
+ */
+pragma[noinline]
+predicate isPossibleIntendedTarget(
+  FunctionDeclarationEntry functionDecl, UsingDeclarationEntry usingDecl
+) {
+  // Extracted to improve the join order. With this approach, we first compute a set of using
+  // declarations and a set of possible intended targets
+  functionDecl.getDeclaration().isTopLevel() and
+  functionDecl.getDeclaration().getQualifiedName() = usingDecl.getDeclaration().getQualifiedName() and
+  functionDecl.getDeclaration().getNamespace().getParentNamespace*() = usingDecl.getParentScope()
+}
+
+/**
+ * Holds if `functionDecl` is a possible intended target of the `usingDecl`, and they exist at the
+ * given locations.
+ */
+pragma[noinline]
+predicate isPossibleIntendedTargetLocation(
+  FunctionDeclarationEntry functionDecl, UsingDeclarationEntry usingDecl, File usingsFile,
+  File unavailableFile, int usingsStartLine, int unavailableStartLine
+) {
+  // Extracted to improve the join order. With this approach, we take the set of possible intended
+  // targets computed in isPossibleIntendedTargets, and compute the files and start lines.
+  // This helps avoid the join order preferred by the optimiser if this is all written directly in
+  // the from-where-select, where it will eagerly join:
+  //
+  // usingDeclarationEntries -> enclosing files -> all other elements in those files
+  //
+  // which is expensive when there are a lot of files with using declarations
+  isPossibleIntendedTarget(functionDecl, usingDecl) and
+  usingsFile = usingDecl.getFile() and
+  unavailableFile = functionDecl.getFile() and
+  usingsStartLine = usingDecl.getLocation().getStartLine() and
+  unavailableStartLine = functionDecl.getLocation().getStartLine()
+}
+
+query predicate problems(
+  FunctionDeclarationEntry unavailableDecl, string message, UsingDeclarationEntry usingDecl,
+  string usingDecl_string
+) {
+  not isExcluded(unavailableDecl, getQuery()) and
+  exists(File usingsFile, File unavailableFile, int usingsStartLine, int unavailableStartLine |
+    isPossibleIntendedTargetLocation(unavailableDecl, usingDecl, usingsFile, unavailableFile,
+      usingsStartLine, unavailableStartLine) and
+    // An approximation of order where we want the using to preceed the new declaration.
+    usingsFile = unavailableFile and
+    usingsStartLine < unavailableStartLine
+  ) and
+  message =
+    "Definition for '" + unavailableDecl.getName() +
+      "' is not available for unqualified lookup because it is declared after $@" and
+  usingDecl_string = "using-declaration"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll b/cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll
new file mode 100644
index 0000000000..31669cb0dc
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery }
+
+query predicate problems(ReThrowExpr re, string message) {
+  not isExcluded(re, getQuery()) and
+  not re.getEnclosingElement+() instanceof CatchBlock and
+  message = "Rethrow outside catch block"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
new file mode 100644
index 0000000000..7b31c00b47
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
@@ -0,0 +1,15 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery extends Query { }
+
+Query getQuery() { result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery }
+
+query predicate problems(Element e, string message) {
+not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll
new file mode 100644
index 0000000000..c4c9d33f35
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll
@@ -0,0 +1,19 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery
+}
+
+query predicate problems(Enum e, string message) {
+  not isExcluded(e, getQuery()) and
+  not e.hasExplicitUnderlyingType() and
+  message = "Base type of enumeration is not explicitly specified."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll
new file mode 100644
index 0000000000..f9fded32cd
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll
@@ -0,0 +1,18 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class ExceptionObjectHavePointerType_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof ExceptionObjectHavePointerType_sharedSharedQuery }
+
+query predicate problems(Expr thrownExpr, string message) {
+  not isExcluded(thrownExpr, getQuery()) and
+  thrownExpr = any(ThrowExpr te).getExpr() and
+  thrownExpr.getType().getUnspecifiedType() instanceof PointerType and
+  message = "Exception object with pointer type " + thrownExpr.getType() + " is thrown here."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll b/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll
new file mode 100644
index 0000000000..71c03b6e94
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll
@@ -0,0 +1,29 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.standardlibrary.Utility
+
+abstract class ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery
+}
+
+query predicate problems(FunctionCall c, string message, Parameter a, string a_string) {
+  not isExcluded(c, getQuery()) and
+  a_string = a.getName() and
+  a.getAnAccess() = c.getAnArgument() and
+  (
+    c instanceof StdMoveCall and
+    a instanceof ForwardParameter and
+    message = "Function `std::forward` should be used for forwarding the forward reference $@."
+    or
+    c instanceof StdForwardCall and
+    a instanceof ConsumeParameter and
+    message = "Function `std::move` should be used for forwarding rvalue reference $@."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll b/cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll
new file mode 100644
index 0000000000..71b7c09a18
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll
@@ -0,0 +1,30 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.IrreplaceableFunctionLikeMacro
+
+abstract class FunctionLikeMacrosDefined_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof FunctionLikeMacrosDefined_sharedSharedQuery }
+
+predicate partOfConstantExpr(MacroInvocation i) {
+  exists(Expr e |
+    e.isConstant() and
+    not i.getExpr() = e and
+    i.getExpr().getParent+() = e
+  )
+}
+
+query predicate problems(FunctionLikeMacro m, string message) {
+  not isExcluded(m, getQuery()) and
+  not m instanceof IrreplaceableFunctionLikeMacro and
+  //macros can have empty body
+  not m.getBody().length() = 0 and
+  //function call not allowed in a constant expression (where constant expr is parent)
+  forall(MacroInvocation i | i = m.getAnInvocation() | not partOfConstantExpr(i)) and
+  message = "Macro used instead of a function."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll
new file mode 100644
index 0000000000..18ad403ffe
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll
@@ -0,0 +1,35 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery
+}
+
+class RecursiveCall extends FunctionCall {
+  RecursiveCall() {
+    this.getTarget().calls*(this.getEnclosingFunction()) and
+    not this.getTarget().hasSpecifier("is_constexpr")
+  }
+}
+
+query predicate problems(FunctionCall fc, string message, Function f, string f_name) {
+  exists(RecursiveCall call |
+    not isExcluded(call, getQuery()) and
+    f = fc.getTarget() and
+    f_name = fc.getTarget().getName() and
+    fc.getTarget() = call.getTarget() and
+    if fc.getTarget() = fc.getEnclosingFunction()
+    then message = "This call directly invokes its containing function $@."
+    else
+      message =
+        "The function " + fc.getEnclosingFunction() +
+          " is indirectly recursive via this call to $@."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll b/cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll
new file mode 100644
index 0000000000..e39ab569b7
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll
@@ -0,0 +1,20 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class FunctionTemplatesExplicitlySpecialized_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof FunctionTemplatesExplicitlySpecialized_sharedSharedQuery }
+
+query predicate problems(
+  FunctionTemplateSpecialization f, string message, TemplateFunction tf, string tf_string
+) {
+  not isExcluded(f, getQuery()) and
+  tf = f.getPrimaryTemplate() and
+  tf_string = f.getPrimaryTemplate().getFile().getBaseName() and
+  message = "Specialization of function template from primary template located in $@."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll b/cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll
new file mode 100644
index 0000000000..89dee4dd8b
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll
@@ -0,0 +1,21 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class GlobalNamespaceDeclarations_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof GlobalNamespaceDeclarations_sharedSharedQuery }
+
+query predicate problems(DeclarationEntry e, string message) {
+  not isExcluded(e, getQuery()) and
+  e.getDeclaration().getNamespace() instanceof GlobalNamespace and
+  e.getDeclaration().isTopLevel() and
+  not exists(Function f | f = e.getDeclaration() | f.hasGlobalName("main") or f.hasCLinkage()) and
+  message =
+    "Declaration " + e.getName() +
+      " is in the global namespace and is not a main, a namespace, or an extern \"C\" declaration."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll b/cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll
new file mode 100644
index 0000000000..112ff0b674
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll
@@ -0,0 +1,22 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.OperatorDelete
+
+abstract class GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery }
+
+query predicate problems(OperatorDelete unsized_delete, string message) {
+  not isExcluded(unsized_delete, getQuery()) and
+  not unsized_delete.isSizeDelete() and
+  not exists(OperatorDelete od | unsized_delete.isNoThrowDelete() = od.isNoThrowDelete() |
+    od.isSizeDelete()
+  ) and
+  message =
+    "Unsized function '" + unsized_delete.getName() + "' defined globally without sized version."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll b/cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll
new file mode 100644
index 0000000000..031b4674c5
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll
@@ -0,0 +1,22 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.OperatorDelete
+
+abstract class GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery }
+
+query predicate problems(OperatorDelete sized_delete, string message) {
+  not isExcluded(sized_delete, getQuery()) and
+  sized_delete.isSizeDelete() and
+  not exists(OperatorDelete od | sized_delete.isNoThrowDelete() = od.isNoThrowDelete() |
+    not od.isSizeDelete()
+  ) and
+  message =
+    "Sized function '" + sized_delete.getName() + "' defined globally without unsized version."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll b/cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll
new file mode 100644
index 0000000000..11c09e2298
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll
@@ -0,0 +1,59 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class GotoReferenceALabelInSurroundingBlock_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof GotoReferenceALabelInSurroundingBlock_sharedSharedQuery }
+
+predicate isPartOfSwitch(Stmt goto) {
+  exists(SwitchStmt switch | switch.getStmt() = goto.getParent())
+}
+
+SwitchCase getSwitchCase(Stmt stmt) {
+  exists(int index, SwitchStmt switch |
+    getStmtInSwitch(switch, stmt, index) and getStmtInSwitch(switch, result, index - 1)
+  )
+  or
+  exists(int index, SwitchStmt switch, Stmt other |
+    getStmtInSwitch(switch, stmt, index) and
+    getStmtInSwitch(switch, other, index - 1) and
+    not other instanceof SwitchCase and
+    result = getSwitchCase(other)
+  )
+}
+
+predicate getStmtInSwitch(SwitchStmt switch, Stmt s, int index) {
+  switch.getStmt().(BlockStmt).getStmt(index) = s
+}
+
+int statementDepth(Stmt statement) {
+  statement.getParent() = statement.getEnclosingFunction().getBlock() and result = 1
+  or
+  statementDepth(statement.getParent()) + 1 = result
+}
+
+query predicate problems(GotoStmt goto, string message, Stmt target, string target_string) {
+  not isExcluded(goto, getQuery()) and
+  exists(int gotoDepth, int targetDepth |
+    goto.getTarget() = target and
+    gotoDepth = statementDepth(goto) and
+    targetDepth = statementDepth(target) and
+    targetDepth >= gotoDepth and
+    (
+      targetDepth = gotoDepth
+      implies
+      (
+        not isPartOfSwitch(goto) and not goto.getParent() = target.getParent()
+        or
+        isPartOfSwitch(goto) and not getSwitchCase(goto) = getSwitchCase(target)
+      )
+    ) and
+    target_string = "label" and
+    message = "The goto statement and its $@ are not declared or enclosed in the same block."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll
new file mode 100644
index 0000000000..7ec5ddb557
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class GotoStatementShouldNotBeUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof GotoStatementShouldNotBeUsed_sharedSharedQuery }
+
+query predicate problems(Stmt s, string message) {
+  not isExcluded(s, getQuery()) and
+  (s instanceof GotoStmt or s instanceof ComputedGotoStmt) and
+  message = "Use of goto."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll
new file mode 100644
index 0000000000..080d686b9f
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll
@@ -0,0 +1,56 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Class
+
+abstract class HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery }
+
+/**
+ * Holds if the class has a non-virtual member function with the given name.
+ */
+pragma[noinline, nomagic]
+predicate hasNonVirtualMemberFunction(Class clazz, MemberFunction mf, string name) {
+  mf.getDeclaringType() = clazz and
+  mf.getName() = name and
+  not mf.isVirtual() and
+  // Exclude private member functions, which cannot be inherited.
+  not mf.isPrivate()
+}
+
+/**
+ * Holds if the member function is in a class with the given base class, and has the given name.
+ */
+pragma[noinline, nomagic]
+predicate hasDeclarationBaseClass(MemberFunction mf, Class baseClass, string functionName) {
+  baseClass = mf.getDeclaringType().getABaseClass() and
+  functionName = mf.getName()
+}
+
+query predicate problems(
+  MemberFunction overridingDecl, string message, MemberFunction hiddenDecl, string hiddenDecl_string
+) {
+  exists(Class baseClass, string name |
+    not isExcluded(overridingDecl, getQuery()) and // Check if we are overriding a non-virtual inherited member function
+    hasNonVirtualMemberFunction(baseClass, hiddenDecl, name) and
+    hasDeclarationBaseClass(overridingDecl, baseClass, name) and
+    // Where the hidden member function isn't explicitly brought in scope through a using declaration.
+    not exists(UsingDeclarationEntry ude |
+      ude.getDeclaration() = hiddenDecl and
+      ude.getEnclosingElement() = overridingDecl.getDeclaringType()
+    ) and
+    // Exclude compiler generated member functions which include things like copy constructor that hide base class
+    // copy constructors.
+    not overridingDecl.isCompilerGenerated() and
+    // Exclude special member functions, which cannot be inherited.
+    not overridingDecl instanceof SpecialMemberFunction and
+    message =
+      "Declaration for member '" + name + "' hides non-overridable inherited member function $@" and
+    hiddenDecl_string = hiddenDecl.getName()
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll
new file mode 100644
index 0000000000..b41bebf6f4
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll
@@ -0,0 +1,54 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class HiddenInheritedOverridableMemberFunction_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof HiddenInheritedOverridableMemberFunction_sharedSharedQuery }
+
+query predicate problems(
+  FunctionDeclarationEntry overridingDecl, string message, FunctionDeclarationEntry hiddenDecl,
+  string hiddenDecl_string
+) {
+  not isExcluded(overridingDecl, getQuery()) and
+  // Check if we are overriding a virtual inherited member function
+  hiddenDecl.getDeclaration().isVirtual() and
+  // Exclude private member functions, which cannot be inherited.
+  not hiddenDecl.getDeclaration().(MemberFunction).isPrivate() and
+  // The overriding declaration hides the hidden declaration if:
+  (
+    // 1. the overriding declaration overrides a function in a base class that is an overload of the hidden declaration
+    // and the hidden declaration isn't overriden in the same class.
+    exists(FunctionDeclarationEntry overridenDecl |
+      overridingDecl.getDeclaration().(MemberFunction).overrides(overridenDecl.getDeclaration()) and
+      overridenDecl.getDeclaration().getAnOverload() = hiddenDecl.getDeclaration() and
+      not exists(MemberFunction overridingFunc |
+        hiddenDecl.getDeclaration().(MemberFunction).getAnOverridingFunction() = overridingFunc and
+        overridingFunc.getDeclaringType() = overridingDecl.getDeclaration().getDeclaringType()
+      )
+    ) and
+    // and the hidden declaration isn't explicitly brought in scope through a using declaration.
+    not exists(UsingDeclarationEntry ude |
+      ude.getDeclaration() = hiddenDecl.getDeclaration() and
+      ude.getEnclosingElement() = overridingDecl.getDeclaration().getDeclaringType()
+    )
+    or
+    // 2. if the overriding declaration doesn't override a base member function but has the same name
+    // as the hidden declaration
+    not overridingDecl.getDeclaration().(MemberFunction).overrides(_) and
+    overridingDecl.getName() = hiddenDecl.getName() and
+    overridingDecl.getDeclaration().getDeclaringType().getABaseClass() =
+      hiddenDecl.getDeclaration().getDeclaringType()
+  ) and
+  // Limit the results to the declarations and not the definitions, if any.
+  (overridingDecl.getDeclaration().hasDefinition() implies not overridingDecl.isDefinition()) and
+  (hiddenDecl.getDeclaration().hasDefinition() implies not hiddenDecl.isDefinition()) and
+  message =
+    "Declaration for member '" + overridingDecl.getName() +
+      "' hides overridable inherited member function $@" and
+  hiddenDecl_string = hiddenDecl.getName()
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll b/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll
new file mode 100644
index 0000000000..0143a88ca7
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll
@@ -0,0 +1,44 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Constructor
+
+abstract class InitializeAllVirtualBaseClasses_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof InitializeAllVirtualBaseClasses_sharedSharedQuery }
+
+query predicate problems(
+  Constructor c, string message, Class declaringType, string declaringType_string, Class baseClass,
+  string baseClass_string
+) {
+  exists(string type |
+    not isExcluded(c, getQuery()) and
+    declaringType = c.getDeclaringType() and
+    (
+      declaringType.getABaseClass() = baseClass and type = ""
+      or
+      baseClass.(VirtualBaseClass).getAVirtuallyDerivedClass().getADerivedClass+() = declaringType and
+      type = " virtual"
+    ) and
+    // There is not an initializer on the constructor for this particular base class
+    not exists(ConstructorBaseClassInit init |
+      c.getAnInitializer() = init and
+      init.getInitializedClass() = baseClass and
+      not init.isCompilerGenerated()
+    ) and
+    // Must be a defined constructor
+    c.hasDefinition() and
+    // Not a compiler-generated constructor
+    not c.isCompilerGenerated() and
+    // Not a defaulted constructor
+    not c.isDefaulted() and
+    declaringType_string = declaringType.getSimpleName() and
+    baseClass_string = baseClass.getSimpleName() and
+    message =
+      "Constructor for $@ does not explicitly call constructor for" + type + " base class $@."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll b/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll
new file mode 100644
index 0000000000..75fd17761e
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll
@@ -0,0 +1,65 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery
+}
+
+class StdInitializerList extends Class {
+  StdInitializerList() { hasQualifiedName("std", "initializer_list") }
+}
+
+/**
+ * An _initializer-list constructor_ according to `[dcl.init.list]`.
+ *
+ * A `Constructor` where the first parameter refers to `std::initializer_list`, and any remaining
+ * parameters have default arguments.
+ */
+class InitializerListConstructor extends Constructor {
+  InitializerListConstructor() {
+    // The first parameter is a `std::intializer_list` parameter
+    exists(Type firstParamType | firstParamType = getParameter(0).getType() |
+      // Either directly `std::initializer_list`
+      firstParamType instanceof StdInitializerList
+      or
+      //A reference to `std::initializer_list`
+      firstParamType.(ReferenceType).getBaseType().getUnspecifiedType() instanceof
+        StdInitializerList
+    ) and
+    // All parameters other than the fi
+    forall(Parameter other | other = getParameter([1 .. (getNumberOfParameters() - 1)]) |
+      exists(other.getInitializer())
+    )
+  }
+}
+
+query predicate problems(
+  Constructor c, string message, InitializerListConstructor stdInitializerConstructor,
+  string stdInitializerConstructor_string
+) {
+  exists(string paramList |
+    not isExcluded(c, getQuery()) and
+    // Not an initializer-list constructor
+    not c instanceof InitializerListConstructor and
+    // Constructor is not a special member function constructor
+    not c instanceof CopyConstructor and
+    not c instanceof MoveConstructor and
+    not c.getNumberOfParameters() = 0 and // default constructor
+    // And there is an initalizer-list constructor
+    stdInitializerConstructor = c.getDeclaringType().getAConstructor() and
+    // Determine the parameter type list of the constructor
+    paramList =
+      concat(string parameter | parameter = c.getAParameter().getType().getName() | parameter, ",") and
+    message =
+      "The constructor " + c.getQualifiedName() + "(" + paramList +
+        ") may be ignored in favour of $@ when using braced initialization." and
+    stdInitializerConstructor_string = "the constructor accepting std::initializer_list"
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll b/cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll
new file mode 100644
index 0000000000..454f95b070
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class LineSplicingUsedInComments_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof LineSplicingUsedInComments_sharedSharedQuery }
+
+query predicate problems(CppStyleComment c, string message) {
+  not isExcluded(c, getQuery()) and
+  exists(c.getContents().regexpFind("\\\n", _, _)) and
+  message = "C++ comment includes \\ as the last character of a line"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll b/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll
new file mode 100644
index 0000000000..14fee7001e
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class LoopCompoundCondition_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof LoopCompoundCondition_sharedSharedQuery }
+
+query predicate problems(Loop loop, string message) {
+  not isExcluded(loop, getQuery()) and
+  not loop.getStmt() instanceof BlockStmt and
+  message = "Loop body not enclosed within braces."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll b/cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll
new file mode 100644
index 0000000000..6316367c0d
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll
@@ -0,0 +1,18 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Literals
+
+abstract class LowercaseLStartsInLiteralSuffix_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof LowercaseLStartsInLiteralSuffix_sharedSharedQuery }
+
+query predicate problems(IntegerLiteral l, string message) {
+  not isExcluded(l, getQuery()) and
+  exists(l.getValueText().indexOf("l")) and
+  message = "Lowercase 'l' used as a literal suffix."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
new file mode 100644
index 0000000000..285be72705
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
@@ -0,0 +1,15 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class MacroOffsetofUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof MacroOffsetofUsed_sharedSharedQuery }
+
+query predicate problems(MacroInvocation mi, string message) {
+not isExcluded(mi, getQuery()) and   mi.getMacroName() = "offsetof" and message = "Use of banned macro " + mi.getMacroName() + "."
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll b/cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll
new file mode 100644
index 0000000000..4eaf97123a
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll
@@ -0,0 +1,22 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Macro
+
+abstract class MacroParameterFollowingHash_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof MacroParameterFollowingHash_sharedSharedQuery }
+
+query predicate problems(Macro m, string message) {
+  not isExcluded(m, getQuery()) and
+  exists(StringizingOperator one, TokenPastingOperator two |
+    one.getMacro() = m and
+    two.getMacro() = m and
+    one.getOffset() < two.getOffset()
+  ) and
+  message = "Macro definition uses an # operator followed by a ## operator."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll b/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll
new file mode 100644
index 0000000000..df7e0af73d
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll
@@ -0,0 +1,251 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.CExpr
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.SideEffects
+import codingstandards.cpp.COrdering
+
+abstract class MemoryOperationsNotSequencedAppropriately_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof MemoryOperationsNotSequencedAppropriately_sharedSharedQuery }
+
+class VariableEffectOrAccess extends Expr {
+  VariableEffectOrAccess() {
+    this instanceof VariableEffect or
+    this instanceof VariableAccess
+  }
+}
+
+pragma[noinline]
+predicate partOfFullExpr(VariableEffectOrAccess e, FullExpr fe) {
+  (
+    exists(VariableEffect ve | e = ve and ve.getAnAccess() = fe.getAChild+() and not ve.isPartial())
+    or
+    e.(VariableAccess) = fe.getAChild+()
+  )
+}
+
+class ConstituentExprOrdering extends Ordering::Configuration {
+  ConstituentExprOrdering() { this = "ConstituentExprOrdering" }
+
+  override predicate isCandidate(Expr e1, Expr e2) {
+    exists(FullExpr fe |
+      partOfFullExpr(e1, fe) and
+      partOfFullExpr(e2, fe)
+    )
+  }
+}
+
+predicate sameFullExpr(FullExpr fe, VariableAccess va1, VariableAccess va2) {
+  partOfFullExpr(va1, fe) and
+  partOfFullExpr(va2, fe) and
+  va1 != va2 and
+  exists(Variable v1, Variable v2 |
+    // Use `pragma[only_bind_into]` to prevent CP between variable accesses.
+    va1.getTarget() = pragma[only_bind_into](v1) and va2.getTarget() = pragma[only_bind_into](v2)
+  |
+    v1.isVolatile() and v2.isVolatile()
+    or
+    not (v1.isVolatile() and v2.isVolatile()) and
+    v1 = v2
+  )
+}
+
+int getLeafCount(LeftRightOperation bop) {
+  if
+    not bop.getLeftOperand() instanceof BinaryOperation and
+    not bop.getRightOperand() instanceof BinaryOperation
+  then result = 2
+  else
+    if
+      bop.getLeftOperand() instanceof BinaryOperation and
+      not bop.getRightOperand() instanceof BinaryOperation
+    then result = 1 + getLeafCount(bop.getLeftOperand())
+    else
+      if
+        not bop.getLeftOperand() instanceof BinaryOperation and
+        bop.getRightOperand() instanceof BinaryOperation
+      then result = 1 + getLeafCount(bop.getRightOperand())
+      else result = getLeafCount(bop.getLeftOperand()) + getLeafCount(bop.getRightOperand())
+}
+
+class LeftRightOperation extends Expr {
+  LeftRightOperation() {
+    this instanceof BinaryOperation or
+    this instanceof AssignOperation or
+    this instanceof AssignExpr
+  }
+
+  Expr getLeftOperand() {
+    result = this.(BinaryOperation).getLeftOperand()
+    or
+    result = this.(AssignOperation).getLValue()
+    or
+    result = this.(AssignExpr).getLValue()
+  }
+
+  Expr getRightOperand() {
+    result = this.(BinaryOperation).getRightOperand()
+    or
+    result = this.(AssignOperation).getRValue()
+    or
+    result = this.(AssignExpr).getRValue()
+  }
+
+  Expr getAnOperand() {
+    result = getLeftOperand() or
+    result = getRightOperand()
+  }
+}
+
+int getOperandIndexIn(FullExpr fullExpr, Expr operand) {
+  result = getOperandIndex(fullExpr, operand)
+  or
+  fullExpr.(Call).getArgument(result).getAChild*() = operand
+}
+
+int getOperandIndex(LeftRightOperation binop, Expr operand) {
+  if operand = binop.getAnOperand()
+  then
+    operand = binop.getLeftOperand() and
+    result = 0
+    or
+    operand = binop.getRightOperand() and
+    result = getLeafCount(binop.getLeftOperand()) + 1
+    or
+    operand = binop.getRightOperand() and
+    not binop.getLeftOperand() instanceof LeftRightOperation and
+    result = 1
+  else (
+    // Child of left operand that is a binary operation.
+    result = getOperandIndex(binop.getLeftOperand(), operand)
+    or
+    // Child of left operand that is not a binary operation.
+    result = 0 and
+    not binop.getLeftOperand() instanceof LeftRightOperation and
+    binop.getLeftOperand().getAChild+() = operand
+    or
+    // Child of right operand and both left and right operands are binary operations.
+    result =
+      getLeafCount(binop.getLeftOperand()) + getOperandIndex(binop.getRightOperand(), operand)
+    or
+    // Child of right operand and left operand is not a binary operation.
+    result = 1 + getOperandIndex(binop.getRightOperand(), operand) and
+    not binop.getLeftOperand() instanceof LeftRightOperation
+    or
+    // Child of right operand that is not a binary operation and the left operand is a binary operation.
+    result = getLeafCount(binop.getLeftOperand()) + 1 and
+    binop.getRightOperand().getAChild+() = operand and
+    not binop.getRightOperand() instanceof LeftRightOperation
+    or
+    // Child of right operand that is not a binary operation and the left operand is not a binary operation.
+    result = 1 and
+    not binop.getLeftOperand() instanceof LeftRightOperation and
+    not binop.getRightOperand() instanceof LeftRightOperation and
+    binop.getRightOperand().getAChild+() = operand
+  )
+}
+
+predicate inConditionalThen(ConditionalExpr ce, Expr e) {
+  e = ce.getThen()
+  or
+  exists(Expr parent |
+    inConditionalThen(ce, parent) and
+    parent.getAChild() = e
+  )
+}
+
+predicate inConditionalElse(ConditionalExpr ce, Expr e) {
+  e = ce.getElse()
+  or
+  exists(Expr parent |
+    inConditionalElse(ce, parent) and
+    parent.getAChild() = e
+  )
+}
+
+predicate isUnsequencedEffect(
+  ConstituentExprOrdering orderingConfig, FullExpr fullExpr, VariableEffect variableEffect1,
+  VariableAccess va1, VariableAccess va2, Locatable placeHolder, string label
+) {
+  // The two access are scoped to the same full expression.
+  sameFullExpr(fullExpr, va1, va2) and
+  // We are only interested in effects that change an object,
+  // i.e., exclude patterns suchs as `b->data[b->cursor++]` where `b` is considered modified and read or `foo.bar = 1` where `=` modifies to both `foo` and `bar`.
+  not variableEffect1.isPartial() and
+  variableEffect1.getAnAccess() = va1 and
+  (
+    exists(VariableEffect variableEffect2 |
+      not variableEffect2.isPartial() and
+      variableEffect2.getAnAccess() = va2 and
+      // If the effect is not local (happens in a different function) we use the call with the access as a proxy.
+      (
+        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
+        orderingConfig.isUnsequenced(variableEffect1, variableEffect2)
+        or
+        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+        not va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
+        exists(Call call |
+          call.getAnArgument() = va2 and call.getEnclosingStmt() = va1.getEnclosingStmt()
+        |
+          orderingConfig.isUnsequenced(variableEffect1, call)
+        )
+        or
+        not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
+        exists(Call call |
+          call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
+        |
+          orderingConfig.isUnsequenced(call, variableEffect2)
+        )
+      ) and
+      // Break the symmetry of the ordering relation by requiring that the first expression is located before the second.
+      // This builds upon the assumption that the expressions are part of the same full expression as specified in the ordering configuration.
+      getOperandIndexIn(fullExpr, va1) < getOperandIndexIn(fullExpr, va2) and
+      placeHolder = variableEffect2 and
+      label = "side effect"
+    )
+    or
+    placeHolder = va2 and
+    label = "read" and
+    not exists(VariableEffect variableEffect2 | variableEffect1 != variableEffect2 |
+      variableEffect2.getAnAccess() = va2
+    ) and
+    (
+      va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+      orderingConfig.isUnsequenced(variableEffect1, va2)
+      or
+      not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+      exists(Call call |
+        call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
+      |
+        orderingConfig.isUnsequenced(call, va2)
+      )
+    ) and
+    // The read is not used to compute the effect on the variable.
+    // E.g., exclude x = x + 1
+    not variableEffect1.getAChild+() = va2
+  ) and
+  // Both are evaluated
+  not exists(ConditionalExpr ce | inConditionalThen(ce, va1) and inConditionalElse(ce, va2))
+}
+
+query predicate problems(
+  FullExpr fullExpr, string message, VariableEffect variableEffect1, string variableEffect1_string,
+  Locatable placeHolder, string label, VariableAccess va1, string va1_string, VariableAccess va2,
+  string va2_string
+) {
+  exists(ConstituentExprOrdering orderingConfig |
+    not isExcluded(fullExpr, getQuery()) and
+    isUnsequencedEffect(orderingConfig, fullExpr, variableEffect1, va1, va2, placeHolder, label) and
+    message = "The expression contains unsequenced $@ to $@ and $@ to $@." and
+    variableEffect1_string = "side effect" and
+    va1_string = va1.getTarget().getName() and
+    va2_string = va2.getTarget().getName()
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll b/cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll
new file mode 100644
index 0000000000..317605cd1f
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll
@@ -0,0 +1,65 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class MultipleGlobalOrMemberDeclarators_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof MultipleGlobalOrMemberDeclarators_sharedSharedQuery }
+
+/*
+ * Unfortunately, we do not have an equivalent of `DeclStmt` for non-local declarations, so we
+ * cannot determine whether a declaration was declared with another declaration.
+ *
+ * However, we can use location trickery to figure out if the declaration occurs close enough to
+ * another declaration that it _must_ have been declared within the same declaration sequence.
+ *
+ * We do this by requiring that the end location of a previous declaration is within a certain
+ * number of characters of the start location of the current declaration.
+ */
+
+/**
+ * A `Declaration` which is not in a local scope, and is written directly by the user.
+ *
+ * These act as "candidates" for declarations that could plausibly occur in a declaration sequence
+ * with other candidates.
+ */
+class NonLocalUserDeclaration extends Declaration {
+  NonLocalUserDeclaration() {
+    not this instanceof StackVariable and
+    not this instanceof TemplateParameter and
+    not this instanceof EnumConstant and
+    not this instanceof TypedefType and
+    not any(LambdaCapture lc).getField() = this and
+    not this.(Function).isCompilerGenerated() and
+    not this.(Variable).isCompilerGenerated() and
+    not this.(Parameter).getFunction().isCompilerGenerated() and
+    not this.isInMacroExpansion() and
+    not exists(Struct s, TypedefType t |
+      s.isAnonymous() and
+      t.getBaseType() = s and
+      this = s.getAMemberVariable()
+    )
+  }
+}
+
+/**
+ * Holds if `d1` is followed directly by `d2`.
+ */
+predicate isFollowingDeclaration(NonLocalUserDeclaration d1, NonLocalUserDeclaration d2) {
+  exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
+    d1.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
+    d2.getLocation().hasLocationInfo(filepath, startline, endcolumn + [2 .. 3], endline, _)
+  ) and
+  not d1.(UserType).stripType() = d2.(Variable).getType().stripType()
+}
+
+query predicate problems(NonLocalUserDeclaration d1, string message) {
+  not isExcluded(d1, getQuery()) and
+  isFollowingDeclaration(d1, _) and
+  not isFollowingDeclaration(_, d1) and
+  message = "Multiple declarations after " + d1.getName() + " in this declaration sequence."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll b/cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll
new file mode 100644
index 0000000000..41c396bddc
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll
@@ -0,0 +1,19 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class MultipleLocalDeclarators_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof MultipleLocalDeclarators_sharedSharedQuery }
+
+query predicate problems(DeclStmt ds, string message) {
+  not isExcluded(ds, getQuery()) and
+  count(Declaration d | d = ds.getADeclaration()) > 1 and
+  // Not a compiler generated `DeclStmt`, such as in the range-based for loop
+  not ds.isCompilerGenerated() and
+  message = "Declaration list contains more than one declaration."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll
new file mode 100644
index 0000000000..6542caf889
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll
@@ -0,0 +1,19 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class NamedBitFieldsWithSignedIntegerType_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof NamedBitFieldsWithSignedIntegerType_sharedSharedQuery }
+
+query predicate problems(BitField bitField, string message) {
+  not isExcluded(bitField, getQuery()) and
+  bitField.getDeclaredNumBits() = 1 and // Single-bit,
+  not bitField.isAnonymous() and // named,
+  bitField.getType().(IntegralType).isSigned() and // but its type is signed.
+  message = "A named bit-field with signed integral type should have at least 2 bits of storage."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll
new file mode 100644
index 0000000000..49149ef171
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll
@@ -0,0 +1,35 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.NameInDependentBase
+
+abstract class NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery }
+
+query predicate problems(
+  NameQualifiableElement fn, string message, Element actualTarget, string targetName,
+  Element dependentTypeMemberWithSameName, string dependentType_string
+) {
+  not isExcluded(fn, getQuery()) and
+  missingNameQualifier(fn) and
+  exists(TemplateClass c |
+    fn = getConfusingFunctionAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName)
+    or
+    fn = getConfusingFunctionCall(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
+    not exists(Expr e | e = fn.(FunctionCall).getQualifier())
+    or
+    fn =
+      getConfusingMemberVariableAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
+    not exists(Expr e | e = fn.(VariableAccess).getQualifier())
+  ) and
+  not fn.isAffectedByMacro() and
+  message =
+    "Use of unqualified identifier " + targetName +
+      " targets $@ but a member with the name also exists $@." and
+  dependentType_string = "in the dependent base class"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll
new file mode 100644
index 0000000000..1b97c1f56d
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll
@@ -0,0 +1,36 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.NameInDependentBase
+
+abstract class NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery }
+
+query predicate problems(
+  NameQualifiableElement fn, string message, Element actualTarget, string targetName,
+  Element dependentTypeMemberWithSameName, string dependentType_string
+) {
+  not isExcluded(fn, getQuery()) and
+  not isCustomExcluded(fn) and
+  missingNameQualifier(fn) and
+  exists(TemplateClass c |
+    fn = getConfusingFunctionAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName)
+    or
+    fn = getConfusingFunctionCall(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
+    not exists(Expr e | e = fn.(FunctionCall).getQualifier())
+    or
+    not fn.(VariableAccess).getTarget() instanceof Parameter and
+    fn =
+      getConfusingMemberVariableAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
+    not exists(Expr e | e = fn.(VariableAccess).getQualifier())
+  ) and
+  message =
+    "Use of unqualified identifier " + targetName +
+      " targets $@ but a member with the name also exists $@." and
+  dependentType_string = "in the dependent base class"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll b/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll
new file mode 100644
index 0000000000..31a606c0db
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll
@@ -0,0 +1,38 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.exceptions.ExceptionFlow
+import ExceptionPathGraph
+import codingstandards.cpp.exceptions.ExceptionSpecifications
+
+abstract class NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery
+}
+
+class NoExceptThrowingFunction extends ExceptionThrowingFunction {
+  NoExceptThrowingFunction() {
+    // Can exit with an exception
+    exists(getAFunctionThrownType(_, _)) and
+    // But is marked noexcept(true) or equivalent
+    isNoExceptTrue(this)
+  }
+}
+
+query predicate problems(
+  NoExceptThrowingFunction f, ExceptionFlowNode exceptionSource, ExceptionFlowNode functionNode,
+  string message
+) {
+  exists(ExceptionType exceptionType |
+    not isExcluded(f, getQuery()) and
+    f.hasExceptionFlow(exceptionSource, functionNode, exceptionType) and
+    message =
+      "Function " + f.getName() + " is declared noexcept(true) but can throw exceptions of type " +
+        exceptionType.getExceptionName() + "."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll
new file mode 100644
index 0000000000..69a7e7e091
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll
@@ -0,0 +1,18 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class NonGlobalFunctionMain_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof NonGlobalFunctionMain_sharedSharedQuery }
+
+query predicate problems(Function f, string message) {
+  not isExcluded(f, getQuery()) and
+  f.hasName("main") and
+  not f.hasGlobalName("main") and
+  message = "Identifier main used for a function other than the global function main."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll
new file mode 100644
index 0000000000..4f479a5bdb
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll
@@ -0,0 +1,42 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class NonTerminatedEscapeSequences_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof NonTerminatedEscapeSequences_sharedSharedQuery }
+
+bindingset[s]
+predicate isOctalEscape(string s) {
+  s.charAt(0) = "\\" and
+  exists(int i | i = [0 .. 7] | i.toString() = s.charAt(1))
+}
+
+bindingset[s]
+predicate isHexEscape(string s) { s.indexOf("\\x") = 0 }
+
+query predicate problems(Literal l, string message) {
+  not isExcluded(l, getQuery()) and
+  exists(int idx, string sl, string escapeKind, string s |
+    sl = l.getValueText() and
+    idx = sl.indexOf("\\") and
+    s = sl.substring(idx, sl.length()) and
+    // Note: Octal representations must be 1-3 digits. There is no limitation on a
+    // Hex literal as long as the characters are valid. This query does not consider
+    // if the hex literal being constructed will overflow.
+    (
+      isHexEscape(s) and
+      not s.regexpMatch("^((\\\\x[0-9A-F]+(?=[\"'\\\\])))[\\s\\S]*") and
+      escapeKind = "hexadecimal"
+      or
+      isOctalEscape(s) and
+      not s.regexpMatch("^(((\\\\[0-7]{1,3})(?=[\"'\\\\])))[\\s\\S]*") and
+      escapeKind = "octal"
+    ) and
+    message = "Invalid " + escapeKind + " escape in string literal at '" + s + "'."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll
new file mode 100644
index 0000000000..a9831d9ead
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll
@@ -0,0 +1,36 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class NonUniqueEnumerationConstant_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof NonUniqueEnumerationConstant_sharedSharedQuery }
+
+/**
+ * An `EnumConstant` that has an implicitly specified value:
+ * `enum e { explicit = 1, implicit }`
+ */
+class ImplicitlySpecifiedEnumConstant extends EnumConstant {
+  ImplicitlySpecifiedEnumConstant() {
+    //implicitly specified have an initializer with location: `file://:0:0:0:0`
+    not this.getInitializer().getLocation().getFile() = this.getFile()
+  }
+}
+
+query predicate problems(
+  ImplicitlySpecifiedEnumConstant imp, string message, EnumConstant exp, string exp_string
+) {
+  not isExcluded(imp, getQuery()) and
+  not isExcluded(exp, getQuery()) and
+  not exp = imp and
+  imp.getValue() = exp.getValue() and
+  imp.getDeclaringEnum() = exp.getDeclaringEnum() and
+  //can technically be the same declared enum across multiple headers but those are not relevant to this rule
+  imp.getFile() = exp.getFile() and
+  message = "Nonunique value of enum constant compared to $@" and
+  exp_string = exp.getName()
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll
new file mode 100644
index 0000000000..992a1ac645
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll
@@ -0,0 +1,26 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import semmle.code.cpp.commons.NULL
+
+abstract class NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery
+}
+
+query predicate problems(Literal l, string message) {
+  not isExcluded(l, getQuery()) and // Not the type of the nullptr literal
+  not l.getType() instanceof NullPointerType and
+  // Converted to a pointer type
+  l.getConversion().getType().getUnspecifiedType() instanceof PointerType and
+  // Value of zero
+  l.getValue() = "0" and
+  // Not the StringLiteral "0"
+  not l instanceof StringLiteral and
+  message = l.getValueText() + " is used as the null-pointer-constant but is not nullptr."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll b/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll
new file mode 100644
index 0000000000..992b568f2a
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll
@@ -0,0 +1,91 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery
+}
+
+predicate thisCall(FunctionCall c) {
+  c.getQualifier() instanceof ThisExpr or
+  c.getQualifier().(PointerDereferenceExpr).getChild(0) instanceof ThisExpr
+}
+
+predicate virtualThisCall(FunctionCall c, Function overridingFunction) {
+  c.isVirtual() and
+  thisCall(c) and
+  overridingFunction = c.getTarget().(VirtualFunction).getAnOverridingFunction()
+}
+
+class DynamicTypeExpr extends Expr {
+  DynamicTypeExpr() {
+    this instanceof TypeidOperator and
+    this.getEnclosingFunction().getDeclaringType().isPolymorphic()
+    or
+    this instanceof DynamicCast
+    or
+    virtualThisCall(this.(FunctionCall), _)
+  }
+}
+
+/*
+ * Catch most cases: go into functions in the same class, but only catch direct
+ * references to "this".
+ */
+
+predicate nonVirtualMemberFunction(MemberFunction mf, Class c) {
+  mf = c.getAMemberFunction() and
+  not mf instanceof Constructor and
+  not mf instanceof Destructor and
+  not mf.isVirtual()
+}
+
+predicate callFromNonVirtual(MemberFunction source, Class c, MemberFunction targ) {
+  exists(FunctionCall fc |
+    fc.getEnclosingFunction() = source and fc.getTarget() = targ and thisCall(fc)
+  ) and
+  targ = c.getAMemberFunction() and
+  nonVirtualMemberFunction(source, c)
+}
+
+predicate indirectlyInvokesDynamicTypeExpr(MemberFunction caller, DynamicTypeExpr target) {
+  target =
+    any(DynamicTypeExpr expr |
+      expr.getEnclosingFunction() = caller and
+      nonVirtualMemberFunction(caller, caller.getDeclaringType())
+    )
+  or
+  exists(MemberFunction mid |
+    indirectlyInvokesDynamicTypeExpr(mid, target) and
+    callFromNonVirtual(caller, caller.getDeclaringType(), mid)
+  )
+}
+
+query predicate problems(
+  DynamicTypeExpr expr, string explanation, MemberFunction mf, string mf_string
+) {
+  not isExcluded(expr, getQuery()) and
+  (
+    mf instanceof Constructor or
+    mf instanceof Destructor
+  ) and
+  mf_string = mf.getQualifiedName() and
+  exists(FunctionCall call |
+    mf = expr.getEnclosingFunction() and
+    explanation = "$@ uses the dynamic type of its own object."
+    or
+    mf != expr.getEnclosingFunction() and
+    mf = call.getEnclosingFunction() and
+    thisCall(call) and
+    indirectlyInvokesDynamicTypeExpr(call.getTarget(), expr) and
+    explanation =
+      "$@ calls " + call.getTarget().getQualifiedName() +
+        ", which uses the dynamic type of its own object."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll b/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll
new file mode 100644
index 0000000000..f9438cefc8
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll
@@ -0,0 +1,37 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery
+}
+
+query predicate problems(VirtualFunction f2, string message, VirtualFunction f1, string f1_string) {
+  not isExcluded(f2, getQuery()) and
+  not isExcluded(f1, getQuery()) and
+  f2 = f1.getAnOverridingFunction() and
+  exists(Parameter p1, Parameter p2 |
+    p1 = f1.getAParameter() and
+    p2 = f2.getParameter(p1.getIndex())
+  |
+    if p1.hasInitializer()
+    then
+      // if there is no initializer
+      not p2.hasInitializer()
+      or
+      // if there is one and it doesn't match
+      not p1.getInitializer().getExpr().getValueText() =
+        p2.getInitializer().getExpr().getValueText()
+    else
+      // if p1 doesn't have an initializer p2 shouldn't either
+      p2.hasInitializer()
+  ) and
+  message = "Overriding function does not have the same default parameters as $@" and
+  f1_string = "overridden function"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll b/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll
new file mode 100644
index 0000000000..be93180112
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll
@@ -0,0 +1,32 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery
+}
+
+query predicate problems(
+  EqualityOperation equalityComparison, string message, MemberFunction virtualFunction,
+  string virtualFunction_string, Expr otherOperand, string otherOperand_string
+) {
+  not isExcluded(equalityComparison, getQuery()) and
+  exists(FunctionAccess accessOperand |
+    virtualFunction.isVirtual() and
+    equalityComparison.getAnOperand() = accessOperand and
+    accessOperand.getTarget() = virtualFunction and
+    otherOperand = equalityComparison.getAnOperand() and
+    not otherOperand = accessOperand and
+    not otherOperand.getType() instanceof NullPointerType and
+    message =
+      "A pointer to member virtual function $@ is tested for equality with non-null-pointer-constant $@." and
+    virtualFunction_string = virtualFunction.getName() and
+    otherOperand_string = otherOperand.toString()
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll
new file mode 100644
index 0000000000..b325b8ba47
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll
@@ -0,0 +1,15 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class ReinterpretCastUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof ReinterpretCastUsed_sharedSharedQuery }
+
+query predicate problems(ReinterpretCast rc, string message) {
+  not isExcluded(rc, getQuery()) and message = "Use of reinterpret_cast."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll
new file mode 100644
index 0000000000..d44d3d2b8e
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll
@@ -0,0 +1,17 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery }
+
+query predicate problems(AssignExpr e, string message) {
+  not isExcluded(e, getQuery()) and
+  not exists(ExprStmt s | s.getExpr() = e) and
+  message = "Use of an assignment operator's result."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll b/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll
new file mode 100644
index 0000000000..e3444fe368
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll
@@ -0,0 +1,36 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery
+}
+
+query predicate problems(
+  ReturnStmt rs, string message, Function f, string f_string, Variable auto, string auto_string
+) {
+  exists(VariableAccess va, string returnType |
+    not isExcluded(rs, getQuery()) and
+    f = rs.getEnclosingFunction() and
+    (
+      f.getType() instanceof ReferenceType and va = rs.getExpr() and returnType = "reference"
+      or
+      f.getType() instanceof PointerType and
+      va = rs.getExpr().(AddressOfExpr).getOperand() and
+      returnType = "pointer"
+    ) and
+    auto = va.getTarget() and
+    not auto.isStatic() and
+    not f.isCompilerGenerated() and
+    not auto.getType() instanceof ReferenceType and
+    message = "The $@ returns a " + returnType + "to an $@ variable" and
+    f_string = f.getName() and
+    auto_string = "automatic"
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll b/cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll
new file mode 100644
index 0000000000..2db252da61
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll
@@ -0,0 +1,44 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class SwitchCompoundCondition_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof SwitchCompoundCondition_sharedSharedQuery }
+
+/**
+ * Class to differentiate between extractor generated blockstmt and actual blockstmt. The extractor
+ * will generate an artificial blockstmt when there is a single case and statement, e.g.
+ * ```
+ * switch(x)
+ *   case 1:
+ *     f();
+ * ```
+ * This is because our AST model considers the `case` to be a statement in its own right, so the
+ * extractor needs an aritifical block to hold both the case and the statement.
+ */
+class ArtificialBlock extends BlockStmt {
+  ArtificialBlock() {
+    exists(Location block, Location firstStatement |
+      block = getLocation() and firstStatement = getStmt(0).getLocation()
+    |
+      // We can identify artificial blocks as those where the start of the statement is at the same
+      // location as the start of the first statement in the block i.e. there was no opening brace.
+      block.getStartLine() = firstStatement.getStartLine() and
+      block.getStartColumn() = firstStatement.getStartColumn()
+    )
+  }
+}
+
+query predicate problems(SwitchStmt switch, string message) {
+  (
+    switch.getStmt() instanceof ArtificialBlock or
+    not switch.getStmt() instanceof BlockStmt
+  ) and
+  not isExcluded(switch, getQuery()) and
+  message = "Switch body not enclosed within braces."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll
new file mode 100644
index 0000000000..a59a4e6fd5
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll
@@ -0,0 +1,30 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Cpp14Literal
+
+abstract class UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery
+}
+
+query predicate problems(Cpp14Literal::NumericLiteral nl, string message) {
+  exists(string literalKind |
+    not isExcluded(nl, getQuery()) and
+    (
+      nl instanceof Cpp14Literal::OctalLiteral and literalKind = "Octal"
+      or
+      nl instanceof Cpp14Literal::HexLiteral and literalKind = "Hex"
+    ) and
+    // This either directly has an unsigned integer type, or it is converted to an unsigned integer type
+    nl.getType().getUnspecifiedType().(IntegralType).isUnsigned() and
+    // The literal already has a `u` or `U` suffix.
+    not nl.getValueText().regexpMatch(".*[lL]*[uU][lL]*") and
+    message = literalKind + " literal is an unsigned integer but does not include a 'U' suffix."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll b/cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll
new file mode 100644
index 0000000000..9020e9c5f0
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll
@@ -0,0 +1,32 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Overflow
+import semmle.code.cpp.controlflow.Guards
+import semmle.code.cpp.valuenumbering.GlobalValueNumbering
+
+abstract class UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery }
+
+query predicate problems(InterestingOverflowingOperation op, string message) {
+  not isExcluded(op, getQuery()) and
+  op.getType().getUnderlyingType().(IntegralType).isUnsigned() and
+  // Not within a guard condition
+  not exists(GuardCondition gc | gc.getAChild*() = op) and
+  // Not guarded by a check, where the check is not an invalid overflow check
+  not op.hasValidPreCheck() and
+  // Is not checked after the operation
+  not op.hasValidPostCheck() and
+  // Permitted by exception 3
+  not op instanceof LShiftExpr and
+  // Permitted by exception 2 - zero case is handled in separate query
+  not op instanceof DivExpr and
+  not op instanceof RemExpr and
+  message =
+    "Operation " + op.getOperator() + " of type " + op.getType().getUnderlyingType() + " may wrap."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll b/cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll
new file mode 100644
index 0000000000..8c952da18e
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll
@@ -0,0 +1,18 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Cpp14Literal
+
+abstract class UseOfNonZeroOctalLiteral_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof UseOfNonZeroOctalLiteral_sharedSharedQuery }
+
+query predicate problems(Cpp14Literal::OctalLiteral octalLiteral, string message) {
+  not isExcluded(octalLiteral, getQuery()) and
+  not octalLiteral.getValue() = "0" and
+  message = "Non zero octal literal " + octalLiteral.getValueText() + "."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll b/cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll
new file mode 100644
index 0000000000..1fda305df2
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll
@@ -0,0 +1,33 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.StdNamespace
+
+abstract class VectorShouldNotBeSpecializedWithBool_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof VectorShouldNotBeSpecializedWithBool_sharedSharedQuery }
+
+predicate isVectorBool(ClassTemplateInstantiation c) {
+  c.getNamespace() instanceof StdNS and
+  c.getTemplateArgument(0) instanceof BoolType and
+  c.getSimpleName() = "vector"
+}
+
+predicate isUsingVectorBool(ClassTemplateInstantiation c) {
+  isVectorBool(c) or
+  isUsingVectorBool(c.getTemplateArgument(_))
+}
+
+query predicate problems(Variable v, string message) {
+  exists(ClassTemplateInstantiation c |
+    not isExcluded(v, getQuery()) and
+    v.getUnderlyingType() = c and
+    not v.isFromTemplateInstantiation(_) and
+    isUsingVectorBool(c) and
+    message = "Use of std::vector<bool> specialization."
+  )
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll b/cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll
new file mode 100644
index 0000000000..44e814c29b
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll
@@ -0,0 +1,38 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery }
+
+query predicate problems(
+  Class c3, string message, Class base, string base_string, ClassDerivation cd1, string cd1_string,
+  Class c2, string c2_string
+) {
+  exists(Class c1, ClassDerivation cd2 |
+    not isExcluded(c3, getQuery()) and
+    // for each pair of classes, get all of their derivations
+    cd1 = c1.getADerivation() and
+    cd2 = c2.getADerivation() and
+    // where they share the same base class
+    base = cd1.getBaseClass() and
+    base = cd2.getBaseClass() and
+    // but one is virtual, and one is not, and the derivations are in different classes
+    cd1.isVirtual() and
+    not cd2.isVirtual() and
+    // and there is some 'other class' that derives from both of these classes
+    c3.derivesFrom*(c1) and
+    c3.derivesFrom*(c2) and
+    // and the base class is accessible from the 'other class'
+    c3.getAMemberFunction().getEnclosingAccessHolder().canAccessClass(base, c3) and
+    message = "Class inherits base class $@, which is derived virtual by $@ and non-virtual by $@." and
+    base_string = base.getName() and
+    cd1_string = cd1.getDerivedClass().toString() and
+    c2_string = cd2.getDerivedClass().toString()
+  )
+}
diff --git a/cpp/common/test/includes/standard-library/assert.h b/cpp/common/test/includes/standard-library/assert.h
index e69de29bb2..ee60d0748f 100644
--- a/cpp/common/test/includes/standard-library/assert.h
+++ b/cpp/common/test/includes/standard-library/assert.h
@@ -0,0 +1 @@
+#define	assert(x) (void)0
diff --git a/cpp/common/test/includes/standard-library/ctime b/cpp/common/test/includes/standard-library/ctime
index f99aab4fb3..53ab219208 100644
--- a/cpp/common/test/includes/standard-library/ctime
+++ b/cpp/common/test/includes/standard-library/ctime
@@ -1,39 +1,7 @@
 #ifndef _GHLIBCPP_CTIME
 #define _GHLIBCPP_CTIME
-
-namespace std
-{
-    typedef unsigned long clock_t;
-    typedef unsigned long time_t;
+#include "time.h"
+namespace std {
     
-    typedef unsigned long size_t;
-    struct tm
-    {
-        int tm_sec;	
-        int tm_min;	
-        int tm_hour;
-        int tm_mday;
-        int tm_mon;	
-        int tm_year;
-        int tm_wday;
-        int tm_yday;
-        int tm_isdst;
-    };
-
-
-    clock_t clock (void);
-    double difftime (clock_t end, clock_t beginning);
-    time_t mktime (struct tm * timeptr);
-    time_t time (time_t* timer);
-    char* asctime (const struct tm * timeptr);
-
-    char* ctime (const time_t * timer);
-    struct tm * gmtime (const time_t * timer);
-    struct tm * localtime (const time_t * timer);
-    size_t strftime (char* ptr, size_t maxsize, const char* format,
-                 const struct tm* timeptr );
-
-}
-
-
-#endif
\ No newline at end of file
+} // namespace std
+#endif // _GHLIBCPP_CTIME
\ No newline at end of file
diff --git a/cpp/common/test/includes/standard-library/locale.h b/cpp/common/test/includes/standard-library/locale.h
index 346c4eeef5..19a8905531 100644
--- a/cpp/common/test/includes/standard-library/locale.h
+++ b/cpp/common/test/includes/standard-library/locale.h
@@ -1,8 +1,38 @@
 #ifndef _GHLIBCPP_LOCALE
 #define _GHLIBCPP_LOCALE
 
-struct lconv;
-char *setlocale(int, const char *);
-lconv *localeconv();
+#define LC_ALL      6
+
+struct lconv {
+	char *decimal_point;
+	char *thousands_sep;
+	char *grouping;
+
+	char *int_curr_symbol;
+	char *currency_symbol;
+	char *mon_decimal_point;
+	char *mon_thousands_sep;
+	char *mon_grouping;
+	char *positive_sign;
+	char *negative_sign;
+	char int_frac_digits;
+	char frac_digits;
+	char p_cs_precedes;
+	char p_sep_by_space;
+	char n_cs_precedes;
+	char n_sep_by_space;
+	char p_sign_posn;
+	char n_sign_posn;
+	char int_p_cs_precedes;
+	char int_p_sep_by_space;
+	char int_n_cs_precedes;
+	char int_n_sep_by_space;
+	char int_p_sign_posn;
+	char int_n_sign_posn;
+};
+
+
+char *setlocale (int, const char *);
+struct lconv *localeconv(void);
 
 #endif // _GHLIBCPP_LOCALE
\ No newline at end of file
diff --git a/cpp/common/test/includes/standard-library/stddef.h b/cpp/common/test/includes/standard-library/stddef.h
index 496de53167..96e9849973 100644
--- a/cpp/common/test/includes/standard-library/stddef.h
+++ b/cpp/common/test/includes/standard-library/stddef.h
@@ -17,5 +17,11 @@ using size_t = decltype(sizeof(char));
 
 #define offsetof(t, d) __builtin_offsetof(t, d) /*implementation-defined*/
 
+#ifdef __cplusplus
+#define NULL 0L
+#else
+#define NULL ((void*)0)
+#endif
+
 // namespace std
 #endif // _GHLIBCPP_STDDEF
\ No newline at end of file
diff --git a/cpp/common/test/includes/standard-library/stdlib.h b/cpp/common/test/includes/standard-library/stdlib.h
index c8ff7a7592..67f1abd694 100644
--- a/cpp/common/test/includes/standard-library/stdlib.h
+++ b/cpp/common/test/includes/standard-library/stdlib.h
@@ -15,6 +15,8 @@ int system(const char *command);
 
 char *getenv(const char *name);
 
+int setenv (const char *, const char *, int);
+
 int atoi(const char *str);
 long int atol(const char *str);
 long long int atoll(const char *str);
diff --git a/cpp/common/test/includes/standard-library/string.h b/cpp/common/test/includes/standard-library/string.h
index c4d06b6e7b..d94a186f0e 100644
--- a/cpp/common/test/includes/standard-library/string.h
+++ b/cpp/common/test/includes/standard-library/string.h
@@ -36,6 +36,8 @@ char *strstr(char *str1, const char *str2);
 
 char *strtok(char *str, const char *delimiters);
 
+char *strdup (const char *);
+
 void *memcpy(void *dest, const void *src, size_t count);
 void *memset(void *dest, int ch, size_t count);
 void *memmove(void *dest, const void *src, size_t count);
diff --git a/cpp/common/test/includes/standard-library/time.h b/cpp/common/test/includes/standard-library/time.h
index e69de29bb2..4c6198589f 100644
--- a/cpp/common/test/includes/standard-library/time.h
+++ b/cpp/common/test/includes/standard-library/time.h
@@ -0,0 +1,32 @@
+#ifndef _GHLIBCPP_CTIME
+#define _GHLIBCPP_CTIME
+
+typedef unsigned long clock_t;
+typedef unsigned long time_t;
+
+typedef unsigned long size_t;
+struct tm {
+  int tm_sec;
+  int tm_min;
+  int tm_hour;
+  int tm_mday;
+  int tm_mon;
+  int tm_year;
+  int tm_wday;
+  int tm_yday;
+  int tm_isdst;
+};
+
+clock_t clock(void);
+double difftime(clock_t end, clock_t beginning);
+time_t mktime(struct tm *timeptr);
+time_t time(time_t *timer);
+char *asctime(const struct tm *timeptr);
+
+char *ctime(const time_t *timer);
+struct tm *gmtime(const time_t *timer);
+struct tm *localtime(const time_t *timer);
+size_t strftime(char *ptr, size_t maxsize, const char *format,
+                const struct tm *timeptr);
+
+#endif
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.expected b/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.expected
rename to cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.expected
diff --git a/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql b/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
new file mode 100644
index 0000000000..0a40e9b1b9
--- /dev/null
+++ b/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.addressofoperatoroverloaded_shared.AddressOfOperatorOverloaded_shared
+
+class TestFileQuery extends AddressOfOperatorOverloaded_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M5-3-3/test.cpp b/cpp/common/test/rules/addressofoperatoroverloaded_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M5-3-3/test.cpp
rename to cpp/common/test/rules/addressofoperatoroverloaded_shared/test.cpp
diff --git a/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
new file mode 100644
index 0000000000..71355bf4cc
--- /dev/null
+++ b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
@@ -0,0 +1,2 @@
+| test.cpp:5:1:5:41 | #define BAD_MACRO_WITH_ARG(x) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG contains use of parameter x used in multiple contexts. |
+| test.cpp:6:1:6:48 | #define BAD_MACRO_WITH_ARG_TWO(x,y) (x) + wow ## x | Macro BAD_MACRO_WITH_ARG_TWO contains use of parameter x used in multiple contexts. |
diff --git a/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
new file mode 100644
index 0000000000..8fc299b7f3
--- /dev/null
+++ b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
+
+class TestFileQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery, TestQuery {
+}
diff --git a/c/misra/test/rules/RULE-20-12/test.c b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.cpp
similarity index 86%
rename from c/misra/test/rules/RULE-20-12/test.c
rename to cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.cpp
index 768238f36d..e96e2f7414 100644
--- a/c/misra/test/rules/RULE-20-12/test.c
+++ b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.cpp
@@ -1,4 +1,5 @@
-
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #define GOOD_MACRO_WITH_ARG(X) ((X)*X##_scale) // COMPLIANT
 #define MACRO 1
 #define BAD_MACRO_WITH_ARG(x) (x) + wow##x        // NON_COMPLIANT
diff --git a/cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.expected b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.expected
rename to cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.expected
diff --git a/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
new file mode 100644
index 0000000000..fd61a27184
--- /dev/null
+++ b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
+
+class TestFileQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/M5-2-12/test.cpp b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M5-2-12/test.cpp
rename to cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.expected b/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.expected
rename to cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.expected
diff --git a/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql b/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
new file mode 100644
index 0000000000..129fb3a5eb
--- /dev/null
+++ b/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.asmdeclarationused_shared.AsmDeclarationUsed_shared
+
+class TestFileQuery extends AsmDeclarationUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A7-4-1/test.cpp b/cpp/common/test/rules/asmdeclarationused_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A7-4-1/test.cpp
rename to cpp/common/test/rules/asmdeclarationused_shared/test.cpp
diff --git a/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected b/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
new file mode 100644
index 0000000000..9a849af3f4
--- /dev/null
+++ b/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
@@ -0,0 +1,4 @@
+| test.cpp:8:14:8:17 | call to atof | Call to banned function atof. |
+| test.cpp:9:12:9:15 | call to atoi | Call to banned function atoi. |
+| test.cpp:10:13:10:16 | call to atol | Call to banned function atol. |
+| test.cpp:11:18:11:22 | call to atoll | Call to banned function atoll. |
diff --git a/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql b/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
new file mode 100644
index 0000000000..75b1a7ea10
--- /dev/null
+++ b/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
+
+class TestFileQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-21-7/test.c b/cpp/common/test/rules/atofatoiatolandatollused_shared/test.cpp
similarity index 66%
rename from c/misra/test/rules/RULE-21-7/test.c
rename to cpp/common/test/rules/atofatoiatolandatollused_shared/test.cpp
index 141dd061d3..c995df6aad 100644
--- a/c/misra/test/rules/RULE-21-7/test.c
+++ b/cpp/common/test/rules/atofatoiatolandatollused_shared/test.cpp
@@ -1,8 +1,10 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <float.h>
 #include <stdlib.h>
 void f2();
 void f1() {
-  char l1[5] = "abcde";
+  char l1[5] = "abcd";
   float l2 = atof(l1);      // NON_COMLIANT
   int l3 = atoi(l1);        // NON_COMPLIANT
   long l4 = atol(l1);       // NON_COMPLIANT
diff --git a/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.expected b/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.expected
rename to cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.expected
diff --git a/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql b/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
new file mode 100644
index 0000000000..ad9a9eb112
--- /dev/null
+++ b/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
+
+class TestFileQuery extends BackslashCharacterMisuse_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A2-13-1/test.cpp b/cpp/common/test/rules/backslashcharactermisuse_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A2-13-1/test.cpp
rename to cpp/common/test/rules/backslashcharactermisuse_shared/test.cpp
diff --git a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
new file mode 100644
index 0000000000..346a557e32
--- /dev/null
+++ b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
@@ -0,0 +1,4 @@
+| test.cpp:9:7:9:8 | x1 | Bit-field 'x1' is declared on type 'int'. |
+| test.cpp:13:15:13:16 | x5 | Bit-field 'x5' is declared on type 'signed long'. |
+| test.cpp:15:15:15:16 | x6 | Bit-field 'x6' is declared on type 'signed char'. |
+| test.cpp:17:14:17:15 | x7 | Bit-field 'x7' is declared on type 'Color'. |
diff --git a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
new file mode 100644
index 0000000000..e460832dc7
--- /dev/null
+++ b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
+
+class TestFileQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.cpp b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.cpp
new file mode 100644
index 0000000000..96b28997c4
--- /dev/null
+++ b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.cpp
@@ -0,0 +1,18 @@
+
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+typedef unsigned int UINT16;
+
+enum Color { R, G, B };
+
+struct SampleStruct {
+  int x1 : 2;          // NON_COMPLIANT - not explicitly signed or unsigned
+  unsigned int x2 : 2; // COMPLIANT - explicitly unsigned
+  signed int x3 : 2;   // COMPLIANT - explicitly signed
+  UINT16 x4 : 2;       // COMPLIANT - type alias resolves to a compliant type
+  signed long x5 : 2; // NON_COMPLIANT - cannot declare bit field for long, even
+                      // if it's signed
+  signed char x6 : 2; // NON_COMPLIANT - cannot declare bit field for char, even
+                      // if it's signed
+  enum Color x7 : 3;  // NON_COMPLIANT - cannot declare bit field for enum
+} sample_struct;
diff --git a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.expected b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.expected
rename to cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.expected
diff --git a/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
new file mode 100644
index 0000000000..d7b6f1d4cb
--- /dev/null
+++ b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
+
+class TestFileQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/M5-3-2/test.cpp b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M5-3-2/test.cpp
rename to cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/test.cpp
diff --git a/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.expected b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.expected
new file mode 100644
index 0000000000..24493879f0
--- /dev/null
+++ b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.expected
@@ -0,0 +1,2 @@
+| test.cpp:3:3:3:34 | reinterpret_cast<..(*)(..)>... | Cast converting a pointer to function. |
+| test.cpp:4:3:4:30 | reinterpret_cast<void *>... | Cast converting a pointer to function. |
diff --git a/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
new file mode 100644
index 0000000000..5fb036e12f
--- /dev/null
+++ b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
+
+class TestFileQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/M5-2-6/test.cpp b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/test.cpp
similarity index 99%
rename from cpp/autosar/test/rules/M5-2-6/test.cpp
rename to cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/test.cpp
index ac14351b00..aad03a054e 100644
--- a/cpp/autosar/test/rules/M5-2-6/test.cpp
+++ b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/test.cpp
@@ -1,3 +1,4 @@
+
 void f(int) {
   reinterpret_cast<void (*)()>(&f); // NON_COMPLIANT
   reinterpret_cast<void *>(&f);     // NON_COMPLIANT
diff --git a/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.expected b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.expected
rename to cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.expected
diff --git a/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
new file mode 100644
index 0000000000..d172827f54
--- /dev/null
+++ b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
+
+class TestFileQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/autosar/test/rules/M2-7-1/test.cpp b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M2-7-1/test.cpp
rename to cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/test.cpp
diff --git a/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected b/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
new file mode 100644
index 0000000000..b02aa464bb
--- /dev/null
+++ b/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
@@ -0,0 +1,20 @@
+problems
+| test.cpp:11:8:11:12 | c_str | test.cpp:18:16:18:21 | call to getenv | test.cpp:11:8:11:12 | c_str | The object returned by the function getenv should not be modified. |
+| test.cpp:67:5:67:9 | conv4 | test.cpp:64:11:64:20 | call to localeconv | test.cpp:67:5:67:9 | conv4 | The object returned by the function localeconv should not be modified. |
+| test.cpp:76:5:76:8 | conv | test.cpp:72:25:72:34 | call to localeconv | test.cpp:76:5:76:8 | conv | The object returned by the function localeconv should not be modified. |
+edges
+| test.cpp:8:18:8:22 | c_str | test.cpp:11:8:11:12 | c_str |
+| test.cpp:18:16:18:21 | call to getenv | test.cpp:24:9:24:12 | env1 |
+| test.cpp:24:9:24:12 | env1 | test.cpp:8:18:8:22 | c_str |
+| test.cpp:64:11:64:20 | call to localeconv | test.cpp:67:5:67:9 | conv4 |
+| test.cpp:72:25:72:34 | call to localeconv | test.cpp:76:5:76:8 | conv |
+nodes
+| test.cpp:8:18:8:22 | c_str | semmle.label | c_str |
+| test.cpp:11:8:11:12 | c_str | semmle.label | c_str |
+| test.cpp:18:16:18:21 | call to getenv | semmle.label | call to getenv |
+| test.cpp:24:9:24:12 | env1 | semmle.label | env1 |
+| test.cpp:64:11:64:20 | call to localeconv | semmle.label | call to localeconv |
+| test.cpp:67:5:67:9 | conv4 | semmle.label | conv4 |
+| test.cpp:72:25:72:34 | call to localeconv | semmle.label | call to localeconv |
+| test.cpp:76:5:76:8 | conv | semmle.label | conv |
+subpaths
diff --git a/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql b/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql
new file mode 100644
index 0000000000..53c27eb3ce
--- /dev/null
+++ b/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.constlikereturnvalue.ConstLikeReturnValue
+
+class TestFileQuery extends ConstLikeReturnValueSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/constlikereturnvalue/test.cpp b/cpp/common/test/rules/constlikereturnvalue/test.cpp
new file mode 100644
index 0000000000..af7ecdc2d9
--- /dev/null
+++ b/cpp/common/test/rules/constlikereturnvalue/test.cpp
@@ -0,0 +1,96 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>
+
+void trstr(char *c_str, char orig, char rep) {
+  while (*c_str != '\0') {
+    if (*c_str == orig) {
+      *c_str = rep; // NON_COMPLIANT
+    }
+    ++c_str;
+  }
+}
+
+void f1(void) {
+  char *env1 = getenv("TEST_ENV");
+  char *copy_of_env;
+  copy_of_env = env1; // COMPLIANT
+
+  if (env1 == NULL) {
+  }
+  trstr(env1, '"', '_');
+}
+
+void f2(void) {
+  const char *env2;
+  char *copy_of_env;
+
+  env2 = getenv("TEST_ENV");
+  if (env2 == NULL) {
+  }
+
+  copy_of_env = (char *)malloc(strlen(env2) + 1);
+  if (copy_of_env == NULL) {
+  }
+
+  strcpy(copy_of_env, env2);
+  trstr(copy_of_env, '"', '_'); // COMPLIANT
+}
+
+void f3(void) {
+  const char *env3;
+  char *copy_of_env;
+
+  env3 = getenv("TEST_ENV");
+  if (env3 == NULL) {
+  }
+
+  copy_of_env = strdup(env3);
+  if (copy_of_env == NULL) {
+  }
+
+  trstr(copy_of_env, '"', '_'); // COMPLIANT
+  if (setenv("TEST_ENV", copy_of_env, 1) != 0) {
+  }
+}
+
+void f4(void) {
+  struct lconv *conv4 = localeconv();
+
+  setlocale(LC_ALL, "C"); // COMPLIANT
+  conv4 = localeconv();   // COMPLIANT
+
+  if ('\0' == conv4->decimal_point[0]) {
+    conv4->decimal_point = "."; // NON_COMPLIANT
+  }
+}
+
+void f4alias(void) {
+  struct lconv *conv4 = localeconv();
+  struct lconv *conv = conv4;
+
+  if ('\0' == conv4->decimal_point[0]) {
+    conv->decimal_point = "."; // NON_COMPLIANT
+  }
+}
+
+void f5(void) {
+  const struct lconv *conv5 = localeconv();
+  if (conv5 == NULL) {
+  }
+
+  struct lconv *copy_of_conv = (struct lconv *)malloc(sizeof(struct lconv));
+  if (copy_of_conv == NULL) {
+  }
+
+  memcpy(copy_of_conv, conv5, sizeof(struct lconv));
+
+  if ('\0' == copy_of_conv->decimal_point[0]) {
+    copy_of_conv->decimal_point = "."; // COMPLIANT
+  }
+
+  free(copy_of_conv);
+}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.expected b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.expected
rename to cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.expected
diff --git a/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
new file mode 100644
index 0000000000..8d4b1e8f6f
--- /dev/null
+++ b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
+
+class TestFileQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A12-8-5/test.cpp b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A12-8-5/test.cpp
rename to cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.expected b/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.expected
rename to cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.expected
diff --git a/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql b/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
new file mode 100644
index 0000000000..d17d984621
--- /dev/null
+++ b/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
+
+class TestFileQuery extends CsignalFunctionsUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M18-7-1/test.cpp b/cpp/common/test/rules/csignalfunctionsused_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M18-7-1/test.cpp
rename to cpp/common/test/rules/csignalfunctionsused_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.expected b/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.expected
rename to cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.expected
diff --git a/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql b/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
new file mode 100644
index 0000000000..57b937cb94
--- /dev/null
+++ b/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.csignaltypesused_shared.CsignalTypesUsed_shared
+
+class TestFileQuery extends CsignalTypesUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/csignaltypesused_shared/test.cpp b/cpp/common/test/rules/csignaltypesused_shared/test.cpp
new file mode 100644
index 0000000000..e621160b81
--- /dev/null
+++ b/cpp/common/test/rules/csignaltypesused_shared/test.cpp
@@ -0,0 +1,13 @@
+#include <csignal>
+
+void signal_handler(int signal) {}
+
+void test_signal_is_used() {
+  std::sig_atomic_t atom;              // NON_COMPLIANT
+  std::signal(SIGINT, signal_handler); // NON_COMPLIANT
+  std::raise(SIGINT);                  // NON_COMPLIANT
+
+  sig_atomic_t atom1;             // NON_COMPLIANT
+  signal(SIGINT, signal_handler); // NON_COMPLIANT
+  raise(SIGINT);                  // NON_COMPLIANT
+}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.expected b/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.expected
rename to cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.expected
diff --git a/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql b/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
new file mode 100644
index 0000000000..f7066f041f
--- /dev/null
+++ b/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.cstdiofunctionsused_shared.CstdioFunctionsUsed_shared
+
+class TestFileQuery extends CstdioFunctionsUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M27-0-1/test.cpp b/cpp/common/test/rules/cstdiofunctionsused_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M27-0-1/test.cpp
rename to cpp/common/test/rules/cstdiofunctionsused_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.expected b/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.expected
rename to cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.expected
diff --git a/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql b/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
new file mode 100644
index 0000000000..3b1a3d4dae
--- /dev/null
+++ b/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.cstdiomacrosused_shared.CstdioMacrosUsed_shared
+
+class TestFileQuery extends CstdioMacrosUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiomacrosused_shared/test.cpp b/cpp/common/test/rules/cstdiomacrosused_shared/test.cpp
new file mode 100644
index 0000000000..27447ba06a
--- /dev/null
+++ b/cpp/common/test/rules/cstdiomacrosused_shared/test.cpp
@@ -0,0 +1,61 @@
+#include <cstdio>
+#include <stddef.h>
+void *test_cstdio_is_used() {
+  std::FILE *f = std::fopen("foo.txt", "r"); // NON_COMPLIANT
+
+  std::fpos_t init_position;       // NON_COMPLIANT
+  std::fgetpos(f, &init_position); // NON_COMPLIANT
+
+  while (!std::feof(f)) {   // NON_COMPLIANT
+    char c = std::fgetc(f); // NON_COMPLIANT
+    if (c == EOF)           // NON_COMPLIANT
+      std::rewind(f);       // NON_COMPLIANT
+  }
+  if (std::ferror(f)) {   // NON_COMPLIANT
+    std::clearerr(f);     // NON_COMPLIANT
+    std::fclose(f);       // NON_COMPLIANT
+    std::perror("fgetc"); // NON_COMPLIANT
+  }
+
+  std::fseek(f, (size_t)0, SEEK_SET); // NON_COMPLIANT
+  std::fseek(f, (size_t)0, SEEK_END); // NON_COMPLIANT
+  char buf[BUFSIZ];                   // NON_COMPLIANT
+  std::fread(buf, 1, sizeof(buf), f); // NON_COMPLIANT
+
+  std::fsetpos(f, &init_position); // NON_COMPLIANT
+  std::fflush(f);                  // NON_COMPLIANT
+  std::fclose(f);                  // NON_COMPLIANT
+
+  std::printf("DEBUG: TMP_MAX=%d FILENAME_MAX=%d FOPEN_MAX=%d\n", TMP_MAX,
+              FILENAME_MAX, FOPEN_MAX); // NON_COMPLIANT
+  std::puts("all done!");               // NON_COMPLIANT
+
+  // global namespace
+  FILE *f1 = fopen("foo.txt", "r"); // NON_COMPLIANT
+
+  fpos_t init_position1;
+  fgetpos(f1, &init_position1); // NON_COMPLIANT
+
+  while (!feof(f1)) {   // NON_COMPLIANT
+    char c = fgetc(f1); // NON_COMPLIANT
+    if (c == EOF)       // NON_COMPLIANT
+      rewind(f1);       // NON_COMPLIANT
+  }
+  if (ferror(f1)) {  // NON_COMPLIANT
+    clearerr(f1);    // NON_COMPLIANT
+    fclose(f1);      // NON_COMPLIANT
+    perror("fgetc"); // NON_COMPLIANT
+  }
+
+  fseek(f1, (size_t)0, SEEK_SET); // NON_COMPLIANT
+  fread(buf, 1, sizeof(buf), f1); // NON_COMPLIANT
+
+  fsetpos(f1, &init_position1); // NON_COMPLIANT
+  fflush(f1);                   // NON_COMPLIANT
+  fclose(f1);                   // NON_COMPLIANT
+
+  printf("foo");     // NON_COMPLIANT
+  puts("all done!"); // NON_COMPLIANT
+
+  return NULL; // COMPLIANT - NULL is not uniquely defined by cstdio
+}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.expected b/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.expected
rename to cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.expected
diff --git a/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql b/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
new file mode 100644
index 0000000000..5e03cf9517
--- /dev/null
+++ b/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
+
+class TestFileQuery extends CstdioTypesUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiotypesused_shared/test.cpp b/cpp/common/test/rules/cstdiotypesused_shared/test.cpp
new file mode 100644
index 0000000000..27447ba06a
--- /dev/null
+++ b/cpp/common/test/rules/cstdiotypesused_shared/test.cpp
@@ -0,0 +1,61 @@
+#include <cstdio>
+#include <stddef.h>
+void *test_cstdio_is_used() {
+  std::FILE *f = std::fopen("foo.txt", "r"); // NON_COMPLIANT
+
+  std::fpos_t init_position;       // NON_COMPLIANT
+  std::fgetpos(f, &init_position); // NON_COMPLIANT
+
+  while (!std::feof(f)) {   // NON_COMPLIANT
+    char c = std::fgetc(f); // NON_COMPLIANT
+    if (c == EOF)           // NON_COMPLIANT
+      std::rewind(f);       // NON_COMPLIANT
+  }
+  if (std::ferror(f)) {   // NON_COMPLIANT
+    std::clearerr(f);     // NON_COMPLIANT
+    std::fclose(f);       // NON_COMPLIANT
+    std::perror("fgetc"); // NON_COMPLIANT
+  }
+
+  std::fseek(f, (size_t)0, SEEK_SET); // NON_COMPLIANT
+  std::fseek(f, (size_t)0, SEEK_END); // NON_COMPLIANT
+  char buf[BUFSIZ];                   // NON_COMPLIANT
+  std::fread(buf, 1, sizeof(buf), f); // NON_COMPLIANT
+
+  std::fsetpos(f, &init_position); // NON_COMPLIANT
+  std::fflush(f);                  // NON_COMPLIANT
+  std::fclose(f);                  // NON_COMPLIANT
+
+  std::printf("DEBUG: TMP_MAX=%d FILENAME_MAX=%d FOPEN_MAX=%d\n", TMP_MAX,
+              FILENAME_MAX, FOPEN_MAX); // NON_COMPLIANT
+  std::puts("all done!");               // NON_COMPLIANT
+
+  // global namespace
+  FILE *f1 = fopen("foo.txt", "r"); // NON_COMPLIANT
+
+  fpos_t init_position1;
+  fgetpos(f1, &init_position1); // NON_COMPLIANT
+
+  while (!feof(f1)) {   // NON_COMPLIANT
+    char c = fgetc(f1); // NON_COMPLIANT
+    if (c == EOF)       // NON_COMPLIANT
+      rewind(f1);       // NON_COMPLIANT
+  }
+  if (ferror(f1)) {  // NON_COMPLIANT
+    clearerr(f1);    // NON_COMPLIANT
+    fclose(f1);      // NON_COMPLIANT
+    perror("fgetc"); // NON_COMPLIANT
+  }
+
+  fseek(f1, (size_t)0, SEEK_SET); // NON_COMPLIANT
+  fread(buf, 1, sizeof(buf), f1); // NON_COMPLIANT
+
+  fsetpos(f1, &init_position1); // NON_COMPLIANT
+  fflush(f1);                   // NON_COMPLIANT
+  fclose(f1);                   // NON_COMPLIANT
+
+  printf("foo");     // NON_COMPLIANT
+  puts("all done!"); // NON_COMPLIANT
+
+  return NULL; // COMPLIANT - NULL is not uniquely defined by cstdio
+}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.expected b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.expected
rename to cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.expected
diff --git a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
new file mode 100644
index 0000000000..852e501f38
--- /dev/null
+++ b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
+
+class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/autosar/test/rules/A7-3-1/test.cpp b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A7-3-1/test.cpp
rename to cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.expected b/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.expected
rename to cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.expected
diff --git a/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql b/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
new file mode 100644
index 0000000000..388419946e
--- /dev/null
+++ b/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
+
+class TestFileQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M15-1-3/test.cpp b/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M15-1-3/test.cpp
rename to cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.expected b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.expected
rename to cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.expected
diff --git a/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql
new file mode 100644
index 0000000000..2ede7c3cea
--- /dev/null
+++ b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
+
+class TestFileQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A7-2-2/test.cpp b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A7-2-2/test.cpp
rename to cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.expected b/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.expected
rename to cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.expected
diff --git a/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql b/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
new file mode 100644
index 0000000000..43fec407b5
--- /dev/null
+++ b/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.exceptionobjecthavepointertype_shared.ExceptionObjectHavePointerType_shared
+
+class TestFileQuery extends ExceptionObjectHavePointerType_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A15-1-2/test.cpp b/cpp/common/test/rules/exceptionobjecthavepointertype_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A15-1-2/test.cpp
rename to cpp/common/test/rules/exceptionobjecthavepointertype_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.expected b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.expected
rename to cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.expected
diff --git a/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
new file mode 100644
index 0000000000..98ee8b8c23
--- /dev/null
+++ b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
+
+class TestFileQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A18-9-2/test.cpp b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A18-9-2/test.cpp
rename to cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/test.cpp
diff --git a/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected b/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
new file mode 100644
index 0000000000..62787cca0b
--- /dev/null
+++ b/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
@@ -0,0 +1,2 @@
+| test.cpp:8:1:8:25 | #define MACRO4(x) (x + 1) | Macro used instead of a function. |
+| test.cpp:13:1:13:48 | #define MACRO9() printf_custom("output = %d", 7) | Macro used instead of a function. |
diff --git a/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql b/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
new file mode 100644
index 0000000000..062cce047c
--- /dev/null
+++ b/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
+
+class TestFileQuery extends FunctionLikeMacrosDefined_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp b/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp
new file mode 100644
index 0000000000..99d3b173e0
--- /dev/null
+++ b/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp
@@ -0,0 +1,42 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <assert.h>
+
+#define MACRO(OP, L, R) ((L)OP(R))                      // COMPLIANT
+#define MACRO2(L, R) (L + R)                            // COMPLIANT
+#define MACRO3(L, R) (L " " R " " L)                    // COMPLIANT
+#define MACRO4(x) (x + 1)                               // NON_COMPLIANT
+#define MACRO5(L, LR) (LR + 1)                          // COMPLIANT
+#define MACRO6(x) printf_custom("output = %d", test##x) // COMPLIANT
+#define MACRO7(x) #x                                    // COMPLIANT
+#define MACRO8(x) "NOP"                                 // COMPLIANT
+#define MACRO9() printf_custom("output = %d", 7)        // NON_COMPLIANT
+#define MACRO10(x)                                      // COMPLIANT
+#define MY_ASSERT(X) assert(X) // NON_COMPLIANT[FALSE_NEGATIVE]
+
+char a1[MACRO2(1, 1) + 6];
+extern int printf_custom(char*, int);
+int test1;
+
+void f() {
+  int i = MACRO(+, 1, 1);
+  int i2 = MACRO2(7, 10);
+
+  static int i3 = MACRO2(1, 1);
+
+  char *i4 = MACRO3("prefix", "suffix");
+
+  int i5 = MACRO4(1);
+
+  int i6 = MACRO4(MACRO2(1, 1));
+
+  int i7 = MACRO5(1, 1);
+
+  MACRO6(1);
+
+  char *i10 = MACRO7("prefix");
+
+  asm(MACRO8(1));
+
+  MY_ASSERT(1);
+}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.expected b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.expected
rename to cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.expected
diff --git a/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
new file mode 100644
index 0000000000..91a244c8a4
--- /dev/null
+++ b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
+
+class TestFileQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A7-5-2/test.cpp b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A7-5-2/test.cpp
rename to cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.expected b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.expected
rename to cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.expected
diff --git a/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
new file mode 100644
index 0000000000..9301154455
--- /dev/null
+++ b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
+
+class TestFileQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A14-8-2/test.cpp b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A14-8-2/test.cpp
rename to cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.expected b/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.expected
rename to cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.expected
diff --git a/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql b/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
new file mode 100644
index 0000000000..ea066bfd33
--- /dev/null
+++ b/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.globalnamespacedeclarations_shared.GlobalNamespaceDeclarations_shared
+
+class TestFileQuery extends GlobalNamespaceDeclarations_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M7-3-1/test.cpp b/cpp/common/test/rules/globalnamespacedeclarations_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M7-3-1/test.cpp
rename to cpp/common/test/rules/globalnamespacedeclarations_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.expected b/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.expected
rename to cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.expected
diff --git a/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql b/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
new file mode 100644
index 0000000000..5fd76da92d
--- /dev/null
+++ b/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined_shared.GlobalSizedOperatorDeleteNotDefined_shared
+
+class TestFileQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A18-5-4/test.cpp b/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A18-5-4/test.cpp
rename to cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/test.cpp
diff --git a/c/misra/test/rules/RULE-7-3/cpp/LowercaseCharacterLUsedInLiteralSuffix.expected b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.expected
similarity index 100%
rename from c/misra/test/rules/RULE-7-3/cpp/LowercaseCharacterLUsedInLiteralSuffix.expected
rename to cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.expected
diff --git a/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
new file mode 100644
index 0000000000..8ea177a305
--- /dev/null
+++ b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined_shared.GlobalUnsizedOperatorDeleteNotDefined_shared
+
+class TestFileQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/test.cpp b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/test.cpp
new file mode 100644
index 0000000000..8f77a41637
--- /dev/null
+++ b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/test.cpp
@@ -0,0 +1,3 @@
+
+void operator delete(void *ptr) {} // NON_COMPLIANT
+// void operator delete(void *ptr, std::size_t sz) {}
diff --git a/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
new file mode 100644
index 0000000000..416f949eaa
--- /dev/null
+++ b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
@@ -0,0 +1,2 @@
+| test.cpp:42:3:42:10 | goto ... | The goto statement and its $@ are not declared or enclosed in the same block. | test.cpp:46:3:46:5 | label ...: | label |
+| test.cpp:57:5:57:12 | goto ... | The goto statement and its $@ are not declared or enclosed in the same block. | test.cpp:60:3:60:5 | label ...: | label |
diff --git a/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
new file mode 100644
index 0000000000..f905b9a46c
--- /dev/null
+++ b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
+
+class TestFileQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.cpp b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.cpp
new file mode 100644
index 0000000000..07ebb4b13a
--- /dev/null
+++ b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.cpp
@@ -0,0 +1,87 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+/*void f1() {
+  int i = 0; goto L1;
+  for (;i < 100; i++) {
+  L1: // NON_COMPLIANT - this is compiler checked
+    break;
+  }
+}*/
+
+void f2() {
+  int i = 0;
+  if (i >= 0) {
+    for (int j = 0; j < 10; j++) {
+      goto L2;
+    }
+  }
+L2: // COMPLIANT
+  return;
+}
+
+void f3() {
+  int i = 0;
+  if (i >= 0) {
+    for (int j = 0; j < 10; j++) {
+      goto L3;
+    L3: // COMPLIANT
+      break;
+    }
+  }
+}
+
+void f4() {
+  int i = 0;
+L4: // COMPLIANT
+  if (i >= 0) {
+    goto L4;
+  }
+}
+
+void f5(int p) {
+  goto L1;
+
+  switch (p) {
+  case 0:
+  L1:; // NON_COMPLIANT
+    break;
+  default:
+    break;
+  }
+}
+
+void f6(int p) {
+
+  switch (p) {
+  case 0:
+    goto L1;
+    break;
+  default:
+  L1: // NON_COMPLIANT
+    break;
+  }
+}
+
+void f7(int p) {
+L1: // COMPLIANT
+  switch (p) {
+  case 0:
+    goto L1;
+    break;
+  default:
+    break;
+  }
+}
+
+void f8(int p) {
+
+  switch (p) {
+  case 0:
+    goto L1;
+    ;
+  L1:; // COMPLIANT
+    break;
+  default:
+    break;
+  }
+}
diff --git a/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.expected b/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
index c1b2f35eda..9e9d81e62c 100644
--- a/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
+++ b/cpp/common/test/rules/gotostatementcondition/GotoStatementCondition.expected
@@ -1,4 +1,4 @@
-| test.cpp:7:3:7:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:7:3:7:10 | goto ... | l1 | test.cpp:3:1:3:3 | label ...: | label ...: |
-| test.cpp:19:3:19:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:19:3:19:10 | goto ... | l2 | test.cpp:15:1:15:3 | label ...: | label ...: |
-| test.cpp:21:3:21:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:21:3:21:10 | goto ... | l1 | test.cpp:14:1:14:3 | label ...: | label ...: |
-| test.cpp:26:3:26:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:26:3:26:10 | goto ... | l1 | test.cpp:25:1:25:3 | label ...: | label ...: |
+| test.cpp:9:3:9:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:9:3:9:10 | goto ... | l1 | test.cpp:5:1:5:3 | label ...: | label ...: |
+| test.cpp:21:3:21:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:21:3:21:10 | goto ... | l2 | test.cpp:17:1:17:3 | label ...: | label ...: |
+| test.cpp:23:3:23:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:23:3:23:10 | goto ... | l1 | test.cpp:16:1:16:3 | label ...: | label ...: |
+| test.cpp:28:3:28:10 | goto ... | The $@ statement jumps to a $@ that is not declared later in the same function. | test.cpp:28:3:28:10 | goto ... | l1 | test.cpp:27:1:27:3 | label ...: | label ...: |
diff --git a/cpp/common/test/rules/gotostatementcondition/test.cpp b/cpp/common/test/rules/gotostatementcondition/test.cpp
index 225c1b32f6..5854b21983 100644
--- a/cpp/common/test/rules/gotostatementcondition/test.cpp
+++ b/cpp/common/test/rules/gotostatementcondition/test.cpp
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void f1(int p1) {
 
 l1:
diff --git a/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected b/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
new file mode 100644
index 0000000000..48547e3cca
--- /dev/null
+++ b/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
@@ -0,0 +1 @@
+| test.cpp:6:3:6:14 | goto ... | Use of goto. |
diff --git a/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql b/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
new file mode 100644
index 0000000000..e7ae4fcebb
--- /dev/null
+++ b/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
+
+class TestFileQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/gotostatementshouldnotbeused_shared/test.cpp b/cpp/common/test/rules/gotostatementshouldnotbeused_shared/test.cpp
new file mode 100644
index 0000000000..0763208625
--- /dev/null
+++ b/cpp/common/test/rules/gotostatementshouldnotbeused_shared/test.cpp
@@ -0,0 +1,11 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+void test_goto() {
+  int x = 1;
+
+  goto label1; // NON_COMPLIANT
+
+label1:
+
+  x = 2;
+}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.expected b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.expected
rename to cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.expected
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
new file mode 100644
index 0000000000..5e440a4f92
--- /dev/null
+++ b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
+
+class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/test.cpp b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/test.cpp
new file mode 100644
index 0000000000..c0904238c3
--- /dev/null
+++ b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/test.cpp
@@ -0,0 +1,94 @@
+struct S1 {
+  int i;
+};
+
+class C1 {
+public:
+  void f1(int);
+
+  virtual void f2(int);
+  virtual void f2(double);
+  virtual void f2(S1);
+
+private:
+  void f3(int);
+  void f4(int);
+};
+
+class C2 : public C1 {
+public:
+  void f1(double); // NON_COMPLIANT
+
+  void f2(double) override; // NON_COMPLIANT
+};
+
+class C3 : public C1 {
+public:
+  void f2(char *); // NON_COMPLIANT
+};
+
+class C4 : public C1 {
+public:
+  using C1::f1;
+  void f1(double); // COMPLIANT
+
+  using C1::f2;
+  void f2(double) override; // COMPLIANT
+};
+
+namespace ns1 {
+void f1(int);
+}
+
+using ns1::f1;
+
+namespace ns1 {
+void f1(double); // NON_COMPLIANT
+}
+
+void f1() {
+  C2 l1;
+  l1.f1(0); // calls C2::f1(double) instead of C1::f1(int)
+  l1.f2(0); // calls C2::f2(double) instead of C1::f2(int)
+  // S1 s1;
+  // l1.f2(s1); Won't compile because there is no suitable conversion from S1 to
+  // double.
+  C1 &l2{l1};
+  l2.f1(0); // calls C1::f1(int)
+
+  C4 l3;
+  l3.f1(0);   // calls C1::f1(int)
+  l3.f1(0.0); // calls C3::f1(double)
+  l3.f2(0);   // calls C1::f2(int)
+  l3.f2(0.0); // calls C3::f2(double)
+  S1 l4;
+  l3.f2(l4); // calls C1:f2(S1)
+}
+
+class C5 : public C1 {
+public:
+  void f1(double); // COMPLIANT
+  using C1::f1;    // order of using and f1 declaration is not relevant
+
+  void f2(double) override; // COMPLIANT
+  using C1::f2;             // order of using and f2 declaration is not relevant
+};
+
+void f2() {
+  C5 c5;
+  c5.f1(0);   // calls C1::f1(int)
+  c5.f1(0.0); // calls C5::f1(double)
+  c5.f2(0);   // calls C1::f2(int)
+  c5.f2(0.0); // calls C5::f2(double)
+}
+
+class C6 : public C1 {
+public:
+  C6 &operator=(const C6 &); // COMPLIANT
+};
+
+class C7 : public C1 {
+  void f3(int); // COMPLIANT
+
+  void f4(int); // COMPLIANT
+};
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.expected b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.expected
rename to cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.expected
diff --git a/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
new file mode 100644
index 0000000000..a8fd6220e8
--- /dev/null
+++ b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
+
+class TestFileQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/test.cpp b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/test.cpp
new file mode 100644
index 0000000000..c0904238c3
--- /dev/null
+++ b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/test.cpp
@@ -0,0 +1,94 @@
+struct S1 {
+  int i;
+};
+
+class C1 {
+public:
+  void f1(int);
+
+  virtual void f2(int);
+  virtual void f2(double);
+  virtual void f2(S1);
+
+private:
+  void f3(int);
+  void f4(int);
+};
+
+class C2 : public C1 {
+public:
+  void f1(double); // NON_COMPLIANT
+
+  void f2(double) override; // NON_COMPLIANT
+};
+
+class C3 : public C1 {
+public:
+  void f2(char *); // NON_COMPLIANT
+};
+
+class C4 : public C1 {
+public:
+  using C1::f1;
+  void f1(double); // COMPLIANT
+
+  using C1::f2;
+  void f2(double) override; // COMPLIANT
+};
+
+namespace ns1 {
+void f1(int);
+}
+
+using ns1::f1;
+
+namespace ns1 {
+void f1(double); // NON_COMPLIANT
+}
+
+void f1() {
+  C2 l1;
+  l1.f1(0); // calls C2::f1(double) instead of C1::f1(int)
+  l1.f2(0); // calls C2::f2(double) instead of C1::f2(int)
+  // S1 s1;
+  // l1.f2(s1); Won't compile because there is no suitable conversion from S1 to
+  // double.
+  C1 &l2{l1};
+  l2.f1(0); // calls C1::f1(int)
+
+  C4 l3;
+  l3.f1(0);   // calls C1::f1(int)
+  l3.f1(0.0); // calls C3::f1(double)
+  l3.f2(0);   // calls C1::f2(int)
+  l3.f2(0.0); // calls C3::f2(double)
+  S1 l4;
+  l3.f2(l4); // calls C1:f2(S1)
+}
+
+class C5 : public C1 {
+public:
+  void f1(double); // COMPLIANT
+  using C1::f1;    // order of using and f1 declaration is not relevant
+
+  void f2(double) override; // COMPLIANT
+  using C1::f2;             // order of using and f2 declaration is not relevant
+};
+
+void f2() {
+  C5 c5;
+  c5.f1(0);   // calls C1::f1(int)
+  c5.f1(0.0); // calls C5::f1(double)
+  c5.f2(0);   // calls C1::f2(int)
+  c5.f2(0.0); // calls C5::f2(double)
+}
+
+class C6 : public C1 {
+public:
+  C6 &operator=(const C6 &); // COMPLIANT
+};
+
+class C7 : public C1 {
+  void f3(int); // COMPLIANT
+
+  void f4(int); // COMPLIANT
+};
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.expected b/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.expected
rename to cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.expected
diff --git a/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql b/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
new file mode 100644
index 0000000000..6ef0476388
--- /dev/null
+++ b/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
+
+class TestFileQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A12-1-1/test.cpp b/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A12-1-1/test.cpp
rename to cpp/common/test/rules/initializeallvirtualbaseclasses_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.expected b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.expected
rename to cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.expected
diff --git a/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
new file mode 100644
index 0000000000..d2b4aa6c89
--- /dev/null
+++ b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
+
+class TestFileQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A8-5-4/test.cpp b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A8-5-4/test.cpp
rename to cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/test.cpp
diff --git a/cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected b/cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected
new file mode 100644
index 0000000000..9a39d3a88d
--- /dev/null
+++ b/cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.expected
@@ -0,0 +1,6 @@
+| test.cpp:21:14:21:19 | tmpvar | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.cpp:13:12:13:17 | call to getenv | call to getenv | test.cpp:17:13:17:18 | call to getenv | call to getenv |
+| test.cpp:134:14:134:17 | temp | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.cpp:130:12:130:17 | call to getenv | call to getenv | test.cpp:131:11:131:16 | call to getenv | call to getenv |
+| test.cpp:134:20:134:22 | tmp | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.cpp:131:11:131:16 | call to getenv | call to getenv | test.cpp:130:12:130:17 | call to getenv | call to getenv |
+| test.cpp:165:14:165:26 | tmpvar_global | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.cpp:157:19:157:24 | call to getenv | call to getenv | test.cpp:161:20:161:25 | call to getenv | call to getenv |
+| test.cpp:188:18:188:18 | r | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.cpp:185:7:185:15 | call to setlocale | call to setlocale | test.cpp:187:8:187:17 | call to localeconv | call to localeconv |
+| test.cpp:208:10:208:15 | tmpvar | This pointer was returned by a $@ and may have been overwritten by the susequent $@. | test.cpp:202:12:202:17 | call to getenv | call to getenv | test.cpp:206:3:206:8 | call to f11fun | call to f11fun |
diff --git a/cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql b/cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql
new file mode 100644
index 0000000000..b82c43333a
--- /dev/null
+++ b/cpp/common/test/rules/invalidatedenvstringpointers/InvalidatedEnvStringPointers.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.invalidatedenvstringpointers.InvalidatedEnvStringPointers
+
+class TestFileQuery extends InvalidatedEnvStringPointersSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/invalidatedenvstringpointers/test.cpp b/cpp/common/test/rules/invalidatedenvstringpointers/test.cpp
new file mode 100644
index 0000000000..74e3d1b8f5
--- /dev/null
+++ b/cpp/common/test/rules/invalidatedenvstringpointers/test.cpp
@@ -0,0 +1,209 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+void f1(void) {
+  char *tmpvar;
+  char *tempvar;
+
+  tmpvar = getenv("TMP");
+  if (!tmpvar) {
+    /* Handle error */
+  }
+  tempvar = getenv("TEMP");
+  if (!tempvar) {
+    /* Handle error */
+  }
+  if (strcmp(tmpvar, tempvar) == 0) { // NON_COMPLIANT
+    printf("TMP and TEMP are the same.\n");
+  } else {
+    printf("TMP and TEMP are NOT the same.\n");
+  }
+}
+
+void f2(void) {
+  char *tmpvar;
+  char *tempvar;
+
+  const char *temp = getenv("TMP");
+  if (temp != NULL) {
+    tmpvar = (char *)malloc(strlen(temp) + 1);
+    if (tmpvar != NULL) {
+      strcpy(tmpvar, temp);
+    } else {
+      /* Handle error */
+    }
+  } else {
+    /* Handle error */
+  }
+
+  temp = getenv("TEMP");
+  if (temp != NULL) {
+    tempvar = (char *)malloc(strlen(temp) + 1);
+    if (tempvar != NULL) {
+      strcpy(tempvar, temp);
+    } else {
+      /* Handle error */
+    }
+  } else {
+    /* Handle error */
+  }
+
+  if (strcmp(tmpvar, tempvar) == 0) { // COMPLIANT
+    printf("TMP and TEMP are the same.\n");
+  } else {
+    printf("TMP and TEMP are NOT the same.\n");
+  }
+  free(tmpvar);
+  free(tempvar);
+}
+
+#define __STDC_WANT_LIB_EXT1__ 1
+
+void f3(void) {
+  char *tmpvar;
+  char *tempvar;
+
+  const char *temp = getenv("TMP");
+  if (temp != NULL) {
+    tmpvar = strdup(temp);
+    if (tmpvar == NULL) {
+      /* Handle error */
+    }
+  } else {
+    /* Handle error */
+  }
+
+  temp = getenv("TEMP");
+  if (temp != NULL) {
+    tempvar = strdup(temp);
+    if (tempvar == NULL) {
+      /* Handle error */
+    }
+  } else {
+    /* Handle error */
+  }
+
+  if (strcmp(tmpvar, tempvar) == 0) { // COMPLIANT
+    printf("TMP and TEMP are the same.\n");
+  } else {
+    printf("TMP and TEMP are NOT the same.\n");
+  }
+  free(tmpvar);
+  tmpvar = NULL;
+  free(tempvar);
+  tempvar = NULL;
+}
+
+void f4(void) {
+  char *temp = getenv("VAR1");
+  printf(temp);
+  temp = getenv("VAR2");
+  printf(temp); // COMPLIANT
+}
+
+void f5(void) {
+  const char *envVars[] = {
+      "v1",
+      "v2",
+      "v3",
+  };
+  for (int i = 0; i < 3; i++) {
+    char *temp = getenv(envVars[i]);
+    printf(temp); // COMPLIANT
+  }
+}
+
+void f5b(void) {
+  const char *envVars[] = {
+      "v1",
+      "v2",
+      "v3",
+  };
+  char *temp;
+  char *tmp;
+  for (int i = 0; i < 3; i++) {
+    temp = getenv(envVars[i]);
+    tmp = getenv(envVars[i]);
+  }
+
+  if (strcmp(temp, tmp) == 0) { // NON_COMPLIANT
+    printf("TMP and TEMP are the same.\n");
+  } else {
+    printf("TMP and TEMP are NOT the same.\n");
+  }
+}
+
+void f6(void) {
+  const char *envVars[] = {
+      "v1",
+      "v2",
+      "v3",
+  };
+  char *temp[3];
+  for (int i = 0; i < 3; i++) {
+    temp[i] = getenv(envVars[i]);
+  }
+  printf(temp[0]); // NON_COMPLIANT[FALSE_NEGATIVE]
+}
+
+char *tmpvar_global;
+char *tempvar_global;
+void f7(void) {
+  tmpvar_global = getenv("TMP");
+  if (!tmpvar_global) {
+    /* Handle error */
+  }
+  tempvar_global = getenv("TEMP");
+  if (!tempvar_global) {
+    /* Handle error */
+  }
+  if (strcmp(tmpvar_global, tempvar_global) == 0) { // NON_COMPLIANT
+    printf("TMP and TEMP are the same.\n");
+  } else {
+    printf("TMP and TEMP are NOT the same.\n");
+  }
+}
+
+extern void f8fun();
+void f8(void) {
+  char *temp = getenv("VAR1");
+  printf(temp);
+  f8fun(); // this function might call getenv()
+  temp = getenv("VAR2");
+  printf(temp); // NON_COMPLIANT[FALSE_NEGATIVE]
+}
+
+void f9(void) {
+  const char *r;
+  struct lconv *lc;
+  char c[128];
+  r = setlocale(LC_ALL, "ja_JP.UTF-8");
+  strcpy(c, r);
+  lc = localeconv();
+  printf("%s\n", r);                   // NON_COMPLIANT
+  printf("%s\n", c);                   // COMPLIANT
+  printf("%s\n", lc->currency_symbol); // COMPLIANT
+}
+
+void f10(void) {
+  struct tm tm = *localtime(&(time_t){time(NULL)});
+  printf("%s", asctime(&tm)); // COMPLIANT
+}
+
+void f11fun(void) { char *tempvar = getenv("TEMP"); }
+void f11(void) {
+  char *tmpvar;
+
+  tmpvar = getenv("TMP");
+  if (!tmpvar) {
+    /* Handle error */
+  }
+  f11fun();
+
+  printf(tmpvar); // NON_COMPLIANT
+}
diff --git a/cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected b/cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected
new file mode 100644
index 0000000000..9061fcfbc4
--- /dev/null
+++ b/cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.expected
@@ -0,0 +1,2 @@
+| test.cpp:15:19:15:24 | call to getenv | The value of variable $@ might become invalid after a subsequent call to function `getenv`. | test.cpp:12:7:12:19 | tmpvar_global | tmpvar_global |
+| test.cpp:18:20:18:25 | call to getenv | The value of variable $@ might become invalid after a subsequent call to function `getenv`. | test.cpp:9:9:9:20 | tmpvar_field | tmpvar_field |
diff --git a/cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql b/cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql
new file mode 100644
index 0000000000..7a56af210d
--- /dev/null
+++ b/cpp/common/test/rules/invalidatedenvstringpointerswarn/InvalidatedEnvStringPointersWarn.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.invalidatedenvstringpointerswarn.InvalidatedEnvStringPointersWarn
+
+class TestFileQuery extends InvalidatedEnvStringPointersWarnSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/invalidatedenvstringpointerswarn/test.cpp b/cpp/common/test/rules/invalidatedenvstringpointerswarn/test.cpp
new file mode 100644
index 0000000000..5001e538a1
--- /dev/null
+++ b/cpp/common/test/rules/invalidatedenvstringpointerswarn/test.cpp
@@ -0,0 +1,21 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct test_struct {
+  char *tmpvar_field;
+};
+
+char *tmpvar_global;
+
+void f1(void) {
+  tmpvar_global = getenv("TMP"); // NON_COMPLIANT
+
+  struct test_struct s;
+  s.tmpvar_field = getenv("TEMP"); // NON_COMPLIANT
+
+  char *tmpvar_local = getenv("TEMP"); // COMPLIANT
+}
diff --git a/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.expected b/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.expected
rename to cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.expected
diff --git a/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql b/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
new file mode 100644
index 0000000000..f10ee1f3ad
--- /dev/null
+++ b/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.linesplicingusedincomments_shared.LineSplicingUsedInComments_shared
+
+class TestFileQuery extends LineSplicingUsedInComments_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A2-7-1/test.cpp b/cpp/common/test/rules/linesplicingusedincomments_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A2-7-1/test.cpp
rename to cpp/common/test/rules/linesplicingusedincomments_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.expected b/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.expected
rename to cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.expected
diff --git a/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql b/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
new file mode 100644
index 0000000000..7ca1d2643e
--- /dev/null
+++ b/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
+
+class TestFileQuery extends LoopCompoundCondition_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M6-3-1/test.cpp b/cpp/common/test/rules/loopcompoundcondition_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M6-3-1/test.cpp
rename to cpp/common/test/rules/loopcompoundcondition_shared/test.cpp
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
new file mode 100644
index 0000000000..545b6d3441
--- /dev/null
+++ b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
@@ -0,0 +1,16 @@
+| test.cpp:5:10:5:11 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:6:10:6:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:9:10:9:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:10:10:10:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:15:11:15:12 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:16:11:16:13 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:19:11:19:13 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:20:11:20:13 | 0 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:25:10:25:14 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:26:10:26:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:29:10:29:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:30:10:30:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:35:11:35:14 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:36:11:36:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:39:11:39:15 | 1 | Lowercase 'l' used as a literal suffix. |
+| test.cpp:40:11:40:15 | 1 | Lowercase 'l' used as a literal suffix. |
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
new file mode 100644
index 0000000000..8d7d9f0be8
--- /dev/null
+++ b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix_shared.LowercaseLStartsInLiteralSuffix_shared
+
+class TestFileQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-7-3/cpp/README.md b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/README.md
similarity index 100%
rename from c/misra/test/rules/RULE-7-3/cpp/README.md
rename to cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/README.md
diff --git a/c/misra/test/rules/RULE-7-3/test.c b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp
similarity index 86%
rename from c/misra/test/rules/RULE-7-3/test.c
rename to cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp
index 5e1c448926..6cbff873ee 100644
--- a/c/misra/test/rules/RULE-7-3/test.c
+++ b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp
@@ -1,4 +1,6 @@
-
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+int x = false; // COMPLIANT - reported as FP in #319
 int a1 = 0L;  // COMPLIANT
 int a2 = 0l;  // NON_COMPLIANT
 int a3 = 0ll; // NON_COMPLIANT
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected
similarity index 100%
rename from cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected
rename to cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.gcc b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.gcc
similarity index 100%
rename from cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.gcc
rename to cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.gcc
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.qcc b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.qcc
similarity index 100%
rename from cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.expected.qcc
rename to cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.qcc
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected
new file mode 100644
index 0000000000..88647b9f36
--- /dev/null
+++ b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected
@@ -0,0 +1 @@
+| test.cpp:9:32:9:51 | offsetof(t,d) | Use of banned macro offsetof. |
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
new file mode 100644
index 0000000000..b1e69f5a8a
--- /dev/null
+++ b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.macrooffsetofused_shared.MacroOffsetofUsed_shared
+
+class TestFileQuery extends MacroOffsetofUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M18-2-1/test.cpp b/cpp/common/test/rules/macrooffsetofused_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M18-2-1/test.cpp
rename to cpp/common/test/rules/macrooffsetofused_shared/test.cpp
diff --git a/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected b/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
new file mode 100644
index 0000000000..6a3d5c5da7
--- /dev/null
+++ b/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
@@ -0,0 +1 @@
+| test.cpp:27:1:27:29 | #define MACROTHIRTEEN(X) #X ## X | Macro definition uses an # operator followed by a ## operator. |
diff --git a/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql b/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
new file mode 100644
index 0000000000..8c3dd270d0
--- /dev/null
+++ b/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
+
+class TestFileQuery extends MacroParameterFollowingHash_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-20-11/test.c b/cpp/common/test/rules/macroparameterfollowinghash_shared/test.cpp
similarity index 83%
rename from c/misra/test/rules/RULE-20-11/test.c
rename to cpp/common/test/rules/macroparameterfollowinghash_shared/test.cpp
index ad2c205970..5e6f187445 100644
--- a/c/misra/test/rules/RULE-20-11/test.c
+++ b/cpp/common/test/rules/macroparameterfollowinghash_shared/test.cpp
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #define MACROONE 1 // COMPLIANT
 
 #define MACROTWO '#\'-#' + '#' // COMPLIANT
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
new file mode 100644
index 0000000000..54c8ee481b
--- /dev/null
+++ b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
@@ -0,0 +1,6 @@
+| test.cpp:8:12:8:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:8:12:8:13 | l1 | side effect | test.cpp:8:17:8:18 | l1 | side effect | test.cpp:8:12:8:13 | l1 | l1 | test.cpp:8:17:8:18 | l1 | l1 |
+| test.cpp:9:12:9:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:9:12:9:13 | l1 | side effect | test.cpp:9:17:9:18 | l2 | side effect | test.cpp:9:12:9:13 | l1 | l1 | test.cpp:9:17:9:18 | l2 | l2 |
+| test.cpp:19:3:19:21 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:19:8:19:9 | l1 | side effect | test.cpp:19:13:19:14 | l1 | side effect | test.cpp:19:8:19:9 | l1 | l1 | test.cpp:19:13:19:14 | l1 | l1 |
+| test.cpp:21:3:21:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:21:7:21:8 | l1 | side effect | test.cpp:21:11:21:12 | l2 | side effect | test.cpp:21:7:21:8 | l1 | l1 | test.cpp:21:11:21:12 | l2 | l2 |
+| test.cpp:27:3:27:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:27:7:27:10 | ... ++ | side effect | test.cpp:27:13:27:14 | l8 | read | test.cpp:27:7:27:8 | l8 | l8 | test.cpp:27:13:27:14 | l8 | l8 |
+| test.cpp:37:5:37:13 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:37:10:37:12 | ... ++ | side effect | test.cpp:37:10:37:12 | ... ++ | side effect | test.cpp:37:10:37:10 | i | i | test.cpp:37:10:37:10 | i | i |
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
new file mode 100644
index 0000000000..e49f82c8fd
--- /dev/null
+++ b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
+
+class TestFileQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery, TestQuery {
+}
diff --git a/c/misra/test/rules/RULE-13-2/test.c b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.cpp
similarity index 86%
rename from c/misra/test/rules/RULE-13-2/test.c
rename to cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.cpp
index 1bebec3775..427555d735 100644
--- a/c/misra/test/rules/RULE-13-2/test.c
+++ b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.cpp
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void foo(int, int);
 
 void unsequenced_sideeffects1() {
@@ -27,7 +29,7 @@ void unsequenced_sideeffects1() {
   int l10 = l8++, l11 = l8++; // COMPLIANT
 }
 
-int g1[], g2[];
+int g1[10], g2[10];
 #define test(i) (g1[i] = g2[i])
 void unsequenced_sideeffects2() {
   int i;
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.expected b/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.expected
rename to cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.expected
diff --git a/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql b/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
new file mode 100644
index 0000000000..061e572c73
--- /dev/null
+++ b/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
+
+class TestFileQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M8-0-1/test.cpp b/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M8-0-1/test.cpp
rename to cpp/common/test/rules/multipleglobalormemberdeclarators_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.expected b/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.expected
rename to cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.expected
diff --git a/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql b/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
new file mode 100644
index 0000000000..b578fb7eca
--- /dev/null
+++ b/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
+
+class TestFileQuery extends MultipleLocalDeclarators_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/multiplelocaldeclarators_shared/test.cpp b/cpp/common/test/rules/multiplelocaldeclarators_shared/test.cpp
new file mode 100644
index 0000000000..cf664e4b34
--- /dev/null
+++ b/cpp/common/test/rules/multiplelocaldeclarators_shared/test.cpp
@@ -0,0 +1,24 @@
+int g1, g2; // NON_COMPLIANT
+int g3;     // COMPLIANT
+
+namespace n1 {
+int n_v1, n_v2; // NON_COMPLIANT
+int n_v3;       // COMPLIANT
+} // namespace n1
+
+void f() {
+  int l1, l2; // NON_COMPLIANT
+  int l3;     // COMPLIANT
+}
+
+class ClassA {
+  int m1, m2; // NON_COMPLIANT
+  int m3;     // COMPLIANT
+};
+
+#include <vector>
+void test_loop(std::vector<ClassA> v) {
+  for (const auto b : v) { // COMPLIANT - DeclStmt is compiler generated
+    b;
+  }
+}
\ No newline at end of file
diff --git a/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected b/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
new file mode 100644
index 0000000000..8ddc10e90c
--- /dev/null
+++ b/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
@@ -0,0 +1,5 @@
+| test.cpp:6:7:6:8 | x1 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.cpp:9:14:9:15 | x2 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.cpp:11:7:11:8 | x3 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.cpp:13:7:13:8 | x4 | A named bit-field with signed integral type should have at least 2 bits of storage. |
+| test.cpp:22:14:22:14 | x | A named bit-field with signed integral type should have at least 2 bits of storage. |
diff --git a/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql b/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
new file mode 100644
index 0000000000..09b98ff226
--- /dev/null
+++ b/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
+
+class TestFileQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-6-2/test.c b/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.cpp
similarity index 70%
rename from c/misra/test/rules/RULE-6-2/test.c
rename to cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.cpp
index 8182dfdb5d..0d6e838f83 100644
--- a/c/misra/test/rules/RULE-6-2/test.c
+++ b/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.cpp
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <stdint.h>
 
 struct SampleStruct {
@@ -15,3 +17,12 @@ struct SampleStruct {
                      // to carry more than 1 bit
   signed char : 1;   // COMPLIANT: single-bit bit-field but unnamed
 } sample_struct;
+
+struct S {
+  signed int x : 1; // NON-COMPLIANT
+  signed int y : 5; // COMPLIANT
+  signed int z : 7; // COMPLIANT
+  signed int : 0;   // COMPLIANT
+  signed int : 1;   // COMPLIANT
+  signed int : 2;   // COMPLIANT
+};
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.expected b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.expected
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.expected
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
new file mode 100644
index 0000000000..6f8e2c1e7f
--- /dev/null
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
+
+class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M14-6-1/test.cpp b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M14-6-1/test.cpp
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.expected b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.expected
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.expected
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
new file mode 100644
index 0000000000..e5d93d74db
--- /dev/null
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
+
+class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/test.cpp b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/test.cpp
new file mode 100644
index 0000000000..b16e6b40dc
--- /dev/null
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/test.cpp
@@ -0,0 +1,87 @@
+typedef int TYPE;
+void g();
+void g1();
+int m;
+
+template <typename T> class B {
+public:
+  typedef T TYPE;
+  void g();
+  int m;
+};
+
+template <typename T> class A : B<T> {
+public:
+  void m1() {
+    m = 0;            // NON_COMPLIANT
+    g();              // NON_COMPLIANT
+    TYPE t = 0;       // NON_COMPLIANT[FALSE_NEGATIVE]
+    void (*p)() = &g; // NON_COMPLIANT
+  }
+  void m2() {
+    ::m = 0;                      // COMPLIANT
+    ::g();                        // COMPLIANT
+    ::TYPE t1 = 0;                // COMPLIANT
+    B<T>::m = 0;                  // COMPLIANT
+    this->m = 0;                  // COMPLIANT
+    this->g();                    // COMPLIANT
+    void (B<T>::*p)() = &B<T>::g; // COMPLIANT
+    typename B<T>::TYPE t2 = 0;   // COMPLIANT
+    g1();                         // COMPLIANT, identifier not found in B
+  }
+  void m3(int m) {
+    m = 0; // COMPLIANT, hides member
+  }
+  void m4() {
+    int m = 0;
+    m = 0; // COMPLIANT, hides member
+  }
+};
+
+void f() {
+  A<int> a;
+  a.m1();
+  a.m2();
+  a.m3(1);
+  a.m4();
+}
+
+class D {
+public:
+  typedef int TYPE;
+  void g();
+  void g(int x);
+  static void sg();
+  static void sg(int x);
+  int m;
+};
+
+class C : D {
+public:
+  void m1() {
+    m = 0;       // COMPLIANT - does not apply to non-class templates
+    g();         // COMPLIANT - does not apply to non-class templates
+    sg();        // COMPLIANT - does not apply to non-class templates
+    TYPE t1 = 0; // COMPLIANT - does not apply to non-class templates
+    // void (*p)() = &g; // NON_COMPILABLE - not valid to take address of member
+    // function without qualifier
+  }
+};
+
+template <typename T> class E : D {
+public:
+  void m1() {
+    m = 0;       // COMPLIANT - does not apply to non dependent base types
+    g();         // COMPLIANT - does not apply to non dependent base types
+    TYPE t1 = 0; // COMPLIANT - does not apply to non dependent base types
+    // void (*p)() = &g; // NON_COMPILABLE - not valid to take address of member
+    // function without qualifier
+  }
+};
+
+void f2() {
+  C c;
+  c.m1();
+  E<int> e;
+  e.m1();
+}
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.expected b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.expected
similarity index 99%
rename from cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.expected
rename to cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.expected
index b2f8391b15..db392fd8f6 100644
--- a/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.expected
+++ b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.expected
@@ -1,3 +1,9 @@
+problems
+| test.cpp:4:6:4:15 | test_throw | test.cpp:5:3:5:20 | throw ... [ExceptionA] | test.cpp:4:6:4:15 | test_throw [ExceptionA] | Function test_throw is declared noexcept(true) but can throw exceptions of type ExceptionA. |
+| test.cpp:10:6:10:27 | noexceptIndirectThrowA | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:10:6:10:27 | noexceptIndirectThrowA [ExceptionA] | Function noexceptIndirectThrowA is declared noexcept(true) but can throw exceptions of type ExceptionA. |
+| test.cpp:12:6:12:24 | test_indirect_throw | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:12:6:12:24 | test_indirect_throw [ExceptionA] | Function test_indirect_throw is declared noexcept(true) but can throw exceptions of type ExceptionA. |
+| test.cpp:16:6:16:26 | test_indirect_throw_2 | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:16:6:16:26 | test_indirect_throw_2 [ExceptionA] | Function test_indirect_throw_2 is declared noexcept(true) but can throw exceptions of type ExceptionA. |
+| test.cpp:33:6:33:26 | test_indirect_throw_6 | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:33:6:33:26 | test_indirect_throw_6 [ExceptionA] | Function test_indirect_throw_6 is declared noexcept(true) but can throw exceptions of type ExceptionA. |
 edges
 | test.cpp:5:3:5:20 | throw ... [ExceptionA] | test.cpp:4:6:4:15 | test_throw [ExceptionA] |
 | test.cpp:8:6:8:11 | throwA [ExceptionA] | test.cpp:9:25:9:30 | call to throwA [ExceptionA] |
@@ -11,9 +17,3 @@ edges
 | test.cpp:13:3:13:8 | call to throwA [ExceptionA] | test.cpp:12:6:12:24 | test_indirect_throw [ExceptionA] |
 | test.cpp:17:3:17:8 | call to throwA [ExceptionA] | test.cpp:16:6:16:26 | test_indirect_throw_2 [ExceptionA] |
 | test.cpp:34:3:34:16 | call to indirectThrowA [ExceptionA] | test.cpp:33:6:33:26 | test_indirect_throw_6 [ExceptionA] |
-#select
-| test.cpp:4:6:4:15 | test_throw | test.cpp:5:3:5:20 | throw ... [ExceptionA] | test.cpp:4:6:4:15 | test_throw [ExceptionA] | Function test_throw is declared noexcept(true) but can throw exceptions of type ExceptionA. |
-| test.cpp:10:6:10:27 | noexceptIndirectThrowA | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:10:6:10:27 | noexceptIndirectThrowA [ExceptionA] | Function noexceptIndirectThrowA is declared noexcept(true) but can throw exceptions of type ExceptionA. |
-| test.cpp:12:6:12:24 | test_indirect_throw | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:12:6:12:24 | test_indirect_throw [ExceptionA] | Function test_indirect_throw is declared noexcept(true) but can throw exceptions of type ExceptionA. |
-| test.cpp:16:6:16:26 | test_indirect_throw_2 | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:16:6:16:26 | test_indirect_throw_2 [ExceptionA] | Function test_indirect_throw_2 is declared noexcept(true) but can throw exceptions of type ExceptionA. |
-| test.cpp:33:6:33:26 | test_indirect_throw_6 | test.cpp:8:17:8:34 | throw ... [ExceptionA] | test.cpp:33:6:33:26 | test_indirect_throw_6 [ExceptionA] | Function test_indirect_throw_6 is declared noexcept(true) but can throw exceptions of type ExceptionA. |
diff --git a/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
new file mode 100644
index 0000000000..4a405daaaf
--- /dev/null
+++ b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
+
+class TestFileQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A15-4-2/test.cpp b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A15-4-2/test.cpp
rename to cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.expected b/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.expected
rename to cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.expected
diff --git a/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql b/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
new file mode 100644
index 0000000000..611b3d0f77
--- /dev/null
+++ b/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
+
+class TestFileQuery extends NonGlobalFunctionMain_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M7-3-2/test.cpp b/cpp/common/test/rules/nonglobalfunctionmain_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M7-3-2/test.cpp
rename to cpp/common/test/rules/nonglobalfunctionmain_shared/test.cpp
diff --git a/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected b/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
new file mode 100644
index 0000000000..3051e32537
--- /dev/null
+++ b/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
@@ -0,0 +1,21 @@
+| test.cpp:37:18:37:24 | \u001aG | Invalid hexadecimal escape in string literal at '\\x1AG"'. |
+| test.cpp:40:18:40:23 | \u00029 | Invalid octal escape in string literal at '\\029"'. |
+| test.cpp:43:18:43:24 | \n7 | Invalid octal escape in string literal at '\\0127"'. |
+| test.cpp:44:18:44:24 | \r7 | Invalid octal escape in string literal at '\\0157"'. |
+| test.cpp:46:19:46:29 | \n\n9 | Invalid octal escape in string literal at '\\0129"'. |
+| test.cpp:47:19:47:28 | \n\u00019 | Invalid octal escape in string literal at '\\019"'. |
+| test.cpp:50:19:50:31 | \nAAA\u000f | Invalid octal escape in string literal at '\\012AAA\\017"'. |
+| test.cpp:53:19:53:39 | Some Data \n\u000fA | Invalid octal escape in string literal at '\\017A"'. |
+| test.cpp:54:19:55:21 | Some Data \n\u000fA5 | Invalid octal escape in string literal at '\\017A"\n                  "5"'. |
+| test.cpp:56:19:58:25 | Some Data \n\u000fA\n1 | Invalid octal escape in string literal at '\\0121"'. |
+| test.cpp:62:19:63:26 | \u0011G\u00012 | Invalid octal escape in string literal at '\\0012"'. |
+| test.cpp:64:19:65:25 | \u0011GG\u0001 | Invalid hexadecimal escape in string literal at '\\x11G"\n                  "G\\001"'. |
+| test.cpp:66:19:67:26 | \u0011GG\u00013 | Invalid hexadecimal escape in string literal at '\\x11G"\n                  "G\\0013"'. |
+| test.cpp:66:19:67:26 | \u0011GG\u00013 | Invalid octal escape in string literal at '\\0013"'. |
+| test.cpp:73:18:73:42 | Some Data \n\u000fA5 | Invalid octal escape in string literal at '\\017A" "5"'. |
+| test.cpp:74:18:74:49 | Some Data \n\u000fA\n1 | Invalid octal escape in string literal at '\\0121"'. |
+| test.cpp:76:18:76:32 | \u0011G\u00012 | Invalid octal escape in string literal at '\\0012"'. |
+| test.cpp:77:18:77:32 | \u0011GG\u0001 | Invalid hexadecimal escape in string literal at '\\x11G" "G\\001"'. |
+| test.cpp:78:18:78:33 | \u0011GG\u00013 | Invalid hexadecimal escape in string literal at '\\x11G" "G\\0013"'. |
+| test.cpp:78:18:78:33 | \u0011GG\u00013 | Invalid octal escape in string literal at '\\0013"'. |
+| test.cpp:81:11:81:16 | 10 | Invalid hexadecimal escape in string literal at '\\x0a''. |
diff --git a/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql b/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
new file mode 100644
index 0000000000..6cbb2220bb
--- /dev/null
+++ b/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
+
+class TestFileQuery extends NonTerminatedEscapeSequences_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-4-1/test.c b/cpp/common/test/rules/nonterminatedescapesequences_shared/test.cpp
similarity index 61%
rename from c/misra/test/rules/RULE-4-1/test.c
rename to cpp/common/test/rules/nonterminatedescapesequences_shared/test.cpp
index 4a0dcaa6ac..aa1093b791 100644
--- a/c/misra/test/rules/RULE-4-1/test.c
+++ b/cpp/common/test/rules/nonterminatedescapesequences_shared/test.cpp
@@ -1,3 +1,31 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <stdint.h>
+
+struct SampleStruct {
+  int x1 : 1; // NON_COMPLIANT: very likely be signed, but if it's not, the
+              // query will automatically handle it since we use signed(), not
+              // isExplicitlySigned().
+  signed int x2 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  signed char
+      x3 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  signed short
+      x4 : 1; // NON_COMPLIANT: single-bit named field with a signed type
+  unsigned int
+      x5 : 1; // COMPLIANT: single-bit named field but with an unsigned type
+  signed int x6 : 2; // COMPLIANT: named field with a signed type but declared
+                     // to carry more than 1 bit
+  signed char : 1;   // COMPLIANT: single-bit bit-field but unnamed
+} sample_struct;
+
+struct S {
+  signed int x : 1; // NON-COMPLIANT
+  signed int y : 5; // COMPLIANT
+  signed int z : 7; // COMPLIANT
+  signed int : 0;   // COMPLIANT
+  signed int : 1;   // COMPLIANT
+  signed int : 2;   // COMPLIANT
+};
 const char *a1 = "\x11"
                  "G"; // COMPLIANT
 
diff --git a/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected b/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
new file mode 100644
index 0000000000..662a21b5d6
--- /dev/null
+++ b/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
@@ -0,0 +1 @@
+| test.cpp:5:19:5:20 | c4 | Nonunique value of enum constant compared to $@ | test.cpp:5:23:5:24 | c5 | c5 |
diff --git a/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql b/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
new file mode 100644
index 0000000000..f01ef52853
--- /dev/null
+++ b/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
+
+class TestFileQuery extends NonUniqueEnumerationConstant_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonuniqueenumerationconstant_shared/test.cpp b/cpp/common/test/rules/nonuniqueenumerationconstant_shared/test.cpp
new file mode 100644
index 0000000000..0712cb59e4
--- /dev/null
+++ b/cpp/common/test/rules/nonuniqueenumerationconstant_shared/test.cpp
@@ -0,0 +1,6 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+enum e { c = 3 };                   // COMPLIANT
+enum e1 { c1 = 3, c2 };             // COMPLIANT
+enum e3 { c3 = 3, c4, c5 = 4 };     // NON_COMPLIANT
+enum e4 { c6 = 3, c7, c8, c9 = 6 }; // COMPLIANT
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected
diff --git a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.clang b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.clang
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.clang
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.clang
diff --git a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.gcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.gcc
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.gcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.gcc
diff --git a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.qcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.qcc
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.expected.qcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.qcc
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
new file mode 100644
index 0000000000..6b9f1d2ac5
--- /dev/null
+++ b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
+
+class TestFileQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A4-10-1/test.cpp b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/test.cpp
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A4-10-1/test.cpp.clang b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.clang
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/test.cpp.clang
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.clang
diff --git a/cpp/autosar/test/rules/A4-10-1/test.cpp.gcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.gcc
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/test.cpp.gcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.gcc
diff --git a/cpp/autosar/test/rules/A4-10-1/test.cpp.qcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.qcc
similarity index 100%
rename from cpp/autosar/test/rules/A4-10-1/test.cpp.qcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.qcc
diff --git a/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.expected b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.expected
rename to cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.expected
diff --git a/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
new file mode 100644
index 0000000000..784e94366f
--- /dev/null
+++ b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
+
+class TestFileQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/M12-1-1/test.cpp b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M12-1-1/test.cpp
rename to cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/test.cpp
diff --git a/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.expected b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.expected
new file mode 100644
index 0000000000..d2d80e0572
--- /dev/null
+++ b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.expected
@@ -0,0 +1,2 @@
+| test.cpp:16:8:16:8 | f | Overriding function does not have the same default parameters as $@ | test.cpp:4:16:4:16 | f | overridden function |
+| test.cpp:21:8:21:8 | f | Overriding function does not have the same default parameters as $@ | test.cpp:4:16:4:16 | f | overridden function |
diff --git a/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
new file mode 100644
index 0000000000..81578b5174
--- /dev/null
+++ b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
+
+class TestFileQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/M8-3-1/test.cpp b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M8-3-1/test.cpp
rename to cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.expected b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.expected
similarity index 63%
rename from cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.expected
rename to cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.expected
index 81f26e5130..71c0662377 100644
--- a/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.expected
+++ b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.expected
@@ -1,2 +1,2 @@
-| test.cpp:14:14:14:29 | ... == ... | A pointer to member virtual function $@ is tested for equality with non-null-pointer-constant $@.  | test.cpp:6:16:6:17 | F3 | F3 | test.cpp:14:24:14:29 | F1 | F1 |
-| test.cpp:15:14:15:29 | ... == ... | A pointer to member virtual function $@ is tested for equality with non-null-pointer-constant $@.  | test.cpp:6:16:6:17 | F3 | F3 | test.cpp:15:24:15:29 | F2 | F2 |
+| test.cpp:14:14:14:29 | ... == ... | A pointer to member virtual function $@ is tested for equality with non-null-pointer-constant $@. | test.cpp:6:16:6:17 | F3 | F3 | test.cpp:14:24:14:29 | F1 | F1 |
+| test.cpp:15:14:15:29 | ... == ... | A pointer to member virtual function $@ is tested for equality with non-null-pointer-constant $@. | test.cpp:6:16:6:17 | F3 | F3 | test.cpp:15:24:15:29 | F2 | F2 |
diff --git a/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
new file mode 100644
index 0000000000..b3f05d17a9
--- /dev/null
+++ b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
+
+class TestFileQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/A5-10-1/test.cpp b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A5-10-1/test.cpp
rename to cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.expected b/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.expected
rename to cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.expected
diff --git a/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql b/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
new file mode 100644
index 0000000000..af9a8f0ebe
--- /dev/null
+++ b/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.reinterpretcastused_shared.ReinterpretCastUsed_shared
+
+class TestFileQuery extends ReinterpretCastUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A5-2-4/test.cpp b/cpp/common/test/rules/reinterpretcastused_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A5-2-4/test.cpp
rename to cpp/common/test/rules/reinterpretcastused_shared/test.cpp
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
new file mode 100644
index 0000000000..3f2720dd76
--- /dev/null
+++ b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
@@ -0,0 +1,3 @@
+| test.cpp:9:7:9:12 | ... = ... | Use of an assignment operator's result. |
+| test.cpp:13:11:13:16 | ... = ... | Use of an assignment operator's result. |
+| test.cpp:15:8:15:13 | ... = ... | Use of an assignment operator's result. |
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
new file mode 100644
index 0000000000..e4928beb62
--- /dev/null
+++ b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
+
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
+}
diff --git a/c/misra/test/rules/RULE-13-4/test.c b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.cpp
similarity index 59%
rename from c/misra/test/rules/RULE-13-4/test.c
rename to cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.cpp
index aeabb60fac..21fb4c0910 100644
--- a/c/misra/test/rules/RULE-13-4/test.c
+++ b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.cpp
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void test() {
   int l1, l2;
   int l3[1];
diff --git a/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.expected b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.expected
rename to cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.expected
diff --git a/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
new file mode 100644
index 0000000000..7184897c6e
--- /dev/null
+++ b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
+
+class TestFileQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/M7-5-1/test.cpp b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M7-5-1/test.cpp
rename to cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.expected b/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.expected
rename to cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.expected
diff --git a/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql b/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
new file mode 100644
index 0000000000..9c296a8a24
--- /dev/null
+++ b/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.switchcompoundcondition_shared.SwitchCompoundCondition_shared
+
+class TestFileQuery extends SwitchCompoundCondition_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/switchcompoundcondition_shared/test.cpp b/cpp/common/test/rules/switchcompoundcondition_shared/test.cpp
new file mode 100644
index 0000000000..487c007fdc
--- /dev/null
+++ b/cpp/common/test/rules/switchcompoundcondition_shared/test.cpp
@@ -0,0 +1,56 @@
+void test_loop_missing_braces(int expression) {
+  for (int i = 0; i < expression; i++) // BAD
+    expression = expression % 2;
+}
+
+void test_loop_valid_braces_check(int expression) {
+  for (int i = 0; i < expression; i++) { // GOOD
+    expression = expression % 2;
+  }
+
+  int j = 10;
+  while (expression < 10) // BAD
+    j = j + 10;
+}
+
+void test_loop_mix_validity(int expression) {
+  do // BAD
+    expression = expression % 2;
+  while (expression < 10);
+
+  while (expression > 10) // GOOD
+  {
+    expression = expression * 2;
+  }
+
+  do { // GOOD
+    expression = expression % 2;
+  } while (expression < 5);
+}
+
+void test_switch_valid_braces(int i, int expression) {
+  // GOOD
+  switch (expression) {
+  case 0:
+    while (i < 10) {
+      i = i + expression;
+    }
+    break;
+  case 1:
+    if (i > 10) {
+      i = i * i;
+    }
+    break;
+  default:
+    break;
+  }
+}
+
+void test_switch_invalid_braces(int i, int expression) {
+  // BAD
+  switch (expression)
+  case 0:
+    while (i < 10) {
+      i = i + expression;
+    }
+}
diff --git a/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.expected b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M2-13-3/MissingUSuffix.expected
rename to cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.expected
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
new file mode 100644
index 0000000000..3ed0fc3b14
--- /dev/null
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
+
+class TestFileQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/autosar/test/rules/M2-13-3/test.cpp b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M2-13-3/test.cpp
rename to cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/test.cpp
diff --git a/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
new file mode 100644
index 0000000000..3902cae09d
--- /dev/null
+++ b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
@@ -0,0 +1,4 @@
+| test.cpp:7:3:7:9 | ... + ... | Operation + of type unsigned int may wrap. |
+| test.cpp:8:3:8:10 | ... += ... | Operation += of type unsigned int may wrap. |
+| test.cpp:61:3:61:9 | ... - ... | Operation - of type unsigned int may wrap. |
+| test.cpp:62:3:62:10 | ... -= ... | Operation -= of type unsigned int may wrap. |
diff --git a/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
new file mode 100644
index 0000000000..24780bcc5d
--- /dev/null
+++ b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
+
+class TestFileQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery, TestQuery {
+}
diff --git a/c/cert/test/rules/INT30-C/test.c b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.cpp
similarity index 94%
rename from c/cert/test/rules/INT30-C/test.c
rename to cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.cpp
index 433cf534f4..8f76fbeeeb 100644
--- a/c/cert/test/rules/INT30-C/test.c
+++ b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.cpp
@@ -1,3 +1,6 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+
 #include <limits.h>
 
 void test_add_simple(unsigned int i1, unsigned int i2) {
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.expected b/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.expected
rename to cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql b/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
new file mode 100644
index 0000000000..dcd6042639
--- /dev/null
+++ b/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
+
+class TestFileQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M2-13-2/test.cpp b/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M2-13-2/test.cpp
rename to cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
diff --git a/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.expected b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.expected
rename to cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected
diff --git a/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.expected.qcc b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected.qcc
similarity index 100%
rename from cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.expected.qcc
rename to cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected.qcc
diff --git a/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
new file mode 100644
index 0000000000..6bedf0ab1c
--- /dev/null
+++ b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
+
+class TestFileQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/A18-1-2/test.cpp b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/A18-1-2/test.cpp
rename to cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/test.cpp
diff --git a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.expected b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.expected
similarity index 100%
rename from cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.expected
rename to cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.expected
diff --git a/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
new file mode 100644
index 0000000000..38348b693b
--- /dev/null
+++ b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
+
+class TestFileQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery, TestQuery { }
diff --git a/cpp/autosar/test/rules/M10-1-3/test.cpp b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/test.cpp
similarity index 100%
rename from cpp/autosar/test/rules/M10-1-3/test.cpp
rename to cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/test.cpp
diff --git a/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql b/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
new file mode 100644
index 0000000000..4937de01c4
--- /dev/null
+++ b/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/copy-and-move-assignments-shall-handle-self-assignment
+ * @name DIR-15-8-1: User-provided copy assignment operators and move assignment operators shall handle self-assignment
+ * @description User-provided copy assignment operators and move assignment operators shall handle
+ *              self-assignment.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/dir-15-8-1
+ *       external/misra/allocated-target/implementation
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
+
+class CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery {
+  CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery() {
+    this = ImportMisra23Package::copyAndMoveAssignmentsShallHandleSelfAssignmentQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
new file mode 100644
index 0000000000..d135fec871
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/use-single-global-or-member-declarators
+ * @name RULE-10-0-1: Multiple declarations in the same global or member declaration sequence
+ * @description A declaration should not declare more than one variable or member variable.
+ * @kind problem
+ * @precision medium
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-10-0-1
+ *       readability
+ *       maintainability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
+
+class UseSingleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery {
+  UseSingleGlobalOrMemberDeclaratorsQuery() {
+    this = ImportMisra23Package::useSingleGlobalOrMemberDeclaratorsQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql b/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
new file mode 100644
index 0000000000..2e0147014d
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/use-single-local-declarators
+ * @name RULE-10-0-1: Multiple declarations in the same local statement
+ * @description A declaration should not declare more than one variable or member variable.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-10-0-1
+ *       readability
+ *       maintainability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
+
+class UseSingleLocalDeclaratorsQuery extends MultipleLocalDeclarators_sharedSharedQuery {
+  UseSingleLocalDeclaratorsQuery() {
+    this = ImportMisra23Package::useSingleLocalDeclaratorsQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql b/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
new file mode 100644
index 0000000000..8b7c05359f
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/enumeration-not-defined-with-an-explicit-underlying-type
+ * @name RULE-10-2-1: An enumeration shall be defined with an explicit underlying type
+ * @description An enumeration shall be defined with an explicit underlying type.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-10-2-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
+
+class EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery {
+  EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery() {
+    this = ImportMisra23Package::enumerationNotDefinedWithAnExplicitUnderlyingTypeQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql
new file mode 100644
index 0000000000..7ef737a0a3
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/asm-declaration-shall-not-be-used
+ * @name RULE-10-4-1: The asm declaration shall not be used
+ * @description The asm declaration shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-10-4-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.asmdeclarationused_shared.AsmDeclarationUsed_shared
+
+class AsmDeclarationShallNotBeUsedQuery extends AsmDeclarationUsed_sharedSharedQuery {
+  AsmDeclarationShallNotBeUsedQuery() {
+    this = ImportMisra23Package::asmDeclarationShallNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql b/cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql
new file mode 100644
index 0000000000..bfcc9414ac
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/non-unique-enumeration-constant
+ * @name RULE-11-6-3: Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique
+ * @description Within an enumerator list, the value of an implicitly-specified enumeration constant
+ *              shall be unique.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-11-6-3
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
+
+class NonUniqueEnumerationConstantQuery extends NonUniqueEnumerationConstant_sharedSharedQuery {
+  NonUniqueEnumerationConstantQuery() {
+    this = ImportMisra23Package::nonUniqueEnumerationConstantQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
new file mode 100644
index 0000000000..aa43636010
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/bit-field-shall-have-an-appropriate-type
+ * @name RULE-12-2-2: A bit-field shall have an appropriate type
+ * @description A bit-field shall have an appropriate type.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-12-2-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
+
+class BitFieldShallHaveAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery {
+  BitFieldShallHaveAnAppropriateTypeQuery() {
+    this = ImportMisra23Package::bitFieldShallHaveAnAppropriateTypeQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql b/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
new file mode 100644
index 0000000000..b179bae6e5
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/signed-integer-named-bit-field-have-a-length-of-one-bit
+ * @name RULE-12-2-3: A named bit-field with signed integer type shall not have a length of one bit
+ * @description A named bit-field with signed integer type shall not have a length of one bit.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-12-2-3
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
+
+class SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery {
+  SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery() {
+    this = ImportMisra23Package::signedIntegerNamedBitFieldHaveALengthOfOneBitQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql b/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
new file mode 100644
index 0000000000..88677cf5fa
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/virtual-and-non-virtual-class-in-the-hierarchy
+ * @name RULE-13-1-2: An accessible base class shall not be both virtual and non-virtual in the same hierarchy
+ * @description An accessible base class shall not be both virtual and non-virtual in the same
+ *              hierarchy.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-13-1-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
+
+class VirtualAndNonVirtualClassInTheHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery {
+  VirtualAndNonVirtualClassInTheHierarchyQuery() {
+    this = ImportMisra23Package::virtualAndNonVirtualClassInTheHierarchyQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql b/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
new file mode 100644
index 0000000000..2b4b7c1785
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/overriding-shall-specify-different-default-arguments
+ * @name RULE-13-3-2: Parameters in an overriding virtual function shall not specify different default arguments
+ * @description Parameters in an overriding virtual function shall not specify different default
+ *              arguments.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-13-3-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
+
+class OverridingShallSpecifyDifferentDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery {
+  OverridingShallSpecifyDifferentDefaultArgumentsQuery() {
+    this = ImportMisra23Package::overridingShallSpecifyDifferentDefaultArgumentsQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql b/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
new file mode 100644
index 0000000000..bf263bac58
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/potentially-virtual-pointer-only-compares-to-nullptr
+ * @name RULE-13-3-4: A comparison of a potentially virtual pointer to member function shall only be with nullptr
+ * @description A comparison of a potentially virtual pointer to member function shall only be with
+ *              nullptr.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-13-3-4
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
+
+class PotentiallyVirtualPointerOnlyComparesToNullptrQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery {
+  PotentiallyVirtualPointerOnlyComparesToNullptrQuery() {
+    this = ImportMisra23Package::potentiallyVirtualPointerOnlyComparesToNullptrQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql b/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
new file mode 100644
index 0000000000..ab1ad49c71
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/objects-dynamic-type-used-from-constructor-or-destructor
+ * @name RULE-15-1-1: An object’s dynamic type shall not be used from within its constructor or destructor
+ * @description An object’s dynamic type shall not be used from within its constructor or
+ *              destructor.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-15-1-1
+ *       scope/system
+ *       external/misra/enforcement/undecidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
+
+class ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery {
+  ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery() {
+    this = ImportMisra23Package::objectsDynamicTypeUsedFromConstructorOrDestructorQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
new file mode 100644
index 0000000000..78dcd9c474
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/initialize-all-virtual-base-classes
+ * @name RULE-15-1-2: All constructors of a class should explicitly initialize all of its virtual base classes and
+ * @description All constructors of a class should explicitly initialize all of its virtual base
+ *              classes and immediate base classes.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-15-1-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
+
+class InitializeAllVirtualBaseClassesQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery {
+  InitializeAllVirtualBaseClassesQuery() {
+    this = ImportMisra23Package::initializeAllVirtualBaseClassesQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql b/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
new file mode 100644
index 0000000000..f2bc05e535
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/initializer-list-constructor-is-the-only-constructor
+ * @name RULE-15-1-5: A class shall only define an initializer-list constructor when it is the only constructor
+ * @description A class shall only define an initializer-list constructor when it is the only
+ *              constructor.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-15-1-5
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
+
+class InitializerListConstructorIsTheOnlyConstructorQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery {
+  InitializerListConstructorIsTheOnlyConstructorQuery() {
+    this = ImportMisra23Package::initializerListConstructorIsTheOnlyConstructorQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql b/cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql
new file mode 100644
index 0000000000..11623e996e
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/address-of-operator-overloaded
+ * @name RULE-16-5-2: The address-of operator shall not be overloaded
+ * @description The address-of operator shall not be overloaded.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-16-5-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.addressofoperatoroverloaded_shared.AddressOfOperatorOverloaded_shared
+
+class AddressOfOperatorOverloadedQuery extends AddressOfOperatorOverloaded_sharedSharedQuery {
+  AddressOfOperatorOverloadedQuery() {
+    this = ImportMisra23Package::addressOfOperatorOverloadedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql b/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
new file mode 100644
index 0000000000..fc910377bd
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/function-templates-explicitly-specialized
+ * @name RULE-17-8-1: Function templates shall not be explicitly specialized
+ * @description Function templates shall not be explicitly specialized.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-17-8-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
+
+class FunctionTemplatesExplicitlySpecializedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery {
+  FunctionTemplatesExplicitlySpecializedQuery() {
+    this = ImportMisra23Package::functionTemplatesExplicitlySpecializedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql b/cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql
new file mode 100644
index 0000000000..db7683c7f2
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/exception-object-have-pointer-type
+ * @name RULE-18-1-1: An exception object shall not have pointer type
+ * @description An exception object shall not have pointer type.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-18-1-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.exceptionobjecthavepointertype_shared.ExceptionObjectHavePointerType_shared
+
+class ExceptionObjectHavePointerTypeQuery extends ExceptionObjectHavePointerType_sharedSharedQuery {
+  ExceptionObjectHavePointerTypeQuery() {
+    this = ImportMisra23Package::exceptionObjectHavePointerTypeQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
new file mode 100644
index 0000000000..77aa45ce72
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/empty-throw-only-within-a-catch-handler
+ * @name RULE-18-1-2: An empty throw shall only occur within the compound-statement of a catch handler
+ * @description An empty throw shall only occur within the compound-statement of a catch handler.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-18-1-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
+
+class EmptyThrowOnlyWithinACatchHandlerQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery {
+  EmptyThrowOnlyWithinACatchHandlerQuery() {
+    this = ImportMisra23Package::emptyThrowOnlyWithinACatchHandlerQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql b/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
new file mode 100644
index 0000000000..d99fbea400
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/noexcept-function-should-not-propagate-to-the-caller
+ * @name RULE-18-5-1: A noexcept function should not attempt to propagate an exception to the calling function
+ * @description A noexcept function should not attempt to propagate an exception to the calling
+ *              function.
+ * @kind path-problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-18-5-1
+ *       scope/system
+ *       external/misra/enforcement/undecidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
+
+class NoexceptFunctionShouldNotPropagateToTheCallerQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery {
+  NoexceptFunctionShouldNotPropagateToTheCallerQuery() {
+    this = ImportMisra23Package::noexceptFunctionShouldNotPropagateToTheCallerQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql b/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
new file mode 100644
index 0000000000..04ca50994f
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/function-like-macros-defined
+ * @name RULE-19-0-2: Function-like macros shall not be defined
+ * @description Function-like macros shall not be defined.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-19-0-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
+
+class FunctionLikeMacrosDefinedQuery extends FunctionLikeMacrosDefined_sharedSharedQuery {
+  FunctionLikeMacrosDefinedQuery() {
+    this = ImportMisra23Package::functionLikeMacrosDefinedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql b/cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql
new file mode 100644
index 0000000000..8c90302b7a
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/macro-parameter-following-hash
+ * @name RULE-19-3-2: A macro parameter immediately following a # operator shall not be immediately followed by a ##
+ * @description A macro parameter immediately following a # operator shall not be immediately
+ *              followed by a ## operator.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-19-3-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
+
+class MacroParameterFollowingHashQuery extends MacroParameterFollowingHash_sharedSharedQuery {
+  MacroParameterFollowingHashQuery() {
+    this = ImportMisra23Package::macroParameterFollowingHashQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql b/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
new file mode 100644
index 0000000000..59fd054720
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/a-mixed-use-macro-argument-subject-to-expansion
+ * @name RULE-19-3-3: The argument to a mixed-use macro parameter shall not be subject to further expansion
+ * @description The argument to a mixed-use macro parameter shall not be subject to further
+ *              expansion.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-19-3-3
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
+
+class AMixedUseMacroArgumentSubjectToExpansionQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery {
+  AMixedUseMacroArgumentSubjectToExpansionQuery() {
+    this = ImportMisra23Package::aMixedUseMacroArgumentSubjectToExpansionQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql b/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
new file mode 100644
index 0000000000..19edf41394
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/csignal-facilities-used
+ * @name RULE-21-10-3: The facilities provided by the standard header file <csignal> shall not be used
+ * @description Signal handling contains implementation-defined and undefined behaviour.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-21-10-3
+ *       maintainability
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
+
+class CsignalFacilitiesUsedQuery extends CsignalFunctionsUsed_sharedSharedQuery {
+  CsignalFacilitiesUsedQuery() {
+    this = ImportMisra23Package::csignalFacilitiesUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql
new file mode 100644
index 0000000000..56172db86e
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/csignal-types-shall-not-be-used
+ * @name RULE-21-10-3: The signal-handling types of <csignal> shall not be used
+ * @description The types provided by the standard header file <csignal> shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-21-10-3
+ *       maintainability
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.csignaltypesused_shared.CsignalTypesUsed_shared
+
+class CsignalTypesShallNotBeUsedQuery extends CsignalTypesUsed_sharedSharedQuery {
+  CsignalTypesShallNotBeUsedQuery() {
+    this = ImportMisra23Package::csignalTypesShallNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql b/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
new file mode 100644
index 0000000000..a88a29a734
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/atof-atoi-atol-and-atoll-used
+ * @name RULE-21-2-1: The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used
+ * @description The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-21-2-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
+
+class AtofAtoiAtolAndAtollUsedQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery {
+  AtofAtoiAtolAndAtollUsedQuery() {
+    this = ImportMisra23Package::atofAtoiAtolAndAtollUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql
new file mode 100644
index 0000000000..f449463c01
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/macro-offsetof-shall-not-be-used
+ * @name RULE-21-2-4: The macro offsetof shall not be used
+ * @description The macro offsetof shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-21-2-4
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.macrooffsetofused_shared.MacroOffsetofUsed_shared
+
+class MacroOffsetofShallNotBeUsedQuery extends MacroOffsetofUsed_sharedSharedQuery {
+  MacroOffsetofShallNotBeUsedQuery() {
+    this = ImportMisra23Package::macroOffsetofShallNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql b/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
new file mode 100644
index 0000000000..57f993fc7f
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/global-sized-operator-delete-shall-be-defined
+ * @name RULE-21-6-4: Sized 'operator delete' must be defined globally if unsized 'operator delete' is defined globally
+ * @description If a project defines the unsized version of a global operator delete, then the sized
+ *              version shall be defined.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-21-6-4
+ *       maintainability
+ *       scope/system
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined_shared.GlobalSizedOperatorDeleteNotDefined_shared
+
+class GlobalSizedOperatorDeleteShallBeDefinedQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery {
+  GlobalSizedOperatorDeleteShallBeDefinedQuery() {
+    this = ImportMisra23Package::globalSizedOperatorDeleteShallBeDefinedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql b/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
new file mode 100644
index 0000000000..384926228f
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/global-unsized-operator-delete-shall-be-defined
+ * @name RULE-21-6-4: Unsized 'operator delete' must be defined globally if sized 'operator delete' is defined globally
+ * @description If a project defines the sized version of a global operator delete, then the unsized
+ *              version shall be defined.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-21-6-4
+ *       maintainability
+ *       scope/system
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined_shared.GlobalUnsizedOperatorDeleteNotDefined_shared
+
+class GlobalUnsizedOperatorDeleteShallBeDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery {
+  GlobalUnsizedOperatorDeleteShallBeDefinedQuery() {
+    this = ImportMisra23Package::globalUnsizedOperatorDeleteShallBeDefinedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql b/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
new file mode 100644
index 0000000000..7793ec65d0
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/vector-should-not-be-specialized-with-bool
+ * @name RULE-26-3-1: std::vector should not be specialized with bool
+ * @description std::vector should not be specialized with bool.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-26-3-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
+
+class VectorShouldNotBeSpecializedWithBoolQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery {
+  VectorShouldNotBeSpecializedWithBoolQuery() {
+    this = ImportMisra23Package::vectorShouldNotBeSpecializedWithBoolQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql b/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
new file mode 100644
index 0000000000..f134fa28d6
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/forwarding-references-and-forward-not-used-together
+ * @name RULE-28-6-2: Forwarding references and std::forward shall be used together
+ * @description Forwarding references and std::forward shall be used together.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-28-6-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
+
+class ForwardingReferencesAndForwardNotUsedTogetherQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery {
+  ForwardingReferencesAndForwardNotUsedTogetherQuery() {
+    this = ImportMisra23Package::forwardingReferencesAndForwardNotUsedTogetherQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql
new file mode 100644
index 0000000000..f05607c77a
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/cstdio-functions-shall-not-be-used
+ * @name RULE-30-0-1: The stream input/output library <cstdio> functions shall not be used
+ * @description The C Library input/output functions shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-30-0-1
+ *       maintainability
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.cstdiofunctionsused_shared.CstdioFunctionsUsed_shared
+
+class CstdioFunctionsShallNotBeUsedQuery extends CstdioFunctionsUsed_sharedSharedQuery {
+  CstdioFunctionsShallNotBeUsedQuery() {
+    this = ImportMisra23Package::cstdioFunctionsShallNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql
new file mode 100644
index 0000000000..7590aaccb3
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/cstdio-macros-shall-not-be-used
+ * @name RULE-30-0-1: The stream input/output library <cstdio> macros shall not be used
+ * @description The C Library input/output functions shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-30-0-1
+ *       maintainability
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.cstdiomacrosused_shared.CstdioMacrosUsed_shared
+
+class CstdioMacrosShallNotBeUsedQuery extends CstdioMacrosUsed_sharedSharedQuery {
+  CstdioMacrosShallNotBeUsedQuery() {
+    this = ImportMisra23Package::cstdioMacrosShallNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
new file mode 100644
index 0000000000..c80ce69250
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/cstdio-types-shall-not-be-used
+ * @name RULE-30-0-1: The stream input/output library <cstdio> types shall not be used
+ * @description The C Library input/output functions shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-30-0-1
+ *       maintainability
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
+
+class CstdioTypesShallNotBeUsedQuery extends CstdioTypesUsed_sharedSharedQuery {
+  CstdioTypesShallNotBeUsedQuery() {
+    this = ImportMisra23Package::cstdioTypesShallNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql b/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
new file mode 100644
index 0000000000..0bcda339bd
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/memory-operations-not-sequenced-appropriately
+ * @name RULE-4-6-1: Operations on a memory location shall be sequenced appropriately
+ * @description Operations on a memory location shall be sequenced appropriately.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-4-6-1
+ *       scope/system
+ *       external/misra/enforcement/undecidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
+
+class MemoryOperationsNotSequencedAppropriatelyQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery {
+  MemoryOperationsNotSequencedAppropriatelyQuery() {
+    this = ImportMisra23Package::memoryOperationsNotSequencedAppropriatelyQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql b/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
new file mode 100644
index 0000000000..c2612fd71f
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/backslash-character-misuse
+ * @name RULE-5-13-1: In character literals and non-raw string literals, \ shall only be used to form a defined escape
+ * @description In character literals and non-raw string literals, \ shall only be used to form a
+ *              defined escape sequence or universal character name.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-5-13-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
+
+class BackslashCharacterMisuseQuery extends BackslashCharacterMisuse_sharedSharedQuery {
+  BackslashCharacterMisuseQuery() {
+    this = ImportMisra23Package::backslashCharacterMisuseQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql b/cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql
new file mode 100644
index 0000000000..47a06f2512
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/non-terminated-escape-sequences
+ * @name RULE-5-13-2: Octal escape sequences, hexadecimal escape sequences, and universal character names shall be
+ * @description Octal escape sequences, hexadecimal escape sequences, and universal character names
+ *              shall be terminated.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-5-13-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
+
+class NonTerminatedEscapeSequencesQuery extends NonTerminatedEscapeSequences_sharedSharedQuery {
+  NonTerminatedEscapeSequencesQuery() {
+    this = ImportMisra23Package::nonTerminatedEscapeSequencesQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql b/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
new file mode 100644
index 0000000000..816b3439b2
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/octal-constants-used
+ * @name RULE-5-13-3: Octal constants shall not be used
+ * @description Octal constants shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-5-13-3
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
+
+class OctalConstantsUsedQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery {
+  OctalConstantsUsedQuery() {
+    this = ImportMisra23Package::octalConstantsUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql b/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
new file mode 100644
index 0000000000..7f3e99bbc9
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/unsigned-integer-literals-not-appropriately-suffixed
+ * @name RULE-5-13-4: Unsigned integer literals shall be appropriately suffixed
+ * @description Unsigned integer literals shall be appropriately suffixed.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-5-13-4
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
+
+class UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery {
+  UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery() {
+    this = ImportMisra23Package::unsignedIntegerLiteralsNotAppropriatelySuffixedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
new file mode 100644
index 0000000000..f1d62437fb
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/lowercase-l-starts-in-literal-suffix
+ * @name RULE-5-13-5: The lowercase form of L shall not be used as the first character in a literal suffix
+ * @description The lowercase form of L shall not be used as the first character in a literal
+ *              suffix.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-5-13-5
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix_shared.LowercaseLStartsInLiteralSuffix_shared
+
+class LowercaseLStartsInLiteralSuffixQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery {
+  LowercaseLStartsInLiteralSuffixQuery() {
+    this = ImportMisra23Package::lowercaseLStartsInLiteralSuffixQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql b/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
new file mode 100644
index 0000000000..93fc2cfccc
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/character-sequence-used-within-ac-style-comment
+ * @name RULE-5-7-1: The character sequence /* shall not be used within a C-style comment
+ * @description The character sequence /* shall not be used within a C-style comment.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-5-7-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
+
+class CharacterSequenceUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery {
+  CharacterSequenceUsedWithinACStyleCommentQuery() {
+    this = ImportMisra23Package::characterSequenceUsedWithinACStyleCommentQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql b/cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql
new file mode 100644
index 0000000000..9708b2da46
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/line-splicing-used-in-comments
+ * @name RULE-5-7-3: Line-splicing shall not be used in // comments
+ * @description Line-splicing shall not be used in // comments.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-5-7-3
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.linesplicingusedincomments_shared.LineSplicingUsedInComments_shared
+
+class LineSplicingUsedInCommentsQuery extends LineSplicingUsedInComments_sharedSharedQuery {
+  LineSplicingUsedInCommentsQuery() {
+    this = ImportMisra23Package::lineSplicingUsedInCommentsQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql b/cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql
new file mode 100644
index 0000000000..e211dfd770
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/global-namespace-declarations
+ * @name RULE-6-0-3: The only declarations in the global namespace should be main, namespace declarations and extern "C"
+ * @description The only declarations in the global namespace should be main, namespace declarations
+ *              and extern "C" declarations.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-6-0-3
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.globalnamespacedeclarations_shared.GlobalNamespaceDeclarations_shared
+
+class GlobalNamespaceDeclarationsQuery extends GlobalNamespaceDeclarations_sharedSharedQuery {
+  GlobalNamespaceDeclarationsQuery() {
+    this = ImportMisra23Package::globalNamespaceDeclarationsQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql b/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
new file mode 100644
index 0000000000..909a4e2640
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/non-global-function-main
+ * @name RULE-6-0-4: The identifier main shall not be used for a function other than the global function main
+ * @description The identifier main shall not be used for a function other than the global function
+ *              main.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-6-0-4
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
+
+class NonGlobalFunctionMainQuery extends NonGlobalFunctionMain_sharedSharedQuery {
+  NonGlobalFunctionMainQuery() {
+    this = ImportMisra23Package::nonGlobalFunctionMainQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql b/cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql
new file mode 100644
index 0000000000..bc02bf3f6e
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql
@@ -0,0 +1,26 @@
+/**
+ * @id cpp/misra/definition-shall-be-considered-for-unqualified-lookup
+ * @name RULE-6-4-2: Using declaration followed by new definition
+ * @description A using declaration that makes a symbol available for unqualified lookup does not
+ *              included definitions defined after the using declaration which can result in
+ *              unexpected behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-6-4-2
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
+
+class DefinitionShallBeConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery
+{
+  DefinitionShallBeConsideredForUnqualifiedLookupQuery() {
+    this = ImportMisra23Package::definitionShallBeConsideredForUnqualifiedLookupQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql b/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
new file mode 100644
index 0000000000..b6c246dc20
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/inherited-non-overridable-member-function
+ * @name RULE-6-4-2: Member function hides inherited member function
+ * @description A non-overriding member function definition that hides an inherited member function
+ *              can result in unexpected behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-6-4-2
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
+
+class InheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery {
+  InheritedNonOverridableMemberFunctionQuery() {
+    this = ImportMisra23Package::inheritedNonOverridableMemberFunctionQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql b/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
new file mode 100644
index 0000000000..7212ad840f
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/misra/inherited-overridable-member-function
+ * @name RULE-6-4-2: Member function hides inherited member function
+ * @description An overriding member function definition thats hides an overload of the overridden
+ *              inherited member function can result in unexpected behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-6-4-2
+ *       correctness
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
+
+class InheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery {
+  InheritedOverridableMemberFunctionQuery() {
+    this = ImportMisra23Package::inheritedOverridableMemberFunctionQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
new file mode 100644
index 0000000000..ac7dbcc776
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/misra/name-shall-be-referred-using-a-qualified-id-or-this
+ * @name RULE-6-4-3: In a class template with a dependent base, any name that may be found in that dependent base shall shall be referred to using a qualified-id or this->
+ * @description Not using a qualified-id or `this->` syntax for identifiers used in a class template
+ *              makes the code more difficult to understand.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-6-4-3
+ *       maintainability
+ *       readability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
+
+class NameShallBeReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery {
+  NameShallBeReferredUsingAQualifiedIdOrThisQuery() {
+    this = ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
new file mode 100644
index 0000000000..96da12f90b
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/misra/name-shall-be-referred-using-a-qualified-id-or-this-audit
+ * @name RULE-6-4-3: (Audit) In a class template with a dependent base, any name that may be found in that dependent base shall shall be referred to using a qualified-id or this->
+ * @description Not using a qualified-id or `this->` syntax for identifiers used in a class template
+ *              makes the code more difficult to understand.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-6-4-3
+ *       maintainability
+ *       readability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
+
+class NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery {
+  NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery() {
+    this = ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisAuditQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql b/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
new file mode 100644
index 0000000000..5ee261a0b8
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/return-reference-or-pointer-to-automatic-local-variable
+ * @name RULE-6-8-2: A function must not return a reference or a pointer to a local variable with automatic storage
+ * @description A function must not return a reference or a pointer to a local variable with
+ *              automatic storage duration.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-6-8-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/mandatory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
+
+class ReturnReferenceOrPointerToAutomaticLocalVariableQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery {
+  ReturnReferenceOrPointerToAutomaticLocalVariableQuery() {
+    this = ImportMisra23Package::returnReferenceOrPointerToAutomaticLocalVariableQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql b/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
new file mode 100644
index 0000000000..6566bbd16d
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/nullptr-not-the-only-form-of-the-null-pointer-constant
+ * @name RULE-7-11-1: nullptr shall be the only form of the null-pointer-constant
+ * @description nullptr shall be the only form of the null-pointer-constant.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-7-11-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
+
+class NullptrNotTheOnlyFormOfTheNullPointerConstantQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery {
+  NullptrNotTheOnlyFormOfTheNullPointerConstantQuery() {
+    this = ImportMisra23Package::nullptrNotTheOnlyFormOfTheNullPointerConstantQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
new file mode 100644
index 0000000000..dbefbaa845
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/array-passed-as-function-argument-decay-to-a-pointer
+ * @name RULE-7-11-2: An array passed as a function argument shall not decay to a pointer
+ * @description An array passed as a function argument shall not decay to a pointer.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-7-11-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
+
+class ArrayPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery {
+  ArrayPassedAsFunctionArgumentDecayToAPointerQuery() {
+    this = ImportMisra23Package::arrayPassedAsFunctionArgumentDecayToAPointerQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
new file mode 100644
index 0000000000..56f177e9cd
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/result-of-an-assignment-operator-should-not-be-used
+ * @name RULE-8-18-2: The result of an assignment operator should not be used
+ * @description The result of an assignment operator should not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-18-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
+
+class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery {
+  ResultOfAnAssignmentOperatorShouldNotBeUsedQuery() {
+    this = ImportMisra23Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.ql b/cpp/misra/src/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.ql
new file mode 100644
index 0000000000..df5be50dc0
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/comma-operator-should-not-be-used
+ * @name RULE-8-19-1: The comma operator should not be used
+ * @description The comma operator should not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-19-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.commaoperatorused.CommaOperatorUsed
+
+class CommaOperatorShouldNotBeUsedQuery extends CommaOperatorUsedSharedQuery {
+  CommaOperatorShouldNotBeUsedQuery() {
+    this = ImportMisra23Package::commaOperatorShouldNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql b/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
new file mode 100644
index 0000000000..bd9da57cc2
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/functions-call-themselves-either-directly-or-indirectly
+ * @name RULE-8-2-10: Functions shall not call themselves, either directly or indirectly
+ * @description Functions shall not call themselves, either directly or indirectly.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-2-10
+ *       scope/system
+ *       external/misra/enforcement/undecidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
+
+class FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery {
+  FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery() {
+    this = ImportMisra23Package::functionsCallThemselvesEitherDirectlyOrIndirectlyQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql b/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
new file mode 100644
index 0000000000..b8dcbd2ced
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/casts-between-a-pointer-to-function-and-any-other-type
+ * @name RULE-8-2-4: Casts shall not be performed between a pointer to function and any other type
+ * @description Casts shall not be performed between a pointer to function and any other type.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-2-4
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
+
+class CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery {
+  CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery() {
+    this = ImportMisra23Package::castsBetweenAPointerToFunctionAndAnyOtherTypeQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql
new file mode 100644
index 0000000000..8af353d948
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/reinterpret-cast-shall-not-be-used
+ * @name RULE-8-2-5: reinterpret_cast shall not be used
+ * @description reinterpret_cast shall not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-2-5
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.reinterpretcastused_shared.ReinterpretCastUsed_shared
+
+class ReinterpretCastShallNotBeUsedQuery extends ReinterpretCastUsed_sharedSharedQuery {
+  ReinterpretCastShallNotBeUsedQuery() {
+    this = ImportMisra23Package::reinterpretCastShallNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql b/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
new file mode 100644
index 0000000000..6100aa30c4
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/unsigned-operation-with-constant-operands-wraps
+ * @name RULE-8-20-1: An unsigned arithmetic operation with constant operands should not wrap
+ * @description An unsigned arithmetic operation with constant operands should not wrap.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-20-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
+
+class UnsignedOperationWithConstantOperandsWrapsQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery {
+  UnsignedOperationWithConstantOperandsWrapsQuery() {
+    this = ImportMisra23Package::unsignedOperationWithConstantOperandsWrapsQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql b/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
new file mode 100644
index 0000000000..38be9db001
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/misra/built-in-unary-operator-applied-to-unsigned-expression
+ * @name RULE-8-3-1: The built-in unary - operator should not be applied to an expression of unsigned type
+ * @description The built-in unary - operator should not be applied to an expression of unsigned
+ *              type.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-3-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
+
+class BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery {
+  BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery() {
+    this = ImportMisra23Package::builtInUnaryOperatorAppliedToUnsignedExpressionQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql b/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
new file mode 100644
index 0000000000..2984d328fd
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/misra/loop-body-compound-condition
+ * @name RULE-9-3-1: The statement forming the body of a loop shall be a compound statement
+ * @description If the body of a loop is not enclosed in braces, then this can lead to incorrect
+ *              execution, and hard for developers to maintain.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-9-3-1
+ *       maintainability
+ *       readability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
+
+class LoopBodyCompoundConditionQuery extends LoopCompoundCondition_sharedSharedQuery {
+  LoopBodyCompoundConditionQuery() {
+    this = ImportMisra23Package::loopBodyCompoundConditionQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql b/cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql
new file mode 100644
index 0000000000..8ab562bd38
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/misra/switch-body-compound-condition
+ * @name RULE-9-3-1: The statement forming the body of a switch shall be a compound statement
+ * @description If the body of a switch is not enclosed in braces, then this can lead to incorrect
+ *              execution, and hard for developers to maintain.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-9-3-1
+ *       maintainability
+ *       readability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.switchcompoundcondition_shared.SwitchCompoundCondition_shared
+
+class SwitchBodyCompoundConditionQuery extends SwitchCompoundCondition_sharedSharedQuery {
+  SwitchBodyCompoundConditionQuery() {
+    this = ImportMisra23Package::switchBodyCompoundConditionQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql b/cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql
new file mode 100644
index 0000000000..6db27d6c75
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/goto-statement-should-not-be-used
+ * @name RULE-9-6-1: The goto statement should not be used
+ * @description The goto statement should not be used.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-9-6-1
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
+
+class GotoStatementShouldNotBeUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
+  GotoStatementShouldNotBeUsedQuery() {
+    this = ImportMisra23Package::gotoStatementShouldNotBeUsedQuery()
+  }
+}
diff --git a/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql b/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
new file mode 100644
index 0000000000..da381e8033
--- /dev/null
+++ b/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
@@ -0,0 +1,22 @@
+/**
+ * @id cpp/misra/goto-reference-a-label-in-surrounding-block
+ * @name RULE-9-6-2: A goto statement shall reference a label in a surrounding block
+ * @description A goto statement shall reference a label in a surrounding block.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-9-6-2
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
+
+class GotoReferenceALabelInSurroundingBlockQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery {
+  GotoReferenceALabelInSurroundingBlockQuery() {
+    this = ImportMisra23Package::gotoReferenceALabelInSurroundingBlockQuery()
+  }
+}
diff --git a/cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref b/cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref
new file mode 100644
index 0000000000..23e38dba55
--- /dev/null
+++ b/cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
new file mode 100644
index 0000000000..b848fce94f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
new file mode 100644
index 0000000000..2d7784cea0
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref
new file mode 100644
index 0000000000..b848fce94f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref
new file mode 100644
index 0000000000..2d7784cea0
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref b/cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref
new file mode 100644
index 0000000000..27391be776
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref
new file mode 100644
index 0000000000..d0a190a3eb
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref b/cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref
new file mode 100644
index 0000000000..f25d51bf8d
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref b/cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref
new file mode 100644
index 0000000000..32867e3bbc
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref b/cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref
new file mode 100644
index 0000000000..a2543b0769
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref b/cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref
new file mode 100644
index 0000000000..966337628d
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref b/cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref
new file mode 100644
index 0000000000..c89e908ada
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref b/cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
new file mode 100644
index 0000000000..2a9e8b2eef
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref b/cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref
new file mode 100644
index 0000000000..985c209460
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref b/cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref
new file mode 100644
index 0000000000..1bf7e7fffb
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref b/cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref
new file mode 100644
index 0000000000..b9075dec6f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref b/cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref
new file mode 100644
index 0000000000..f9c1d69467
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref b/cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref
new file mode 100644
index 0000000000..04c3f5a724
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref b/cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref
new file mode 100644
index 0000000000..41eabfe5a6
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref b/cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref
new file mode 100644
index 0000000000..01a7dde1dd
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref b/cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref
new file mode 100644
index 0000000000..089cce1ccf
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref b/cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref
new file mode 100644
index 0000000000..99791747ae
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref b/cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref
new file mode 100644
index 0000000000..bf61f640dd
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref b/cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref
new file mode 100644
index 0000000000..6cfdd63510
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref b/cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref
new file mode 100644
index 0000000000..e491bc10c7
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/csignalfacilitiesused_shared/CsignalFacilitiesUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref
new file mode 100644
index 0000000000..3ea4c7008d
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref
new file mode 100644
index 0000000000..3ea4c7008d
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref b/cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref
new file mode 100644
index 0000000000..67251b4d35
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref
new file mode 100644
index 0000000000..f53f8d6f9f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref b/cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref
new file mode 100644
index 0000000000..bd7e582a38
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref b/cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref
new file mode 100644
index 0000000000..781d037067
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref b/cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref
new file mode 100644
index 0000000000..96d8385f5f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref b/cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref
new file mode 100644
index 0000000000..16fd01273f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref
new file mode 100644
index 0000000000..595b7fcffa
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref
new file mode 100644
index 0000000000..8bc3a8fcde
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref
new file mode 100644
index 0000000000..4020d6427e
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref b/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
new file mode 100644
index 0000000000..347bf0114c
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref b/cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref
new file mode 100644
index 0000000000..a257ad6ab7
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref b/cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref
new file mode 100644
index 0000000000..6212775e36
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref b/cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref
new file mode 100644
index 0000000000..5b23b86826
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref b/cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref
new file mode 100644
index 0000000000..1a58c1eee1
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref b/cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref
new file mode 100644
index 0000000000..ab0542973b
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref b/cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref
new file mode 100644
index 0000000000..8073a976cd
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref b/cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref
new file mode 100644
index 0000000000..d4f66ed35e
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref b/cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref
new file mode 100644
index 0000000000..93764c480e
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref b/cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref
new file mode 100644
index 0000000000..528412284f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref b/cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref
new file mode 100644
index 0000000000..3b04b2950f
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref b/cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref
new file mode 100644
index 0000000000..371b80ead3
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref b/cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref
new file mode 100644
index 0000000000..3fcc2ed7e7
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref
new file mode 100644
index 0000000000..34df16815b
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref
new file mode 100644
index 0000000000..0bef5586dd
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref b/cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref
new file mode 100644
index 0000000000..676e414381
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref b/cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref
new file mode 100644
index 0000000000..495d8eddba
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref b/cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref
new file mode 100644
index 0000000000..97edef0af2
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref b/cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
new file mode 100644
index 0000000000..fe502f81be
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.testref b/cpp/misra/test/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.testref
new file mode 100644
index 0000000000..845133096b
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-8-19-1/CommaOperatorShouldNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/commaoperatorused/CommaOperatorUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref b/cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref
new file mode 100644
index 0000000000..1ebf3d5742
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref b/cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref
new file mode 100644
index 0000000000..5eeeea570a
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref
new file mode 100644
index 0000000000..a553240f19
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref b/cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref
new file mode 100644
index 0000000000..8b29a5cd46
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref b/cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref
new file mode 100644
index 0000000000..48a20b03f1
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref b/cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref
new file mode 100644
index 0000000000..e301b04020
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref b/cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref
new file mode 100644
index 0000000000..e48ef207a0
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref b/cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref
new file mode 100644
index 0000000000..3f2f4508b1
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref b/cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref
new file mode 100644
index 0000000000..7bbaffe1e3
--- /dev/null
+++ b/cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
\ No newline at end of file
diff --git a/rule_packages/c/Banned.json b/rule_packages/c/Banned.json
index 42decbb3e3..dceb538e97 100644
--- a/rule_packages/c/Banned.json
+++ b/rule_packages/c/Banned.json
@@ -245,6 +245,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "AtofAtoiAtolAndAtollOfStdlibhUsed",
+          "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/c/BitfieldTypes.json b/rule_packages/c/BitfieldTypes.json
index 4e93f3371a..41d109ec3b 100644
--- a/rule_packages/c/BitfieldTypes.json
+++ b/rule_packages/c/BitfieldTypes.json
@@ -12,6 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "BitFieldsShallOnlyBeDeclaredWithAnAppropriateType",
+          "shared_implementation_short_name": "BitFieldShallHaveAnAppropriateType_shared",
           "tags": []
         }
       ],
@@ -29,6 +30,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "SingleBitNamedBitFieldsOfASignedType",
+          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType_shared",
           "tags": []
         }
       ],
diff --git a/rule_packages/c/Declarations7.json b/rule_packages/c/Declarations7.json
index cd3b3e6b18..335a9f3603 100644
--- a/rule_packages/c/Declarations7.json
+++ b/rule_packages/c/Declarations7.json
@@ -57,6 +57,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ValueImplicitEnumerationConstantNotUnique",
+          "shared_implementation_short_name": "NonUniqueEnumerationConstant_shared",
           "tags": [
             "correctness",
             "readability"
diff --git a/rule_packages/c/IntegerOverflow.json b/rule_packages/c/IntegerOverflow.json
index 5edc90eb21..0549f0a29e 100644
--- a/rule_packages/c/IntegerOverflow.json
+++ b/rule_packages/c/IntegerOverflow.json
@@ -12,6 +12,7 @@
           "precision": "medium",
           "severity": "error",
           "short_name": "UnsignedIntegerOperationsWrapAround",
+          "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps_shared",
           "tags": [
             "correctness",
             "security"
diff --git a/rule_packages/c/Preprocessor2.json b/rule_packages/c/Preprocessor2.json
index 9eeb7beba8..ddce5a7080 100644
--- a/rule_packages/c/Preprocessor2.json
+++ b/rule_packages/c/Preprocessor2.json
@@ -12,6 +12,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "MoreThanOneHashOperatorInMacroDefinition",
+          "shared_implementation_short_name": "MacroParameterFollowingHash_shared",
           "tags": [
             "correctness"
           ],
@@ -35,9 +36,10 @@
           "precision": "high",
           "severity": "warning",
           "short_name": "MacroParameterUsedAsHashOperand",
+          "shared_implementation_short_name": "AMixedUseMacroArgumentSubjectToExpansion_shared",
           "tags": [
-              "maintainability",
-              "readability"
+            "maintainability",
+            "readability"
           ]
         }
       ],
@@ -56,8 +58,8 @@
           "severity": "warning",
           "short_name": "UndefShouldNotBeUsed",
           "tags": [
-              "maintainability",
-              "readability"
+            "maintainability",
+            "readability"
           ]
         }
       ],
diff --git a/rule_packages/c/Preprocessor6.json b/rule_packages/c/Preprocessor6.json
index be0ae84851..324a2e5fa7 100644
--- a/rule_packages/c/Preprocessor6.json
+++ b/rule_packages/c/Preprocessor6.json
@@ -12,6 +12,7 @@
           "precision": "medium",
           "severity": "recommendation",
           "short_name": "FunctionOverFunctionLikeMacro",
+          "shared_implementation_short_name": "FunctionLikeMacrosDefined_shared",
           "tags": [
             "external/misra/audit",
             "maintainability",
diff --git a/rule_packages/c/SideEffects1.json b/rule_packages/c/SideEffects1.json
index e66f4c3136..f45a57e547 100644
--- a/rule_packages/c/SideEffects1.json
+++ b/rule_packages/c/SideEffects1.json
@@ -131,6 +131,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed",
+          "shared_implementation_short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed_shared",
           "tags": [
             "correctness",
             "readability"
diff --git a/rule_packages/c/SideEffects3.json b/rule_packages/c/SideEffects3.json
index 2d67df6e2e..a6030975fd 100644
--- a/rule_packages/c/SideEffects3.json
+++ b/rule_packages/c/SideEffects3.json
@@ -12,6 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnsequencedSideEffects",
+          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/c/Statements2.json b/rule_packages/c/Statements2.json
index 8aa44c5091..0c24ff602f 100644
--- a/rule_packages/c/Statements2.json
+++ b/rule_packages/c/Statements2.json
@@ -33,6 +33,7 @@
           "precision": "high",
           "severity": "recommendation",
           "short_name": "GotoLabelBlockCondition",
+          "shared_implementation_short_name": "GotoReferenceALabelInSurroundingBlock_shared",
           "tags": [
             "maintainability",
             "readability"
@@ -102,4 +103,4 @@
       "title": "A switch-expression shall not have essentially Boolean type"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/rule_packages/c/Statements3.json b/rule_packages/c/Statements3.json
index 41463415a6..6b881f9a95 100644
--- a/rule_packages/c/Statements3.json
+++ b/rule_packages/c/Statements3.json
@@ -32,7 +32,7 @@
         {
           "description": "if the body of a selection statement is not enclosed in braces, then this can lead to incorrect execution, and is hard for developers to maintain.",
           "kind": "problem",
-          "name": "the statement forming the body of a loop shall be a compound statement",
+          "name": "the statement forming the body of a slection statement shall be a compound statement",
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "SelectionCompoundCondition",
diff --git a/rule_packages/c/Statements6.json b/rule_packages/c/Statements6.json
index 101987f9c3..eb0eefb437 100644
--- a/rule_packages/c/Statements6.json
+++ b/rule_packages/c/Statements6.json
@@ -12,6 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GotoStatementUsed",
+          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed_shared",
           "tags": [
             "correctness",
             "security"
diff --git a/rule_packages/c/Syntax.json b/rule_packages/c/Syntax.json
index d294c44183..9b4b6e44bd 100644
--- a/rule_packages/c/Syntax.json
+++ b/rule_packages/c/Syntax.json
@@ -53,6 +53,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "OctalAndHexadecimalEscapeSequencesNotTerminated",
+          "shared_implementation_short_name": "NonTerminatedEscapeSequences_shared",
           "tags": [
             "maintainability",
             "readability",
@@ -79,7 +80,7 @@
             "maintainability",
             "readability",
             "correctness"
-          ]        
+          ]
         }
       ],
       "title": "Sections of code should not be commented out"
@@ -96,7 +97,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "IdentifiersInTheSameNameSpaceUnambiguous",
-          "shared_implementation_short_name" : "DifferentIdentifiersNotTypographicallyUnambiguous",
+          "shared_implementation_short_name": "DifferentIdentifiersNotTypographicallyUnambiguous",
           "tags": [
             "readability",
             "maintainability"
@@ -137,6 +138,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "LowercaseCharacterLUsedInLiteralSuffix",
+          "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix_shared",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/cpp/BannedFunctions.json b/rule_packages/cpp/BannedFunctions.json
index bb89ab2320..c974c3a2d9 100644
--- a/rule_packages/cpp/BannedFunctions.json
+++ b/rule_packages/cpp/BannedFunctions.json
@@ -189,6 +189,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "MacroOffsetofUsed",
+          "shared_implementation_short_name": "MacroOffsetofUsed_shared",
           "tags": [
             "security",
             "scope/single-translation-unit"
diff --git a/rule_packages/cpp/BannedLibraries.json b/rule_packages/cpp/BannedLibraries.json
index 09b5d2f224..37b1cf6d2b 100644
--- a/rule_packages/cpp/BannedLibraries.json
+++ b/rule_packages/cpp/BannedLibraries.json
@@ -114,6 +114,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CsignalFunctionsUsed",
+          "shared_implementation_short_name": "CsignalFunctionsUsed_shared",
           "tags": [
             "maintainability",
             "correctness",
@@ -127,6 +128,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CsignalTypesUsed",
+          "shared_implementation_short_name": "CsignalTypesUsed_shared",
           "tags": [
             "maintainability",
             "correctness",
@@ -177,6 +179,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioFunctionsUsed",
+          "shared_implementation_short_name": "CstdioFunctionsUsed_shared",
           "tags": [
             "maintainability",
             "correctness",
@@ -190,6 +193,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioMacrosUsed",
+          "shared_implementation_short_name": "CstdioMacrosUsed_shared",
           "tags": [
             "maintainability",
             "correctness",
@@ -203,6 +207,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioTypesUsed",
+          "shared_implementation_short_name": "CstdioTypesUsed_shared",
           "tags": [
             "maintainability",
             "correctness",
diff --git a/rule_packages/cpp/BannedSyntax.json b/rule_packages/cpp/BannedSyntax.json
index 0f559e60b7..d65fa65e67 100644
--- a/rule_packages/cpp/BannedSyntax.json
+++ b/rule_packages/cpp/BannedSyntax.json
@@ -169,6 +169,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ReinterpretCastUsed",
+          "shared_implementation_short_name": "ReinterpretCastUsed_shared",
           "tags": [
             "correctness",
             "security",
@@ -194,6 +195,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GotoStatementUsed",
+          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed_shared",
           "tags": [
             "correctness",
             "security",
@@ -266,6 +268,7 @@
           "name": "The asm declaration shall not be used",
           "precision": "very-high",
           "severity": "error",
+          "shared_implementation_short_name": "AsmDeclarationUsed_shared",
           "short_name": "AsmDeclarationUsed",
           "tags": [
             "correctness",
diff --git a/rule_packages/cpp/BannedTypes.json b/rule_packages/cpp/BannedTypes.json
index 4a45433746..3f94b9c85b 100644
--- a/rule_packages/cpp/BannedTypes.json
+++ b/rule_packages/cpp/BannedTypes.json
@@ -41,6 +41,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "VectorboolSpecializationUsed",
+          "shared_implementation_short_name": "VectorShouldNotBeSpecializedWithBool_shared",
           "tags": [
             "correctness",
             "scope/single-translation-unit"
diff --git a/rule_packages/cpp/Comments.json b/rule_packages/cpp/Comments.json
index 7af32f62c1..b27832f6c2 100644
--- a/rule_packages/cpp/Comments.json
+++ b/rule_packages/cpp/Comments.json
@@ -16,6 +16,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "SingleLineCommentEndsWithSlash",
+          "shared_implementation_short_name": "LineSplicingUsedInComments_shared",
           "tags": [
             "correctness",
             "readability",
@@ -94,6 +95,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "SlashStarUsedWithinACStyleComment",
+          "shared_implementation_short_name": "CharacterSequenceUsedWithinACStyleComment_shared",
           "tags": [
             "maintainability",
             "readability",
diff --git a/rule_packages/cpp/Conditionals.json b/rule_packages/cpp/Conditionals.json
index c2afb626e4..022c1898c0 100644
--- a/rule_packages/cpp/Conditionals.json
+++ b/rule_packages/cpp/Conditionals.json
@@ -78,6 +78,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "SwitchCompoundCondition",
+          "shared_implementation_short_name": "SwitchCompoundCondition_shared",
           "tags": [
             "maintainability",
             "readability"
@@ -90,6 +91,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "LoopCompoundCondition",
+          "shared_implementation_short_name": "LoopCompoundCondition_shared",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/cpp/Declarations.json b/rule_packages/cpp/Declarations.json
index 65dfbf781e..d64f072751 100644
--- a/rule_packages/cpp/Declarations.json
+++ b/rule_packages/cpp/Declarations.json
@@ -50,6 +50,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GlobalSizedOperatorDeleteNotDefined",
+          "shared_implementation_short_name": "GlobalSizedOperatorDeleteNotDefined_shared",
           "tags": [
             "maintainability"
           ]
@@ -61,6 +62,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GlobalUnsizedOperatorDeleteNotDefined",
+          "shared_implementation_short_name": "GlobalUnsizedOperatorDeleteNotDefined_shared",
           "tags": [
             "maintainability"
           ]
@@ -216,6 +218,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "EnumerationUnderlyingBaseTypeNotExplicitlyDefined",
+          "shared_implementation_short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType_shared",
           "tags": [
             "readability",
             "maintainability"
diff --git a/rule_packages/cpp/Exceptions1.json b/rule_packages/cpp/Exceptions1.json
index d42c949b48..45109d9178 100644
--- a/rule_packages/cpp/Exceptions1.json
+++ b/rule_packages/cpp/Exceptions1.json
@@ -90,6 +90,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "PointerExceptionObject",
+          "shared_implementation_short_name": "ExceptionObjectHavePointerType_shared",
           "tags": [
             "correctness"
           ]
@@ -224,6 +225,7 @@
           "severity": "error",
           "kind": "path-problem",
           "short_name": "NoExceptFunctionThrows",
+          "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller_shared",
           "tags": [
             "correctness"
           ]
@@ -428,6 +430,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "EmptyThrowOutsideCatch",
+          "shared_implementation_short_name": "EmptyThrowOnlyWithinACatchHandler_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Functions.json b/rule_packages/cpp/Functions.json
index 7f21cf0873..2d72fd08df 100644
--- a/rule_packages/cpp/Functions.json
+++ b/rule_packages/cpp/Functions.json
@@ -87,6 +87,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "RecursiveFunctions",
+          "shared_implementation_short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared",
           "tags": [
             "correctness",
             "maintainability"
@@ -232,6 +233,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "FunctionReturnAutomaticVarCondition",
+          "shared_implementation_short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable_shared",
           "tags": [
             "correctness",
             "security"
@@ -326,4 +328,4 @@
       "title": "Do not return from a function declared [[noreturn]]"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/rule_packages/cpp/ImportMisra23.json b/rule_packages/cpp/ImportMisra23.json
index ced7198cff..33f437d6b1 100644
--- a/rule_packages/cpp/ImportMisra23.json
+++ b/rule_packages/cpp/ImportMisra23.json
@@ -500,6 +500,1255 @@
         }
       ],
       "title": "Reads and writes on the same file stream shall be separated by a positioning operation"
+    },
+    "RULE-8-19-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "The comma operator should not be used.",
+          "kind": "problem",
+          "name": "The comma operator should not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "CommaOperatorShouldNotBeUsed",
+          "shared_implementation_short_name": "CommaOperatorUsed",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The comma operator should not be used"
+    },
+    "DIR-15-8-1": {
+      "properties": {
+        "allocated-target": [
+          "implementation"
+        ],
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "User-provided copy assignment operators and move assignment operators shall handle self-assignment.",
+          "kind": "problem",
+          "name": "User-provided copy assignment operators and move assignment operators shall handle self-assignment",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment",
+          "shared_implementation_short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment_shared",
+          "tags": []
+        }
+      ],
+      "title": "User-provided copy assignment operators and move assignment operators shall handle self-assignment"
+    },
+    "RULE-10-0-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "A declaration should not declare more than one variable or member variable.",
+          "kind": "problem",
+          "name": "Multiple declarations in the same local statement",
+          "precision": "very-high",
+          "severity": "recommendation",
+          "short_name": "UseSingleLocalDeclarators",
+          "shared_implementation_short_name": "MultipleLocalDeclarators_shared",
+          "tags": [
+            "readability",
+            "maintainability",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "A declaration should not declare more than one variable or member variable.",
+          "kind": "problem",
+          "name": "Multiple declarations in the same global or member declaration sequence",
+          "precision": "medium",
+          "severity": "recommendation",
+          "short_name": "UseSingleGlobalOrMemberDeclarators",
+          "shared_implementation_short_name": "MultipleGlobalOrMemberDeclarators_shared",
+          "tags": [
+            "readability",
+            "maintainability",
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A declaration should not declare more than one variable or member variable"
+    },
+    "RULE-10-2-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "An enumeration shall be defined with an explicit underlying type.",
+          "kind": "problem",
+          "name": "An enumeration shall be defined with an explicit underlying type",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType",
+          "shared_implementation_short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "An enumeration shall be defined with an explicit underlying type"
+    },
+    "RULE-10-4-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The asm declaration shall not be used.",
+          "kind": "problem",
+          "name": "The asm declaration shall not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "AsmDeclarationShallNotBeUsed",
+          "shared_implementation_short_name": "AsmDeclarationUsed_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The asm declaration shall not be used"
+    },
+    "RULE-11-6-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique.",
+          "kind": "problem",
+          "name": "Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "NonUniqueEnumerationConstant",
+          "shared_implementation_short_name": "NonUniqueEnumerationConstant_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique"
+    },
+    "RULE-12-2-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A bit-field shall have an appropriate type.",
+          "kind": "problem",
+          "name": "A bit-field shall have an appropriate type",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "BitFieldShallHaveAnAppropriateType",
+          "shared_implementation_short_name": "BitFieldShallHaveAnAppropriateType_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A bit-field shall have an appropriate type"
+    },
+    "RULE-12-2-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A named bit-field with signed integer type shall not have a length of one bit.",
+          "kind": "problem",
+          "name": "A named bit-field with signed integer type shall not have a length of one bit",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "SignedIntegerNamedBitFieldHaveALengthOfOneBit",
+          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A named bit-field with signed integer type shall not have a length of one bit"
+    },
+    "RULE-13-1-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "An accessible base class shall not be both virtual and non-virtual in the same hierarchy.",
+          "kind": "problem",
+          "name": "An accessible base class shall not be both virtual and non-virtual in the same hierarchy",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "VirtualAndNonVirtualClassInTheHierarchy",
+          "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "An accessible base class shall not be both virtual and non-virtual in the same hierarchy"
+    },
+    "RULE-13-3-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Parameters in an overriding virtual function shall not specify different default arguments.",
+          "kind": "problem",
+          "name": "Parameters in an overriding virtual function shall not specify different default arguments",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "OverridingShallSpecifyDifferentDefaultArguments",
+          "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Parameters in an overriding virtual function shall not specify different default arguments"
+    },
+    "RULE-13-3-4": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A comparison of a potentially virtual pointer to member function shall only be with nullptr.",
+          "kind": "problem",
+          "name": "A comparison of a potentially virtual pointer to member function shall only be with nullptr",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr",
+          "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A comparison of a potentially virtual pointer to member function shall only be with nullptr"
+    },
+    "RULE-15-1-1": {
+      "properties": {
+        "enforcement": "undecidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "An object\u2019s dynamic type shall not be used from within its constructor or destructor.",
+          "kind": "problem",
+          "name": "An object\u2019s dynamic type shall not be used from within its constructor or destructor",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
+          "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared",
+          "tags": [
+            "scope/system"
+          ]
+        }
+      ],
+      "title": "An object\u2019s dynamic type shall not be used from within its constructor or destructor"
+    },
+    "RULE-15-1-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "All constructors of a class should explicitly initialize all of its virtual base classes and immediate base classes.",
+          "kind": "problem",
+          "name": "All constructors of a class should explicitly initialize all of its virtual base classes and",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "InitializeAllVirtualBaseClasses",
+          "shared_implementation_short_name": "InitializeAllVirtualBaseClasses_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "All constructors of a class should explicitly initialize all of its virtual base classes and immediate base classes"
+    },
+    "RULE-15-1-5": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A class shall only define an initializer-list constructor when it is the only constructor.",
+          "kind": "problem",
+          "name": "A class shall only define an initializer-list constructor when it is the only constructor",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "InitializerListConstructorIsTheOnlyConstructor",
+          "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A class shall only define an initializer-list constructor when it is the only constructor"
+    },
+    "RULE-16-5-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The address-of operator shall not be overloaded.",
+          "kind": "problem",
+          "name": "The address-of operator shall not be overloaded",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "AddressOfOperatorOverloaded",
+          "shared_implementation_short_name": "AddressOfOperatorOverloaded_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The address-of operator shall not be overloaded"
+    },
+    "RULE-17-8-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Function templates shall not be explicitly specialized.",
+          "kind": "problem",
+          "name": "Function templates shall not be explicitly specialized",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "FunctionTemplatesExplicitlySpecialized",
+          "shared_implementation_short_name": "FunctionTemplatesExplicitlySpecialized_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Function templates shall not be explicitly specialized"
+    },
+    "RULE-18-1-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "An exception object shall not have pointer type.",
+          "kind": "problem",
+          "name": "An exception object shall not have pointer type",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ExceptionObjectHavePointerType",
+          "shared_implementation_short_name": "ExceptionObjectHavePointerType_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "An exception object shall not have pointer type"
+    },
+    "RULE-18-1-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "An empty throw shall only occur within the compound-statement of a catch handler.",
+          "kind": "problem",
+          "name": "An empty throw shall only occur within the compound-statement of a catch handler",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "EmptyThrowOnlyWithinACatchHandler",
+          "shared_implementation_short_name": "EmptyThrowOnlyWithinACatchHandler_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "An empty throw shall only occur within the compound-statement of a catch handler"
+    },
+    "RULE-18-5-1": {
+      "properties": {
+        "enforcement": "undecidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "A noexcept function should not attempt to propagate an exception to the calling function.",
+          "kind": "path-problem",
+          "name": "A noexcept function should not attempt to propagate an exception to the calling function",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
+          "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller_shared",
+          "tags": [
+            "scope/system"
+          ]
+        }
+      ],
+      "title": "A noexcept function should not attempt to propagate an exception to the calling function"
+    },
+    "RULE-19-0-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Function-like macros shall not be defined.",
+          "kind": "problem",
+          "name": "Function-like macros shall not be defined",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "FunctionLikeMacrosDefined",
+          "shared_implementation_short_name": "FunctionLikeMacrosDefined_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Function-like macros shall not be defined"
+    },
+    "RULE-19-3-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A macro parameter immediately following a # operator shall not be immediately followed by a ## operator.",
+          "kind": "problem",
+          "name": "A macro parameter immediately following a # operator shall not be immediately followed by a ##",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "MacroParameterFollowingHash",
+          "shared_implementation_short_name": "MacroParameterFollowingHash_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A macro parameter immediately following a # operator shall not be immediately followed by a ## operator"
+    },
+    "RULE-19-3-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The argument to a mixed-use macro parameter shall not be subject to further expansion.",
+          "kind": "problem",
+          "name": "The argument to a mixed-use macro parameter shall not be subject to further expansion",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "AMixedUseMacroArgumentSubjectToExpansion",
+          "shared_implementation_short_name": "AMixedUseMacroArgumentSubjectToExpansion_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The argument to a mixed-use macro parameter shall not be subject to further expansion"
+    },
+    "RULE-21-10-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Signal handling contains implementation-defined and undefined behaviour.",
+          "kind": "problem",
+          "name": "The facilities provided by the standard header file <csignal> shall not be used",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "CsignalFacilitiesUsed",
+          "shared_implementation_short_name": "CsignalFunctionsUsed_shared",
+          "tags": [
+            "maintainability",
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "The types provided by the standard header file <csignal> shall not be used.",
+          "kind": "problem",
+          "name": "The signal-handling types of <csignal> shall not be used",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "CsignalTypesShallNotBeUsed",
+          "shared_implementation_short_name": "CsignalTypesUsed_shared",
+          "tags": [
+            "maintainability",
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The facilities provided by the standard header file <csignal> shall not be used"
+    },
+    "RULE-21-2-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used.",
+          "kind": "problem",
+          "name": "The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "AtofAtoiAtolAndAtollUsed",
+          "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used"
+    },
+    "RULE-21-2-4": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The macro offsetof shall not be used.",
+          "kind": "problem",
+          "name": "The macro offsetof shall not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "MacroOffsetofShallNotBeUsed",
+          "shared_implementation_short_name": "MacroOffsetofUsed_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The macro offsetof shall not be used"
+    },
+    "RULE-21-6-4": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "If a project defines the unsized version of a global operator delete, then the sized version shall be defined.",
+          "kind": "problem",
+          "name": "Sized 'operator delete' must be defined globally if unsized 'operator delete' is defined globally",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "GlobalSizedOperatorDeleteShallBeDefined",
+          "shared_implementation_short_name": "GlobalSizedOperatorDeleteNotDefined_shared",
+          "tags": [
+            "maintainability",
+            "scope/system"
+          ]
+        },
+        {
+          "description": "If a project defines the sized version of a global operator delete, then the unsized version shall be defined.",
+          "kind": "problem",
+          "name": "Unsized 'operator delete' must be defined globally if sized 'operator delete' is defined globally",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "GlobalUnsizedOperatorDeleteShallBeDefined",
+          "shared_implementation_short_name": "GlobalUnsizedOperatorDeleteNotDefined_shared",
+          "tags": [
+            "maintainability",
+            "scope/system"
+          ]
+        }
+      ],
+      "title": "If a project defines either a sized or unsized version of a global operator delete, then both shall be defined"
+    },
+    "RULE-26-3-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "std::vector should not be specialized with bool.",
+          "kind": "problem",
+          "name": "std::vector should not be specialized with bool",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "VectorShouldNotBeSpecializedWithBool",
+          "shared_implementation_short_name": "VectorShouldNotBeSpecializedWithBool_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "std::vector should not be specialized with bool"
+    },
+    "RULE-28-6-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Forwarding references and std::forward shall be used together.",
+          "kind": "problem",
+          "name": "Forwarding references and std::forward shall be used together",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ForwardingReferencesAndForwardNotUsedTogether",
+          "shared_implementation_short_name": "ForwardingReferencesAndForwardNotUsedTogether_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Forwarding references and std::forward shall be used together"
+    },
+    "RULE-30-0-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The C Library input/output functions shall not be used.",
+          "kind": "problem",
+          "name": "The stream input/output library <cstdio> functions shall not be used",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "CstdioFunctionsShallNotBeUsed",
+          "shared_implementation_short_name": "CstdioFunctionsUsed_shared",
+          "tags": [
+            "maintainability",
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "The C Library input/output functions shall not be used.",
+          "kind": "problem",
+          "name": "The stream input/output library <cstdio> macros shall not be used",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "CstdioMacrosShallNotBeUsed",
+          "shared_implementation_short_name": "CstdioMacrosUsed_shared",
+          "tags": [
+            "maintainability",
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "The C Library input/output functions shall not be used.",
+          "kind": "problem",
+          "name": "The stream input/output library <cstdio> types shall not be used",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "CstdioTypesShallNotBeUsed",
+          "shared_implementation_short_name": "CstdioTypesUsed_shared",
+          "tags": [
+            "maintainability",
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The C Library input/output functions shall not be used"
+    },
+    "RULE-4-6-1": {
+      "properties": {
+        "enforcement": "undecidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Operations on a memory location shall be sequenced appropriately.",
+          "kind": "problem",
+          "name": "Operations on a memory location shall be sequenced appropriately",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "MemoryOperationsNotSequencedAppropriately",
+          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately_shared",
+          "tags": [
+            "scope/system"
+          ]
+        }
+      ],
+      "title": "Operations on a memory location shall be sequenced appropriately"
+    },
+    "RULE-5-13-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "In character literals and non-raw string literals, \\ shall only be used to form a defined escape sequence or universal character name.",
+          "kind": "problem",
+          "name": "In character literals and non-raw string literals, \\ shall only be used to form a defined escape",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "BackslashCharacterMisuse",
+          "shared_implementation_short_name": "BackslashCharacterMisuse_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "In character literals and non-raw string literals, \\ shall only be used to form a defined escape sequence or universal character name"
+    },
+    "RULE-5-13-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Octal escape sequences, hexadecimal escape sequences, and universal character names shall be terminated.",
+          "kind": "problem",
+          "name": "Octal escape sequences, hexadecimal escape sequences, and universal character names shall be",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "NonTerminatedEscapeSequences",
+          "shared_implementation_short_name": "NonTerminatedEscapeSequences_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Octal escape sequences, hexadecimal escape sequences, and universal character names shall be terminated"
+    },
+    "RULE-5-13-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Octal constants shall not be used.",
+          "kind": "problem",
+          "name": "Octal constants shall not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "OctalConstantsUsed",
+          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Octal constants shall not be used"
+    },
+    "RULE-5-13-4": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Unsigned integer literals shall be appropriately suffixed.",
+          "kind": "problem",
+          "name": "Unsigned integer literals shall be appropriately suffixed",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
+          "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Unsigned integer literals shall be appropriately suffixed"
+    },
+    "RULE-5-13-5": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The lowercase form of L shall not be used as the first character in a literal suffix.",
+          "kind": "problem",
+          "name": "The lowercase form of L shall not be used as the first character in a literal suffix",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "LowercaseLStartsInLiteralSuffix",
+          "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The lowercase form of L shall not be used as the first character in a literal suffix"
+    },
+    "RULE-5-7-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The character sequence /* shall not be used within a C-style comment.",
+          "kind": "problem",
+          "name": "The character sequence /* shall not be used within a C-style comment",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "CharacterSequenceUsedWithinACStyleComment",
+          "shared_implementation_short_name": "CharacterSequenceUsedWithinACStyleComment_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The character sequence /* shall not be used within a C-style comment"
+    },
+    "RULE-5-7-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Line-splicing shall not be used in // comments.",
+          "kind": "problem",
+          "name": "Line-splicing shall not be used in // comments",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "LineSplicingUsedInComments",
+          "shared_implementation_short_name": "LineSplicingUsedInComments_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Line-splicing shall not be used in // comments"
+    },
+    "RULE-6-0-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "The only declarations in the global namespace should be main, namespace declarations and extern \"C\" declarations.",
+          "kind": "problem",
+          "name": "The only declarations in the global namespace should be main, namespace declarations and extern \"C\"",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "GlobalNamespaceDeclarations",
+          "shared_implementation_short_name": "GlobalNamespaceDeclarations_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The only declarations in the global namespace should be main, namespace declarations and extern \"C\" declarations"
+    },
+    "RULE-6-0-4": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The identifier main shall not be used for a function other than the global function main.",
+          "kind": "problem",
+          "name": "The identifier main shall not be used for a function other than the global function main",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "NonGlobalFunctionMain",
+          "shared_implementation_short_name": "NonGlobalFunctionMain_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The identifier main shall not be used for a function other than the global function main"
+    },
+    "RULE-6-4-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A non-overriding member function definition that hides an inherited member function can result in unexpected behavior.",
+          "kind": "problem",
+          "name": "Member function hides inherited member function",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "InheritedNonOverridableMemberFunction",
+          "shared_implementation_short_name": "HiddenInheritedNonOverridableMemberFunction_shared",
+          "tags": [
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "An overriding member function definition thats hides an overload of the overridden inherited member function can result in unexpected behavior.",
+          "kind": "problem",
+          "name": "Member function hides inherited member function",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "InheritedOverridableMemberFunction",
+          "shared_implementation_short_name": "HiddenInheritedOverridableMemberFunction_shared",
+          "tags": [
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "A using declaration that makes a symbol available for unqualified lookup does not included definitions defined after the using declaration which can result in unexpected behavior.",
+          "kind": "problem",
+          "name": "Using declaration followed by new definition",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "DefinitionShallBeConsideredForUnqualifiedLookup",
+          "shared_implementation_short_name": "DefinitionNotConsideredForUnqualifiedLookup_shared",
+          "tags": [
+            "correctness",
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Derived classes shall not conceal functions that are inherited from their bases"
+    },
+    "RULE-6-4-3": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Not using a qualified-id or `this->` syntax for identifiers used in a class template makes the code more difficult to understand.",
+          "kind": "problem",
+          "name": "In a class template with a dependent base, any name that may be found in that dependent base shall shall be referred to using a qualified-id or this->",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "NameShallBeReferredUsingAQualifiedIdOrThis",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThis_shared",
+          "tags": [
+            "maintainability",
+            "readability",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "Not using a qualified-id or `this->` syntax for identifiers used in a class template makes the code more difficult to understand.",
+          "kind": "problem",
+          "name": "(Audit) In a class template with a dependent base, any name that may be found in that dependent base shall shall be referred to using a qualified-id or this->",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "NameShallBeReferredUsingAQualifiedIdOrThisAudit",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit_shared",
+          "tags": [
+            "maintainability",
+            "readability",
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A name that is present in a dependent base shall not be resolved by unqualified lookup"
+    },
+    "RULE-6-8-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "mandatory"
+      },
+      "queries": [
+        {
+          "description": "A function must not return a reference or a pointer to a local variable with automatic storage duration.",
+          "kind": "problem",
+          "name": "A function must not return a reference or a pointer to a local variable with automatic storage",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable",
+          "shared_implementation_short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A function must not return a reference or a pointer to a local variable with automatic storage duration"
+    },
+    "RULE-7-11-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "nullptr shall be the only form of the null-pointer-constant.",
+          "kind": "problem",
+          "name": "nullptr shall be the only form of the null-pointer-constant",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant",
+          "shared_implementation_short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "nullptr shall be the only form of the null-pointer-constant"
+    },
+    "RULE-7-11-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "An array passed as a function argument shall not decay to a pointer.",
+          "kind": "problem",
+          "name": "An array passed as a function argument shall not decay to a pointer",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer",
+          "shared_implementation_short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "An array passed as a function argument shall not decay to a pointer"
+    },
+    "RULE-8-18-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "The result of an assignment operator should not be used.",
+          "kind": "problem",
+          "name": "The result of an assignment operator should not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed",
+          "shared_implementation_short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The result of an assignment operator should not be used"
+    },
+    "RULE-8-2-10": {
+      "properties": {
+        "enforcement": "undecidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Functions shall not call themselves, either directly or indirectly.",
+          "kind": "problem",
+          "name": "Functions shall not call themselves, either directly or indirectly",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly",
+          "shared_implementation_short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared",
+          "tags": [
+            "scope/system"
+          ]
+        }
+      ],
+      "title": "Functions shall not call themselves, either directly or indirectly"
+    },
+    "RULE-8-2-4": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Casts shall not be performed between a pointer to function and any other type.",
+          "kind": "problem",
+          "name": "Casts shall not be performed between a pointer to function and any other type",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
+          "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "Casts shall not be performed between a pointer to function and any other type"
+    },
+    "RULE-8-2-5": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "reinterpret_cast shall not be used.",
+          "kind": "problem",
+          "name": "reinterpret_cast shall not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ReinterpretCastShallNotBeUsed",
+          "shared_implementation_short_name": "ReinterpretCastUsed_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "reinterpret_cast shall not be used"
+    },
+    "RULE-8-20-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "An unsigned arithmetic operation with constant operands should not wrap.",
+          "kind": "problem",
+          "name": "An unsigned arithmetic operation with constant operands should not wrap",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "UnsignedOperationWithConstantOperandsWraps",
+          "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "An unsigned arithmetic operation with constant operands should not wrap"
+    },
+    "RULE-8-3-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "The built-in unary - operator should not be applied to an expression of unsigned type.",
+          "kind": "problem",
+          "name": "The built-in unary - operator should not be applied to an expression of unsigned type",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression",
+          "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The built-in unary - operator should not be applied to an expression of unsigned type"
+    },
+    "RULE-9-3-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "If the body of a switch is not enclosed in braces, then this can lead to incorrect execution, and hard for developers to maintain.",
+          "kind": "problem",
+          "name": "The statement forming the body of a switch shall be a compound statement",
+          "precision": "very-high",
+          "severity": "recommendation",
+          "short_name": "SwitchBodyCompoundCondition",
+          "shared_implementation_short_name": "SwitchCompoundCondition_shared",
+          "tags": [
+            "maintainability",
+            "readability",
+            "scope/single-translation-unit"
+          ]
+        },
+        {
+          "description": "If the body of a loop is not enclosed in braces, then this can lead to incorrect execution, and hard for developers to maintain.",
+          "kind": "problem",
+          "name": "The statement forming the body of a loop shall be a compound statement",
+          "precision": "very-high",
+          "severity": "recommendation",
+          "short_name": "LoopBodyCompoundCondition",
+          "shared_implementation_short_name": "LoopCompoundCondition_shared",
+          "tags": [
+            "maintainability",
+            "readability",
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The body of an iteration-statement or a selection-statement shall be a compound-statement"
+    },
+    "RULE-9-6-1": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "The goto statement should not be used.",
+          "kind": "problem",
+          "name": "The goto statement should not be used",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "GotoStatementShouldNotBeUsed",
+          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "The goto statement should not be used"
+    },
+    "RULE-9-6-2": {
+      "properties": {
+        "enforcement": "decidable",
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A goto statement shall reference a label in a surrounding block.",
+          "kind": "problem",
+          "name": "A goto statement shall reference a label in a surrounding block",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "GotoReferenceALabelInSurroundingBlock",
+          "shared_implementation_short_name": "GotoReferenceALabelInSurroundingBlock_shared",
+          "tags": [
+            "scope/single-translation-unit"
+          ]
+        }
+      ],
+      "title": "A goto statement shall reference a label in a surrounding block"
     }
   }
 }
\ No newline at end of file
diff --git a/rule_packages/cpp/Inheritance.json b/rule_packages/cpp/Inheritance.json
index 55175e0013..09c8b89f18 100644
--- a/rule_packages/cpp/Inheritance.json
+++ b/rule_packages/cpp/Inheritance.json
@@ -144,7 +144,8 @@
           "name": "An accessible base class shall not be both virtual and non-virtual in the same hierarchy",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy",
+          "short_name": "AccessibleBaseClassBothVirtualAndNonVirtual",
+          "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy_shared",
           "tags": []
         }
       ],
@@ -187,6 +188,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "DynamicTypeOfThisUsedFromConstructorOrDestructor",
+          "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared",
           "tags": []
         }
       ],
diff --git a/rule_packages/cpp/Initialization.json b/rule_packages/cpp/Initialization.json
index da2ed53c98..e839b4fd7e 100644
--- a/rule_packages/cpp/Initialization.json
+++ b/rule_packages/cpp/Initialization.json
@@ -16,6 +16,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "ExplicitConstructorBaseClassInitialization",
+          "shared_implementation_short_name": "InitializeAllVirtualBaseClasses_shared",
           "tags": [
             "maintainability",
             "correctness"
@@ -304,6 +305,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "ConfusingUseOfInitializerListConstructors",
+          "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor_shared",
           "tags": [
             "readability",
             "maintainability"
@@ -328,6 +330,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "MultipleLocalDeclarators",
+          "shared_implementation_short_name": "MultipleLocalDeclarators_shared",
           "tags": [
             "readability",
             "maintainability"
@@ -340,6 +343,7 @@
           "precision": "medium",
           "severity": "recommendation",
           "short_name": "MultipleGlobalOrMemberDeclarators",
+          "shared_implementation_short_name": "MultipleGlobalOrMemberDeclarators_shared",
           "tags": [
             "readability",
             "maintainability"
diff --git a/rule_packages/cpp/Literals.json b/rule_packages/cpp/Literals.json
index e762a9c411..6c35af04dc 100644
--- a/rule_packages/cpp/Literals.json
+++ b/rule_packages/cpp/Literals.json
@@ -39,6 +39,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "EscapeSequenceOutsideISO",
+          "shared_implementation_short_name": "BackslashCharacterMisuse_shared",
           "tags": [
             "correctness"
           ]
@@ -85,6 +86,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "NullPointerConstantNotNullptr",
+          "shared_implementation_short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant_shared",
           "tags": [
             "readability"
           ]
@@ -132,6 +134,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "UseOfNonZeroOctalLiteral",
+          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral_shared",
           "tags": [
             "readability"
           ]
@@ -166,6 +169,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "MissingUSuffix",
+          "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared",
           "tags": [
             "correctness",
             "readability"
diff --git a/rule_packages/cpp/MoveForward.json b/rule_packages/cpp/MoveForward.json
index 6278135d2c..13917fcc30 100644
--- a/rule_packages/cpp/MoveForward.json
+++ b/rule_packages/cpp/MoveForward.json
@@ -40,6 +40,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ForwardingValuesToOtherFunctions",
+          "shared_implementation_short_name": "ForwardingReferencesAndForwardNotUsedTogether_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Naming.json b/rule_packages/cpp/Naming.json
index e59f007975..7cf9a97bbf 100644
--- a/rule_packages/cpp/Naming.json
+++ b/rule_packages/cpp/Naming.json
@@ -290,7 +290,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "DifferentIdentifiersNotTypographicallyUnambiguous",
-          "shared_implementation_short_name" : "DifferentIdentifiersNotTypographicallyUnambiguous",
+          "shared_implementation_short_name": "DifferentIdentifiersNotTypographicallyUnambiguous",
           "tags": [
             "readability",
             "maintainability"
@@ -313,7 +313,8 @@
           "name": "The identifier main shall not be used for a function other than the global function main",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain",
+          "short_name": "IdentifierMainUsedForAFunctionOtherThanGlobalMain",
+          "shared_implementation_short_name": "NonGlobalFunctionMain_shared",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/cpp/OperatorInvariants.json b/rule_packages/cpp/OperatorInvariants.json
index b34df998e9..68d45942b5 100644
--- a/rule_packages/cpp/OperatorInvariants.json
+++ b/rule_packages/cpp/OperatorInvariants.json
@@ -39,6 +39,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CopyAssignmentAndAMoveHandleSelfAssignment",
+          "shared_implementation_short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Operators.json b/rule_packages/cpp/Operators.json
index 8bb2cb9d55..a04478c3df 100644
--- a/rule_packages/cpp/Operators.json
+++ b/rule_packages/cpp/Operators.json
@@ -296,7 +296,8 @@
           "name": "The unary minus operator shall not be applied to an expression whose underlying type is unsigned",
           "precision": "very-high",
           "severity": "error",
-          "short_name": "UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned",
+          "short_name": "UnaryMinusOperatorAppliedToAnUnsignedExpression",
+          "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression_shared",
           "tags": []
         }
       ],
@@ -318,6 +319,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnaryOperatorOverloaded",
+          "shared_implementation_short_name": "AddressOfOperatorOverloaded_shared",
           "tags": []
         }
       ],
diff --git a/rule_packages/cpp/Pointers.json b/rule_packages/cpp/Pointers.json
index 6a862e057c..ad5bb34c44 100644
--- a/rule_packages/cpp/Pointers.json
+++ b/rule_packages/cpp/Pointers.json
@@ -86,7 +86,8 @@
           "name": "A pointer to member virtual function shall only be tested for equality with null-pointer-constant",
           "precision": "very-high",
           "severity": "error",
-          "short_name": "PointerToMemberVirtualFunctionWithNullPointerConstant",
+          "short_name": "VirtualPointerOnlyComparesToNullptrConstant",
+          "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr_shared",
           "tags": [
             "correctness"
           ]
@@ -278,7 +279,8 @@
           "name": "An identifier with array type passed as a function argument shall not decay to a pointer",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer",
+          "short_name": "IdentifierPassedAsFunctionArgumentDecayToAPointer",
+          "shared_implementation_short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer_shared",
           "tags": [
             "correctness"
           ]
@@ -325,6 +327,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CastNotConvertPointerToFunction",
+          "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Representation.json b/rule_packages/cpp/Representation.json
index 96674eef0e..8cf6e7a3ed 100644
--- a/rule_packages/cpp/Representation.json
+++ b/rule_packages/cpp/Representation.json
@@ -96,6 +96,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit",
+          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Scope.json b/rule_packages/cpp/Scope.json
index 30b92a0675..665091fdb6 100644
--- a/rule_packages/cpp/Scope.json
+++ b/rule_packages/cpp/Scope.json
@@ -64,6 +64,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "HiddenInheritedNonOverridableMemberFunction",
+          "shared_implementation_short_name": "HiddenInheritedNonOverridableMemberFunction_shared",
           "tags": [
             "correctness"
           ]
@@ -75,6 +76,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "HiddenInheritedOverridableMemberFunction",
+          "shared_implementation_short_name": "HiddenInheritedOverridableMemberFunction_shared",
           "tags": [
             "correctness"
           ]
@@ -86,6 +88,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "DefinitionNotConsideredForUnqualifiedLookup",
+          "shared_implementation_short_name": "DefinitionNotConsideredForUnqualifiedLookup_shared",
           "tags": [
             "correctness"
           ]
@@ -228,6 +231,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "GlobalNamespaceMembershipViolation",
+          "shared_implementation_short_name": "GlobalNamespaceDeclarations_shared",
           "tags": [
             "readability"
           ]
diff --git a/rule_packages/cpp/Templates.json b/rule_packages/cpp/Templates.json
index 006f81bda6..5fd2946f1e 100644
--- a/rule_packages/cpp/Templates.json
+++ b/rule_packages/cpp/Templates.json
@@ -22,7 +22,7 @@
             "readability"
           ]
         }
-    ],
+      ],
       "title": "A template should check if a specific template argument is suitable for this template."
     },
     "A14-5-1": {
@@ -112,6 +112,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "ExplicitSpecializationsOfFunctionTemplatesUsed",
+          "shared_implementation_short_name": "FunctionTemplatesExplicitlySpecialized_shared",
           "tags": [
             "maintainability",
             "readability"
@@ -171,25 +172,27 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "NameNotReferredUsingAQualifiedIdOrThis",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThis_shared",
           "tags": [
             "maintainability",
             "readability"
           ]
         },
         {
-            "description": "Not using a qualified-id or `this->` syntax for identifiers used in a class template makes the code more difficult to understand.",
-            "kind": "problem",
-            "name": "(Audit) In a class template with a dependent base, any name that may be found in that dependent base shall shall be referred to using a qualified-id or this->",
-            "precision": "very-high",
-            "severity": "warning",
-            "short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit",
-            "tags": [
-              "maintainability",
-              "readability"
-            ]
-          }
+          "description": "Not using a qualified-id or `this->` syntax for identifiers used in a class template makes the code more difficult to understand.",
+          "kind": "problem",
+          "name": "(Audit) In a class template with a dependent base, any name that may be found in that dependent base shall shall be referred to using a qualified-id or this->",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit_shared",
+          "tags": [
+            "maintainability",
+            "readability"
+          ]
+        }
       ],
       "title": "In a class template with a dependent base, any name that may be found in that dependent base shall be referred to using a qualified-id or this->."
     }
   }
-}
+}
\ No newline at end of file
diff --git a/rule_packages/cpp/VirtualFunctions.json b/rule_packages/cpp/VirtualFunctions.json
index 198aba1bb7..79a286aa2c 100644
--- a/rule_packages/cpp/VirtualFunctions.json
+++ b/rule_packages/cpp/VirtualFunctions.json
@@ -176,7 +176,8 @@
           "name": "Parameters in an overriding virtual function shall have the same default arguments or no default arguments",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "VirtualFunctionParametersUseTheSameDefaultArguments",
+          "short_name": "VirtualFunctionParametersUseSameDefaultArguments",
+          "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments_shared",
           "tags": [
             "correctness"
           ]
diff --git a/rules.csv b/rules.csv
index 256b8e6ccf..de8aa6e566 100644
--- a/rules.csv
+++ b/rules.csv
@@ -787,36 +787,36 @@ cpp,MISRA-C++-2023,DIR-0-3-2,Yes,Required,,,A function call shall not violate th
 cpp,MISRA-C++-2023,RULE-4-1-1,Yes,Required,Undecidable,System,A program shall conform to ISO/IEC 14882:2017 (C++17),,,Hard,
 cpp,MISRA-C++-2023,RULE-4-1-2,Yes,Advisory,Decidable,Single Translation Unit,Deprecated features should not be used,,,Very Hard,
 cpp,MISRA-C++-2023,RULE-4-1-3,Yes,Required,Undecidable,System,There shall be no occurrence of undefined or critical unspecified behaviour,,,Very Hard,
-cpp,MISRA-C++-2023,RULE-4-6-1,Yes,Required,Undecidable,System,Operations on a memory location shall be sequenced appropriately,RULE-13-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-4-6-1,Yes,Required,Undecidable,System,Operations on a memory location shall be sequenced appropriately,RULE-13-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-0-1,Yes,Advisory,Decidable,Single Translation Unit,Trigraph-like sequences should not be used,A2-5-1,,Very Hard,
-cpp,MISRA-C++-2023,RULE-5-7-1,Yes,Required,Decidable,Single Translation Unit,The character sequence /* shall not be used within a C-style comment,M2-7-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-5-7-1,Yes,Required,Decidable,Single Translation Unit,The character sequence /* shall not be used within a C-style comment,M2-7-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,DIR-5-7-2,Yes,Advisory,,,Sections of code should not be “commented out”,A2-7-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-5-7-3,Yes,Required,Decidable,Single Translation Unit,Line-splicing shall not be used in // comments,A2-7-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-5-7-3,Yes,Required,Decidable,Single Translation Unit,Line-splicing shall not be used in // comments,A2-7-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-10-1,Yes,Required,Decidable,Single Translation Unit,User-defined identifiers shall have an appropriate form,,,Easy,
-cpp,MISRA-C++-2023,RULE-5-13-1,Yes,Required,Decidable,Single Translation Unit,"In character literals and non-raw string literals, \ shall only be used to form a defined escape sequence or universal character name",A2-13-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-5-13-2,Yes,Required,Decidable,Single Translation Unit,"Octal escape sequences, hexadecimal escape sequences, and universal character names shall be terminated",RULE-4-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-5-13-3,Yes,Required,Decidable,Single Translation Unit,Octal constants shall not be used,RULE-7-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-5-13-4,Yes,Required,Decidable,Single Translation Unit,Unsigned integer literals shall be appropriately suffixed,M2-13-3,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-5-13-5,Yes,Required,Decidable,Single Translation Unit,The lowercase form of L shall not be used as the first character in a literal suffix,RULE-7-3,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-5-13-1,Yes,Required,Decidable,Single Translation Unit,"In character literals and non-raw string literals, \ shall only be used to form a defined escape sequence or universal character name",A2-13-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-5-13-2,Yes,Required,Decidable,Single Translation Unit,"Octal escape sequences, hexadecimal escape sequences, and universal character names shall be terminated",RULE-4-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-5-13-3,Yes,Required,Decidable,Single Translation Unit,Octal constants shall not be used,M2-13-2,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-5-13-4,Yes,Required,Decidable,Single Translation Unit,Unsigned integer literals shall be appropriately suffixed,M2-13-3,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-5-13-5,Yes,Required,Decidable,Single Translation Unit,The lowercase form of L shall not be used as the first character in a literal suffix,RULE-7-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-13-6,Yes,Required,Decidable,Single Translation Unit,An integer-literal of type long long shall not use a single L or l in any suffix,,,Easy,
 cpp,MISRA-C++-2023,RULE-5-13-7,No,Required,Decidable,Single Translation Unit,String literals with different encoding prefixes shall not be concatenated,A2-13-2,,,
 cpp,MISRA-C++-2023,RULE-6-0-1,Yes,Required,Decidable,Single Translation Unit,Block scope declarations shall not be visually ambiguous,"M3-1-2,DCL53-CPP",,Easy,
 cpp,MISRA-C++-2023,RULE-6-0-2,Yes,Advisory,Decidable,Single Translation Unit,"When an array with external linkage is declared, its size should be explicitly specified",RULE-18-8,,Easy,
-cpp,MISRA-C++-2023,RULE-6-0-3,Yes,Advisory,Decidable,Single Translation Unit,"The only declarations in the global namespace should be main, namespace declarations and extern ""C"" declarations",M7-3-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-6-0-4,Yes,Required,Decidable,Single Translation Unit,The identifier main shall not be used for a function other than the global function main,M7-3-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-6-0-3,Yes,Advisory,Decidable,Single Translation Unit,"The only declarations in the global namespace should be main, namespace declarations and extern ""C"" declarations",M7-3-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-6-0-4,Yes,Required,Decidable,Single Translation Unit,The identifier main shall not be used for a function other than the global function main,M7-3-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-2-1,Yes,Required,Decidable,System,The one-definition rule shall not be violated,M3-2-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-2-2,Yes,Required,Decidable,System,All declarations of a variable or function shall have the same type,"M3-9-1,DCL40-C",,Easy,
 cpp,MISRA-C++-2023,RULE-6-2-3,Yes,Required,Decidable,System,The source code used to implement an entity shall appear only once,,,Medium,
 cpp,MISRA-C++-2023,RULE-6-2-4,Yes,Required,Decidable,Single Translation Unit,A header file shall not contain definitions of functions or objects that are non-inline and have external linkage,,,Easy,
 cpp,MISRA-C++-2023,RULE-6-4-1,Yes,Required,Decidable,Single Translation Unit,A variable declared in an inner scope shall not hide a variable declared in an outer scope,A2-10-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-6-4-2,Yes,Required,Decidable,Single Translation Unit,Derived classes shall not conceal functions that are inherited from their bases,A7-3-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-6-4-3,Yes,Required,Decidable,Single Translation Unit,A name that is present in a dependent base shall not be resolved by unqualified lookup,M14-6-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-6-4-2,Yes,Required,Decidable,Single Translation Unit,Derived classes shall not conceal functions that are inherited from their bases,A7-3-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-6-4-3,Yes,Required,Decidable,Single Translation Unit,A name that is present in a dependent base shall not be resolved by unqualified lookup,M14-6-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-5-1,Yes,Advisory,Decidable,Single Translation Unit,A function or object with external linkage should be introduced in a header file,,,Medium,
 cpp,MISRA-C++-2023,RULE-6-5-2,Yes,Advisory,Decidable,Single Translation Unit,Internal linkage should be specified appropriately,,,Medium,
 cpp,MISRA-C++-2023,RULE-6-7-1,Yes,Required,Decidable,Single Translation Unit,Local variables shall not have static storage duration,,,Easy,
 cpp,MISRA-C++-2023,RULE-6-7-2,Yes,Required,Decidable,Single Translation Unit,Global variables shall not be used,,,Easy,
 cpp,MISRA-C++-2023,RULE-6-8-1,Yes,Required,Undecidable,System,An object shall not be accessed outside of its lifetime,A3-8-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-6-8-2,Yes,Mandatory,Decidable,Single Translation Unit,A function must not return a reference or a pointer to a local variable with automatic storage duration,M7-5-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-6-8-2,Yes,Mandatory,Decidable,Single Translation Unit,A function must not return a reference or a pointer to a local variable with automatic storage duration,M7-5-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-8-3,Yes,Required,Decidable,Single Translation Unit,An assignment operator shall not assign the address of an object with automatic storage duration to an object with a greater lifetime,,,Medium,
 cpp,MISRA-C++-2023,RULE-6-8-4,Yes,Advisory,Decidable,Single Translation Unit,Member functions returning references to their object should be refqualified appropriately,,,Medium,
 cpp,MISRA-C++-2023,RULE-6-9-1,Yes,Required,Decidable,Single Translation Unit,The same type aliases shall be used in all declarations of the same entity,,,Medium,
@@ -827,8 +827,8 @@ cpp,MISRA-C++-2023,RULE-7-0-3,Yes,Required,Decidable,Single Translation Unit,The
 cpp,MISRA-C++-2023,RULE-7-0-4,Yes,Required,Decidable,Single Translation Unit,The operands of bitwise operators and shift operators shall be appropriate,RULE-10-1,,Medium,
 cpp,MISRA-C++-2023,RULE-7-0-5,Yes,Required,Decidable,Single Translation Unit,Integral promotion and the usual arithmetic conversions shall not change the signedness or the type category of an operand,"M5-0-4,M5-0-9,INT31-C",,Medium,
 cpp,MISRA-C++-2023,RULE-7-0-6,Yes,Required,Decidable,Single Translation Unit,Assignment between numeric types shall be appropriate,,,Hard,
-cpp,MISRA-C++-2023,RULE-7-11-1,Yes,Required,Decidable,Single Translation Unit,nullptr shall be the only form of the null-pointer-constant,A4-10-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-7-11-2,Yes,Required,Decidable,Single Translation Unit,An array passed as a function argument shall not decay to a pointer,M5-2-12,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-7-11-1,Yes,Required,Decidable,Single Translation Unit,nullptr shall be the only form of the null-pointer-constant,A4-10-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-7-11-2,Yes,Required,Decidable,Single Translation Unit,An array passed as a function argument shall not decay to a pointer,M5-2-12,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-7-11-3,Yes,Required,Decidable,Single Translation Unit,A conversion from function type to pointer-to-function type shall only occur in appropriate contexts,,,Easy,
 cpp,MISRA-C++-2023,RULE-8-0-1,Yes,Advisory,Decidable,Single Translation Unit,Parentheses should be used to make the meaning of an expression appropriately explicit,M5-0-2,,Medium,
 cpp,MISRA-C++-2023,RULE-8-1-1,Yes,Required,Decidable,Single Translation Unit,A non-transient lambda shall not implicitly capture this,,,Easy,
@@ -836,81 +836,81 @@ cpp,MISRA-C++-2023,RULE-8-1-2,Yes,Advisory,Decidable,Single Translation Unit,Var
 cpp,MISRA-C++-2023,RULE-8-2-1,Yes,Required,Decidable,Single Translation Unit,A virtual base class shall only be cast to a derived class by means of dynamic_cast,,,Easy,
 cpp,MISRA-C++-2023,RULE-8-2-2,Yes,Required,Decidable,Single Translation Unit,C-style casts and functional notation casts shall not be used,A5-2-2,,Easy,
 cpp,MISRA-C++-2023,RULE-8-2-3,Yes,Required,Decidable,Single Translation Unit,A cast shall not remove any const or volatile qualification from the type accessed via a pointer or by reference,A5-2-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-8-2-4,Yes,Required,Decidable,Single Translation Unit,Casts shall not be performed between a pointer to function and any other type,M5-2-6,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-8-2-5,Yes,Required,Decidable,Single Translation Unit,reinterpret_cast shall not be used,A5-2-4,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-8-2-4,Yes,Required,Decidable,Single Translation Unit,Casts shall not be performed between a pointer to function and any other type,M5-2-6,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-8-2-5,Yes,Required,Decidable,Single Translation Unit,reinterpret_cast shall not be used,A5-2-4,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-8-2-6,Yes,Required,Decidable,Single Translation Unit,"An object with integral, enumerated, or pointer to void type shall not be cast to a pointer type","RULE-11-6, INT36-C",,Easy,
 cpp,MISRA-C++-2023,RULE-8-2-7,Yes,Advisory,Decidable,Single Translation Unit,A cast should not convert a pointer type to an integral type,"RULE-11-6, INT36-C",,Easy,
 cpp,MISRA-C++-2023,RULE-8-2-8,Yes,Required,Decidable,Single Translation Unit,An object pointer type shall not be cast to an integral type other than std::uintptr_t or std::intptr_t,"RULE-11-6, INT36-C",,Easy,
 cpp,MISRA-C++-2023,RULE-8-2-9,Yes,Required,Decidable,Single Translation Unit,The operand to typeid shall not be an expression of polymorphic class type,,,Easy,
-cpp,MISRA-C++-2023,RULE-8-2-10,Yes,Required,Undecidable,System,"Functions shall not call themselves, either directly or indirectly",A7-5-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-8-2-10,Yes,Required,Undecidable,System,"Functions shall not call themselves, either directly or indirectly",A7-5-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-8-2-11,Yes,Required,Decidable,Single Translation Unit,An argument passed via ellipsis shall have an appropriate type,,,Easy,
-cpp,MISRA-C++-2023,RULE-8-3-1,Yes,Advisory,Decidable,Single Translation Unit,The built-in unary - operator should not be applied to an expression of unsigned type,M5-3-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-8-3-1,Yes,Advisory,Decidable,Single Translation Unit,The built-in unary - operator should not be applied to an expression of unsigned type,M5-3-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-8-3-2,Yes,Advisory,Decidable,Single Translation Unit,The built-in unary + operator should not be used,,,Easy,
 cpp,MISRA-C++-2023,RULE-8-7-1,Yes,Required,Undecidable,System,Pointer arithmetic shall not form an invalid pointer,ARR30-C,,Easy,
 cpp,MISRA-C++-2023,RULE-8-7-2,Yes,Required,Undecidable,System,Subtraction between pointers shall only be applied to pointers that address elements of the same array,ARR36-C,,Easy,
 cpp,MISRA-C++-2023,RULE-8-9-1,Yes,Required,Undecidable,System,"The built-in relational operators >, >=, < and <= shall not be applied to objects of pointer type, except where they point to elements of the same array",ARR36-C,,Easy,
 cpp,MISRA-C++-2023,RULE-8-14-1,Yes,Advisory,Undecidable,System,The right-hand operand of a logical && or operator should not contain persistent side effects,"M5-14-1, RULE-13-5",,Medium,
 cpp,MISRA-C++-2023,RULE-8-18-1,Yes,Mandatory,Undecidable,System,An object or subobject must not be copied to an overlapping object,"M0-2-1, RULE-19-1",,Hard,
-cpp,MISRA-C++-2023,RULE-8-18-2,Yes,Advisory,Decidable,Single Translation Unit,The result of an assignment operator should not be used,RULE-13-4,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-8-19-1,Yes,Advisory,Decidable,Single Translation Unit,The comma operator should not be used,M15-8-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-8-20-1,Yes,Advisory,Decidable,Single Translation Unit,An unsigned arithmetic operation with constant operands should not wrap,INT30-C,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-8-18-2,Yes,Advisory,Decidable,Single Translation Unit,The result of an assignment operator should not be used,RULE-13-4,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-8-19-1,Yes,Advisory,Decidable,Single Translation Unit,The comma operator should not be used,M5-18-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-8-20-1,Yes,Advisory,Decidable,Single Translation Unit,An unsigned arithmetic operation with constant operands should not wrap,INT30-C,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-2-1,Yes,Required,Decidable,Single Translation Unit,An explicit type conversion shall not be an expression statement,DCL53-CPP,,Easy,
-cpp,MISRA-C++-2023,RULE-9-3-1,Yes,Required,Decidable,Single Translation Unit,The body of an iteration-statement or a selection-statement shall be a compound-statement,RULE-15-6,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-9-3-1,Yes,Required,Decidable,Single Translation Unit,The body of an iteration-statement or a selection-statement shall be a compound-statement,RULE-15-6,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-4-1,Yes,Required,Decidable,Single Translation Unit,All if ... else if constructs shall be terminated with an else statement,RULE-15-7,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-4-2,Yes,Required,Decidable,Single Translation Unit,The structure of a switch statement shall be appropriate,"RULE-16-1, RULE-16-2,RULE-16-3,RULE-16-4,RULE-16-5,RULE-16-6,RULE-16-7",,Medium,
 cpp,MISRA-C++-2023,RULE-9-5-1,Yes,Advisory,Decidable,Single Translation Unit,Legacy for statements should be simple,,,Hard,
 cpp,MISRA-C++-2023,RULE-9-5-2,Yes,Required,Decidable,Single Translation Unit,A for-range-initializer shall contain at most one function call,,,Easy,
-cpp,MISRA-C++-2023,RULE-9-6-1,Yes,Advisory,Decidable,Single Translation Unit,The goto statement should not be used,RULE-15-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-9-6-2,Yes,Required,Decidable,Single Translation Unit,A goto statement shall reference a label in a surrounding block,RULE-15-3,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-9-6-1,Yes,Advisory,Decidable,Single Translation Unit,The goto statement should not be used,RULE-15-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-9-6-2,Yes,Required,Decidable,Single Translation Unit,A goto statement shall reference a label in a surrounding block,RULE-15-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-6-3,Yes,Required,Decidable,Single Translation Unit,The goto statement shall jump to a label declared later in the function body,RULE-15-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-6-4,Yes,Required,Undecidable,System,A function declared with the [[noreturn]] attribute shall not return,MSC53-CPP,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-6-5,Yes,Required,Decidable,Single Translation Unit,A function with non-void return type shall return a value on all paths,MSC52-CPP,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-10-0-1,Yes,Advisory,Decidable,Single Translation Unit,A declaration should not declare more than one variable or member variable,M8-0-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-10-0-1,Yes,Advisory,Decidable,Single Translation Unit,A declaration should not declare more than one variable or member variable,M8-0-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-10-1-1,Yes,Advisory,Decidable,Single Translation Unit,The target type of a pointer or lvalue reference parameter should be const-qualified appropriately,RULE-8-13,,Hard,
 cpp,MISRA-C++-2023,RULE-10-1-2,Yes,Required,Decidable,Single Translation Unit,The volatile qualifier shall be used appropriately,,,Easy,
-cpp,MISRA-C++-2023,RULE-10-2-1,Yes,Required,Decidable,Single Translation Unit,An enumeration shall be defined with an explicit underlying type,A7-2-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-10-2-1,Yes,Required,Decidable,Single Translation Unit,An enumeration shall be defined with an explicit underlying type,A7-2-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-10-2-2,Yes,Advisory,Decidable,Single Translation Unit,Unscoped enumerations should not be declared,A7-2-3,,Easy,
 cpp,MISRA-C++-2023,RULE-10-2-3,Yes,Required,Decidable,Single Translation Unit,The numeric value of an unscoped enumeration with no fixed underlying type shall not be used,A4-5-1,,Easy,
 cpp,MISRA-C++-2023,RULE-10-3-1,Yes,Advisory,Decidable,Single Translation Unit,There should be no unnamed namespaces in header files,"DCL59-CPP, M7-3-3",,Easy,
-cpp,MISRA-C++-2023,RULE-10-4-1,Yes,Required,Decidable,Single Translation Unit,The asm declaration shall not be used,A7-4-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-10-4-1,Yes,Required,Decidable,Single Translation Unit,The asm declaration shall not be used,A7-4-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-11-3-1,Yes,Advisory,Decidable,Single Translation Unit,Variables of array type should not be declared,,,Easy,
 cpp,MISRA-C++-2023,RULE-11-3-2,Yes,Advisory,Decidable,Single Translation Unit,The declaration of an object should contain no more than two levels of pointer indirection,A5-0-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-11-6-1,Yes,Advisory,Decidable,Single Translation Unit,All variables should be initialized,,,Easy,
 cpp,MISRA-C++-2023,RULE-11-6-2,Yes,Mandatory,Undecidable,System,The value of an object must not be read before it has been set,A8-5-0,,Very Hard,
-cpp,MISRA-C++-2023,RULE-11-6-3,Yes,Required,Decidable,Single Translation Unit,"Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique",RULE-8-12,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-11-6-3,Yes,Required,Decidable,Single Translation Unit,"Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique",RULE-8-12,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-12-2-1,Yes,Advisory,Decidable,Single Translation Unit,Bit-fields should not be declared,A9-6-2,,Easy,
-cpp,MISRA-C++-2023,RULE-12-2-2,Yes,Required,Decidable,Single Translation Unit,A bit-field shall have an appropriate type,RULE-6-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-12-2-3,Yes,Required,Decidable,Single Translation Unit,A named bit-field with signed integer type shall not have a length of one bit,"RULE-6-2, M9-6-4",ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-12-2-2,Yes,Required,Decidable,Single Translation Unit,A bit-field shall have an appropriate type,RULE-6-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-12-2-3,Yes,Required,Decidable,Single Translation Unit,A named bit-field with signed integer type shall not have a length of one bit,M9-6-4,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-12-3-1,Yes,Required,Decidable,Single Translation Unit,The union keyword shall not be used,RULE-19-2,,Easy,
 cpp,MISRA-C++-2023,RULE-13-1-1,Yes,Advisory,Decidable,Single Translation Unit,Classes should not be inherited virtually,,,Easy,
-cpp,MISRA-C++-2023,RULE-13-1-2,Yes,Required,Decidable,Single Translation Unit,An accessible base class shall not be both virtual and non-virtual in the same hierarchy,M10-1-3,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-13-1-2,Yes,Required,Decidable,Single Translation Unit,An accessible base class shall not be both virtual and non-virtual in the same hierarchy,M10-1-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-13-3-1,Yes,Required,Decidable,Single Translation Unit,"User-declared member functions shall use the virtual, override and final specifiers appropriately",,,Easy,
-cpp,MISRA-C++-2023,RULE-13-3-2,Yes,Required,Decidable,Single Translation Unit,Parameters in an overriding virtual function shall not specify different default arguments,M8-3-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-13-3-3,Yes,Required,Decidable,System,The parameters in all declarations or overrides of a function shall either be unnamed or have identical names,A15-1-2,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-13-3-4,Yes,Required,Decidable,Single Translation Unit,A comparison of a potentially virtual pointer to member function shall only be with nullptr,A5-10-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-13-3-2,Yes,Required,Decidable,Single Translation Unit,Parameters in an overriding virtual function shall not specify different default arguments,M8-3-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-13-3-3,Yes,Required,Decidable,System,The parameters in all declarations or overrides of a function shall either be unnamed or have identical names,RULE-8-3,,Easy,
+cpp,MISRA-C++-2023,RULE-13-3-4,Yes,Required,Decidable,Single Translation Unit,A comparison of a potentially virtual pointer to member function shall only be with nullptr,A5-10-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-14-1-1,Yes,Advisory,Decidable,Single Translation Unit,Non-static data members should be either all private or all public,,,Easy,
 cpp,MISRA-C++-2023,RULE-15-0-1,Yes,Required,Decidable,Single Translation Unit,Special member functions shall be provided appropriately,A12-0-1,,Medium,
 cpp,MISRA-C++-2023,RULE-15-0-2,Yes,Advisory,Decidable,Single Translation Unit,User-provided copy and move member functions of a class should have appropriate signatures,,,Easy,
-cpp,MISRA-C++-2023,RULE-15-1-1,Yes,Required,Undecidable,System,An object’s dynamic type shall not be used from within its constructor or destructor,M12-1-1,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-15-1-2,Yes,Advisory,Decidable,Single Translation Unit,All constructors of a class should explicitly initialize all of its virtual base classes and immediate base classes,A12-1-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-15-1-1,Yes,Required,Undecidable,System,An object’s dynamic type shall not be used from within its constructor or destructor,M12-1-1,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-15-1-2,Yes,Advisory,Decidable,Single Translation Unit,All constructors of a class should explicitly initialize all of its virtual base classes and immediate base classes,A12-1-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-15-1-3,Yes,Required,Decidable,Single Translation Unit,Conversion operators and constructors that are callable with a single argument shall be explicit,"A12-1-4,A13-5-2",,Easy,
 cpp,MISRA-C++-2023,RULE-15-1-4,Yes,Advisory,Decidable,Single Translation Unit,"All direct, non-static data members of a class should be initialized before the class object is accessible",,,Hard,
-cpp,MISRA-C++-2023,RULE-15-1-5,Yes,Required,Decidable,Single Translation Unit,A class shall only define an initializer-list constructor when it is the only constructor,A8-5-4,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,DIR-15-8-1,Yes,Required,Decidable,Implementation,User-provided copy assignment operators and move assignment operators shall handle self-assignment,A12-8-5,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-15-1-5,Yes,Required,Decidable,Single Translation Unit,A class shall only define an initializer-list constructor when it is the only constructor,A8-5-4,ImportMisra23,Import,
+cpp,MISRA-C++-2023,DIR-15-8-1,Yes,Required,Decidable,Implementation,User-provided copy assignment operators and move assignment operators shall handle self-assignment,A12-8-5,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-16-5-1,Yes,Required,Decidable,Single Translation Unit,The logical AND and logical OR operators shall not be overloaded,M5-2-11,,Easy,
-cpp,MISRA-C++-2023,RULE-16-5-2,Yes,Required,Decidable,Single Translation Unit,The address-of operator shall not be overloaded,M5-3-3,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-16-5-2,Yes,Required,Decidable,Single Translation Unit,The address-of operator shall not be overloaded,M5-3-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-16-6-1,Yes,Advisory,Decidable,Single Translation Unit,Symmetrical operators should only be implemented as non-member functions,,,Medium,
-cpp,MISRA-C++-2023,RULE-17-8-1,Yes,Required,Decidable,Single Translation Unit,Function templates shall not be explicitly specialized,A14-8-2,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-18-1-1,Yes,Required,Decidable,Single Translation Unit,An exception object shall not have pointer type,A15-1-2,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-18-1-2,Yes,Required,Decidable,Single Translation Unit,An empty throw shall only occur within the compound-statement of a catch handler,M15-1-3,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-17-8-1,Yes,Required,Decidable,Single Translation Unit,Function templates shall not be explicitly specialized,A14-8-2,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-18-1-1,Yes,Required,Decidable,Single Translation Unit,An exception object shall not have pointer type,A15-1-2,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-18-1-2,Yes,Required,Decidable,Single Translation Unit,An empty throw shall only occur within the compound-statement of a catch handler,M15-1-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-18-3-1,Yes,Advisory,Decidable,Single Translation Unit,There should be at least one exception handler to catch all otherwise unhandled exceptions,A15-3-3,,Easy,
 cpp,MISRA-C++-2023,RULE-18-3-2,Yes,Required,Decidable,Single Translation Unit,An exception of class type shall be caught by const reference or reference,A15-3-5,,Easy,
 cpp,MISRA-C++-2023,RULE-18-3-3,Yes,Required,Decidable,Single Translation Unit,Handlers for a function-try-block of a constructor or destructor shall not refer to non-static members from their class or its bases,M15-3-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-18-4-1,Yes,Required,Decidable,Single Translation Unit,Exception-unfriendly functions shall be noexcept,A15-5-1,,Easy,
-cpp,MISRA-C++-2023,RULE-18-5-1,Yes,Advisory,Undecidable,System,A noexcept function should not attempt to propagate an exception to the calling function,A15-4-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-18-5-1,Yes,Advisory,Undecidable,System,A noexcept function should not attempt to propagate an exception to the calling function,A15-4-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-18-5-2,Yes,Advisory,Decidable,Single Translation Unit,Program-terminating functions should not be used,,,Easy,
 cpp,MISRA-C++-2023,RULE-19-0-1,No,Required,Decidable,Single Translation Unit,A line whose first token is # shall be a valid preprocessing directive,,,,
-cpp,MISRA-C++-2023,RULE-19-0-2,Yes,Required,Decidable,Single Translation Unit,Function-like macros shall not be defined,DIR-4-9,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-19-0-2,Yes,Required,Decidable,Single Translation Unit,Function-like macros shall not be defined,DIR-4-9,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-0-3,Yes,Advisory,Decidable,Single Translation Unit,#include directives should only be preceded by preprocessor directives or comments,RULE-20-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-0-4,Yes,Advisory,Decidable,Single Translation Unit,#undef should only be used for macros defined previously in the same file,,,Easy,
 cpp,MISRA-C++-2023,RULE-19-1-1,Yes,Required,Decidable,Single Translation Unit,The defined preprocessor operator shall be used appropriately,M16-1-1,,Easy,
@@ -920,23 +920,23 @@ cpp,MISRA-C++-2023,RULE-19-2-1,Yes,Required,Decidable,Single Translation Unit,Pr
 cpp,MISRA-C++-2023,RULE-19-2-2,Yes,Required,Decidable,Single Translation Unit,"The #include directive shall be followed by either a <filename> or ""filename"" sequence",,,Easy,
 cpp,MISRA-C++-2023,RULE-19-2-3,Yes,Required,Decidable,Single Translation Unit,"The ' or "" or \ characters and the /* or // character sequences shall not occur in a header file name",A16-2-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-3-1,Yes,Advisory,Decidable,Single Translation Unit,The # and ## preprocessor operators should not be used,M16-3-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-19-3-2,Yes,Required,Decidable,Single Translation Unit,A macro parameter immediately following a # operator shall not be immediately followed by a ## operator,RULE-20-11,ImportMisra23-1,Import,
-cpp,MISRA-C++-2023,RULE-19-3-3,Yes,Required,Decidable,Single Translation Unit,The argument to a mixed-use macro parameter shall not be subject to further expansion,RULE-20-12,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-19-3-2,Yes,Required,Decidable,Single Translation Unit,A macro parameter immediately following a # operator shall not be immediately followed by a ## operator,RULE-20-11,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-19-3-3,Yes,Required,Decidable,Single Translation Unit,The argument to a mixed-use macro parameter shall not be subject to further expansion,RULE-20-12,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-3-4,Yes,Required,Decidable,Single Translation Unit,Parentheses shall be used to ensure macro arguments are expanded appropriately,M16-0-6,,Medium,
 cpp,MISRA-C++-2023,RULE-19-3-5,Yes,Required,Decidable,Single Translation Unit,Tokens that look like a preprocessing directive shall not occur within a macro argument,RULE-20-6,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-6-1,Yes,Advisory,Decidable,Single Translation Unit,The #pragma directive and the _Pragma operator should not be used,A16-7-1,,Easy,
-cpp,MISRA-C++-2023,RULE-21-2-1,Yes,Required,Decidable,Single Translation Unit,"The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used",RULE-21-7,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-21-2-1,Yes,Required,Decidable,Single Translation Unit,"The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used",RULE-21-7,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-21-2-2,Yes,Required,Decidable,Single Translation Unit,"The string handling functions from <cstring>, <cstdlib>, <cwchar> and <cinttypes> shall not be used",M18-0-5,,Easy,
 cpp,MISRA-C++-2023,RULE-21-2-3,Yes,Required,Decidable,Single Translation Unit,The library function system from <cstdlib> shall not be used,M18-0-3,,Easy,
-cpp,MISRA-C++-2023,RULE-21-2-4,Yes,Required,Decidable,Single Translation Unit,The macro offsetof shall not be used,M18-2-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-21-2-4,Yes,Required,Decidable,Single Translation Unit,The macro offsetof shall not be used,M18-2-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-21-6-1,Yes,Advisory,Undecidable,Single Translation Unit,Dynamic memory should not be used,DIR-4-12,,Easy,
 cpp,MISRA-C++-2023,RULE-21-6-2,Yes,Required,Decidable,Single Translation Unit,Dynamic memory shall be managed automatically,,,Easy,
 cpp,MISRA-C++-2023,RULE-21-6-3,Yes,Required,Decidable,Single Translation Unit,Advanced memory management shall not be used,,,Medium,
-cpp,MISRA-C++-2023,RULE-21-6-4,Yes,Required,Decidable,System,"If a project defines either a sized or unsized version of a global operator delete, then both shall be defined",A18-5-4,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-21-6-4,Yes,Required,Decidable,System,"If a project defines either a sized or unsized version of a global operator delete, then both shall be defined",A18-5-4,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-21-6-5,Yes,Required,Decidable,Single Translation Unit,A pointer to an incomplete class type shall not be deleted,A5-3-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-21-10-1,Yes,Required,Decidable,Single Translation Unit,The features of <cstdarg> shall not be used,DCL50-CPP,,Easy,
 cpp,MISRA-C++-2023,RULE-21-10-2,Yes,Required,Decidable,Single Translation Unit,The standard header file <csetjmp> shall not be used,ERR52-CPP,,Easy,
-cpp,MISRA-C++-2023,RULE-21-10-3,Yes,Required,Decidable,Single Translation Unit,The facilities provided by the standard header file <csignal> shall not be used,M18-7-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-21-10-3,Yes,Required,Decidable,Single Translation Unit,The facilities provided by the standard header file <csignal> shall not be used,M18-7-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-22-3-1,Yes,Required,Decidable,Single Translation Unit,The assert macro shall not be used with a constant-expression,,,Easy,
 cpp,MISRA-C++-2023,RULE-22-4-1,Yes,Required,Decidable,Single Translation Unit,The literal value zero shall be the only value assigned to errno,,,Easy,
 cpp,MISRA-C++-2023,RULE-23-11-1,Yes,Advisory,Decidable,Single Translation Unit,The raw pointer constructors of std::shared_ptr and std::unique_ptr should not be used,,,Easy,
@@ -945,11 +945,11 @@ cpp,MISRA-C++-2023,RULE-24-5-2,Yes,Required,Decidable,Single Translation Unit,"T
 cpp,MISRA-C++-2023,RULE-25-5-1,Yes,Required,Decidable,Single Translation Unit,The setlocale and std::locale::global functions shall not be called,,,Easy,
 cpp,MISRA-C++-2023,RULE-25-5-2,Yes,Mandatory,Decidable,Single Translation Unit,"The pointers returned by the C++ Standard Library functions localeconv, getenv, setlocale or strerror must only be used as if they have pointer to const-qualified type",RULE-21-19,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-25-5-3,Yes,Mandatory,Undecidable,System,"The pointer returned by the C++ Standard Library functions asctime, ctime, gmtime, localtime, localeconv, getenv, setlocale or strerror must not be used following a subsequent call to the same function",RULE-21-20,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-26-3-1,Yes,Advisory,Decidable,Single Translation Unit,std::vector should not be specialized with bool,A18-1-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-26-3-1,Yes,Advisory,Decidable,Single Translation Unit,std::vector should not be specialized with bool,A18-1-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-28-3-1,Yes,Required,Undecidable,System,Predicates shall not have persistent side effects,A25-1-1,,Easy,
 cpp,MISRA-C++-2023,RULE-28-6-1,Yes,Required,Decidable,Single Translation Unit,The argument to std::move shall be a non-const lvalue,A18-9-3,,Easy,
-cpp,MISRA-C++-2023,RULE-28-6-2,Yes,Required,Decidable,Single Translation Unit,Forwarding references and std::forward shall be used together,A18-9-2,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-28-6-2,Yes,Required,Decidable,Single Translation Unit,Forwarding references and std::forward shall be used together,A18-9-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-28-6-3,Yes,Required,Decidable,Single Translation Unit,An object shall not be used while in a potentially moved-from state,A12-8-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-28-6-4,Yes,Required,Decidable,Single Translation Unit,"The result of std::remove, std::remove_if, std::unique and empty shall be used",,,Easy,
-cpp,MISRA-C++-2023,RULE-30-0-1,Yes,Required,Decidable,Single Translation Unit,The C Library input/output functions shall not be used,M27-0-1,ImportMisra23-1,Import,
+cpp,MISRA-C++-2023,RULE-30-0-1,Yes,Required,Decidable,Single Translation Unit,The C Library input/output functions shall not be used,M27-0-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-30-0-2,Yes,Required,Undecidable,System,Reads and writes on the same file stream shall be separated by a positioning operation,A27-0-3,ImportMisra23,Import,

From 2d8786b0f72b89e1e7a2260bd0934d1022617a4b Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 26 Jun 2024 18:48:40 +0200
Subject: [PATCH 029/435] Fix test formatting

---
 .../test/rules/constlikereturnvalue/test.c     |  2 +-
 .../functionlikemacrosdefined_shared/test.c    |  2 +-
 .../test/rules/constlikereturnvalue/test.cpp   |  2 +-
 .../functionlikemacrosdefined_shared/test.cpp  |  2 +-
 .../test.cpp                                   | 18 +++++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/c/common/test/rules/constlikereturnvalue/test.c b/c/common/test/rules/constlikereturnvalue/test.c
index 35e68b4aa8..e28c05961f 100644
--- a/c/common/test/rules/constlikereturnvalue/test.c
+++ b/c/common/test/rules/constlikereturnvalue/test.c
@@ -1,9 +1,9 @@
 // NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
 // CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <locale.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
 
 void trstr(char *c_str, char orig, char rep) {
   while (*c_str != '\0') {
diff --git a/c/common/test/rules/functionlikemacrosdefined_shared/test.c b/c/common/test/rules/functionlikemacrosdefined_shared/test.c
index 0bae4f1c22..ee36549b8d 100644
--- a/c/common/test/rules/functionlikemacrosdefined_shared/test.c
+++ b/c/common/test/rules/functionlikemacrosdefined_shared/test.c
@@ -15,7 +15,7 @@
 #define MY_ASSERT(X) assert(X) // NON_COMPLIANT[FALSE_NEGATIVE]
 
 char a1[MACRO2(1, 1) + 6];
-extern int printf_custom(char*, int);
+extern int printf_custom(char *, int);
 int test1;
 
 void f() {
diff --git a/cpp/common/test/rules/constlikereturnvalue/test.cpp b/cpp/common/test/rules/constlikereturnvalue/test.cpp
index af7ecdc2d9..19db17faee 100644
--- a/cpp/common/test/rules/constlikereturnvalue/test.cpp
+++ b/cpp/common/test/rules/constlikereturnvalue/test.cpp
@@ -1,9 +1,9 @@
 // NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
 // CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <locale.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
 
 void trstr(char *c_str, char orig, char rep) {
   while (*c_str != '\0') {
diff --git a/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp b/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp
index 99d3b173e0..f39236ca3b 100644
--- a/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp
+++ b/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp
@@ -15,7 +15,7 @@
 #define MY_ASSERT(X) assert(X) // NON_COMPLIANT[FALSE_NEGATIVE]
 
 char a1[MACRO2(1, 1) + 6];
-extern int printf_custom(char*, int);
+extern int printf_custom(char *, int);
 int test1;
 
 void f() {
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp
index 6cbff873ee..27be2a327d 100644
--- a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp
+++ b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp
@@ -1,15 +1,15 @@
 // NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
 // CHANGES SHOULD BE REFLECTED THERE AS WELL.
 int x = false; // COMPLIANT - reported as FP in #319
-int a1 = 0L;  // COMPLIANT
-int a2 = 0l;  // NON_COMPLIANT
-int a3 = 0ll; // NON_COMPLIANT
-int a4 = 0LL; // COMPLIANT
-int a5 = 0uL; // COMPLIANT
-int a6 = 0ul; // NON_COMPLIANT
-int a7 = 0lu; // NON_COMPLIANT
-int a8 = 0Lu; // COMPLIANT
-int a9 = 0LU; // COMPLIANT
+int a1 = 0L;   // COMPLIANT
+int a2 = 0l;   // NON_COMPLIANT
+int a3 = 0ll;  // NON_COMPLIANT
+int a4 = 0LL;  // COMPLIANT
+int a5 = 0uL;  // COMPLIANT
+int a6 = 0ul;  // NON_COMPLIANT
+int a7 = 0lu;  // NON_COMPLIANT
+int a8 = 0Lu;  // COMPLIANT
+int a9 = 0LU;  // COMPLIANT
 
 long b1 = 0L;  // COMPLIANT
 long b2 = 0l;  // NON_COMPLIANT

From b784771f3573c8d2b77d23fc2e717fbae4d5aa2a Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 26 Jun 2024 19:04:52 +0200
Subject: [PATCH 030/435] Format with `codeql query format` v2.14.6

---
 .../ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql  | 4 ++--
 c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql      | 7 +++----
 .../ResultOfAnAssignmentOperatorShouldNotBeUsed.ql         | 3 ++-
 c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql           | 4 +---
 c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql     | 4 +---
 .../RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql | 3 ++-
 .../rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql    | 3 ++-
 .../OctalAndHexadecimalEscapeSequencesNotTerminated.ql     | 3 ++-
 .../BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql   | 3 ++-
 .../rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql | 3 ++-
 .../RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql | 3 ++-
 .../A12-1-1/ExplicitConstructorBaseClassInitialization.ql  | 3 ++-
 .../A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql  | 3 ++-
 .../ExplicitSpecializationsOfFunctionTemplatesUsed.ql      | 3 ++-
 cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql    | 4 +---
 cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql    | 7 +++----
 .../src/rules/A18-1-2/VectorboolSpecializationUsed.ql      | 3 ++-
 .../src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql  | 3 ++-
 cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql  | 4 +---
 .../src/rules/A4-10-1/NullPointerConstantNotNullptr.ql     | 3 ++-
 .../A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql | 3 ++-
 cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql        | 4 +---
 cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql          | 4 +---
 .../EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql   | 3 ++-
 .../A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql  | 3 ++-
 .../A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql  | 3 ++-
 .../A7-3-1/HiddenInheritedOverridableMemberFunction.ql     | 3 ++-
 cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql         | 4 +---
 cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql         | 7 +++----
 .../A8-5-4/ConfusingUseOfInitializerListConstructors.ql    | 3 ++-
 .../M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql | 3 ++-
 .../DynamicTypeOfThisUsedFromConstructorOrDestructor.ql    | 3 ++-
 .../M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql      | 3 ++-
 .../M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql | 3 ++-
 cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql    | 4 +---
 cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql         | 4 +---
 cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql      | 4 +---
 cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql          | 4 +---
 cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql  | 4 +---
 cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql            | 4 +---
 .../src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql  | 3 ++-
 cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql       | 4 +---
 cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql          | 4 +---
 cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql           | 4 +---
 .../IdentifierPassedAsFunctionArgumentDecayToAPointer.ql   | 3 ++-
 .../src/rules/M5-2-6/CastNotConvertPointerToFunction.ql    | 3 ++-
 .../UnaryMinusOperatorAppliedToAnUnsignedExpression.ql     | 3 ++-
 cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql      | 4 +---
 cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql    | 4 +---
 .../IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql   | 3 ++-
 .../rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql    | 3 ++-
 .../src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql  | 3 ++-
 cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql   | 4 +---
 .../VirtualFunctionParametersUseSameDefaultArguments.ql    | 3 ++-
 .../AddressOfOperatorOverloaded_shared.qll                 | 4 ++--
 .../EnumerationNotDefinedWithAnExplicitUnderlyingType.qll  | 4 ++--
 .../macrooffsetofused_shared/MacroOffsetofUsed_shared.qll  | 6 ++++--
 .../DefinitionNotConsideredForUnqualifiedLookup_shared.ql  | 4 ++--
 .../HiddenInheritedNonOverridableMemberFunction_shared.ql  | 4 ++--
 .../NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql  | 4 ++--
 .../ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql  | 4 ++--
 .../CopyAndMoveAssignmentsShallHandleSelfAssignment.ql     | 3 ++-
 .../RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql      | 3 ++-
 .../src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql     | 4 +---
 .../EnumerationNotDefinedWithAnExplicitUnderlyingType.ql   | 3 ++-
 .../RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql      | 3 ++-
 .../SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql       | 3 ++-
 .../RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql | 3 ++-
 .../OverridingShallSpecifyDifferentDefaultArguments.ql     | 3 ++-
 .../PotentiallyVirtualPointerOnlyComparesToNullptr.ql      | 3 ++-
 .../ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql   | 3 ++-
 .../rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql   | 3 ++-
 .../InitializerListConstructorIsTheOnlyConstructor.ql      | 3 ++-
 .../RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql  | 3 ++-
 .../rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql | 3 ++-
 .../NoexceptFunctionShouldNotPropagateToTheCaller.ql       | 3 ++-
 .../src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql     | 4 +---
 .../AMixedUseMacroArgumentSubjectToExpansion.ql            | 3 ++-
 cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql  | 4 +---
 .../src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql      | 4 +---
 .../RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql | 3 ++-
 .../GlobalUnsizedOperatorDeleteShallBeDefined.ql           | 3 ++-
 .../RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql    | 3 ++-
 .../ForwardingReferencesAndForwardNotUsedTogether.ql       | 3 ++-
 .../src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql     | 4 +---
 .../MemoryOperationsNotSequencedAppropriately.ql           | 3 ++-
 .../src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql      | 4 +---
 cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql      | 4 +---
 .../UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql     | 3 ++-
 .../rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql   | 3 ++-
 .../CharacterSequenceUsedWithinACStyleComment.ql           | 3 ++-
 cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql    | 4 +---
 .../RULE-6-4-2/InheritedNonOverridableMemberFunction.ql    | 3 ++-
 .../rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql | 3 ++-
 .../NameShallBeReferredUsingAQualifiedIdOrThis.ql          | 3 ++-
 .../NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql     | 3 ++-
 .../ReturnReferenceOrPointerToAutomaticLocalVariable.ql    | 3 ++-
 .../NullptrNotTheOnlyFormOfTheNullPointerConstant.ql       | 3 ++-
 .../ArrayPassedAsFunctionArgumentDecayToAPointer.ql        | 3 ++-
 .../ResultOfAnAssignmentOperatorShouldNotBeUsed.ql         | 3 ++-
 .../FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql   | 3 ++-
 .../CastsBetweenAPointerToFunctionAndAnyOtherType.ql       | 3 ++-
 .../UnsignedOperationWithConstantOperandsWraps.ql          | 3 ++-
 .../BuiltInUnaryOperatorAppliedToUnsignedExpression.ql     | 3 ++-
 .../src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql      | 4 +---
 .../RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql    | 3 ++-
 106 files changed, 189 insertions(+), 179 deletions(-)

diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
index e4928beb62..af3f7697f7 100644
--- a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
+{ }
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index ec002e172f..f2517abc21 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -15,8 +15,7 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
 
-class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery {
-  UnsequencedSideEffectsQuery() {
-    this = SideEffects3Package::unsequencedSideEffectsQuery()
-  }
+class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery
+{
+  UnsequencedSideEffectsQuery() { this = SideEffects3Package::unsequencedSideEffectsQuery() }
 }
diff --git a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index 2582518d78..5a105ca27f 100644
--- a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery {
+class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery
+{
   ResultOfAnAssignmentOperatorShouldNotBeUsedQuery() {
     this = SideEffects1Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery()
   }
diff --git a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
index f8862713b0..845d36f798 100644
--- a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
+++ b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
@@ -16,7 +16,5 @@ import codingstandards.c.misra
 import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
 
 class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
-  GotoStatementUsedQuery() {
-    this = Statements6Package::gotoStatementUsedQuery()
-  }
+  GotoStatementUsedQuery() { this = Statements6Package::gotoStatementUsedQuery() }
 }
diff --git a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
index 7151e367bc..16f24fd75e 100644
--- a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
+++ b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
@@ -17,7 +17,5 @@ import codingstandards.c.misra
 import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
 
 class GotoLabelBlockConditionQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery {
-  GotoLabelBlockConditionQuery() {
-    this = Statements2Package::gotoLabelBlockConditionQuery()
-  }
+  GotoLabelBlockConditionQuery() { this = Statements2Package::gotoLabelBlockConditionQuery() }
 }
diff --git a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
index c951968506..55aa607723 100644
--- a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
+++ b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
 
-class MoreThanOneHashOperatorInMacroDefinitionQuery extends MacroParameterFollowingHash_sharedSharedQuery {
+class MoreThanOneHashOperatorInMacroDefinitionQuery extends MacroParameterFollowingHash_sharedSharedQuery
+{
   MoreThanOneHashOperatorInMacroDefinitionQuery() {
     this = Preprocessor2Package::moreThanOneHashOperatorInMacroDefinitionQuery()
   }
diff --git a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
index 3730a65ecd..efe083efc0 100644
--- a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
+++ b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
 
-class MacroParameterUsedAsHashOperandQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery {
+class MacroParameterUsedAsHashOperandQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery
+{
   MacroParameterUsedAsHashOperandQuery() {
     this = Preprocessor2Package::macroParameterUsedAsHashOperandQuery()
   }
diff --git a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
index 80a4490470..e9d5f7b97c 100644
--- a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
+++ b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
 
-class OctalAndHexadecimalEscapeSequencesNotTerminatedQuery extends NonTerminatedEscapeSequences_sharedSharedQuery {
+class OctalAndHexadecimalEscapeSequencesNotTerminatedQuery extends NonTerminatedEscapeSequences_sharedSharedQuery
+{
   OctalAndHexadecimalEscapeSequencesNotTerminatedQuery() {
     this = SyntaxPackage::octalAndHexadecimalEscapeSequencesNotTerminatedQuery()
   }
diff --git a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
index 932e85087a..aaf7ff68a6 100644
--- a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
+++ b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
@@ -14,7 +14,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
 
-class BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery {
+class BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery
+{
   BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery() {
     this = BitfieldTypesPackage::bitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery()
   }
diff --git a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
index 9eb0b672fb..630f60cb92 100644
--- a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
+++ b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
@@ -14,7 +14,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
 
-class SingleBitNamedBitFieldsOfASignedTypeQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery {
+class SingleBitNamedBitFieldsOfASignedTypeQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery
+{
   SingleBitNamedBitFieldsOfASignedTypeQuery() {
     this = BitfieldTypesPackage::singleBitNamedBitFieldsOfASignedTypeQuery()
   }
diff --git a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
index 91a8a9c021..a2685db53c 100644
--- a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
+++ b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
 
-class ValueImplicitEnumerationConstantNotUniqueQuery extends NonUniqueEnumerationConstant_sharedSharedQuery {
+class ValueImplicitEnumerationConstantNotUniqueQuery extends NonUniqueEnumerationConstant_sharedSharedQuery
+{
   ValueImplicitEnumerationConstantNotUniqueQuery() {
     this = Declarations7Package::valueImplicitEnumerationConstantNotUniqueQuery()
   }
diff --git a/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql b/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
index 2fc8fcd976..e97c540d08 100644
--- a/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
+++ b/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
 
-class ExplicitConstructorBaseClassInitializationQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery {
+class ExplicitConstructorBaseClassInitializationQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery
+{
   ExplicitConstructorBaseClassInitializationQuery() {
     this = InitializationPackage::explicitConstructorBaseClassInitializationQuery()
   }
diff --git a/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql b/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
index 8919a4e46a..789327e5e9 100644
--- a/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
+++ b/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
@@ -19,7 +19,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
 
-class CopyAssignmentAndAMoveHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery {
+class CopyAssignmentAndAMoveHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery
+{
   CopyAssignmentAndAMoveHandleSelfAssignmentQuery() {
     this = OperatorInvariantsPackage::copyAssignmentAndAMoveHandleSelfAssignmentQuery()
   }
diff --git a/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql b/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
index f2cbecb7dc..9f6063d568 100644
--- a/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
+++ b/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
 
-class ExplicitSpecializationsOfFunctionTemplatesUsedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery {
+class ExplicitSpecializationsOfFunctionTemplatesUsedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery
+{
   ExplicitSpecializationsOfFunctionTemplatesUsedQuery() {
     this = TemplatesPackage::explicitSpecializationsOfFunctionTemplatesUsedQuery()
   }
diff --git a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
index 1747d1245c..3187174576 100644
--- a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
+++ b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
@@ -18,7 +18,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.exceptionobjecthavepointertype_shared.ExceptionObjectHavePointerType_shared
 
 class PointerExceptionObjectQuery extends ExceptionObjectHavePointerType_sharedSharedQuery {
-  PointerExceptionObjectQuery() {
-    this = Exceptions1Package::pointerExceptionObjectQuery()
-  }
+  PointerExceptionObjectQuery() { this = Exceptions1Package::pointerExceptionObjectQuery() }
 }
diff --git a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
index 4197e5f7dd..3c32b3970f 100644
--- a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
+++ b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
@@ -17,8 +17,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
 
-class NoExceptFunctionThrowsQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery {
-  NoExceptFunctionThrowsQuery() {
-    this = Exceptions1Package::noExceptFunctionThrowsQuery()
-  }
+class NoExceptFunctionThrowsQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery
+{
+  NoExceptFunctionThrowsQuery() { this = Exceptions1Package::noExceptFunctionThrowsQuery() }
 }
diff --git a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
index 9b4855fc8f..36a4a448a7 100644
--- a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
@@ -19,7 +19,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
 
-class VectorboolSpecializationUsedQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery {
+class VectorboolSpecializationUsedQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery
+{
   VectorboolSpecializationUsedQuery() {
     this = BannedTypesPackage::vectorboolSpecializationUsedQuery()
   }
diff --git a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
index 105e1e1289..02c46fe544 100644
--- a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
+++ b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
 
-class ForwardingValuesToOtherFunctionsQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery {
+class ForwardingValuesToOtherFunctionsQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery
+{
   ForwardingValuesToOtherFunctionsQuery() {
     this = MoveForwardPackage::forwardingValuesToOtherFunctionsQuery()
   }
diff --git a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
index 5649c9765a..0c1ffe818a 100644
--- a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
+++ b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
 
 class EscapeSequenceOutsideISOQuery extends BackslashCharacterMisuse_sharedSharedQuery {
-  EscapeSequenceOutsideISOQuery() {
-    this = LiteralsPackage::escapeSequenceOutsideISOQuery()
-  }
+  EscapeSequenceOutsideISOQuery() { this = LiteralsPackage::escapeSequenceOutsideISOQuery() }
 }
diff --git a/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql b/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
index dd23f6a03b..577a1646c6 100644
--- a/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
+++ b/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
 
-class NullPointerConstantNotNullptrQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery {
+class NullPointerConstantNotNullptrQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery
+{
   NullPointerConstantNotNullptrQuery() {
     this = LiteralsPackage::nullPointerConstantNotNullptrQuery()
   }
diff --git a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
index efa3d605b3..ee3d47611a 100644
--- a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
+++ b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
 
-class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery {
+class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery
+{
   VirtualPointerOnlyComparesToNullptrConstantQuery() {
     this = PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery()
   }
diff --git a/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql b/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
index 938b0aa36a..4a051167f6 100644
--- a/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
+++ b/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.reinterpretcastused_shared.ReinterpretCastUsed_shared
 
 class ReinterpretCastUsedQuery extends ReinterpretCastUsed_sharedSharedQuery {
-  ReinterpretCastUsedQuery() {
-    this = BannedSyntaxPackage::reinterpretCastUsedQuery()
-  }
+  ReinterpretCastUsedQuery() { this = BannedSyntaxPackage::reinterpretCastUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
index c7c8e16d9a..74042c2dc2 100644
--- a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
+++ b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
 
 class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
-  GotoStatementUsedQuery() {
-    this = BannedSyntaxPackage::gotoStatementUsedQuery()
-  }
+  GotoStatementUsedQuery() { this = BannedSyntaxPackage::gotoStatementUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
index 9227c4cc6d..00538a0ada 100644
--- a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
+++ b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
@@ -19,7 +19,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
 
-class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery {
+class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery
+{
   EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery() {
     this = DeclarationsPackage::enumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery()
   }
diff --git a/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql b/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
index 2dd634e971..56e73edce0 100644
--- a/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
+++ b/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
 
-class DefinitionNotConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery {
+class DefinitionNotConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery
+{
   DefinitionNotConsideredForUnqualifiedLookupQuery() {
     this = ScopePackage::definitionNotConsideredForUnqualifiedLookupQuery()
   }
diff --git a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
index 780a0c0997..76d6ac8f69 100644
--- a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
+++ b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
 
-class HiddenInheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery {
+class HiddenInheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery
+{
   HiddenInheritedNonOverridableMemberFunctionQuery() {
     this = ScopePackage::hiddenInheritedNonOverridableMemberFunctionQuery()
   }
diff --git a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
index e59a76093e..4f999f160c 100644
--- a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
+++ b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
 
-class HiddenInheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery {
+class HiddenInheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery
+{
   HiddenInheritedOverridableMemberFunctionQuery() {
     this = ScopePackage::hiddenInheritedOverridableMemberFunctionQuery()
   }
diff --git a/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql b/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
index 37521be2b8..71a703e089 100644
--- a/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
+++ b/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
@@ -18,7 +18,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.asmdeclarationused_shared.AsmDeclarationUsed_shared
 
 class AsmDeclarationUsedQuery extends AsmDeclarationUsed_sharedSharedQuery {
-  AsmDeclarationUsedQuery() {
-    this = BannedSyntaxPackage::asmDeclarationUsedQuery()
-  }
+  AsmDeclarationUsedQuery() { this = BannedSyntaxPackage::asmDeclarationUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql b/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
index 8b9818ab59..bf287b894d 100644
--- a/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
+++ b/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
@@ -18,8 +18,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
 
-class RecursiveFunctionsQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery {
-  RecursiveFunctionsQuery() {
-    this = FunctionsPackage::recursiveFunctionsQuery()
-  }
+class RecursiveFunctionsQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery
+{
+  RecursiveFunctionsQuery() { this = FunctionsPackage::recursiveFunctionsQuery() }
 }
diff --git a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
index 124346a23d..60178e1a2f 100644
--- a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
+++ b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
@@ -19,7 +19,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
 
-class ConfusingUseOfInitializerListConstructorsQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery {
+class ConfusingUseOfInitializerListConstructorsQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery
+{
   ConfusingUseOfInitializerListConstructorsQuery() {
     this = InitializationPackage::confusingUseOfInitializerListConstructorsQuery()
   }
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
index f9b6a082cf..0f2bd30614 100644
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
 
-class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery {
+class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery
+{
   AccessibleBaseClassBothVirtualAndNonVirtualQuery() {
     this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery()
   }
diff --git a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
index ebca52df84..0f16dc6171 100644
--- a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
+++ b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
 
-class DynamicTypeOfThisUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery {
+class DynamicTypeOfThisUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery
+{
   DynamicTypeOfThisUsedFromConstructorOrDestructorQuery() {
     this = InheritancePackage::dynamicTypeOfThisUsedFromConstructorOrDestructorQuery()
   }
diff --git a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
index 1d4754745c..09cc806c24 100644
--- a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
+++ b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
 
-class NameNotReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery {
+class NameNotReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery
+{
   NameNotReferredUsingAQualifiedIdOrThisQuery() {
     this = TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisQuery()
   }
diff --git a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
index 15bacca423..313f82c0d5 100644
--- a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
+++ b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
 
-class NameNotReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery {
+class NameNotReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery
+{
   NameNotReferredUsingAQualifiedIdOrThisAuditQuery() {
     this = TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisAuditQuery()
   }
diff --git a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
index a207de0392..d13df36fc5 100644
--- a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
+++ b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
@@ -18,7 +18,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
 
 class EmptyThrowOutsideCatchQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery {
-  EmptyThrowOutsideCatchQuery() {
-    this = Exceptions1Package::emptyThrowOutsideCatchQuery()
-  }
+  EmptyThrowOutsideCatchQuery() { this = Exceptions1Package::emptyThrowOutsideCatchQuery() }
 }
diff --git a/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql b/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
index 75be69c70b..5daa29bd28 100644
--- a/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
+++ b/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
@@ -18,7 +18,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.macrooffsetofused_shared.MacroOffsetofUsed_shared
 
 class MacroOffsetofUsedQuery extends MacroOffsetofUsed_sharedSharedQuery {
-  MacroOffsetofUsedQuery() {
-    this = BannedFunctionsPackage::macroOffsetofUsedQuery()
-  }
+  MacroOffsetofUsedQuery() { this = BannedFunctionsPackage::macroOffsetofUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql b/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
index 8f176b14af..9f384e60a8 100644
--- a/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
+++ b/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
 
 class CsignalFunctionsUsedQuery extends CsignalFunctionsUsed_sharedSharedQuery {
-  CsignalFunctionsUsedQuery() {
-    this = BannedLibrariesPackage::csignalFunctionsUsedQuery()
-  }
+  CsignalFunctionsUsedQuery() { this = BannedLibrariesPackage::csignalFunctionsUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql b/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
index f18a68fea8..cf65c25e91 100644
--- a/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
+++ b/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.csignaltypesused_shared.CsignalTypesUsed_shared
 
 class CsignalTypesUsedQuery extends CsignalTypesUsed_sharedSharedQuery {
-  CsignalTypesUsedQuery() {
-    this = BannedLibrariesPackage::csignalTypesUsedQuery()
-  }
+  CsignalTypesUsedQuery() { this = BannedLibrariesPackage::csignalTypesUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
index 81d293b43f..6f82348233 100644
--- a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
+++ b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
 
 class UseOfNonZeroOctalLiteralQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery {
-  UseOfNonZeroOctalLiteralQuery() {
-    this = LiteralsPackage::useOfNonZeroOctalLiteralQuery()
-  }
+  UseOfNonZeroOctalLiteralQuery() { this = LiteralsPackage::useOfNonZeroOctalLiteralQuery() }
 }
diff --git a/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql b/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
index 6b5fe3e0ae..95c97deab6 100644
--- a/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
+++ b/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
@@ -21,7 +21,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
 
 class MissingUSuffixQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery {
-  MissingUSuffixQuery() {
-    this = LiteralsPackage::missingUSuffixQuery()
-  }
+  MissingUSuffixQuery() { this = LiteralsPackage::missingUSuffixQuery() }
 }
diff --git a/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql b/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
index db23f3fb0b..4d61dc8088 100644
--- a/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
+++ b/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
 
-class SlashStarUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery {
+class SlashStarUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery
+{
   SlashStarUsedWithinACStyleCommentQuery() {
     this = CommentsPackage::slashStarUsedWithinACStyleCommentQuery()
   }
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
index 6868a8047a..e5b83633e2 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
@@ -20,7 +20,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.cstdiofunctionsused_shared.CstdioFunctionsUsed_shared
 
 class CstdioFunctionsUsedQuery extends CstdioFunctionsUsed_sharedSharedQuery {
-  CstdioFunctionsUsedQuery() {
-    this = BannedLibrariesPackage::cstdioFunctionsUsedQuery()
-  }
+  CstdioFunctionsUsedQuery() { this = BannedLibrariesPackage::cstdioFunctionsUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
index a44ea3dd26..88bb148e65 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
@@ -20,7 +20,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.cstdiomacrosused_shared.CstdioMacrosUsed_shared
 
 class CstdioMacrosUsedQuery extends CstdioMacrosUsed_sharedSharedQuery {
-  CstdioMacrosUsedQuery() {
-    this = BannedLibrariesPackage::cstdioMacrosUsedQuery()
-  }
+  CstdioMacrosUsedQuery() { this = BannedLibrariesPackage::cstdioMacrosUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
index f939370984..82bdbe6ac2 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
@@ -20,7 +20,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
 
 class CstdioTypesUsedQuery extends CstdioTypesUsed_sharedSharedQuery {
-  CstdioTypesUsedQuery() {
-    this = BannedLibrariesPackage::cstdioTypesUsedQuery()
-  }
+  CstdioTypesUsedQuery() { this = BannedLibrariesPackage::cstdioTypesUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
index 25472efad7..14fd286a44 100644
--- a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
 
-class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery {
+class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery
+{
   IdentifierPassedAsFunctionArgumentDecayToAPointerQuery() {
     this = PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery()
   }
diff --git a/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql b/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
index 80135df172..50c7914b16 100644
--- a/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
+++ b/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
 
-class CastNotConvertPointerToFunctionQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery {
+class CastNotConvertPointerToFunctionQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery
+{
   CastNotConvertPointerToFunctionQuery() {
     this = PointersPackage::castNotConvertPointerToFunctionQuery()
   }
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
index b57a309394..0f67d4143f 100644
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
 
-class UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery {
+class UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery
+{
   UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
     this = OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery()
   }
diff --git a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
index d5756cabd9..db71931f80 100644
--- a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
 
 class LoopCompoundConditionQuery extends LoopCompoundCondition_sharedSharedQuery {
-  LoopCompoundConditionQuery() {
-    this = ConditionalsPackage::loopCompoundConditionQuery()
-  }
+  LoopCompoundConditionQuery() { this = ConditionalsPackage::loopCompoundConditionQuery() }
 }
diff --git a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
index 1b8e9839f8..13e9ec067a 100644
--- a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.switchcompoundcondition_shared.SwitchCompoundCondition_shared
 
 class SwitchCompoundConditionQuery extends SwitchCompoundCondition_sharedSharedQuery {
-  SwitchCompoundConditionQuery() {
-    this = ConditionalsPackage::switchCompoundConditionQuery()
-  }
+  SwitchCompoundConditionQuery() { this = ConditionalsPackage::switchCompoundConditionQuery() }
 }
diff --git a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
index d3876527d8..ddcc45356a 100644
--- a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
+++ b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
 
-class IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery extends NonGlobalFunctionMain_sharedSharedQuery {
+class IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery extends NonGlobalFunctionMain_sharedSharedQuery
+{
   IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
     this = NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery()
   }
diff --git a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
index bf94412b9a..9fe9a0f945 100644
--- a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
+++ b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
 
-class FunctionReturnAutomaticVarConditionQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery {
+class FunctionReturnAutomaticVarConditionQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery
+{
   FunctionReturnAutomaticVarConditionQuery() {
     this = FunctionsPackage::functionReturnAutomaticVarConditionQuery()
   }
diff --git a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
index d99fcbe48f..cdbc1f6baf 100644
--- a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
+++ b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
 
-class MultipleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery {
+class MultipleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery
+{
   MultipleGlobalOrMemberDeclaratorsQuery() {
     this = InitializationPackage::multipleGlobalOrMemberDeclaratorsQuery()
   }
diff --git a/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql b/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
index a84832ceda..d352bc05aa 100644
--- a/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
+++ b/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
 
 class MultipleLocalDeclaratorsQuery extends MultipleLocalDeclarators_sharedSharedQuery {
-  MultipleLocalDeclaratorsQuery() {
-    this = InitializationPackage::multipleLocalDeclaratorsQuery()
-  }
+  MultipleLocalDeclaratorsQuery() { this = InitializationPackage::multipleLocalDeclaratorsQuery() }
 }
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
index e5908a5520..7b306b2492 100644
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
 
-class VirtualFunctionParametersUseSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery {
+class VirtualFunctionParametersUseSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery
+{
   VirtualFunctionParametersUseSameDefaultArgumentsQuery() {
     this = VirtualFunctionsPackage::virtualFunctionParametersUseSameDefaultArgumentsQuery()
   }
diff --git a/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll b/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
index a187e8bfa8..f210e2aab5 100644
--- a/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
@@ -12,5 +12,5 @@ abstract class AddressOfOperatorOverloaded_sharedSharedQuery extends Query { }
 Query getQuery() { result instanceof AddressOfOperatorOverloaded_sharedSharedQuery }
 
 query predicate problems(UnaryAddressOfOperator e, string message) {
-not isExcluded(e, getQuery()) and message = "The unary & operator overloaded."
-}
\ No newline at end of file
+  not isExcluded(e, getQuery()) and message = "The unary & operator overloaded."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
index 7b31c00b47..4c35140d00 100644
--- a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
@@ -11,5 +11,5 @@ abstract class EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery exte
 Query getQuery() { result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery }
 
 query predicate problems(Element e, string message) {
-not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
-}
\ No newline at end of file
+  not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
index 285be72705..090238a1de 100644
--- a/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
@@ -11,5 +11,7 @@ abstract class MacroOffsetofUsed_sharedSharedQuery extends Query { }
 Query getQuery() { result instanceof MacroOffsetofUsed_sharedSharedQuery }
 
 query predicate problems(MacroInvocation mi, string message) {
-not isExcluded(mi, getQuery()) and   mi.getMacroName() = "offsetof" and message = "Use of banned macro " + mi.getMacroName() + "."
-}
\ No newline at end of file
+  not isExcluded(mi, getQuery()) and
+  mi.getMacroName() = "offsetof" and
+  message = "Use of banned macro " + mi.getMacroName() + "."
+}
diff --git a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
index 852e501f38..97943daa7f 100644
--- a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
+++ b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
 
-class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
index 5e440a4f92..b822664218 100644
--- a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
+++ b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
 
-class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
index e5d93d74db..abc15222c5 100644
--- a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
 
-class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
index e4928beb62..af3f7697f7 100644
--- a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql b/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
index 4937de01c4..52f876e891 100644
--- a/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
+++ b/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
 
-class CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery {
+class CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery
+{
   CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery() {
     this = ImportMisra23Package::copyAndMoveAssignmentsShallHandleSelfAssignmentQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
index d135fec871..b8b2bc528b 100644
--- a/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
+++ b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
 
-class UseSingleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery {
+class UseSingleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery
+{
   UseSingleGlobalOrMemberDeclaratorsQuery() {
     this = ImportMisra23Package::useSingleGlobalOrMemberDeclaratorsQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql b/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
index 2e0147014d..fcfe438f85 100644
--- a/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
+++ b/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
@@ -18,7 +18,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
 
 class UseSingleLocalDeclaratorsQuery extends MultipleLocalDeclarators_sharedSharedQuery {
-  UseSingleLocalDeclaratorsQuery() {
-    this = ImportMisra23Package::useSingleLocalDeclaratorsQuery()
-  }
+  UseSingleLocalDeclaratorsQuery() { this = ImportMisra23Package::useSingleLocalDeclaratorsQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql b/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
index 8b7c05359f..d014d6e119 100644
--- a/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
+++ b/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
 
-class EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery {
+class EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery
+{
   EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery() {
     this = ImportMisra23Package::enumerationNotDefinedWithAnExplicitUnderlyingTypeQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
index aa43636010..5006884483 100644
--- a/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
+++ b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
 
-class BitFieldShallHaveAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery {
+class BitFieldShallHaveAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery
+{
   BitFieldShallHaveAnAppropriateTypeQuery() {
     this = ImportMisra23Package::bitFieldShallHaveAnAppropriateTypeQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql b/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
index b179bae6e5..0f03fad533 100644
--- a/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
+++ b/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
 
-class SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery {
+class SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery
+{
   SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery() {
     this = ImportMisra23Package::signedIntegerNamedBitFieldHaveALengthOfOneBitQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql b/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
index 88677cf5fa..28d0a4c185 100644
--- a/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
+++ b/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
 
-class VirtualAndNonVirtualClassInTheHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery {
+class VirtualAndNonVirtualClassInTheHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery
+{
   VirtualAndNonVirtualClassInTheHierarchyQuery() {
     this = ImportMisra23Package::virtualAndNonVirtualClassInTheHierarchyQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql b/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
index 2b4b7c1785..f823da6d2d 100644
--- a/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
+++ b/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
 
-class OverridingShallSpecifyDifferentDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery {
+class OverridingShallSpecifyDifferentDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery
+{
   OverridingShallSpecifyDifferentDefaultArgumentsQuery() {
     this = ImportMisra23Package::overridingShallSpecifyDifferentDefaultArgumentsQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql b/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
index bf263bac58..0bdfe750ff 100644
--- a/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
+++ b/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
 
-class PotentiallyVirtualPointerOnlyComparesToNullptrQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery {
+class PotentiallyVirtualPointerOnlyComparesToNullptrQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery
+{
   PotentiallyVirtualPointerOnlyComparesToNullptrQuery() {
     this = ImportMisra23Package::potentiallyVirtualPointerOnlyComparesToNullptrQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql b/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
index ab1ad49c71..6b23e7d1ac 100644
--- a/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
+++ b/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
 
-class ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery {
+class ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery
+{
   ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery() {
     this = ImportMisra23Package::objectsDynamicTypeUsedFromConstructorOrDestructorQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
index 78dcd9c474..42a4813086 100644
--- a/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
+++ b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
 
-class InitializeAllVirtualBaseClassesQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery {
+class InitializeAllVirtualBaseClassesQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery
+{
   InitializeAllVirtualBaseClassesQuery() {
     this = ImportMisra23Package::initializeAllVirtualBaseClassesQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql b/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
index f2bc05e535..47d17df3ed 100644
--- a/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
+++ b/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
 
-class InitializerListConstructorIsTheOnlyConstructorQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery {
+class InitializerListConstructorIsTheOnlyConstructorQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery
+{
   InitializerListConstructorIsTheOnlyConstructorQuery() {
     this = ImportMisra23Package::initializerListConstructorIsTheOnlyConstructorQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql b/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
index fc910377bd..7fd2ecafd2 100644
--- a/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
+++ b/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
 
-class FunctionTemplatesExplicitlySpecializedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery {
+class FunctionTemplatesExplicitlySpecializedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery
+{
   FunctionTemplatesExplicitlySpecializedQuery() {
     this = ImportMisra23Package::functionTemplatesExplicitlySpecializedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
index 77aa45ce72..e37025a0af 100644
--- a/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
+++ b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
 
-class EmptyThrowOnlyWithinACatchHandlerQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery {
+class EmptyThrowOnlyWithinACatchHandlerQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery
+{
   EmptyThrowOnlyWithinACatchHandlerQuery() {
     this = ImportMisra23Package::emptyThrowOnlyWithinACatchHandlerQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql b/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
index d99fbea400..6bea89c4ce 100644
--- a/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
+++ b/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
 
-class NoexceptFunctionShouldNotPropagateToTheCallerQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery {
+class NoexceptFunctionShouldNotPropagateToTheCallerQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery
+{
   NoexceptFunctionShouldNotPropagateToTheCallerQuery() {
     this = ImportMisra23Package::noexceptFunctionShouldNotPropagateToTheCallerQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql b/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
index 04ca50994f..6cc143deb9 100644
--- a/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
+++ b/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
@@ -16,7 +16,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
 
 class FunctionLikeMacrosDefinedQuery extends FunctionLikeMacrosDefined_sharedSharedQuery {
-  FunctionLikeMacrosDefinedQuery() {
-    this = ImportMisra23Package::functionLikeMacrosDefinedQuery()
-  }
+  FunctionLikeMacrosDefinedQuery() { this = ImportMisra23Package::functionLikeMacrosDefinedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql b/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
index 59fd054720..b97bcd2905 100644
--- a/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
+++ b/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
 
-class AMixedUseMacroArgumentSubjectToExpansionQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery {
+class AMixedUseMacroArgumentSubjectToExpansionQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery
+{
   AMixedUseMacroArgumentSubjectToExpansionQuery() {
     this = ImportMisra23Package::aMixedUseMacroArgumentSubjectToExpansionQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql b/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
index 19edf41394..bff43f25e4 100644
--- a/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
+++ b/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
@@ -18,7 +18,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
 
 class CsignalFacilitiesUsedQuery extends CsignalFunctionsUsed_sharedSharedQuery {
-  CsignalFacilitiesUsedQuery() {
-    this = ImportMisra23Package::csignalFacilitiesUsedQuery()
-  }
+  CsignalFacilitiesUsedQuery() { this = ImportMisra23Package::csignalFacilitiesUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql b/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
index a88a29a734..f8cd5c6672 100644
--- a/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
+++ b/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
@@ -16,7 +16,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
 
 class AtofAtoiAtolAndAtollUsedQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery {
-  AtofAtoiAtolAndAtollUsedQuery() {
-    this = ImportMisra23Package::atofAtoiAtolAndAtollUsedQuery()
-  }
+  AtofAtoiAtolAndAtollUsedQuery() { this = ImportMisra23Package::atofAtoiAtolAndAtollUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql b/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
index 57f993fc7f..800a638580 100644
--- a/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
+++ b/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined_shared.GlobalSizedOperatorDeleteNotDefined_shared
 
-class GlobalSizedOperatorDeleteShallBeDefinedQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery {
+class GlobalSizedOperatorDeleteShallBeDefinedQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery
+{
   GlobalSizedOperatorDeleteShallBeDefinedQuery() {
     this = ImportMisra23Package::globalSizedOperatorDeleteShallBeDefinedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql b/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
index 384926228f..06fd6a4385 100644
--- a/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
+++ b/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined_shared.GlobalUnsizedOperatorDeleteNotDefined_shared
 
-class GlobalUnsizedOperatorDeleteShallBeDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery {
+class GlobalUnsizedOperatorDeleteShallBeDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery
+{
   GlobalUnsizedOperatorDeleteShallBeDefinedQuery() {
     this = ImportMisra23Package::globalUnsizedOperatorDeleteShallBeDefinedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql b/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
index 7793ec65d0..92e0773e41 100644
--- a/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
+++ b/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
 
-class VectorShouldNotBeSpecializedWithBoolQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery {
+class VectorShouldNotBeSpecializedWithBoolQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery
+{
   VectorShouldNotBeSpecializedWithBoolQuery() {
     this = ImportMisra23Package::vectorShouldNotBeSpecializedWithBoolQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql b/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
index f134fa28d6..27654a32af 100644
--- a/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
+++ b/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
 
-class ForwardingReferencesAndForwardNotUsedTogetherQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery {
+class ForwardingReferencesAndForwardNotUsedTogetherQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery
+{
   ForwardingReferencesAndForwardNotUsedTogetherQuery() {
     this = ImportMisra23Package::forwardingReferencesAndForwardNotUsedTogetherQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
index c80ce69250..351f93106a 100644
--- a/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
@@ -18,7 +18,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
 
 class CstdioTypesShallNotBeUsedQuery extends CstdioTypesUsed_sharedSharedQuery {
-  CstdioTypesShallNotBeUsedQuery() {
-    this = ImportMisra23Package::cstdioTypesShallNotBeUsedQuery()
-  }
+  CstdioTypesShallNotBeUsedQuery() { this = ImportMisra23Package::cstdioTypesShallNotBeUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql b/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
index 0bcda339bd..8d306afea7 100644
--- a/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
+++ b/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
 
-class MemoryOperationsNotSequencedAppropriatelyQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery {
+class MemoryOperationsNotSequencedAppropriatelyQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery
+{
   MemoryOperationsNotSequencedAppropriatelyQuery() {
     this = ImportMisra23Package::memoryOperationsNotSequencedAppropriatelyQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql b/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
index c2612fd71f..b7dc604875 100644
--- a/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
+++ b/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
@@ -17,7 +17,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
 
 class BackslashCharacterMisuseQuery extends BackslashCharacterMisuse_sharedSharedQuery {
-  BackslashCharacterMisuseQuery() {
-    this = ImportMisra23Package::backslashCharacterMisuseQuery()
-  }
+  BackslashCharacterMisuseQuery() { this = ImportMisra23Package::backslashCharacterMisuseQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql b/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
index 816b3439b2..6499155f7e 100644
--- a/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
+++ b/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
@@ -16,7 +16,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
 
 class OctalConstantsUsedQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery {
-  OctalConstantsUsedQuery() {
-    this = ImportMisra23Package::octalConstantsUsedQuery()
-  }
+  OctalConstantsUsedQuery() { this = ImportMisra23Package::octalConstantsUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql b/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
index 7f3e99bbc9..7cfe38d007 100644
--- a/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
+++ b/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
 
-class UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery {
+class UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery
+{
   UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery() {
     this = ImportMisra23Package::unsignedIntegerLiteralsNotAppropriatelySuffixedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
index f1d62437fb..5cb88f69da 100644
--- a/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
+++ b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix_shared.LowercaseLStartsInLiteralSuffix_shared
 
-class LowercaseLStartsInLiteralSuffixQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery {
+class LowercaseLStartsInLiteralSuffixQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery
+{
   LowercaseLStartsInLiteralSuffixQuery() {
     this = ImportMisra23Package::lowercaseLStartsInLiteralSuffixQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql b/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
index 93fc2cfccc..e3b8e7b581 100644
--- a/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
+++ b/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
 
-class CharacterSequenceUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery {
+class CharacterSequenceUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery
+{
   CharacterSequenceUsedWithinACStyleCommentQuery() {
     this = ImportMisra23Package::characterSequenceUsedWithinACStyleCommentQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql b/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
index 909a4e2640..810bb42951 100644
--- a/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
+++ b/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
@@ -17,7 +17,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
 
 class NonGlobalFunctionMainQuery extends NonGlobalFunctionMain_sharedSharedQuery {
-  NonGlobalFunctionMainQuery() {
-    this = ImportMisra23Package::nonGlobalFunctionMainQuery()
-  }
+  NonGlobalFunctionMainQuery() { this = ImportMisra23Package::nonGlobalFunctionMainQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql b/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
index b6c246dc20..03ce1b7c53 100644
--- a/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
+++ b/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
 
-class InheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery {
+class InheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery
+{
   InheritedNonOverridableMemberFunctionQuery() {
     this = ImportMisra23Package::inheritedNonOverridableMemberFunctionQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql b/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
index 7212ad840f..d7fda7b940 100644
--- a/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
+++ b/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
 
-class InheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery {
+class InheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery
+{
   InheritedOverridableMemberFunctionQuery() {
     this = ImportMisra23Package::inheritedOverridableMemberFunctionQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
index ac7dbcc776..a172b89313 100644
--- a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
+++ b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
 
-class NameShallBeReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery {
+class NameShallBeReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery
+{
   NameShallBeReferredUsingAQualifiedIdOrThisQuery() {
     this = ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
index 96da12f90b..238f07d81a 100644
--- a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
+++ b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
 
-class NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery {
+class NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery
+{
   NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery() {
     this = ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisAuditQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql b/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
index 5ee261a0b8..8615cbd25b 100644
--- a/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
+++ b/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
 
-class ReturnReferenceOrPointerToAutomaticLocalVariableQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery {
+class ReturnReferenceOrPointerToAutomaticLocalVariableQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery
+{
   ReturnReferenceOrPointerToAutomaticLocalVariableQuery() {
     this = ImportMisra23Package::returnReferenceOrPointerToAutomaticLocalVariableQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql b/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
index 6566bbd16d..f335c4d357 100644
--- a/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
+++ b/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
 
-class NullptrNotTheOnlyFormOfTheNullPointerConstantQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery {
+class NullptrNotTheOnlyFormOfTheNullPointerConstantQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery
+{
   NullptrNotTheOnlyFormOfTheNullPointerConstantQuery() {
     this = ImportMisra23Package::nullptrNotTheOnlyFormOfTheNullPointerConstantQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
index dbefbaa845..28a963de3a 100644
--- a/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
+++ b/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
 
-class ArrayPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery {
+class ArrayPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery
+{
   ArrayPassedAsFunctionArgumentDecayToAPointerQuery() {
     this = ImportMisra23Package::arrayPassedAsFunctionArgumentDecayToAPointerQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index 56f177e9cd..647c5bd446 100644
--- a/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery {
+class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery
+{
   ResultOfAnAssignmentOperatorShouldNotBeUsedQuery() {
     this = ImportMisra23Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql b/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
index bd9da57cc2..c136e8d3cd 100644
--- a/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
+++ b/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
 
-class FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery {
+class FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery
+{
   FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery() {
     this = ImportMisra23Package::functionsCallThemselvesEitherDirectlyOrIndirectlyQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql b/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
index b8dcbd2ced..e4b2a2dd3c 100644
--- a/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
+++ b/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
 
-class CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery {
+class CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery
+{
   CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery() {
     this = ImportMisra23Package::castsBetweenAPointerToFunctionAndAnyOtherTypeQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql b/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
index 6100aa30c4..8676a704c2 100644
--- a/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
+++ b/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
 
-class UnsignedOperationWithConstantOperandsWrapsQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery {
+class UnsignedOperationWithConstantOperandsWrapsQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery
+{
   UnsignedOperationWithConstantOperandsWrapsQuery() {
     this = ImportMisra23Package::unsignedOperationWithConstantOperandsWrapsQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql b/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
index 38be9db001..d9b3f7a8fd 100644
--- a/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
+++ b/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
 
-class BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery {
+class BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery
+{
   BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery() {
     this = ImportMisra23Package::builtInUnaryOperatorAppliedToUnsignedExpressionQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql b/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
index 2984d328fd..f2eb867bab 100644
--- a/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
+++ b/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
@@ -19,7 +19,5 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
 
 class LoopBodyCompoundConditionQuery extends LoopCompoundCondition_sharedSharedQuery {
-  LoopBodyCompoundConditionQuery() {
-    this = ImportMisra23Package::loopBodyCompoundConditionQuery()
-  }
+  LoopBodyCompoundConditionQuery() { this = ImportMisra23Package::loopBodyCompoundConditionQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql b/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
index da381e8033..e14281b663 100644
--- a/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
+++ b/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
@@ -15,7 +15,8 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
 
-class GotoReferenceALabelInSurroundingBlockQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery {
+class GotoReferenceALabelInSurroundingBlockQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery
+{
   GotoReferenceALabelInSurroundingBlockQuery() {
     this = ImportMisra23Package::gotoReferenceALabelInSurroundingBlockQuery()
   }

From e2590ec753442f997fb03a1ba105547128e2eae0 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 26 Jun 2024 20:09:39 +0200
Subject: [PATCH 031/435] Regenerate package files

---
 ...OfAnAssignmentOperatorShouldNotBeUsed_shared.ql |  4 ++--
 .../UseOfNonZeroOctalLiteral_shared.expected       |  2 ++
 .../UseOfNonZeroOctalLiteral_shared.ql             |  4 ++++
 .../rules/useofnonzerooctalliteral_shared/test.c   |  7 +++++++
 .../rules/RULE-7-1/OctalConstantsUsed.expected     |  2 --
 .../test/rules/RULE-7-1/OctalConstantsUsed.qlref   |  1 -
 c/misra/test/rules/RULE-7-1/test.c                 | 10 ----------
 .../rules/M2-13-2/UseOfNonZeroOctalEscape.expected |  6 ++++++
 .../rules/M2-13-2/UseOfNonZeroOctalEscape.qlref    |  1 +
 cpp/autosar/test/rules/M2-13-2/test.cpp            | 10 ++++++++++
 cpp/common/test/includes/standard-library/ctime    | 14 ++++++++++++--
 cpp/common/test/includes/standard-library/time.h   |  6 +++---
 ...tionNotConsideredForUnqualifiedLookup_shared.ql |  4 ++--
 ...InheritedNonOverridableMemberFunction_shared.ql |  4 ++--
 ...tReferredUsingAQualifiedIdOrThisAudit_shared.ql |  4 ++--
 ...OfAnAssignmentOperatorShouldNotBeUsed_shared.ql |  4 ++--
 .../UseOfNonZeroOctalLiteral_shared.expected       |  4 ++--
 .../rules/useofnonzerooctalliteral_shared/test.cpp | 10 ++--------
 rule_packages/c/Banned.json                        |  1 +
 19 files changed, 60 insertions(+), 38 deletions(-)
 create mode 100644 c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
 create mode 100644 c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
 create mode 100644 c/common/test/rules/useofnonzerooctalliteral_shared/test.c
 delete mode 100644 c/misra/test/rules/RULE-7-1/OctalConstantsUsed.expected
 delete mode 100644 c/misra/test/rules/RULE-7-1/OctalConstantsUsed.qlref
 delete mode 100644 c/misra/test/rules/RULE-7-1/test.c
 create mode 100644 cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected
 create mode 100644 cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref
 create mode 100644 cpp/autosar/test/rules/M2-13-2/test.cpp

diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
index af3f7697f7..e4928beb62 100644
--- a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
+}
diff --git a/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected b/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
new file mode 100644
index 0000000000..bbd4264069
--- /dev/null
+++ b/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
@@ -0,0 +1,2 @@
+| test.c:5:3:5:5 | 10 | Non zero octal literal 012. |
+| test.c:6:3:6:5 | 44 | Non zero octal literal 054. |
diff --git a/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql b/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
new file mode 100644
index 0000000000..dcd6042639
--- /dev/null
+++ b/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
+
+class TestFileQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/useofnonzerooctalliteral_shared/test.c b/c/common/test/rules/useofnonzerooctalliteral_shared/test.c
new file mode 100644
index 0000000000..4fb1e3712d
--- /dev/null
+++ b/c/common/test/rules/useofnonzerooctalliteral_shared/test.c
@@ -0,0 +1,7 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+void test_non_zero_octal() {
+  0;       // COMPLIANT - octal literal zero permitted
+  012;     // NON_COMPLIANT
+  054;     // NON_COMPLIANT
+}
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-1/OctalConstantsUsed.expected b/c/misra/test/rules/RULE-7-1/OctalConstantsUsed.expected
deleted file mode 100644
index deecdf994c..0000000000
--- a/c/misra/test/rules/RULE-7-1/OctalConstantsUsed.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| test.c:7:3:7:5 | 10 | Use of banned $@ constant. | test.c:7:3:7:5 | 10 | octal |
-| test.c:8:3:8:5 | 44 | Use of banned $@ constant. | test.c:8:3:8:5 | 44 | octal |
diff --git a/c/misra/test/rules/RULE-7-1/OctalConstantsUsed.qlref b/c/misra/test/rules/RULE-7-1/OctalConstantsUsed.qlref
deleted file mode 100644
index 7d66675dad..0000000000
--- a/c/misra/test/rules/RULE-7-1/OctalConstantsUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-7-1/OctalConstantsUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-1/test.c b/c/misra/test/rules/RULE-7-1/test.c
deleted file mode 100644
index fb0f2e0d36..0000000000
--- a/c/misra/test/rules/RULE-7-1/test.c
+++ /dev/null
@@ -1,10 +0,0 @@
-void test_non_zero_octal() {
-  '\0';    // COMPLIANT - octal zero escape sequence permitted
-  '\012';  // COMPLIANT
-  '\054';  // COMPLIANT
-  '\0149'; // COMPLIANT
-  0;       // COMPLIANT - octal literal zero permitted
-  012;     // NON_COMPLIANT
-  054;     // NON_COMPLIANT
-  "\0";    // COMPLIANT - octal zero escape sequence permitted
-}
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected
new file mode 100644
index 0000000000..41ebcf7629
--- /dev/null
+++ b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.expected
@@ -0,0 +1,6 @@
+| test.cpp:3:3:3:8 | 10 | This literal contains the non-zero octal escape code \\012. |
+| test.cpp:4:3:4:8 | 44 | This literal contains the non-zero octal escape code \\054. |
+| test.cpp:5:3:5:9 | 3129 | This literal contains the non-zero octal escape code \\014. |
+| test.cpp:7:3:7:8 | \n | This literal contains the non-zero octal escape code \\012. |
+| test.cpp:8:3:8:8 | , | This literal contains the non-zero octal escape code \\054. |
+| test.cpp:9:3:9:9 | \u000c9 | This literal contains the non-zero octal escape code \\014. |
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref
new file mode 100644
index 0000000000..f2ff9c2aef
--- /dev/null
+++ b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalEscape.qlref
@@ -0,0 +1 @@
+rules/M2-13-2/UseOfNonZeroOctalEscape.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-2/test.cpp b/cpp/autosar/test/rules/M2-13-2/test.cpp
new file mode 100644
index 0000000000..3c7fba30dd
--- /dev/null
+++ b/cpp/autosar/test/rules/M2-13-2/test.cpp
@@ -0,0 +1,10 @@
+void test_non_zero_octal() {
+  '\0';    // COMPLIANT - octal zero escape sequence permitted
+  '\012';  // NON_COMPLIANT
+  '\054';  // NON_COMPLIANT
+  '\0149'; // NON_COMPLIANT
+  "\0";    // COMPLIANT - octal zero escape sequence permitted
+  "\012";  // NON_COMPLIANT
+  "\054";  // NON_COMPLIANT
+  "\0149"; // NON_COMPLIANT
+}
\ No newline at end of file
diff --git a/cpp/common/test/includes/standard-library/ctime b/cpp/common/test/includes/standard-library/ctime
index 53ab219208..9448e0615e 100644
--- a/cpp/common/test/includes/standard-library/ctime
+++ b/cpp/common/test/includes/standard-library/ctime
@@ -1,7 +1,17 @@
 #ifndef _GHLIBCPP_CTIME
 #define _GHLIBCPP_CTIME
-#include "time.h"
+#include <time.h>
 namespace std {
-    
+using ::clock_t;
+using ::clock;
+using ::time_t;
+using ::time;
+using ::tm;
+using ::difftime;
+using ::asctime;
+using ::ctime;
+using ::localtime;
+using ::gmtime;
+using ::mktime;
 } // namespace std
 #endif // _GHLIBCPP_CTIME
\ No newline at end of file
diff --git a/cpp/common/test/includes/standard-library/time.h b/cpp/common/test/includes/standard-library/time.h
index 4c6198589f..cc7ff1673a 100644
--- a/cpp/common/test/includes/standard-library/time.h
+++ b/cpp/common/test/includes/standard-library/time.h
@@ -1,5 +1,5 @@
-#ifndef _GHLIBCPP_CTIME
-#define _GHLIBCPP_CTIME
+#ifndef _GHLIBCPP_TIME
+#define _GHLIBCPP_TIME
 
 typedef unsigned long clock_t;
 typedef unsigned long time_t;
@@ -29,4 +29,4 @@ struct tm *localtime(const time_t *timer);
 size_t strftime(char *ptr, size_t maxsize, const char *format,
                 const struct tm *timeptr);
 
-#endif
\ No newline at end of file
+#endif // _GHLIBCPP_TIME
\ No newline at end of file
diff --git a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
index 97943daa7f..852e501f38 100644
--- a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
+++ b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
 
-class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
index b822664218..5e440a4f92 100644
--- a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
+++ b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
 
-class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
index abc15222c5..e5d93d74db 100644
--- a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
 
-class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
index af3f7697f7..e4928beb62 100644
--- a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected b/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
index 8109c107a5..e4280f2f1a 100644
--- a/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
+++ b/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
@@ -1,2 +1,2 @@
-| test.cpp:7:3:7:5 | 10 | Non zero octal literal 012. |
-| test.cpp:8:3:8:5 | 44 | Non zero octal literal 054. |
+| test.cpp:5:3:5:5 | 10 | Non zero octal literal 012. |
+| test.cpp:6:3:6:5 | 44 | Non zero octal literal 054. |
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp b/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
index a89809d68c..0a914e86ce 100644
--- a/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
+++ b/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
@@ -1,13 +1,7 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void test_non_zero_octal() {
-  '\0';    // COMPLIANT - octal zero escape sequence permitted
-  '\012';  // NON_COMPLIANT
-  '\054';  // NON_COMPLIANT
-  '\0149'; // NON_COMPLIANT
   0;       // COMPLIANT - octal literal zero permitted
   012;     // NON_COMPLIANT
   054;     // NON_COMPLIANT
-  "\0";    // COMPLIANT - octal zero escape sequence permitted
-  "\012";  // NON_COMPLIANT
-  "\054";  // NON_COMPLIANT
-  "\0149"; // NON_COMPLIANT
 }
\ No newline at end of file
diff --git a/rule_packages/c/Banned.json b/rule_packages/c/Banned.json
index dceb538e97..e68485b970 100644
--- a/rule_packages/c/Banned.json
+++ b/rule_packages/c/Banned.json
@@ -338,6 +338,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "OctalConstantsUsed",
+          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral_shared",
           "tags": [
             "readability",
             "correctness",

From d77ab031e54d1283d1b57c17c881d52a3e312549 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 26 Jun 2024 21:07:11 +0200
Subject: [PATCH 032/435] Fix formatting in `generate_package_files.py`

---
 .../ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql   | 4 ++--
 c/common/test/rules/useofnonzerooctalliteral_shared/test.c  | 6 +++---
 .../rules/M7-3-1/GlobalNamespaceMembershipViolation.qlref   | 1 -
 .../DefinitionNotConsideredForUnqualifiedLookup_shared.ql   | 4 ++--
 .../HiddenInheritedNonOverridableMemberFunction_shared.ql   | 4 ++--
 .../NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql   | 4 ++--
 .../ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql   | 4 ++--
 .../test/rules/useofnonzerooctalliteral_shared/test.cpp     | 6 +++---
 scripts/generate_rules/generate_package_files.py            | 3 +++
 9 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.qlref

diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
index e4928beb62..af3f7697f7 100644
--- a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
+{ }
diff --git a/c/common/test/rules/useofnonzerooctalliteral_shared/test.c b/c/common/test/rules/useofnonzerooctalliteral_shared/test.c
index 4fb1e3712d..11b439b02e 100644
--- a/c/common/test/rules/useofnonzerooctalliteral_shared/test.c
+++ b/c/common/test/rules/useofnonzerooctalliteral_shared/test.c
@@ -1,7 +1,7 @@
 // NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
 // CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void test_non_zero_octal() {
-  0;       // COMPLIANT - octal literal zero permitted
-  012;     // NON_COMPLIANT
-  054;     // NON_COMPLIANT
+  0;   // COMPLIANT - octal literal zero permitted
+  012; // NON_COMPLIANT
+  054; // NON_COMPLIANT
 }
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.qlref b/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.qlref
deleted file mode 100644
index f2ec336eec..0000000000
--- a/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/M7-3-1/GlobalNamespaceMembershipViolation.ql
\ No newline at end of file
diff --git a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
index 852e501f38..97943daa7f 100644
--- a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
+++ b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
 
-class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
index 5e440a4f92..b822664218 100644
--- a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
+++ b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
 
-class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
index e5d93d74db..abc15222c5 100644
--- a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
 
-class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
index e4928beb62..af3f7697f7 100644
--- a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
@@ -1,5 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
+{ }
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp b/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
index 0a914e86ce..0bf928c9ec 100644
--- a/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
+++ b/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
@@ -1,7 +1,7 @@
 // NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
 // CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void test_non_zero_octal() {
-  0;       // COMPLIANT - octal literal zero permitted
-  012;     // NON_COMPLIANT
-  054;     // NON_COMPLIANT
+  0;   // COMPLIANT - octal literal zero permitted
+  012; // NON_COMPLIANT
+  054; // NON_COMPLIANT
 }
\ No newline at end of file
diff --git a/scripts/generate_rules/generate_package_files.py b/scripts/generate_rules/generate_package_files.py
index ed8bb625bd..862ccfdc1e 100644
--- a/scripts/generate_rules/generate_package_files.py
+++ b/scripts/generate_rules/generate_package_files.py
@@ -192,6 +192,9 @@ def write_shared_implementation(package_name, rule_id, query, language_name, ql_
             if len(class_name) > 61:
                 # Line break required after comma
                 f.write("\n  TestQuery\n{ }\n")
+            elif len(class_name) == 61:
+                # Line break required before `{`
+                f.write(" TestQuery\n{ }\n")
             elif len(class_name) > 57:
                 # Line break required after `{`
                 f.write(" TestQuery {\n}\n")

From 768df79b9fa9c070bbc386356f71a0fae8b33ea8 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 27 Jun 2024 18:08:04 +0200
Subject: [PATCH 033/435] change note

---
 change_notes/2024-06-27-misra-cpp-2023-import.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-06-27-misra-cpp-2023-import.md

diff --git a/change_notes/2024-06-27-misra-cpp-2023-import.md b/change_notes/2024-06-27-misra-cpp-2023-import.md
new file mode 100644
index 0000000000..5de144c3af
--- /dev/null
+++ b/change_notes/2024-06-27-misra-cpp-2023-import.md
@@ -0,0 +1,2 @@
+- `MISRA C++ 2023`: 
+  - Adds support for `MISRA C++ 2023` rules that are already implemented by existing queries.

From 2644ca41e09f2227330dadc0862892b88a636ac5 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Wed, 10 Jul 2024 17:06:40 -0400
Subject: [PATCH 034/435] M0-2-1: make into split and shared query

moved some libraries to allow for use in shared query
---
 ...otAddOrSubtractAScaledIntegerToAPointer.ql |   2 +-
 ...sAliasedPointerToRestrictQualifiedParam.ql | 178 +---------------
 ...iasedPointerToRestrictQualifiedParam.qlref |   1 -
 ...sedPointerToRestrictQualifiedParam.testref |   1 +
 .../src/codingstandards/c/OutOfBounds.qll     |   2 +-
 c/common/src/codingstandards/c/Variable.qll   |  14 --
 ...rToRestrictQualifiedParam_Shared.expected} |   0
 ...dPointerToRestrictQualifiedParam_Shared.ql |   6 +
 .../test.c                                    |   0
 ...rsionBetweenFunctionPointerAndOtherType.ql |   2 +-
 ...etweenIncompleteTypePointerAndOtherType.ql |   2 +-
 ...weenObjectPointerAndDifferentObjectType.ql |   2 +-
 ...ionBetweenPointerToObjectAndIntegerType.ql |   2 +-
 ...ionFromPointerToVoidIntoPointerToObject.ql |   2 +-
 ...stBetweenPointerToVoidAndArithmeticType.ql |   2 +-
 ...nPointerToObjectAndNonIntArithmeticType.ql |   2 +-
 ...NullNotUsedAsIntegerNullPointerConstant.ql |   2 +-
 ...veMemcmpArgNotPointersToCompatibleTypes.ql |   2 +-
 ...interShouldPointToConstTypeWhenPossible.ql |   2 +-
 ...sAliasedPointerToRestrictQualifiedParam.ql |  24 +++
 ...sedPointerToRestrictQualifiedParam.testref |   1 +
 cpp/autosar/test/rules/M0-2-1/test.cpp        |   2 +-
 .../src/codingstandards/cpp}/Pointers.qll     |   0
 .../src/codingstandards/cpp/Variable.qll      |  14 ++
 .../cpp/exclusions/cpp/Representation.qll     |  17 ++
 ...PointerToRestrictQualifiedParam_Shared.qll | 193 ++++++++++++++++++
 ...erToRestrictQualifiedParam_Shared.expected |   2 +
 ...dPointerToRestrictQualifiedParam_Shared.ql |   6 +
 .../test.cpp                                  |  10 +
 rule_packages/c/Pointers3.json                |   1 +
 rule_packages/cpp/Representation.json         |  12 ++
 31 files changed, 306 insertions(+), 200 deletions(-)
 delete mode 100644 c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.qlref
 create mode 100644 c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
 rename c/{cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected => common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected} (100%)
 create mode 100644 c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
 rename c/{cert/test/rules/EXP43-C => common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared}/test.c (100%)
 create mode 100644 cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
 create mode 100644 cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
 rename {c/common/src/codingstandards/c => cpp/common/src/codingstandards/cpp}/Pointers.qll (100%)
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
 create mode 100644 cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected
 create mode 100644 cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
 create mode 100644 cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.cpp

diff --git a/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql b/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql
index c641c17124..ff1517c5b1 100644
--- a/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql
+++ b/c/cert/src/rules/ARR39-C/DoNotAddOrSubtractAScaledIntegerToAPointer.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 import codingstandards.cpp.dataflow.TaintTracking
 import ScaledIntegerPointerArithmeticFlow::PathGraph
 
diff --git a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
index a4cc4e8944..393967c66e 100644
--- a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
+++ b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -12,177 +12,11 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.c.Pointers
-import codingstandards.c.Variable
-import codingstandards.cpp.dataflow.DataFlow
-import semmle.code.cpp.pointsto.PointsTo
-import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
 
-/**
- * A function that has a parameter with a restrict-qualified pointer type.
- */
-class FunctionWithRestrictParameters extends Function {
-  Parameter restrictPtrParam;
-
-  FunctionWithRestrictParameters() {
-    restrictPtrParam.getUnspecifiedType() instanceof PointerOrArrayType and
-    (
-      restrictPtrParam.getType().hasSpecifier(["restrict"]) and
-      restrictPtrParam = this.getAParameter()
-      or
-      this.hasGlobalName(["strcpy", "strncpy", "strcat", "strncat", "memcpy"]) and
-      restrictPtrParam = this.getParameter([0, 1])
-      or
-      this.hasGlobalName(["strcpy_s", "strncpy_s", "strcat_s", "strncat_s", "memcpy_s"]) and
-      restrictPtrParam = this.getParameter([0, 2])
-      or
-      this.hasGlobalName(["strtok_s"]) and
-      restrictPtrParam = this.getAParameter()
-      or
-      this.hasGlobalName(["printf", "printf_s", "scanf", "scanf_s"]) and
-      restrictPtrParam = this.getParameter(0)
-      or
-      this.hasGlobalName(["sprintf", "sprintf_s", "snprintf", "snprintf_s"]) and
-      restrictPtrParam = this.getParameter(3)
-    )
-  }
-
-  Parameter getARestrictPtrParam() { result = restrictPtrParam }
-}
-
-/**
- * A call to a function that has a parameter with a restrict-qualified pointer type.
- */
-class CallToFunctionWithRestrictParameters extends FunctionCall {
-  CallToFunctionWithRestrictParameters() {
-    this.getTarget() instanceof FunctionWithRestrictParameters
+class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
+{
+  DoNotPassAliasedPointerToRestrictQualifiedParamQuery() {
+    this = Pointers3Package::doNotPassAliasedPointerToRestrictQualifiedParamQuery()
   }
-
-  Expr getARestrictPtrArg() {
-    result =
-      this.getArgument(this.getTarget()
-            .(FunctionWithRestrictParameters)
-            .getARestrictPtrParam()
-            .getIndex())
-  }
-
-  Expr getAPtrArg(int index) {
-    result = this.getArgument(index) and
-    pointerValue(result)
-  }
-
-  Expr getAPossibleSizeArg() {
-    exists(Parameter param |
-      param = this.getTarget().(FunctionWithRestrictParameters).getAParameter() and
-      param.getUnderlyingType() instanceof IntegralType and
-      // exclude __builtin_object_size
-      not result.(FunctionCall).getTarget() instanceof BuiltInFunction and
-      result = this.getArgument(param.getIndex())
-    )
-  }
-}
-
-/**
- * A `PointsToExpr` that is an argument of a pointer-type in a `CallToFunctionWithRestrictParameters`
- */
-class CallToFunctionWithRestrictParametersArgExpr extends Expr {
-  int paramIndex;
-
-  CallToFunctionWithRestrictParametersArgExpr() {
-    this = any(CallToFunctionWithRestrictParameters call).getAPtrArg(paramIndex)
-  }
-
-  int getParamIndex() { result = paramIndex }
-}
-
-int getStatedValue(Expr e) {
-  // `upperBound(e)` defaults to `exprMaxVal(e)` when `e` isn't analyzable. So to get a meaningful
-  // result in this case we pick the minimum value obtainable from dataflow and range analysis.
-  result =
-    upperBound(e)
-        .minimum(min(Expr source | DataFlow::localExprFlow(source, e) | source.getValue().toInt()))
-}
-
-int getPointerArithmeticOperandStatedValue(CallToFunctionWithRestrictParametersArgExpr expr) {
-  result = getStatedValue(expr.(PointerArithmeticExpr).getOperand())
-  or
-  // edge-case: &(array[index]) expressions
-  result = getStatedValue(expr.(AddressOfExpr).getOperand().(PointerArithmeticExpr).getOperand())
-  or
-  // fall-back if `expr` is not a pointer arithmetic expression
-  not expr instanceof PointerArithmeticExpr and
-  not expr.(AddressOfExpr).getOperand() instanceof PointerArithmeticExpr and
-  result = 0
-}
-
-module PointerValueToRestrictArgConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { pointerValue(source.asExpr()) }
-
-  predicate isSink(DataFlow::Node sink) {
-    exists(CallToFunctionWithRestrictParameters call |
-      sink.asExpr() = call.getAPtrArg(_).getAChild*()
-    )
-  }
-
-  predicate isBarrierIn(DataFlow::Node node) {
-    exists(AddressOfExpr a | node.asExpr() = a.getOperand().getAChild*())
-  }
-}
-
-module PointerValueToRestrictArgFlow = DataFlow::Global<PointerValueToRestrictArgConfig>;
-
-from
-  CallToFunctionWithRestrictParameters call, CallToFunctionWithRestrictParametersArgExpr arg1,
-  CallToFunctionWithRestrictParametersArgExpr arg2, int argOffset1, int argOffset2, Expr source1,
-  Expr source2, string sourceMessage1, string sourceMessage2
-where
-  not isExcluded(call, Pointers3Package::doNotPassAliasedPointerToRestrictQualifiedParamQuery()) and
-  arg1 = call.getARestrictPtrArg() and
-  arg2 = call.getAPtrArg(_) and
-  // enforce ordering to remove permutations if multiple restrict-qualified args exist
-  (not arg2 = call.getARestrictPtrArg() or arg2.getParamIndex() > arg1.getParamIndex()) and
-  (
-    // check if two pointers address the same object
-    PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
-      DataFlow::exprNode(arg1.getAChild*())) and
-    (
-      // one pointer value flows to both args
-      PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
-        DataFlow::exprNode(arg2.getAChild*())) and
-      sourceMessage1 = "$@" and
-      sourceMessage2 = "source" and
-      source1 = source2
-      or
-      // there are two separate values that flow from an AddressOfExpr of the same target
-      getAddressOfExprTargetBase(source1) = getAddressOfExprTargetBase(source2) and
-      PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source2),
-        DataFlow::exprNode(arg2.getAChild*())) and
-      sourceMessage1 = "a pair of address-of expressions ($@, $@)" and
-      sourceMessage2 = "addressof1" and
-      not source1 = source2
-    )
-  ) and
-  // get the offset of the pointer arithmetic operand (or '0' if there is none)
-  argOffset1 = getPointerArithmeticOperandStatedValue(arg1) and
-  argOffset2 = getPointerArithmeticOperandStatedValue(arg2) and
-  (
-    // case 1: the pointer args are the same.
-    // (definite aliasing)
-    argOffset1 = argOffset2
-    or
-    // case 2: the pointer args are different, a size arg exists,
-    // and the size arg is greater than the difference between the offsets.
-    // (potential aliasing)
-    exists(Expr sizeArg |
-      sizeArg = call.getAPossibleSizeArg() and
-      getStatedValue(sizeArg) > (argOffset1 - argOffset2).abs()
-    )
-    or
-    // case 3: the pointer args are different, and a size arg does not exist
-    // (potential aliasing)
-    not exists(call.getAPossibleSizeArg())
-  )
-select call,
-  "Call to '" + call.getTarget().getName() + "' passes an $@ to a $@ (pointer value derived from " +
-    sourceMessage1 + ".", arg2, "aliased pointer", arg1, "restrict-qualified parameter", source1,
-  sourceMessage2, source2, "addressof2"
+}
\ No newline at end of file
diff --git a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.qlref b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.qlref
deleted file mode 100644
index 6121235f17..0000000000
--- a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
\ No newline at end of file
diff --git a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
new file mode 100644
index 0000000000..66f173804a
--- /dev/null
+++ b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
@@ -0,0 +1 @@
+c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
\ No newline at end of file
diff --git a/c/common/src/codingstandards/c/OutOfBounds.qll b/c/common/src/codingstandards/c/OutOfBounds.qll
index 87c7c17870..21255827dd 100644
--- a/c/common/src/codingstandards/c/OutOfBounds.qll
+++ b/c/common/src/codingstandards/c/OutOfBounds.qll
@@ -5,7 +5,7 @@
  */
 
 import cpp
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 import codingstandards.c.Variable
 import codingstandards.cpp.Allocations
 import codingstandards.cpp.Overflow
diff --git a/c/common/src/codingstandards/c/Variable.qll b/c/common/src/codingstandards/c/Variable.qll
index adf2f08ad9..09d86e0e25 100644
--- a/c/common/src/codingstandards/c/Variable.qll
+++ b/c/common/src/codingstandards/c/Variable.qll
@@ -39,20 +39,6 @@ class FlexibleArrayMemberCandidate extends MemberVariable {
   }
 }
 
-/**
- * Returns the target variable of a `VariableAccess`.
- * If the access is a field access, then the target is the `Variable` of the qualifier.
- * If the access is an array access, then the target is the array base.
- */
-Variable getAddressOfExprTargetBase(AddressOfExpr expr) {
-  result = expr.getOperand().(ValueFieldAccess).getQualifier().(VariableAccess).getTarget()
-  or
-  not expr.getOperand() instanceof ValueFieldAccess and
-  result = expr.getOperand().(VariableAccess).getTarget()
-  or
-  result = expr.getOperand().(ArrayExpr).getArrayBase().(VariableAccess).getTarget()
-}
-
 /**
  * A struct that contains a flexible array member
  */
diff --git a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected
similarity index 100%
rename from c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.expected
rename to c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected
diff --git a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
new file mode 100644
index 0000000000..ebdb62c802
--- /dev/null
+++ b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
+
+class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery,
+  TestQuery
+{ }
diff --git a/c/cert/test/rules/EXP43-C/test.c b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.c
similarity index 100%
rename from c/cert/test/rules/EXP43-C/test.c
rename to c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.c
diff --git a/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql b/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql
index bfac04da6f..acb5480e4f 100644
--- a/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql
+++ b/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 
 from CStyleCast cast, Type type, Type newType
 where
diff --git a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
index 007b43963b..43ee303415 100644
--- a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
+++ b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 import codingstandards.cpp.Type
 
 from Cast cast, Type type, Type newType
diff --git a/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql b/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql
index ede0a2834e..59674e11ac 100644
--- a/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql
+++ b/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql
@@ -14,7 +14,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 
 from CStyleCast cast, Type baseTypeFrom, Type baseTypeTo
 where
diff --git a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
index 263545dc1f..fa4da7e358 100644
--- a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
+++ b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 
 from CStyleCast cast, Type typeFrom, Type typeTo
 where
diff --git a/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql b/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
index 3450f1ae90..69419e13cd 100644
--- a/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
+++ b/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 
 from Cast cast, VoidPointerType type, PointerToObjectType newType
 where
diff --git a/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql b/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
index b36d8dafb1..987d8a32bb 100644
--- a/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
+++ b/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 
 from CStyleCast cast, Type typeFrom, Type typeTo
 where
diff --git a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
index 30b643963c..f898998d32 100644
--- a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
+++ b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 
 class MisraNonIntegerArithmeticType extends Type {
   MisraNonIntegerArithmeticType() {
diff --git a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
index 81ea8b1dfd..b002ceb4c2 100644
--- a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
+++ b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
@@ -12,7 +12,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 import codingstandards.cpp.Type
 
 from Zero zero, Expr e, string type
diff --git a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
index 2c585d8f10..956fc5383e 100644
--- a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
+++ b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
@@ -12,7 +12,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 
 class MemCmpMoveCpy extends Function {
   // Couldn't extend BuiltInFunction because it misses `memcmp`
diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index 5e63e74e2c..48bd9967b2 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Pointers
+import codingstandards.cpp.Pointers
 import codingstandards.cpp.SideEffect
 
 from Variable ptr, PointerOrArrayType type
diff --git a/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
new file mode 100644
index 0000000000..f337b2ecc1
--- /dev/null
+++ b/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/autosar/do-not-pass-aliased-pointer-to-restrict-qualified-param
+ * @name M0-2-1: Do not pass aliased pointers as parameters of functions where it is undefined behaviour for those pointers to overlap
+ * @description Passing an aliased pointer to a conceptually restrict-qualified parameter is
+ *              undefined behavior.
+ * @kind problem
+ * @precision medium
+ * @problem.severity error
+ * @tags external/autosar/id/m0-2-1
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
+
+class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery {
+  DoNotPassAliasedPointerToRestrictQualifiedParamQuery() {
+    this = RepresentationPackage::doNotPassAliasedPointerToRestrictQualifiedParamQuery()
+  }
+}
diff --git a/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref b/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
new file mode 100644
index 0000000000..31ba6a98ba
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M0-2-1/test.cpp b/cpp/autosar/test/rules/M0-2-1/test.cpp
index e5848e2752..3329f12824 100644
--- a/cpp/autosar/test/rules/M0-2-1/test.cpp
+++ b/cpp/autosar/test/rules/M0-2-1/test.cpp
@@ -51,4 +51,4 @@ void internal_shift() {
 void separate_access() {
   UnionSecret_t hash1, hash2;
   hash2.diff.suffix = hash1.fnv.suffix; // COMPLIANT, different union.
-}
\ No newline at end of file
+}
diff --git a/c/common/src/codingstandards/c/Pointers.qll b/cpp/common/src/codingstandards/cpp/Pointers.qll
similarity index 100%
rename from c/common/src/codingstandards/c/Pointers.qll
rename to cpp/common/src/codingstandards/cpp/Pointers.qll
diff --git a/cpp/common/src/codingstandards/cpp/Variable.qll b/cpp/common/src/codingstandards/cpp/Variable.qll
index dba7af480a..9cf265ca93 100644
--- a/cpp/common/src/codingstandards/cpp/Variable.qll
+++ b/cpp/common/src/codingstandards/cpp/Variable.qll
@@ -5,3 +5,17 @@ import semmle.code.cpp.PODType03
 class ScalarVariable extends Variable {
   ScalarVariable() { isScalarType03(this.getType()) }
 }
+
+/**
+ * Returns the target variable of a `VariableAccess`.
+ * If the access is a field access, then the target is the `Variable` of the qualifier.
+ * If the access is an array access, then the target is the array base.
+ */
+Variable getAddressOfExprTargetBase(AddressOfExpr expr) {
+  result = expr.getOperand().(ValueFieldAccess).getQualifier().(VariableAccess).getTarget()
+  or
+  not expr.getOperand() instanceof ValueFieldAccess and
+  result = expr.getOperand().(VariableAccess).getTarget()
+  or
+  result = expr.getOperand().(ArrayExpr).getArrayBase().(VariableAccess).getTarget()
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll
index a423cfd4ff..ac41c1049a 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll
@@ -7,6 +7,7 @@ newtype RepresentationQuery =
   TBitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocolsQuery() or
   TAuditPossibleHardwareInterfaceDueToBitFieldUsageInDataTypeDefinitionQuery() or
   TObjectAssignedToAnOverlappingObjectQuery() or
+  TDoNotPassAliasedPointerToRestrictQualifiedParamQuery() or
   TUnderlyingBitRepresentationsOfFloatingPointValuesUsedQuery() or
   TNamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBitQuery() or
   TMemsetUsedToAccessObjectRepresentationQuery() or
@@ -41,6 +42,15 @@ predicate isRepresentationQueryMetadata(Query query, string queryId, string rule
   ruleId = "M0-2-1" and
   category = "required"
   or
+  query =
+    // `Query` instance for the `doNotPassAliasedPointerToRestrictQualifiedParam` query
+    RepresentationPackage::doNotPassAliasedPointerToRestrictQualifiedParamQuery() and
+  queryId =
+    // `@id` for the `doNotPassAliasedPointerToRestrictQualifiedParam` query
+    "cpp/autosar/do-not-pass-aliased-pointer-to-restrict-qualified-param" and
+  ruleId = "M0-2-1" and
+  category = "required"
+  or
   query =
     // `Query` instance for the `underlyingBitRepresentationsOfFloatingPointValuesUsed` query
     RepresentationPackage::underlyingBitRepresentationsOfFloatingPointValuesUsedQuery() and
@@ -109,6 +119,13 @@ module RepresentationPackage {
       TQueryCPP(TRepresentationPackageQuery(TObjectAssignedToAnOverlappingObjectQuery()))
   }
 
+  Query doNotPassAliasedPointerToRestrictQualifiedParamQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `doNotPassAliasedPointerToRestrictQualifiedParam` query
+      TQueryCPP(TRepresentationPackageQuery(TDoNotPassAliasedPointerToRestrictQualifiedParamQuery()))
+  }
+
   Query underlyingBitRepresentationsOfFloatingPointValuesUsedQuery() {
     //autogenerate `Query` type
     result =
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
new file mode 100644
index 0000000000..b733f31feb
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
@@ -0,0 +1,193 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Pointers
+import codingstandards.cpp.Variable
+import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.pointsto.PointsTo
+import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
+
+/**
+ * A function that has a parameter with a restrict-qualified pointer type.
+ */
+class FunctionWithRestrictParameters extends Function {
+  Parameter restrictPtrParam;
+
+  FunctionWithRestrictParameters() {
+    restrictPtrParam.getUnspecifiedType() instanceof PointerOrArrayType and
+    (
+      restrictPtrParam.getType().hasSpecifier(["restrict"]) and
+      restrictPtrParam = this.getAParameter()
+      or
+      this.hasGlobalName(["strcpy", "strncpy", "strcat", "strncat", "memcpy"]) and
+      restrictPtrParam = this.getParameter([0, 1])
+      or
+      this.hasGlobalName(["strcpy_s", "strncpy_s", "strcat_s", "strncat_s", "memcpy_s"]) and
+      restrictPtrParam = this.getParameter([0, 2])
+      or
+      this.hasGlobalName(["strtok_s"]) and
+      restrictPtrParam = this.getAParameter()
+      or
+      this.hasGlobalName(["printf", "printf_s", "scanf", "scanf_s"]) and
+      restrictPtrParam = this.getParameter(0)
+      or
+      this.hasGlobalName(["sprintf", "sprintf_s", "snprintf", "snprintf_s"]) and
+      restrictPtrParam = this.getParameter(3)
+    )
+  }
+
+  Parameter getARestrictPtrParam() { result = restrictPtrParam }
+}
+
+/**
+ * A call to a function that has a parameter with a restrict-qualified pointer type.
+ */
+class CallToFunctionWithRestrictParameters extends FunctionCall {
+  CallToFunctionWithRestrictParameters() {
+    this.getTarget() instanceof FunctionWithRestrictParameters
+  }
+
+  Expr getARestrictPtrArg() {
+    result =
+      this.getArgument(this.getTarget()
+            .(FunctionWithRestrictParameters)
+            .getARestrictPtrParam()
+            .getIndex())
+  }
+
+  Expr getAPtrArg(int index) {
+    result = this.getArgument(index) and
+    pointerValue(result)
+  }
+
+  Expr getAPossibleSizeArg() {
+    exists(Parameter param |
+      param = this.getTarget().(FunctionWithRestrictParameters).getAParameter() and
+      param.getUnderlyingType() instanceof IntegralType and
+      // exclude __builtin_object_size
+      not result.(FunctionCall).getTarget() instanceof BuiltInFunction and
+      result = this.getArgument(param.getIndex())
+    )
+  }
+}
+
+/**
+ * A `PointsToExpr` that is an argument of a pointer-type in a `CallToFunctionWithRestrictParameters`
+ */
+class CallToFunctionWithRestrictParametersArgExpr extends Expr {
+  int paramIndex;
+
+  CallToFunctionWithRestrictParametersArgExpr() {
+    this = any(CallToFunctionWithRestrictParameters call).getAPtrArg(paramIndex)
+  }
+
+  int getParamIndex() { result = paramIndex }
+}
+
+int getStatedValue(Expr e) {
+  // `upperBound(e)` defaults to `exprMaxVal(e)` when `e` isn't analyzable. So to get a meaningful
+  // result in this case we pick the minimum value obtainable from dataflow and range analysis.
+  result =
+    upperBound(e)
+        .minimum(min(Expr source | DataFlow::localExprFlow(source, e) | source.getValue().toInt()))
+}
+
+int getPointerArithmeticOperandStatedValue(CallToFunctionWithRestrictParametersArgExpr expr) {
+  result = getStatedValue(expr.(PointerArithmeticExpr).getOperand())
+  or
+  // edge-case: &(array[index]) expressions
+  result = getStatedValue(expr.(AddressOfExpr).getOperand().(PointerArithmeticExpr).getOperand())
+  or
+  // fall-back if `expr` is not a pointer arithmetic expression
+  not expr instanceof PointerArithmeticExpr and
+  not expr.(AddressOfExpr).getOperand() instanceof PointerArithmeticExpr and
+  result = 0
+}
+
+module PointerValueToRestrictArgConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { pointerValue(source.asExpr()) }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(CallToFunctionWithRestrictParameters call |
+      sink.asExpr() = call.getAPtrArg(_).getAChild*()
+    )
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    exists(AddressOfExpr a | node.asExpr() = a.getOperand().getAChild*())
+  }
+}
+
+module PointerValueToRestrictArgFlow = DataFlow::Global<PointerValueToRestrictArgConfig>;
+
+abstract class DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery extends Query { }
+
+Query getQuery() {
+  result instanceof DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
+}
+
+query predicate problems(
+  CallToFunctionWithRestrictParameters call, string message,
+  CallToFunctionWithRestrictParametersArgExpr arg2, string arg2message,
+  CallToFunctionWithRestrictParametersArgExpr arg1, string arg1message, Expr source1,
+  string sourceMessage2, Expr source2, string lastMessage2
+) {
+  not isExcluded(call, getQuery()) and
+  exists(int argOffset1, int argOffset2, string sourceMessage1 |
+    arg1 = call.getARestrictPtrArg() and
+    arg2 = call.getAPtrArg(_) and
+    // enforce ordering to remove permutations if multiple restrict-qualified args exist
+    (not arg2 = call.getARestrictPtrArg() or arg2.getParamIndex() > arg1.getParamIndex()) and
+    (
+      // check if two pointers address the same object
+      PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
+        DataFlow::exprNode(arg1.getAChild*())) and
+      (
+        // one pointer value flows to both args
+        PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
+          DataFlow::exprNode(arg2.getAChild*())) and
+        sourceMessage1 = "$@" and
+        sourceMessage2 = "source" and
+        source1 = source2
+        or
+        // there are two separate values that flow from an AddressOfExpr of the same target
+        getAddressOfExprTargetBase(source1) = getAddressOfExprTargetBase(source2) and
+        PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source2),
+          DataFlow::exprNode(arg2.getAChild*())) and
+        sourceMessage1 = "a pair of address-of expressions ($@, $@)" and
+        sourceMessage2 = "addressof1" and
+        not source1 = source2
+      )
+    ) and
+    // get the offset of the pointer arithmetic operand (or '0' if there is none)
+    argOffset1 = getPointerArithmeticOperandStatedValue(arg1) and
+    argOffset2 = getPointerArithmeticOperandStatedValue(arg2) and
+    (
+      // case 1: the pointer args are the same.
+      // (definite aliasing)
+      argOffset1 = argOffset2
+      or
+      // case 2: the pointer args are different, a size arg exists,
+      // and the size arg is greater than the difference between the offsets.
+      // (potential aliasing)
+      exists(Expr sizeArg |
+        sizeArg = call.getAPossibleSizeArg() and
+        getStatedValue(sizeArg) > (argOffset1 - argOffset2).abs()
+      )
+      or
+      // case 3: the pointer args are different, and a size arg does not exist
+      // (potential aliasing)
+      not exists(call.getAPossibleSizeArg())
+    ) and
+    lastMessage2 = "addressof2" and
+    arg2message = "aliased pointer" and
+    arg1message = "restrict-qualified parameter" and
+    message =
+      "Call to '" + call.getTarget().getName() +
+        "' passes an $@ to a $@ (pointer value derived from " + sourceMessage1 + "."
+  )
+}
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected
new file mode 100644
index 0000000000..f94246bc63
--- /dev/null
+++ b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected
@@ -0,0 +1,2 @@
+| test.cpp:6:3:6:13 | call to memcpy | Call to 'memcpy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.cpp:6:22:6:26 | & ... | aliased pointer | test.cpp:6:15:6:19 | & ... | restrict-qualified parameter | test.cpp:6:15:6:19 | & ... | addressof1 | test.cpp:6:22:6:26 | & ... | addressof2 |
+| test.cpp:8:3:8:13 | call to memcpy | Call to 'memcpy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.cpp:8:22:8:26 | & ... | aliased pointer | test.cpp:8:15:8:19 | & ... | restrict-qualified parameter | test.cpp:8:15:8:19 | & ... | addressof1 | test.cpp:8:22:8:26 | & ... | addressof2 |
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
new file mode 100644
index 0000000000..ebdb62c802
--- /dev/null
+++ b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
@@ -0,0 +1,6 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
+
+class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery,
+  TestQuery
+{ }
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.cpp b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.cpp
new file mode 100644
index 0000000000..42a35d0e92
--- /dev/null
+++ b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.cpp
@@ -0,0 +1,10 @@
+#include <cstring>
+
+int a[20];
+
+void undefined_behaviour_fn_119(void) {
+  std::memcpy(&a[0], &a[1], 10u * sizeof(a[0]));  // NON_COMPLIANT
+  std::memmove(&a[0], &a[1], 10u * sizeof(a[0])); // COMPLIANT
+  std::memcpy(&a[1], &a[0], 10u * sizeof(a[0]));  // NON_COMPLIANT
+  std::memmove(&a[1], &a[0], 10u * sizeof(a[0])); // COMPLIANT
+}
\ No newline at end of file
diff --git a/rule_packages/c/Pointers3.json b/rule_packages/c/Pointers3.json
index a694300cd5..cb688b0f0b 100644
--- a/rule_packages/c/Pointers3.json
+++ b/rule_packages/c/Pointers3.json
@@ -72,6 +72,7 @@
           "precision": "medium",
           "severity": "error",
           "short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam",
+          "shared_implementation_short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam_Shared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Representation.json b/rule_packages/cpp/Representation.json
index 96674eef0e..dcfd75be26 100644
--- a/rule_packages/cpp/Representation.json
+++ b/rule_packages/cpp/Representation.json
@@ -53,6 +53,18 @@
           "tags": [
             "correctness"
           ]
+        },
+        {
+          "description": "Passing an aliased pointer to a conceptually restrict-qualified parameter is undefined behavior.",
+          "kind": "problem",
+          "name": "Do not pass aliased pointers as parameters of functions where it is undefined behaviour for those pointers to overlap",
+          "precision": "medium",
+          "severity": "error",
+          "short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam",
+          "shared_implementation_short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam_Shared",
+          "tags": [
+            "correctness"
+          ]
         }
       ],
       "title": "An object shall not be assigned to an overlapping object."

From e23a0dc43001c6f92552473983bda7000750ded9 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Wed, 10 Jul 2024 17:10:24 -0400
Subject: [PATCH 035/435] M0-2-1: add missing changenote

---
 change_notes/2024-07-10-fix-fn-119-m0-2-1.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-07-10-fix-fn-119-m0-2-1.md

diff --git a/change_notes/2024-07-10-fix-fn-119-m0-2-1.md b/change_notes/2024-07-10-fix-fn-119-m0-2-1.md
new file mode 100644
index 0000000000..08d139ddbe
--- /dev/null
+++ b/change_notes/2024-07-10-fix-fn-119-m0-2-1.md
@@ -0,0 +1,2 @@
+- `M0-2-1` - `DoNotPassAliasedPointerToRestrictQualifiedParam.ql`:
+  - Fixes #119. Adds shared query to cover missing detection of overlapping arrays or pointers in specific list of functions that list undefined behaviour when their parameters overlap.
\ No newline at end of file

From b8193f13eaf303a966a067a3ea769179813cfacd Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Wed, 10 Jul 2024 17:11:51 -0400
Subject: [PATCH 036/435] M0-2-1: add missing query format

---
 .../M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
index f337b2ecc1..928cec0f5e 100644
--- a/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
+++ b/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
 
-class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery {
+class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
+{
   DoNotPassAliasedPointerToRestrictQualifiedParamQuery() {
     this = RepresentationPackage::doNotPassAliasedPointerToRestrictQualifiedParamQuery()
   }

From 00f27aa5142052d260b16f9e440b0db63038dd61 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Wed, 10 Jul 2024 17:12:34 -0400
Subject: [PATCH 037/435] M0-2-1: add missing query format

---
 .../EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
index 393967c66e..9e159a31bf 100644
--- a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
+++ b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -19,4 +19,4 @@ class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAlia
   DoNotPassAliasedPointerToRestrictQualifiedParamQuery() {
     this = Pointers3Package::doNotPassAliasedPointerToRestrictQualifiedParamQuery()
   }
-}
\ No newline at end of file
+}

From 80424af18e496438463710d66a03ebdedc366939 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 11 Jul 2024 00:16:31 -0400
Subject: [PATCH 038/435] M0-2-1: add missing query format

---
 cpp/common/src/codingstandards/cpp/Variable.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/common/src/codingstandards/cpp/Variable.qll b/cpp/common/src/codingstandards/cpp/Variable.qll
index 9cf265ca93..47c6ca7f6c 100644
--- a/cpp/common/src/codingstandards/cpp/Variable.qll
+++ b/cpp/common/src/codingstandards/cpp/Variable.qll
@@ -18,4 +18,4 @@ Variable getAddressOfExprTargetBase(AddressOfExpr expr) {
   result = expr.getOperand().(VariableAccess).getTarget()
   or
   result = expr.getOperand().(ArrayExpr).getArrayBase().(VariableAccess).getTarget()
-}
\ No newline at end of file
+}

From 0c98d9b94733bfc63be0a1efe72eb89d2af3a41a Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 11 Jul 2024 11:25:07 -0400
Subject: [PATCH 039/435] M0-2-1: fix adjusted reference

---
 .../rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
index bbe41259b8..eac0f8826c 100644
--- a/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
+++ b/c/cert/src/rules/EXP43-C/RestrictPointerReferencesOverlappingObject.ql
@@ -14,7 +14,7 @@ import cpp
 import codingstandards.cpp.dataflow.DataFlow
 import semmle.code.cpp.controlflow.Dominance
 import codingstandards.c.cert
-import codingstandards.c.Variable
+import codingstandards.cpp.Variable
 
 /**
  * An `Expr` that is an assignment or initialization to a restrict-qualified pointer-type variable.

From 1777db2359aea22cba3d81883b863be7930bc7ab Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 11 Jul 2024 12:11:40 -0400
Subject: [PATCH 040/435] M0-2-1: re-add accidentally rm'd testfile

---
 c/cert/test/rules/EXP43-C/test.c | 100 +++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 c/cert/test/rules/EXP43-C/test.c

diff --git a/c/cert/test/rules/EXP43-C/test.c b/c/cert/test/rules/EXP43-C/test.c
new file mode 100644
index 0000000000..3bf7cfa490
--- /dev/null
+++ b/c/cert/test/rules/EXP43-C/test.c
@@ -0,0 +1,100 @@
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+
+int *restrict g1;
+int *restrict g2;
+int *restrict g1_1;
+int *g2_1;
+
+struct s1 {
+  int x, y, z;
+};
+struct s1 v1;
+
+void test_global_local() {
+  int *restrict i1 = g1; // COMPLIANT
+  int *restrict i2 = g2; // COMPLIANT
+  int *restrict i3 = i2; // NON_COMPLIANT
+  g1 = g2;               // NON_COMPLIANT
+  i1 = i2;               // NON_COMPLIANT
+  {
+    int *restrict i4;
+    int *restrict i5;
+    int *restrict i6;
+    i4 = g1;        // COMPLIANT
+    i4 = (void *)0; // COMPLIANT
+    i5 = g1;        // NON_COMPLIANT - block rather than statement scope matters
+    i4 = g1;        // NON_COMPLIANT
+    i6 = g2;        // COMPLIANT
+  }
+}
+
+void test_global_local_1() {
+  g1_1 = g2_1; // COMPLIANT
+}
+
+void test_structs() {
+  struct s1 *restrict p1 = &v1;
+  int *restrict px = &v1.x; // NON_COMPLIANT
+  {
+    int *restrict py;
+    int *restrict pz;
+    py = &v1.y; // COMPLIANT
+    py = (int *)0;
+    pz = &v1.z; // NON_COMPLIANT - block rather than statement scope matters
+    py = &v1.y; // NON_COMPLIANT
+  }
+}
+
+void copy(int *restrict p1, int *restrict p2, size_t s) {
+  for (size_t i = 0; i < s; ++i) {
+    p2[i] = p1[i];
+  }
+}
+
+void test_restrict_params() {
+  int i1 = 1;
+  int i2 = 2;
+  copy(&i1, &i1, 1); // NON_COMPLIANT
+  copy(&i1, &i2, 1); // COMPLIANT
+
+  int x[10];
+  int *px = &x[0];
+  copy(&x[0], &x[1], 1);       // COMPLIANT - non overlapping
+  copy(&x[0], &x[1], 2);       // NON_COMPLIANT - overlapping
+  copy(&x[0], (int *)x[0], 1); // COMPLIANT - non overlapping
+  copy(&x[0], px, 1);          // NON_COMPLIANT - overlapping
+}
+
+void test_strcpy() {
+  char s1[] = "my test string";
+  char s2[] = "my other string";
+  strcpy(&s1, &s1 + 3); // NON_COMPLIANT
+  strcpy(&s2, &s1);     // COMPLIANT
+}
+
+void test_memcpy() {
+  char s1[] = "my test string";
+  char s2[] = "my other string";
+  memcpy(&s1, &s1 + 3, 5); // NON_COMPLIANT
+  memcpy(&s2, &s1 + 3, 5); // COMPLIANT
+}
+
+void test_memmove() {
+  char s1[] = "my test string";
+  char s2[] = "my other string";
+  memmove(&s1, &s1 + 3, 5); // COMPLIANT - memmove is allowed to overlap
+  memmove(&s2, &s1 + 3, 5); // COMPLIANT
+}
+
+void test_scanf() {
+  char s1[200] = "%10s";
+  scanf(&s1, &s1 + 4); // NON_COMPLIANT
+}
+
+// TODO also consider the following:
+// strncpy(), strncpy_s()
+// strcat(), 	strcat_s()
+// strncat(),	strncat_s()
+// strtok_s()
\ No newline at end of file

From 7112859edb6f153da880e6ac88056be959beea2e Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 11 Jul 2024 23:37:49 -0400
Subject: [PATCH 041/435] A13-3-1: exclude implicit copy/move ctors

---
 change_notes/2024-07-11-fix-fp-406.md         |  2 ++
 ...wardingReferenceAsItsArgumentOverloaded.ql | 30 ++++++-------------
 ...gReferenceAsItsArgumentOverloaded.expected |  4 ---
 cpp/autosar/test/rules/A13-3-1/test.cpp       |  7 +++--
 4 files changed, 15 insertions(+), 28 deletions(-)
 create mode 100644 change_notes/2024-07-11-fix-fp-406.md

diff --git a/change_notes/2024-07-11-fix-fp-406.md b/change_notes/2024-07-11-fix-fp-406.md
new file mode 100644
index 0000000000..78e607ecb6
--- /dev/null
+++ b/change_notes/2024-07-11-fix-fp-406.md
@@ -0,0 +1,2 @@
+ - `A13-3-1` - `FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql`:
+  - Fixes #406. Exclude detection of overloaded implicit copy/move constructors.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
index 393c1222fd..81ca7039c3 100644
--- a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
+++ b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
@@ -32,25 +32,13 @@ where
   // allow for overloading with different number of parameters, because there is no
   // confusion on what function will be called.
   f.getNumberOfParameters() = c.getNumberOfParameters() and
-  //build a dynamic select statement that guarantees to read that the overloading function is the explicit one
-  if
-    (f instanceof CopyConstructor or f instanceof MoveConstructor) and
-    f.isCompilerGenerated()
-  then (
-    (
-      f instanceof CopyConstructor and
-      msg = "implicit copy constructor"
-      or
-      f instanceof MoveConstructor and
-      msg = "implicit move constructor"
-    ) and
-    firstMsgSegment = " with a forwarding reference parameter " and
-    overloaded = f and
-    overload = c
-  ) else (
-    msg = "function with a forwarding reference parameter" and
-    firstMsgSegment = " " and
-    overloaded = c and
-    overload = f
-  )
+  //ignore implicit copy and move constructor overloads
+  not (
+    f.isCompilerGenerated() and
+    (f instanceof CopyConstructor or f instanceof MoveConstructor)
+  ) and
+  msg = "function with a forwarding reference parameter" and
+  firstMsgSegment = " " and
+  overloaded = c and
+  overload = f
 select overload, "Function" + firstMsgSegment + "overloads a $@.", overloaded, msg
diff --git a/cpp/autosar/test/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.expected b/cpp/autosar/test/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.expected
index 6e79cb00a4..cb71b56b51 100644
--- a/cpp/autosar/test/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.expected
+++ b/cpp/autosar/test/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.expected
@@ -1,7 +1,3 @@
 | test.cpp:24:6:24:7 | F1 | Function overloads a $@. | test.cpp:27:25:27:26 | F1 | function with a forwarding reference parameter |
 | test.cpp:50:3:50:3 | A | Function overloads a $@. | test.cpp:48:3:48:3 | A | function with a forwarding reference parameter |
 | test.cpp:51:3:51:3 | A | Function overloads a $@. | test.cpp:48:3:48:3 | A | function with a forwarding reference parameter |
-| test.cpp:69:3:69:3 | B | Function with a forwarding reference parameter overloads a $@. | test.cpp:64:8:64:8 | B | implicit copy constructor |
-| test.cpp:69:3:69:3 | B | Function with a forwarding reference parameter overloads a $@. | test.cpp:64:8:64:8 | B | implicit move constructor |
-| test.cpp:77:25:77:25 | C | Function with a forwarding reference parameter overloads a $@. | test.cpp:74:7:74:7 | C | implicit copy constructor |
-| test.cpp:77:25:77:25 | C | Function with a forwarding reference parameter overloads a $@. | test.cpp:74:7:74:7 | C | implicit move constructor |
diff --git a/cpp/autosar/test/rules/A13-3-1/test.cpp b/cpp/autosar/test/rules/A13-3-1/test.cpp
index 82fe866a0a..8ed4e4d609 100644
--- a/cpp/autosar/test/rules/A13-3-1/test.cpp
+++ b/cpp/autosar/test/rules/A13-3-1/test.cpp
@@ -40,7 +40,7 @@ template <class T> void F1(T &&x) {} //
 class A {
 public:
   // COMPLIANT[FALSE_POSITIVE] - by exception, constrained to not match
-  // copy/move ctors
+  // explicit copy/move ctors
   template <
       typename T,
       std::enable_if_t<!std::is_same<
@@ -66,7 +66,7 @@ struct B {
       typename T,
       std::enable_if_t<!std::is_same<
           std::remove_cv_t<std::remove_reference_t<T>>, A>::value> * = nullptr>
-  B(T &&value) {} // COMPLIANT[FALSE_POSITIVE] - by exception
+  B(T &&value) {} // COMPLIANT - by exception
 };
 
 int main() {}
@@ -74,5 +74,6 @@ int main() {}
 class C {
 public:
   C() {}
-  template <typename T> C(T &&) {} // NON_COMPLIANT
+  template <typename T>
+  C(T &&) {} // COMPLIANT - ignore overloads of implicit copy/move ctors
 };
\ No newline at end of file

From b67dc05ffa5cce5da451bd737e1ad041ef7c15b5 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 12 Jul 2024 11:11:18 +0100
Subject: [PATCH 042/435] C++: Accept test changes after #16969.

---
 .../ValidContainerElementAccess.expected                      | 2 ++
 cpp/common/test/rules/validcontainerelementaccess/test.cpp    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected b/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected
index 988846beef..1738cbe330 100644
--- a/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected
+++ b/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected
@@ -7,4 +7,6 @@
 | test.cpp:89:15:89:16 | it | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:86:20:86:20 | d | container | test.cpp:92:7:92:12 | call to insert | invalidation |
 | test.cpp:91:9:91:10 | it | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:86:20:86:20 | d | container | test.cpp:92:7:92:12 | call to insert | invalidation |
 | test.cpp:98:56:98:58 | loc | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:96:44:96:46 | str | container | test.cpp:99:9:99:14 | call to insert | invalidation |
+| test.cpp:99:5:99:7 | str | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:96:44:96:46 | str | container | test.cpp:99:9:99:14 | call to insert | invalidation |
 | test.cpp:99:16:99:18 | loc | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:96:44:96:46 | str | container | test.cpp:99:9:99:14 | call to insert | invalidation |
+| test.cpp:106:11:106:13 | str | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:103:45:103:47 | str | container | test.cpp:106:15:106:20 | call to insert | invalidation |
diff --git a/cpp/common/test/rules/validcontainerelementaccess/test.cpp b/cpp/common/test/rules/validcontainerelementaccess/test.cpp
index 55c94cf8f1..0f40687110 100644
--- a/cpp/common/test/rules/validcontainerelementaccess/test.cpp
+++ b/cpp/common/test/rules/validcontainerelementaccess/test.cpp
@@ -96,14 +96,14 @@ void f8(const int *ar) {
 void f9(const std::string &s, std::string &str) {
   std::string::iterator loc = str.begin();
   for (auto i = s.begin(), e = s.end(); i != e; ++i, ++loc) { // NON_COMPLIANT
-    str.insert(loc, 'c');                                     // NON_COMPLIANT
+    str.insert(loc, 'c');                                     // NON_COMPLIANT[FALSE POSITIVE for str]
   }
 }
 
 void f10(const std::string &s, std::string &str) {
   std::string::iterator loc = str.begin();
   for (auto i = s.begin(), e = s.end(); i != e; ++i, ++loc) { // COMPLIANT
-    loc = str.insert(loc, 'c');                               // COMPLIANT
+    loc = str.insert(loc, 'c');                               // COMPLIANT[FALSE POSITIVE]
   }
 }
 

From e32a4e452aa8e74733a86d710b58bb5057586c51 Mon Sep 17 00:00:00 2001
From: Mathias Vorreiter Pedersen <mathiasvp@github.com>
Date: Fri, 12 Jul 2024 11:17:04 +0100
Subject: [PATCH 043/435] C++: Format test file expectations.

---
 cpp/common/test/rules/validcontainerelementaccess/test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/common/test/rules/validcontainerelementaccess/test.cpp b/cpp/common/test/rules/validcontainerelementaccess/test.cpp
index 0f40687110..d9e2c2d89a 100644
--- a/cpp/common/test/rules/validcontainerelementaccess/test.cpp
+++ b/cpp/common/test/rules/validcontainerelementaccess/test.cpp
@@ -96,14 +96,14 @@ void f8(const int *ar) {
 void f9(const std::string &s, std::string &str) {
   std::string::iterator loc = str.begin();
   for (auto i = s.begin(), e = s.end(); i != e; ++i, ++loc) { // NON_COMPLIANT
-    str.insert(loc, 'c');                                     // NON_COMPLIANT[FALSE POSITIVE for str]
+    str.insert(loc, 'c'); // NON_COMPLIANT[FALSE POSITIVE for str]
   }
 }
 
 void f10(const std::string &s, std::string &str) {
   std::string::iterator loc = str.begin();
   for (auto i = s.begin(), e = s.end(); i != e; ++i, ++loc) { // COMPLIANT
-    loc = str.insert(loc, 'c');                               // COMPLIANT[FALSE POSITIVE]
+    loc = str.insert(loc, 'c'); // COMPLIANT[FALSE POSITIVE]
   }
 }
 

From cfbdc212fcbd1b5f1e5274b19a06e3ff796b7ba9 Mon Sep 17 00:00:00 2001
From: Alexandre Boulgakov <sashabu@github.com>
Date: Tue, 16 Jul 2024 14:09:34 +0100
Subject: [PATCH 044/435] A12-8-6: Update tests around unused template special
 members.

---
 .../rules/A12-8-6/CopyAndMoveNotDeclaredProtected.expected    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cpp/autosar/test/rules/A12-8-6/CopyAndMoveNotDeclaredProtected.expected b/cpp/autosar/test/rules/A12-8-6/CopyAndMoveNotDeclaredProtected.expected
index 9f85da12d6..74ed472a52 100644
--- a/cpp/autosar/test/rules/A12-8-6/CopyAndMoveNotDeclaredProtected.expected
+++ b/cpp/autosar/test/rules/A12-8-6/CopyAndMoveNotDeclaredProtected.expected
@@ -20,7 +20,3 @@
 | test.cpp:109:3:109:12 | declaration of BaseClass8 | Move constructor for base class 'BaseClass8' is not declared protected. |
 | test.cpp:110:15:110:23 | declaration of operator= | Copy assignment operator for base class 'BaseClass8' is not declared protected. |
 | test.cpp:111:15:111:23 | declaration of operator= | Move assignment operator for base class 'BaseClass8' is not declared protected. |
-| test.cpp:124:26:124:26 | declaration of BaseClass9 | Implicit copy constructor for base class 'BaseClass9<int>' is not declared deleted. |
-| test.cpp:124:26:124:26 | declaration of BaseClass9 | Implicit move constructor for base class 'BaseClass9<int>' is not declared deleted. |
-| test.cpp:124:26:124:26 | declaration of operator= | Implicit copy assignment operator for base class 'BaseClass9<int>' is not declared deleted. |
-| test.cpp:124:26:124:26 | declaration of operator= | Implicit move assignment operator for base class 'BaseClass9<int>' is not declared deleted. |

From c9f75cb5ad2ce98a7454f8ded7d22d65cba668e7 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 11:50:35 -0400
Subject: [PATCH 045/435] M0-2-1: rename shared queries

---
 ...interToRestrictQualifiedParamShared.expected} |  0
 ...asedPointerToRestrictQualifiedParamShared.ql} |  0
 .../test.c                                       |  0
 ...aram.ql => DoNotPassAliasedPointerToParam.ql} |  0
 .../DoNotPassAliasedPointerToParam.testref       |  1 +
 ...liasedPointerToRestrictQualifiedParam.testref |  1 -
 .../cpp/exclusions/cpp/Representation.qll        | 16 ++++++++--------
 ...asedPointerToRestrictQualifiedParamShared.qll | 15 +++++++++++++++
 ...sedPointerToRestrictQualifiedParam_Shared.qll |  0
 ...interToRestrictQualifiedParamShared.expected} |  0
 ...asedPointerToRestrictQualifiedParamShared.ql} |  0
 .../test.cpp                                     |  0
 rule_packages/c/Pointers3.json                   |  2 +-
 rule_packages/cpp/Representation.json            |  6 +++---
 14 files changed, 28 insertions(+), 13 deletions(-)
 rename c/common/test/rules/{donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected => donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected} (100%)
 rename c/common/test/rules/{donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql => donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql} (100%)
 rename c/common/test/rules/{donotpassaliasedpointertorestrictqualifiedparam_shared => donotpassaliasedpointertorestrictqualifiedparamshared}/test.c (100%)
 rename cpp/autosar/src/rules/M0-2-1/{DoNotPassAliasedPointerToRestrictQualifiedParam.ql => DoNotPassAliasedPointerToParam.ql} (100%)
 create mode 100644 cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToParam.testref
 delete mode 100644 cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
 rename cpp/common/src/codingstandards/cpp/rules/{ => donotpassaliasedpointertorestrictqualifiedparamshared}/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll (100%)
 rename cpp/common/test/rules/{donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected => donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected} (100%)
 rename cpp/common/test/rules/{donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql => donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql} (100%)
 rename cpp/common/test/rules/{donotpassaliasedpointertorestrictqualifiedparam_shared => donotpassaliasedpointertorestrictqualifiedparamshared}/test.cpp (100%)

diff --git a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected
similarity index 100%
rename from c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected
rename to c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected
diff --git a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
similarity index 100%
rename from c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
rename to c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
diff --git a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.c b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/test.c
similarity index 100%
rename from c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.c
rename to c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/test.c
diff --git a/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToParam.ql
similarity index 100%
rename from cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
rename to cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToParam.ql
diff --git a/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToParam.testref b/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToParam.testref
new file mode 100644
index 0000000000..2c64dedd45
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToParam.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref b/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
deleted file mode 100644
index 31ba6a98ba..0000000000
--- a/cpp/autosar/test/rules/M0-2-1/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll
index ac41c1049a..2f92ea89ec 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Representation.qll
@@ -7,7 +7,7 @@ newtype RepresentationQuery =
   TBitFieldsShallBeUsedOnlyWhenInterfacingToHardwareOrConformingToCommunicationProtocolsQuery() or
   TAuditPossibleHardwareInterfaceDueToBitFieldUsageInDataTypeDefinitionQuery() or
   TObjectAssignedToAnOverlappingObjectQuery() or
-  TDoNotPassAliasedPointerToRestrictQualifiedParamQuery() or
+  TDoNotPassAliasedPointerToParamQuery() or
   TUnderlyingBitRepresentationsOfFloatingPointValuesUsedQuery() or
   TNamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBitQuery() or
   TMemsetUsedToAccessObjectRepresentationQuery() or
@@ -43,11 +43,11 @@ predicate isRepresentationQueryMetadata(Query query, string queryId, string rule
   category = "required"
   or
   query =
-    // `Query` instance for the `doNotPassAliasedPointerToRestrictQualifiedParam` query
-    RepresentationPackage::doNotPassAliasedPointerToRestrictQualifiedParamQuery() and
+    // `Query` instance for the `doNotPassAliasedPointerToParam` query
+    RepresentationPackage::doNotPassAliasedPointerToParamQuery() and
   queryId =
-    // `@id` for the `doNotPassAliasedPointerToRestrictQualifiedParam` query
-    "cpp/autosar/do-not-pass-aliased-pointer-to-restrict-qualified-param" and
+    // `@id` for the `doNotPassAliasedPointerToParam` query
+    "cpp/autosar/do-not-pass-aliased-pointer-to-param" and
   ruleId = "M0-2-1" and
   category = "required"
   or
@@ -119,11 +119,11 @@ module RepresentationPackage {
       TQueryCPP(TRepresentationPackageQuery(TObjectAssignedToAnOverlappingObjectQuery()))
   }
 
-  Query doNotPassAliasedPointerToRestrictQualifiedParamQuery() {
+  Query doNotPassAliasedPointerToParamQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `doNotPassAliasedPointerToRestrictQualifiedParam` query
-      TQueryCPP(TRepresentationPackageQuery(TDoNotPassAliasedPointerToRestrictQualifiedParamQuery()))
+      // `Query` type for `doNotPassAliasedPointerToParam` query
+      TQueryCPP(TRepresentationPackageQuery(TDoNotPassAliasedPointerToParamQuery()))
   }
 
   Query underlyingBitRepresentationsOfFloatingPointValuesUsedQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
new file mode 100644
index 0000000000..0c16d4e538
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
@@ -0,0 +1,15 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery }
+
+query predicate problems(Element e, string message) {
+not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
similarity index 100%
rename from cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected
similarity index 100%
rename from cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.expected
rename to cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
similarity index 100%
rename from cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
rename to cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.cpp b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/test.cpp
similarity index 100%
rename from cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/test.cpp
rename to cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/test.cpp
diff --git a/rule_packages/c/Pointers3.json b/rule_packages/c/Pointers3.json
index cb688b0f0b..f35f5b7bd1 100644
--- a/rule_packages/c/Pointers3.json
+++ b/rule_packages/c/Pointers3.json
@@ -72,7 +72,7 @@
           "precision": "medium",
           "severity": "error",
           "short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam",
-          "shared_implementation_short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam_Shared",
+          "shared_implementation_short_name": "DoNotPassAliasedPointerToRestrictQualifiedParamShared",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Representation.json b/rule_packages/cpp/Representation.json
index dcfd75be26..4b9a44099e 100644
--- a/rule_packages/cpp/Representation.json
+++ b/rule_packages/cpp/Representation.json
@@ -55,13 +55,13 @@
           ]
         },
         {
-          "description": "Passing an aliased pointer to a conceptually restrict-qualified parameter is undefined behavior.",
+          "description": "Passing a aliased pointers as parameters of certain functions is undefined behavior.",
           "kind": "problem",
           "name": "Do not pass aliased pointers as parameters of functions where it is undefined behaviour for those pointers to overlap",
           "precision": "medium",
           "severity": "error",
-          "short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam",
-          "shared_implementation_short_name": "DoNotPassAliasedPointerToRestrictQualifiedParam_Shared",
+          "short_name": "DoNotPassAliasedPointerToParam",
+          "shared_implementation_short_name": "DoNotPassAliasedPointerToRestrictQualifiedParamShared",
           "tags": [
             "correctness"
           ]

From 06d585fdb988794af73d7eab02b52c1415c763d9 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 12:25:53 -0400
Subject: [PATCH 046/435] M0-2-1: fix query renaming

---
 .../DoNotPassAliasedPointerToRestrictQualifiedParam.ql        | 4 ++--
 .../DoNotPassAliasedPointerToRestrictQualifiedParam.testref   | 2 +-
 .../DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
index 9e159a31bf..08121f8c2b 100644
--- a/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
+++ b/c/cert/src/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.ql
@@ -12,9 +12,9 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparamshared.DoNotPassAliasedPointerToRestrictQualifiedParamShared
 
-class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
+class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery
 {
   DoNotPassAliasedPointerToRestrictQualifiedParamQuery() {
     this = Pointers3Package::doNotPassAliasedPointerToRestrictQualifiedParamQuery()
diff --git a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
index 66f173804a..ef17bca58a 100644
--- a/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
+++ b/c/cert/test/rules/EXP43-C/DoNotPassAliasedPointerToRestrictQualifiedParam.testref
@@ -1 +1 @@
-c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.ql
\ No newline at end of file
+c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
\ No newline at end of file
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
index ebdb62c802..dc3a521edf 100644
--- a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
+++ b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
@@ -1,6 +1,6 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparamshared.DoNotPassAliasedPointerToRestrictQualifiedParamShared
 
-class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery,
+class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery,
   TestQuery
 { }

From 43e6d67d2112f8bffbfaafcc1f92187fea57a092 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 12:28:16 -0400
Subject: [PATCH 047/435] M0-2-1: reformat query

---
 ...otPassAliasedPointerToRestrictQualifiedParamShared.qll | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
index 0c16d4e538..5d8bfc5634 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
@@ -8,8 +8,10 @@ import codingstandards.cpp.Exclusions
 
 abstract class DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery }
+Query getQuery() {
+  result instanceof DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery
+}
 
 query predicate problems(Element e, string message) {
-not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
-}
\ No newline at end of file
+  not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
+}

From ebb7d39d86f3aa936913937e02aa438d45349016 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 12:48:55 -0400
Subject: [PATCH 048/435] M0-2-1: missed more renaming

---
 .../M0-2-1/DoNotPassAliasedPointerToParam.ql  |  11 +-
 ...dPointerToRestrictQualifiedParamShared.qll | 184 ++++++++++++++++-
 ...PointerToRestrictQualifiedParam_Shared.qll | 193 ------------------
 3 files changed, 185 insertions(+), 203 deletions(-)
 delete mode 100644 cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll

diff --git a/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToParam.ql b/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToParam.ql
index 928cec0f5e..d99ae486fc 100644
--- a/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToParam.ql
+++ b/cpp/autosar/src/rules/M0-2-1/DoNotPassAliasedPointerToParam.ql
@@ -1,8 +1,7 @@
 /**
- * @id cpp/autosar/do-not-pass-aliased-pointer-to-restrict-qualified-param
+ * @id cpp/autosar/do-not-pass-aliased-pointer-to-param
  * @name M0-2-1: Do not pass aliased pointers as parameters of functions where it is undefined behaviour for those pointers to overlap
- * @description Passing an aliased pointer to a conceptually restrict-qualified parameter is
- *              undefined behavior.
+ * @description Passing a aliased pointers as parameters of certain functions is undefined behavior.
  * @kind problem
  * @precision medium
  * @problem.severity error
@@ -15,11 +14,11 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparamshared.DoNotPassAliasedPointerToRestrictQualifiedParamShared
 
-class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
+class DoNotPassAliasedPointerToRestrictQualifiedParamQuery extends DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery
 {
   DoNotPassAliasedPointerToRestrictQualifiedParamQuery() {
-    this = RepresentationPackage::doNotPassAliasedPointerToRestrictQualifiedParamQuery()
+    this = RepresentationPackage::doNotPassAliasedPointerToParamQuery()
   }
 }
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
index 5d8bfc5634..b733f31feb 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
@@ -5,13 +5,189 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Pointers
+import codingstandards.cpp.Variable
+import codingstandards.cpp.dataflow.DataFlow
+import semmle.code.cpp.pointsto.PointsTo
+import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
-abstract class DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery extends Query { }
+/**
+ * A function that has a parameter with a restrict-qualified pointer type.
+ */
+class FunctionWithRestrictParameters extends Function {
+  Parameter restrictPtrParam;
+
+  FunctionWithRestrictParameters() {
+    restrictPtrParam.getUnspecifiedType() instanceof PointerOrArrayType and
+    (
+      restrictPtrParam.getType().hasSpecifier(["restrict"]) and
+      restrictPtrParam = this.getAParameter()
+      or
+      this.hasGlobalName(["strcpy", "strncpy", "strcat", "strncat", "memcpy"]) and
+      restrictPtrParam = this.getParameter([0, 1])
+      or
+      this.hasGlobalName(["strcpy_s", "strncpy_s", "strcat_s", "strncat_s", "memcpy_s"]) and
+      restrictPtrParam = this.getParameter([0, 2])
+      or
+      this.hasGlobalName(["strtok_s"]) and
+      restrictPtrParam = this.getAParameter()
+      or
+      this.hasGlobalName(["printf", "printf_s", "scanf", "scanf_s"]) and
+      restrictPtrParam = this.getParameter(0)
+      or
+      this.hasGlobalName(["sprintf", "sprintf_s", "snprintf", "snprintf_s"]) and
+      restrictPtrParam = this.getParameter(3)
+    )
+  }
+
+  Parameter getARestrictPtrParam() { result = restrictPtrParam }
+}
+
+/**
+ * A call to a function that has a parameter with a restrict-qualified pointer type.
+ */
+class CallToFunctionWithRestrictParameters extends FunctionCall {
+  CallToFunctionWithRestrictParameters() {
+    this.getTarget() instanceof FunctionWithRestrictParameters
+  }
+
+  Expr getARestrictPtrArg() {
+    result =
+      this.getArgument(this.getTarget()
+            .(FunctionWithRestrictParameters)
+            .getARestrictPtrParam()
+            .getIndex())
+  }
+
+  Expr getAPtrArg(int index) {
+    result = this.getArgument(index) and
+    pointerValue(result)
+  }
+
+  Expr getAPossibleSizeArg() {
+    exists(Parameter param |
+      param = this.getTarget().(FunctionWithRestrictParameters).getAParameter() and
+      param.getUnderlyingType() instanceof IntegralType and
+      // exclude __builtin_object_size
+      not result.(FunctionCall).getTarget() instanceof BuiltInFunction and
+      result = this.getArgument(param.getIndex())
+    )
+  }
+}
+
+/**
+ * A `PointsToExpr` that is an argument of a pointer-type in a `CallToFunctionWithRestrictParameters`
+ */
+class CallToFunctionWithRestrictParametersArgExpr extends Expr {
+  int paramIndex;
+
+  CallToFunctionWithRestrictParametersArgExpr() {
+    this = any(CallToFunctionWithRestrictParameters call).getAPtrArg(paramIndex)
+  }
+
+  int getParamIndex() { result = paramIndex }
+}
+
+int getStatedValue(Expr e) {
+  // `upperBound(e)` defaults to `exprMaxVal(e)` when `e` isn't analyzable. So to get a meaningful
+  // result in this case we pick the minimum value obtainable from dataflow and range analysis.
+  result =
+    upperBound(e)
+        .minimum(min(Expr source | DataFlow::localExprFlow(source, e) | source.getValue().toInt()))
+}
+
+int getPointerArithmeticOperandStatedValue(CallToFunctionWithRestrictParametersArgExpr expr) {
+  result = getStatedValue(expr.(PointerArithmeticExpr).getOperand())
+  or
+  // edge-case: &(array[index]) expressions
+  result = getStatedValue(expr.(AddressOfExpr).getOperand().(PointerArithmeticExpr).getOperand())
+  or
+  // fall-back if `expr` is not a pointer arithmetic expression
+  not expr instanceof PointerArithmeticExpr and
+  not expr.(AddressOfExpr).getOperand() instanceof PointerArithmeticExpr and
+  result = 0
+}
+
+module PointerValueToRestrictArgConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { pointerValue(source.asExpr()) }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(CallToFunctionWithRestrictParameters call |
+      sink.asExpr() = call.getAPtrArg(_).getAChild*()
+    )
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    exists(AddressOfExpr a | node.asExpr() = a.getOperand().getAChild*())
+  }
+}
+
+module PointerValueToRestrictArgFlow = DataFlow::Global<PointerValueToRestrictArgConfig>;
+
+abstract class DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery
+  result instanceof DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
 }
 
-query predicate problems(Element e, string message) {
-  not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
+query predicate problems(
+  CallToFunctionWithRestrictParameters call, string message,
+  CallToFunctionWithRestrictParametersArgExpr arg2, string arg2message,
+  CallToFunctionWithRestrictParametersArgExpr arg1, string arg1message, Expr source1,
+  string sourceMessage2, Expr source2, string lastMessage2
+) {
+  not isExcluded(call, getQuery()) and
+  exists(int argOffset1, int argOffset2, string sourceMessage1 |
+    arg1 = call.getARestrictPtrArg() and
+    arg2 = call.getAPtrArg(_) and
+    // enforce ordering to remove permutations if multiple restrict-qualified args exist
+    (not arg2 = call.getARestrictPtrArg() or arg2.getParamIndex() > arg1.getParamIndex()) and
+    (
+      // check if two pointers address the same object
+      PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
+        DataFlow::exprNode(arg1.getAChild*())) and
+      (
+        // one pointer value flows to both args
+        PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
+          DataFlow::exprNode(arg2.getAChild*())) and
+        sourceMessage1 = "$@" and
+        sourceMessage2 = "source" and
+        source1 = source2
+        or
+        // there are two separate values that flow from an AddressOfExpr of the same target
+        getAddressOfExprTargetBase(source1) = getAddressOfExprTargetBase(source2) and
+        PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source2),
+          DataFlow::exprNode(arg2.getAChild*())) and
+        sourceMessage1 = "a pair of address-of expressions ($@, $@)" and
+        sourceMessage2 = "addressof1" and
+        not source1 = source2
+      )
+    ) and
+    // get the offset of the pointer arithmetic operand (or '0' if there is none)
+    argOffset1 = getPointerArithmeticOperandStatedValue(arg1) and
+    argOffset2 = getPointerArithmeticOperandStatedValue(arg2) and
+    (
+      // case 1: the pointer args are the same.
+      // (definite aliasing)
+      argOffset1 = argOffset2
+      or
+      // case 2: the pointer args are different, a size arg exists,
+      // and the size arg is greater than the difference between the offsets.
+      // (potential aliasing)
+      exists(Expr sizeArg |
+        sizeArg = call.getAPossibleSizeArg() and
+        getStatedValue(sizeArg) > (argOffset1 - argOffset2).abs()
+      )
+      or
+      // case 3: the pointer args are different, and a size arg does not exist
+      // (potential aliasing)
+      not exists(call.getAPossibleSizeArg())
+    ) and
+    lastMessage2 = "addressof2" and
+    arg2message = "aliased pointer" and
+    arg1message = "restrict-qualified parameter" and
+    message =
+      "Call to '" + call.getTarget().getName() +
+        "' passes an $@ to a $@ (pointer value derived from " + sourceMessage1 + "."
+  )
 }
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
deleted file mode 100644
index b733f31feb..0000000000
--- a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/donotpassaliasedpointertorestrictqualifiedparam_shared/DoNotPassAliasedPointerToRestrictQualifiedParam_Shared.qll
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Provides a library which includes a `problems` predicate for reporting....
- */
-
-import cpp
-import codingstandards.cpp.Customizations
-import codingstandards.cpp.Exclusions
-import codingstandards.cpp.Pointers
-import codingstandards.cpp.Variable
-import codingstandards.cpp.dataflow.DataFlow
-import semmle.code.cpp.pointsto.PointsTo
-import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
-
-/**
- * A function that has a parameter with a restrict-qualified pointer type.
- */
-class FunctionWithRestrictParameters extends Function {
-  Parameter restrictPtrParam;
-
-  FunctionWithRestrictParameters() {
-    restrictPtrParam.getUnspecifiedType() instanceof PointerOrArrayType and
-    (
-      restrictPtrParam.getType().hasSpecifier(["restrict"]) and
-      restrictPtrParam = this.getAParameter()
-      or
-      this.hasGlobalName(["strcpy", "strncpy", "strcat", "strncat", "memcpy"]) and
-      restrictPtrParam = this.getParameter([0, 1])
-      or
-      this.hasGlobalName(["strcpy_s", "strncpy_s", "strcat_s", "strncat_s", "memcpy_s"]) and
-      restrictPtrParam = this.getParameter([0, 2])
-      or
-      this.hasGlobalName(["strtok_s"]) and
-      restrictPtrParam = this.getAParameter()
-      or
-      this.hasGlobalName(["printf", "printf_s", "scanf", "scanf_s"]) and
-      restrictPtrParam = this.getParameter(0)
-      or
-      this.hasGlobalName(["sprintf", "sprintf_s", "snprintf", "snprintf_s"]) and
-      restrictPtrParam = this.getParameter(3)
-    )
-  }
-
-  Parameter getARestrictPtrParam() { result = restrictPtrParam }
-}
-
-/**
- * A call to a function that has a parameter with a restrict-qualified pointer type.
- */
-class CallToFunctionWithRestrictParameters extends FunctionCall {
-  CallToFunctionWithRestrictParameters() {
-    this.getTarget() instanceof FunctionWithRestrictParameters
-  }
-
-  Expr getARestrictPtrArg() {
-    result =
-      this.getArgument(this.getTarget()
-            .(FunctionWithRestrictParameters)
-            .getARestrictPtrParam()
-            .getIndex())
-  }
-
-  Expr getAPtrArg(int index) {
-    result = this.getArgument(index) and
-    pointerValue(result)
-  }
-
-  Expr getAPossibleSizeArg() {
-    exists(Parameter param |
-      param = this.getTarget().(FunctionWithRestrictParameters).getAParameter() and
-      param.getUnderlyingType() instanceof IntegralType and
-      // exclude __builtin_object_size
-      not result.(FunctionCall).getTarget() instanceof BuiltInFunction and
-      result = this.getArgument(param.getIndex())
-    )
-  }
-}
-
-/**
- * A `PointsToExpr` that is an argument of a pointer-type in a `CallToFunctionWithRestrictParameters`
- */
-class CallToFunctionWithRestrictParametersArgExpr extends Expr {
-  int paramIndex;
-
-  CallToFunctionWithRestrictParametersArgExpr() {
-    this = any(CallToFunctionWithRestrictParameters call).getAPtrArg(paramIndex)
-  }
-
-  int getParamIndex() { result = paramIndex }
-}
-
-int getStatedValue(Expr e) {
-  // `upperBound(e)` defaults to `exprMaxVal(e)` when `e` isn't analyzable. So to get a meaningful
-  // result in this case we pick the minimum value obtainable from dataflow and range analysis.
-  result =
-    upperBound(e)
-        .minimum(min(Expr source | DataFlow::localExprFlow(source, e) | source.getValue().toInt()))
-}
-
-int getPointerArithmeticOperandStatedValue(CallToFunctionWithRestrictParametersArgExpr expr) {
-  result = getStatedValue(expr.(PointerArithmeticExpr).getOperand())
-  or
-  // edge-case: &(array[index]) expressions
-  result = getStatedValue(expr.(AddressOfExpr).getOperand().(PointerArithmeticExpr).getOperand())
-  or
-  // fall-back if `expr` is not a pointer arithmetic expression
-  not expr instanceof PointerArithmeticExpr and
-  not expr.(AddressOfExpr).getOperand() instanceof PointerArithmeticExpr and
-  result = 0
-}
-
-module PointerValueToRestrictArgConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { pointerValue(source.asExpr()) }
-
-  predicate isSink(DataFlow::Node sink) {
-    exists(CallToFunctionWithRestrictParameters call |
-      sink.asExpr() = call.getAPtrArg(_).getAChild*()
-    )
-  }
-
-  predicate isBarrierIn(DataFlow::Node node) {
-    exists(AddressOfExpr a | node.asExpr() = a.getOperand().getAChild*())
-  }
-}
-
-module PointerValueToRestrictArgFlow = DataFlow::Global<PointerValueToRestrictArgConfig>;
-
-abstract class DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery extends Query { }
-
-Query getQuery() {
-  result instanceof DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
-}
-
-query predicate problems(
-  CallToFunctionWithRestrictParameters call, string message,
-  CallToFunctionWithRestrictParametersArgExpr arg2, string arg2message,
-  CallToFunctionWithRestrictParametersArgExpr arg1, string arg1message, Expr source1,
-  string sourceMessage2, Expr source2, string lastMessage2
-) {
-  not isExcluded(call, getQuery()) and
-  exists(int argOffset1, int argOffset2, string sourceMessage1 |
-    arg1 = call.getARestrictPtrArg() and
-    arg2 = call.getAPtrArg(_) and
-    // enforce ordering to remove permutations if multiple restrict-qualified args exist
-    (not arg2 = call.getARestrictPtrArg() or arg2.getParamIndex() > arg1.getParamIndex()) and
-    (
-      // check if two pointers address the same object
-      PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
-        DataFlow::exprNode(arg1.getAChild*())) and
-      (
-        // one pointer value flows to both args
-        PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source1),
-          DataFlow::exprNode(arg2.getAChild*())) and
-        sourceMessage1 = "$@" and
-        sourceMessage2 = "source" and
-        source1 = source2
-        or
-        // there are two separate values that flow from an AddressOfExpr of the same target
-        getAddressOfExprTargetBase(source1) = getAddressOfExprTargetBase(source2) and
-        PointerValueToRestrictArgFlow::flow(DataFlow::exprNode(source2),
-          DataFlow::exprNode(arg2.getAChild*())) and
-        sourceMessage1 = "a pair of address-of expressions ($@, $@)" and
-        sourceMessage2 = "addressof1" and
-        not source1 = source2
-      )
-    ) and
-    // get the offset of the pointer arithmetic operand (or '0' if there is none)
-    argOffset1 = getPointerArithmeticOperandStatedValue(arg1) and
-    argOffset2 = getPointerArithmeticOperandStatedValue(arg2) and
-    (
-      // case 1: the pointer args are the same.
-      // (definite aliasing)
-      argOffset1 = argOffset2
-      or
-      // case 2: the pointer args are different, a size arg exists,
-      // and the size arg is greater than the difference between the offsets.
-      // (potential aliasing)
-      exists(Expr sizeArg |
-        sizeArg = call.getAPossibleSizeArg() and
-        getStatedValue(sizeArg) > (argOffset1 - argOffset2).abs()
-      )
-      or
-      // case 3: the pointer args are different, and a size arg does not exist
-      // (potential aliasing)
-      not exists(call.getAPossibleSizeArg())
-    ) and
-    lastMessage2 = "addressof2" and
-    arg2message = "aliased pointer" and
-    arg1message = "restrict-qualified parameter" and
-    message =
-      "Call to '" + call.getTarget().getName() +
-        "' passes an $@ to a $@ (pointer value derived from " + sourceMessage1 + "."
-  )
-}

From da779575eaca22ca348583cfb6da9523691e812b Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 13:04:45 -0400
Subject: [PATCH 049/435] M0-2-1: missed more renaming

---
 .../DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
index dc3a521edf..1410ee52db 100644
--- a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
+++ b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
@@ -1,6 +1,6 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparamshared.DoNotPassAliasedPointerToRestrictQualifiedParamShared
 
-class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery,
+class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery,
   TestQuery
 { }

From e2c4339ee96d9ee178f6154042a11da959e96d9b Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 13:08:57 -0400
Subject: [PATCH 050/435] M0-2-1: missed more renaming

---
 .../DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll | 4 ++--
 .../DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
index b733f31feb..bea0235881 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.qll
@@ -124,10 +124,10 @@ module PointerValueToRestrictArgConfig implements DataFlow::ConfigSig {
 
 module PointerValueToRestrictArgFlow = DataFlow::Global<PointerValueToRestrictArgConfig>;
 
-abstract class DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery extends Query { }
+abstract class DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery
+  result instanceof DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery
 }
 
 query predicate problems(
diff --git a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
index 1410ee52db..dc3a521edf 100644
--- a/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
+++ b/cpp/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
@@ -1,6 +1,6 @@
 // GENERATED FILE - DO NOT MODIFY
 import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparamshared.DoNotPassAliasedPointerToRestrictQualifiedParamShared
 
-class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery,
+class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery,
   TestQuery
 { }

From eff451119807b1d31ecb0b2f1a6e3688bdb76b13 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 13:17:32 -0400
Subject: [PATCH 051/435] M0-2-1: missed more renaming

---
 .../DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
index ebdb62c802..dc3a521edf 100644
--- a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
+++ b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.ql
@@ -1,6 +1,6 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparam_shared.DoNotPassAliasedPointerToRestrictQualifiedParam_Shared
+import codingstandards.cpp.rules.donotpassaliasedpointertorestrictqualifiedparamshared.DoNotPassAliasedPointerToRestrictQualifiedParamShared
 
-class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParam_SharedSharedQuery,
+class TestFileQuery extends DoNotPassAliasedPointerToRestrictQualifiedParamSharedSharedQuery,
   TestQuery
 { }

From e90cd3fef0dea68cfc13a70bc0c7a3523b59ca62 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 19:07:51 -0400
Subject: [PATCH 052/435] A2-7-3: fix #606, omit fp in friend function
 declarations in template classes

---
 change_notes/2024-07-16-fix-fp-606-A2-7-3.md  |  2 ++
 .../A2-7-3/UndocumentedUserDefinedType.ql     |  8 +++--
 .../UndocumentedUserDefinedType.expected      |  1 +
 cpp/autosar/test/rules/A2-7-3/test.cpp        | 32 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 change_notes/2024-07-16-fix-fp-606-A2-7-3.md

diff --git a/change_notes/2024-07-16-fix-fp-606-A2-7-3.md b/change_notes/2024-07-16-fix-fp-606-A2-7-3.md
new file mode 100644
index 0000000000..a4fc343b76
--- /dev/null
+++ b/change_notes/2024-07-16-fix-fp-606-A2-7-3.md
@@ -0,0 +1,2 @@
+- `A2-7-3` - `UndocumentedUserDefinedType.ql`:
+  - Fixes #606. Fix false positive relating to friend functions in template classes.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
index a8bfe3b361..54bf53bb84 100644
--- a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
+++ b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
@@ -3,7 +3,7 @@
  * @name A2-7-3: Declarations of 'user-defined' types, member variables and functions should be documented
  * @description All declarations of 'user-defined' types, static and non-static data members,
  *              functions and methods shall be preceded by documentation.
- * @kind problem
+ * @ kind problem
  * @precision very-high
  * @problem.severity recommendation
  * @tags external/autosar/id/a2-7-3
@@ -44,7 +44,11 @@ class DocumentableDeclaration extends Declaration {
     // Exclude instantiated template functions, which cannot reasonably be documented.
     not this.(Function).isFromTemplateInstantiation(_) and
     // Exclude anonymous lambda functions.
-    not exists(LambdaExpression lc | lc.getLambdaFunction() = this)
+    not exists(LambdaExpression lc | lc.getLambdaFunction() = this) and
+    //Exclude friend functions (because they have 2 entries in the database), and only one shows documented truly
+    not exists(FriendDecl d |
+      d.getFriend().(Function).getDefinition() = this.getADeclarationEntry()
+    )
     or
     this instanceof MemberVariable and
     declarationType = "member variable" and
diff --git a/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected b/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
index 0ae42152f7..90935f9396 100644
--- a/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
+++ b/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
@@ -7,3 +7,4 @@
 | test.cpp:81:6:81:6 | definition of e | Declaration entry for function e is missing documentation. |
 | test.cpp:88:1:88:30 | definition of message_to_string_undocumented | Declaration entry for function message_to_string_undocumented is missing documentation. |
 | test.cpp:160:21:160:24 | definition of kBar | Declaration entry for member variable kBar is missing documentation. |
+| test.cpp:207:14:207:17 | definition of foo3 | Declaration entry for function foo3 is missing documentation. |
diff --git a/cpp/autosar/test/rules/A2-7-3/test.cpp b/cpp/autosar/test/rules/A2-7-3/test.cpp
index 8e9e180458..77e27c49d4 100644
--- a/cpp/autosar/test/rules/A2-7-3/test.cpp
+++ b/cpp/autosar/test/rules/A2-7-3/test.cpp
@@ -175,4 +175,34 @@ void testFunctionScope() {
       void fNestedTest(); // COMPLIANT - in function scope
     };
   };
-}
\ No newline at end of file
+}
+
+/// Test documentation
+template <typename T> class ClassG { // COMPLIANT
+private:
+  /// Test documentation
+  int x; // COMPLIANT
+
+public:
+  /// Test documentation
+  friend int foo(ClassG<T> g) { return g.x; } // COMPLIANT
+};
+
+/// Test documentation
+void test() { // COMPLIANT
+  ClassG<int> g;
+  foo(g);
+}
+
+/// Test documentation
+class ClassG2 { // COMPLIANT
+public:
+  /// Test documentation
+  friend int foo2() { return 1; } // COMPLIANT
+};
+
+/// Test documentation
+class ClassG3 { // COMPLIANT
+public:
+  friend int foo3() { return 1; } // NON_COMPLIANT
+};
\ No newline at end of file

From 6655624206bcfeed619d80850db8457522da10ed Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 16 Jul 2024 19:13:04 -0400
Subject: [PATCH 053/435] A2-7-3: fix query metadata

---
 cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
index 54bf53bb84..769c4163ad 100644
--- a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
+++ b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
@@ -3,7 +3,7 @@
  * @name A2-7-3: Declarations of 'user-defined' types, member variables and functions should be documented
  * @description All declarations of 'user-defined' types, static and non-static data members,
  *              functions and methods shall be preceded by documentation.
- * @ kind problem
+ * @kind problem
  * @precision very-high
  * @problem.severity recommendation
  * @tags external/autosar/id/a2-7-3

From 0f832d3052fa203ef5fe898fa0ea360addf1215d Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Thu, 18 Jul 2024 16:07:12 +0900
Subject: [PATCH 054/435] Fix for issue: 646

---
 .../test/rules/M0-1-10/test_main_variant.cpp  | 44 +++++++++++++++++++
 .../cpp/EncapsulatingFunctions.qll            |  5 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp

diff --git a/cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp b/cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp
new file mode 100644
index 0000000000..ccc38c95cc
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp
@@ -0,0 +1,44 @@
+#include <cstdint>
+
+// @brief func1
+// @return exit code
+int32_t func1(void) noexcept { // COMPLIANT
+    int32_t x; // CAUTION: uninitialized!!
+    int32_t ret;
+    ret = func2(x);
+    return ret;
+}
+
+// @brief func2
+// @param arg parameter
+// @return exit code
+int32_t func2(const int32_t arg) // COMPLIANT
+{
+    int32_t ret;
+    ret = arg * arg;
+    return ret;
+}
+
+namespace mains {
+    static int32_t var;
+
+    // @brief namespace_func
+    static void namespace_func(void) noexcept { // COMPLIANT
+        mains::var = -1;
+        return;
+    }
+}  // namespace
+
+// @brief main
+// @return exit code
+int32_t main(void) {
+    int32_t ret {0};
+    try {
+        ret = func1();
+        mains::var += ret;
+    }
+    catch(...) {
+        mains::namespace_func();
+    }
+    return ret;
+}
diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
index d8d9739033..5492f95041 100644
--- a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
@@ -14,7 +14,10 @@ abstract class EncapsulatingFunction extends Function { }
 class MainFunction extends MainLikeFunction {
   MainFunction() {
     hasGlobalName("main") and
-    getType() instanceof IntType
+    (
+      getType() instanceof IntType or
+      getType() instanceof Int32_t
+    )
   }
 }
 

From 8c28f1e35ca565013883be1717f07183768537b6 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 23 Jul 2024 11:24:01 +0900
Subject: [PATCH 055/435] Added tests and generalized fix

---
 .../rules/M0-1-10.1/UnusedFunction.expected   |  0
 .../test/rules/M0-1-10.1/UnusedFunction.qlref |  1 +
 cpp/autosar/test/rules/M0-1-10.1/test.cpp     | 34 +++++++++++++++++++
 .../cpp/EncapsulatingFunctions.qll            |  5 +--
 .../typedefint/MainLikeFunction.expected      |  1 +
 .../typedefint/MainLikeFunction.ql            |  5 +++
 .../cpp/mainlikefunctions/typedefint/test.cpp |  8 +++++
 7 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected
 create mode 100644 cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.qlref
 create mode 100644 cpp/autosar/test/rules/M0-1-10.1/test.cpp
 create mode 100644 cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.expected
 create mode 100644 cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.ql
 create mode 100644 cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/test.cpp

diff --git a/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected b/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.qlref b/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.qlref
new file mode 100644
index 0000000000..519660f289
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.qlref
@@ -0,0 +1 @@
+rules/M0-1-10/UnusedFunction.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M0-1-10.1/test.cpp b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
new file mode 100644
index 0000000000..f85bf8bfe7
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
@@ -0,0 +1,34 @@
+#include <cstdint>
+
+namespace mains {
+static std::int32_t var;
+
+// @brief namespace_func
+static void
+namespace_func(void) noexcept { // COMPLIANT: Called from "main" below.
+  mains::var = -1;
+  return;
+}
+} // namespace mains
+
+std::int32_t func2() // COMPLIANT: Called from func1
+{
+  return mains::var + 20;
+}
+
+std::int32_t func1() { // COMPLIANT: Called from main
+  return mains::var + func2(); // func2 called here.
+}
+
+// @brief main
+// @return exit code
+std::int32_t main(void) {
+  std::int32_t ret{0};
+  try {
+    ret = func1(); // func1 called here.
+    mains::var += ret;
+  } catch (...) {
+    mains::namespace_func(); // namespace_func called here.
+  }
+  return ret;
+}
diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
index 5492f95041..f82705e2c7 100644
--- a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
@@ -14,10 +14,7 @@ abstract class EncapsulatingFunction extends Function { }
 class MainFunction extends MainLikeFunction {
   MainFunction() {
     hasGlobalName("main") and
-    (
-      getType() instanceof IntType or
-      getType() instanceof Int32_t
-    )
+    getType().resolveTypedefs() instanceof IntType
   }
 }
 
diff --git a/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.expected b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.expected
new file mode 100644
index 0000000000..fa98ca7648
--- /dev/null
+++ b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.expected
@@ -0,0 +1 @@
+| test.cpp:5:9:5:12 | main |
diff --git a/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.ql b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.ql
new file mode 100644
index 0000000000..ed1757631e
--- /dev/null
+++ b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.ql
@@ -0,0 +1,5 @@
+import cpp
+import codingstandards.cpp.EncapsulatingFunctions
+
+from MainFunction m
+select m
diff --git a/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/test.cpp b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/test.cpp
new file mode 100644
index 0000000000..7b514505f1
--- /dev/null
+++ b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/test.cpp
@@ -0,0 +1,8 @@
+typedef signed int int32_t;
+
+// @brief main
+// @return exit code
+int32_t main(void) {
+  int32_t ret{0};
+  return ret;
+}

From 9f88e856ba7c8488bea0a0921b940fafce496790 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 23 Jul 2024 12:50:45 +0900
Subject: [PATCH 056/435] Added change note for #646

---
 change_notes/2024-07-23-fix-fp-646-M0-1-10.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-07-23-fix-fp-646-M0-1-10.md

diff --git a/change_notes/2024-07-23-fix-fp-646-M0-1-10.md b/change_notes/2024-07-23-fix-fp-646-M0-1-10.md
new file mode 100644
index 0000000000..8854c7b59a
--- /dev/null
+++ b/change_notes/2024-07-23-fix-fp-646-M0-1-10.md
@@ -0,0 +1,2 @@
+- `M0-1-10` - `EncapsulatingFunctions.qll`:
+  - Fixes #646. Consider typedef'd `int` return types for `main()` function as MainFunction.

From aed7701d65f7e085cb53c1be83c0cc7b2512a373 Mon Sep 17 00:00:00 2001
From: Rakesh Pothengil <122329100+rak3-sh@users.noreply.github.com>
Date: Wed, 24 Jul 2024 05:00:54 +0900
Subject: [PATCH 057/435] Delete
 cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp

---
 .../test/rules/M0-1-10/test_main_variant.cpp  | 44 -------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp

diff --git a/cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp b/cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp
deleted file mode 100644
index ccc38c95cc..0000000000
--- a/cpp/autosar/test/rules/M0-1-10/test_main_variant.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <cstdint>
-
-// @brief func1
-// @return exit code
-int32_t func1(void) noexcept { // COMPLIANT
-    int32_t x; // CAUTION: uninitialized!!
-    int32_t ret;
-    ret = func2(x);
-    return ret;
-}
-
-// @brief func2
-// @param arg parameter
-// @return exit code
-int32_t func2(const int32_t arg) // COMPLIANT
-{
-    int32_t ret;
-    ret = arg * arg;
-    return ret;
-}
-
-namespace mains {
-    static int32_t var;
-
-    // @brief namespace_func
-    static void namespace_func(void) noexcept { // COMPLIANT
-        mains::var = -1;
-        return;
-    }
-}  // namespace
-
-// @brief main
-// @return exit code
-int32_t main(void) {
-    int32_t ret {0};
-    try {
-        ret = func1();
-        mains::var += ret;
-    }
-    catch(...) {
-        mains::namespace_func();
-    }
-    return ret;
-}

From d0807db3b6d63e0fea88ff8c0a1a62a71c033253 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Wed, 24 Jul 2024 09:56:32 +0900
Subject: [PATCH 058/435] Corrected formatting

---
 cpp/autosar/test/rules/M0-1-10.1/test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/test/rules/M0-1-10.1/test.cpp b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
index f85bf8bfe7..272f295a35 100644
--- a/cpp/autosar/test/rules/M0-1-10.1/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
@@ -16,7 +16,7 @@ std::int32_t func2() // COMPLIANT: Called from func1
   return mains::var + 20;
 }
 
-std::int32_t func1() { // COMPLIANT: Called from main
+std::int32_t func1() {         // COMPLIANT: Called from main
   return mains::var + func2(); // func2 called here.
 }
 

From 33eb5020bff2d243b046f6620331fb2ddf2b987e Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 24 Jul 2024 22:14:38 +0200
Subject: [PATCH 059/435] Rename shared queries

---
 .../UnsignedIntegerOperationsWrapAround.ql    |   4 +-
 ...nsignedIntegerOperationsWrapAround.testref |   2 +-
 ...eMacroArgumentSubjectToExpansion.expected} |   0
 ...ixedUseMacroArgumentSubjectToExpansion.ql} |   5 +-
 .../test.c                                    |   0
 .../AtofAtoiAtolAndAtollUsed.expected}        |   0
 .../AtofAtoiAtolAndAtollUsed.ql               |   4 +
 .../test.c                                    |   0
 .../AtofAtoiAtolAndAtollUsed_shared.ql        |   4 -
 ...tFieldShallHaveAnAppropriateType.expected} |   0
 .../BitFieldShallHaveAnAppropriateType.ql     |   4 +
 .../test.c                                    |   0
 ...tFieldShallHaveAnAppropriateType_shared.ql |   4 -
 .../FunctionLikeMacrosDefined.expected}       |   0
 .../FunctionLikeMacrosDefined.ql              |   4 +
 .../test.c                                    |   0
 .../FunctionLikeMacrosDefined_shared.ql       |   4 -
 ...eferenceALabelInSurroundingBlock.expected} |   0
 .../GotoReferenceALabelInSurroundingBlock.ql} |   4 +-
 .../test.c                                    |   0
 .../GotoStatementShouldNotBeUsed.expected}    |   0
 .../GotoStatementShouldNotBeUsed.ql           |   4 +
 .../test.c                                    |   0
 .../GotoStatementShouldNotBeUsed_shared.ql    |   4 -
 .../LowercaseLStartsInLiteralSuffix.expected} |   0
 .../LowercaseLStartsInLiteralSuffix.ql        |   4 +
 .../test.c                                    |   0
 .../LowercaseLStartsInLiteralSuffix_shared.ql |   4 -
 .../MacroParameterFollowingHash.expected}     |   0
 .../MacroParameterFollowingHash.ql            |   4 +
 .../test.c                                    |   0
 .../MacroParameterFollowingHash_shared.ql     |   4 -
 ...rationsNotSequencedAppropriately.expected} |   0
 ...oryOperationsNotSequencedAppropriately.ql} |   5 +-
 .../test.c                                    |   0
 ...edBitFieldsWithSignedIntegerType.expected} |   0
 .../NamedBitFieldsWithSignedIntegerType.ql    |   4 +
 .../test.c                                    |   0
 ...edBitFieldsWithSignedIntegerType_shared.ql |   4 -
 .../NonTerminatedEscapeSequences.expected}    |   0
 .../NonTerminatedEscapeSequences.ql           |   4 +
 .../test.c                                    |   0
 .../NonTerminatedEscapeSequences_shared.ql    |   4 -
 .../NonUniqueEnumerationConstant.expected}    |   0
 .../NonUniqueEnumerationConstant.ql           |   4 +
 .../test.c                                    |   0
 .../NonUniqueEnumerationConstant_shared.ql    |   4 -
 ...ssignmentOperatorShouldNotBeUsed.expected} |   0
 ...tOfAnAssignmentOperatorShouldNotBeUsed.ql} |   5 +-
 .../test.c                                    |   0
 ...erationWithConstantOperandsWraps.expected} |   0
 ...gnedOperationWithConstantOperandsWraps.ql} |   5 +-
 .../test.c                                    |   0
 .../UseOfNonZeroOctalLiteral.expected}        |   0
 .../UseOfNonZeroOctalLiteral.ql               |   4 +
 .../test.c                                    |   0
 .../UseOfNonZeroOctalLiteral_shared.ql        |   4 -
 .../DIR-4-9/FunctionOverFunctionLikeMacro.ql  |   4 +-
 .../rules/RULE-13-2/UnsequencedSideEffects.ql |   4 +-
 ...ltOfAnAssignmentOperatorShouldNotBeUsed.ql |   4 +-
 .../src/rules/RULE-15-1/GotoStatementUsed.ql  |   4 +-
 .../RULE-15-3/GotoLabelBlockCondition.ql      |   4 +-
 ...oreThanOneHashOperatorInMacroDefinition.ql |   4 +-
 .../MacroParameterUsedAsHashOperand.ql        |   4 +-
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.ql      |   4 +-
 ...HexadecimalEscapeSequencesNotTerminated.ql |   4 +-
 ...hallOnlyBeDeclaredWithAnAppropriateType.ql |   4 +-
 .../SingleBitNamedBitFieldsOfASignedType.ql   |   4 +-
 ...lueImplicitEnumerationConstantNotUnique.ql |   4 +-
 .../FunctionOverFunctionLikeMacro.testref     |   2 +-
 .../RULE-13-2/UnsequencedSideEffects.testref  |   2 +-
 ...nAssignmentOperatorShouldNotBeUsed.testref |   2 +-
 .../rules/RULE-15-1/GotoStatementUsed.testref |   2 +-
 .../RULE-15-3/GotoLabelBlockCondition.testref |   2 +-
 ...anOneHashOperatorInMacroDefinition.testref |   2 +-
 .../MacroParameterUsedAsHashOperand.testref   |   2 +-
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.testref |   2 +-
 ...ecimalEscapeSequencesNotTerminated.testref |   2 +-
 ...nlyBeDeclaredWithAnAppropriateType.testref |   2 +-
 ...ngleBitNamedBitFieldsOfASignedType.testref |   2 +-
 ...rcaseCharacterLUsedInLiteralSuffix.testref |   2 +-
 ...plicitEnumerationConstantNotUnique.testref |   2 +-
 ...licitConstructorBaseClassInitialization.ql |   4 +-
 ...yAssignmentAndAMoveHandleSelfAssignment.ql |   4 +-
 ...tSpecializationsOfFunctionTemplatesUsed.ql |   4 +-
 .../rules/A15-1-2/PointerExceptionObject.ql   |   4 +-
 .../rules/A15-4-2/NoExceptFunctionThrows.ql   |   4 +-
 .../A18-1-2/VectorboolSpecializationUsed.ql   |   4 +-
 .../GlobalSizedOperatorDeleteNotDefined.ql    |   4 +-
 .../GlobalUnsizedOperatorDeleteNotDefined.ql  |   4 +-
 .../ForwardingValuesToOtherFunctions.ql       |   4 +-
 .../rules/A2-13-1/EscapeSequenceOutsideISO.ql |   4 +-
 .../A2-7-1/SingleLineCommentEndsWithSlash.ql  |   4 +-
 .../A4-10-1/NullPointerConstantNotNullptr.ql  |   4 +-
 ...ualPointerOnlyComparesToNullptrConstant.ql |   4 +-
 .../src/rules/A5-2-4/ReinterpretCastUsed.ql   |   4 +-
 .../src/rules/A6-6-1/GotoStatementUsed.ql     |   4 +-
 ...nUnderlyingBaseTypeNotExplicitlyDefined.ql |   5 +-
 ...nitionNotConsideredForUnqualifiedLookup.ql |   4 +-
 ...enInheritedNonOverridableMemberFunction.ql |   4 +-
 ...iddenInheritedOverridableMemberFunction.ql |   4 +-
 .../src/rules/A7-4-1/AsmDeclarationUsed.ql    |   4 +-
 .../src/rules/A7-5-2/RecursiveFunctions.ql    |   5 +-
 ...nfusingUseOfInitializerListConstructors.ql |   4 +-
 ...ssibleBaseClassBothVirtualAndNonVirtual.ql |   4 +-
 ...peOfThisUsedFromConstructorOrDestructor.ql |   4 +-
 .../NameNotReferredUsingAQualifiedIdOrThis.ql |   4 +-
 ...NotReferredUsingAQualifiedIdOrThisAudit.ql |   4 +-
 .../rules/M15-1-3/EmptyThrowOutsideCatch.ql   |   4 +-
 .../src/rules/M18-2-1/MacroOffsetofUsed.ql    |   4 +-
 .../src/rules/M18-7-1/CsignalFunctionsUsed.ql |   4 +-
 .../src/rules/M18-7-1/CsignalTypesUsed.ql     |   4 +-
 .../rules/M2-13-2/UseOfNonZeroOctalLiteral.ql |   4 +-
 .../src/rules/M2-13-3/MissingUSuffix.ql       |   4 +-
 .../SlashStarUsedWithinACStyleComment.ql      |   4 +-
 .../src/rules/M27-0-1/CstdioFunctionsUsed.ql  |   4 +-
 .../src/rules/M27-0-1/CstdioMacrosUsed.ql     |   4 +-
 .../src/rules/M27-0-1/CstdioTypesUsed.ql      |   4 +-
 ...PassedAsFunctionArgumentDecayToAPointer.ql |   4 +-
 .../M5-2-6/CastNotConvertPointerToFunction.ql |   4 +-
 ...usOperatorAppliedToAnUnsignedExpression.ql |   4 +-
 .../rules/M5-3-3/UnaryOperatorOverloaded.ql   |   4 +-
 .../src/rules/M6-3-1/LoopCompoundCondition.ql |   4 +-
 .../rules/M6-3-1/SwitchCompoundCondition.ql   |   4 +-
 .../GlobalNamespaceMembershipViolation.ql     |   4 +-
 ...MainUsedForAFunctionOtherThanGlobalMain.ql |   4 +-
 .../FunctionReturnAutomaticVarCondition.ql    |   4 +-
 .../MultipleGlobalOrMemberDeclarators.ql      |   4 +-
 .../rules/M8-0-1/MultipleLocalDeclarators.ql  |   4 +-
 ...nctionParametersUseSameDefaultArguments.ql |   4 +-
 ...ConstructorBaseClassInitialization.testref |   2 +-
 ...gnmentAndAMoveHandleSelfAssignment.testref |   2 +-
 ...ializationsOfFunctionTemplatesUsed.testref |   2 +-
 .../A15-1-2/PointerExceptionObject.testref    |   2 +-
 .../A15-4-2/NoExceptFunctionThrows.testref    |   2 +-
 .../VectorboolSpecializationUsed.testref      |   2 +-
 ...lobalSizedOperatorDeleteNotDefined.testref |   2 +-
 ...balUnsizedOperatorDeleteNotDefined.testref |   2 +-
 .../ForwardingValuesToOtherFunctions.testref  |   2 +-
 .../A2-13-1/EscapeSequenceOutsideISO.testref  |   2 +-
 .../SingleLineCommentEndsWithSlash.testref    |   2 +-
 .../NullPointerConstantNotNullptr.testref     |   2 +-
 ...ualFunctionWithNullPointerConstant.testref |   2 +-
 ...irtualPointerOnlyComparesToNullptr.testref |   2 +-
 ...interOnlyComparesToNullptrConstant.testref |   2 +-
 .../rules/A5-2-4/ReinterpretCastUsed.testref  |   2 +-
 .../rules/A6-6-1/GotoStatementUsed.testref    |   2 +-
 ...nNotConsideredForUnqualifiedLookup.testref |   2 +-
 ...eritedNonOverridableMemberFunction.testref |   2 +-
 ...InheritedOverridableMemberFunction.testref |   2 +-
 .../rules/A7-4-1/AsmDeclarationUsed.testref   |   2 +-
 .../rules/A7-5-2/RecursiveFunctions.testref   |   2 +-
 ...ngUseOfInitializerListConstructors.testref |   2 +-
 ...eBaseClassBothVirtualAndNonVirtual.testref |   2 +-
 ...othVirtualAndNonVirtualInHierarchy.testref |   2 +-
 ...hisUsedFromConstructorOrDestructor.testref |   2 +-
 ...NotReferredUsingAQualifiedIdOrThis.testref |   2 +-
 ...ferredUsingAQualifiedIdOrThisAudit.testref |   2 +-
 .../M15-1-3/EmptyThrowOutsideCatch.testref    |   2 +-
 .../rules/M18-2-1/MacroOffsetofUsed.testref   |   2 +-
 .../M18-7-1/CsignalFunctionsUsed.testref      |   2 +-
 .../rules/M18-7-1/CsignalTypesUsed.testref    |   2 +-
 .../M2-13-2/UseOfNonZeroOctalLiteral.testref  |   2 +-
 .../test/rules/M2-13-3/MissingUSuffix.testref |   2 +-
 .../SlashStarUsedWithinACStyleComment.testref |   2 +-
 .../rules/M27-0-1/CstdioFunctionsUsed.testref |   2 +-
 .../rules/M27-0-1/CstdioMacrosUsed.testref    |   2 +-
 .../rules/M27-0-1/CstdioTypesUsed.testref     |   2 +-
 ...dAsFunctionArgumentDecayToAPointer.testref |   2 +-
 .../CastNotConvertPointerToFunction.testref   |   2 +-
 ...ratorAppliedToAnUnsignedExpression.testref |   2 +-
 .../M5-3-3/UnaryOperatorOverloaded.testref    |   2 +-
 .../M6-3-1/LoopCompoundCondition.testref      |   2 +-
 .../M6-3-1/SwitchCompoundCondition.testref    |   2 +-
 ...GlobalNamespaceMembershipViolation.testref |   2 +-
 ...sedForAFunctionOtherThanGlobalMain.testref |   2 +-
 ...tionOtherThanTheGlobalFunctionMain.testref |   2 +-
 ...unctionReturnAutomaticVarCondition.testref |   2 +-
 .../MultipleGlobalOrMemberDeclarators.testref |   2 +-
 .../M8-0-1/MultipleLocalDeclarators.testref   |   2 +-
 ...nParametersUseSameDefaultArguments.testref |   2 +-
 ...rametersUseTheSameDefaultArguments.testref |   2 +-
 ...peShallHaveALengthOfMoreThanOneBit.testref |   2 +-
 .../AddressOfOperatorOverloaded.qll}          |   7 +-
 ...xedUseMacroArgumentSubjectToExpansion.qll} |   8 +-
 ...ssedAsFunctionArgumentDecayToAPointer.qll} |   7 +-
 .../asmdeclarationused/AsmDeclarationUsed.qll |  16 +++
 .../AsmDeclarationUsed_shared.qll             |  15 ---
 .../AtofAtoiAtolAndAtollUsed.qll}             |   7 +-
 .../BackslashCharacterMisuse.qll}             |   8 +-
 .../BitFieldShallHaveAnAppropriateType.qll}   |   7 +-
 ...ryOperatorAppliedToUnsignedExpression.qll} |   8 +-
 ...weenAPointerToFunctionAndAnyOtherType.qll} |   7 +-
 ...acterSequenceUsedWithinACStyleComment.qll} |   7 +-
 .../commaoperatorused/CommaOperatorUsed.qll   |   3 +-
 .../ConstLikeReturnValue.qll                  |   5 +-
 ...eAssignmentsShallHandleSelfAssignment.qll} |   8 +-
 .../CsignalFunctionsUsed.qll}                 |   7 +-
 .../CsignalTypesUsed.qll}                     |   7 +-
 .../CstdioFunctionsUsed.qll}                  |   8 +-
 .../CstdioMacrosUsed.qll}                     |   8 +-
 .../CstdioTypesUsed.qll}                      |   8 +-
 ...tionNotConsideredForUnqualifiedLookup.qll} |   9 +-
 .../DereferenceOfNullPointer.qll              |   3 +-
 .../DoNotUseSetjmpOrLongjmpShared.qll         |   3 +-
 .../EmptyThrowOnlyWithinACatchHandler.qll}    |   8 +-
 ...NotDefinedWithAnExplicitUnderlyingType.qll |  13 +-
 ...nedWithAnExplicitUnderlyingType_shared.qll |  19 ---
 .../ExceptionObjectHavePointerType.qll}       |   8 +-
 ...ngReferencesAndForwardNotUsedTogether.qll} |   7 +-
 .../FunctionLikeMacrosDefined.qll}            |   7 +-
 ...lThemselvesEitherDirectlyOrIndirectly.qll} |   8 +-
 ...unctionTemplatesExplicitlySpecialized.qll} |   7 +-
 .../GlobalNamespaceDeclarations.qll}          |   8 +-
 .../GlobalSizedOperatorDeleteNotDefined.qll}  |   8 +-
 ...GlobalUnsizedOperatorDeleteNotDefined.qll} |   8 +-
 ...GotoReferenceALabelInSurroundingBlock.qll} |   7 +-
 .../GotoStatementShouldNotBeUsed.qll}         |   7 +-
 .../HandleAllExceptionsDuringStartup.qll      |   3 +-
 ...InheritedNonOverridableMemberFunction.qll} |   8 +-
 ...denInheritedOverridableMemberFunction.qll} |   8 +-
 .../identifierhidden/IdentifierHidden.qll     |   5 +-
 ...WithExternalLinkageOneDefinitionShared.qll |   4 +-
 .../IfElseTerminationConstruct.qll            |   3 +-
 .../InitializeAllVirtualBaseClasses.qll}      |   8 +-
 ...erListConstructorIsTheOnlyConstructor.qll} |   8 +-
 .../LineSplicingUsedInComments.qll}           |   8 +-
 .../LoopCompoundCondition.qll                 |  19 +++
 .../LoopCompoundCondition_shared.qll          |  17 ---
 .../LowercaseLStartsInLiteralSuffix.qll}      |   8 +-
 .../MacroOffsetofUsed.qll}                    |   7 +-
 .../MacroParameterFollowingHash.qll}          |   8 +-
 ...MacroParameterNotEnclosedInParentheses.qll |   5 +-
 ...ryOperationsNotSequencedAppropriately.qll} |   7 +-
 .../MultipleGlobalOrMemberDeclarators.qll}    |   7 +-
 .../MultipleLocalDeclarators.qll}             |   7 +-
 .../NamedBitFieldsWithSignedIntegerType.qll}  |   7 +-
 ...ameNotReferredUsingAQualifiedIdOrThis.qll} |   8 +-
 ...tReferredUsingAQualifiedIdOrThisAudit.qll} |   8 +-
 ...FunctionShouldNotPropagateToTheCaller.qll} |   8 +-
 .../NonGlobalFunctionMain.qll}                |   8 +-
 .../NonTerminatedEscapeSequences.qll}         |   8 +-
 .../NonUniqueEnumerationConstant.qll}         |   8 +-
 .../NotDistinctIdentifier.qll                 |   3 +-
 ...otTheOnlyFormOfTheNullPointerConstant.qll} |   7 +-
 ...icTypeUsedFromConstructorOrDestructor.qll} |   8 +-
 ...ShallSpecifyDifferentDefaultArguments.qll} |   8 +-
 ...lyVirtualPointerOnlyComparesToNullptr.qll} |   8 +-
 ...icateFunctionObjectsShouldNotBeMutable.qll |   4 +-
 ...processingDirectiveWithinMacroArgument.qll |   4 +-
 .../ReinterpretCastUsed.qll                   |  16 +++
 .../ReinterpretCastUsed_shared.qll            |  15 ---
 ...OfAnAssignmentOperatorShouldNotBeUsed.qll} |   7 +-
 ...enceOrPointerToAutomaticLocalVariable.qll} |   8 +-
 .../SwitchCasePositionCondition.qll           |   3 +-
 .../SwitchCompoundCondition.qll}              |   8 +-
 .../SwitchNotWellFormed.qll                   |   3 +-
 .../cpp/rules/typeomitted/TypeOmitted.qll     |   3 +-
 ...tegerLiteralsNotAppropriatelySuffixed.qll} |   7 +-
 ...nedOperationWithConstantOperandsWraps.qll} |   7 +-
 .../UseOfNonZeroOctalLiteral.qll}             |   7 +-
 .../VectorShouldNotBeSpecializedWithBool.qll} |   9 +-
 ...rtualAndNonVirtualClassInTheHierarchy.qll} |   8 +-
 .../AddressOfOperatorOverloaded.expected}     |   0
 .../AddressOfOperatorOverloaded.ql            |   4 +
 .../test.cpp                                  |   0
 .../AddressOfOperatorOverloaded_shared.ql     |   4 -
 ...eMacroArgumentSubjectToExpansion.expected} |   0
 ...ixedUseMacroArgumentSubjectToExpansion.ql} |   5 +-
 .../test.cpp                                  |   0
 ...sFunctionArgumentDecayToAPointer.expected} |   0
 ...assedAsFunctionArgumentDecayToAPointer.ql} |   6 +-
 .../test.cpp                                  |   0
 .../AsmDeclarationUsed.expected}              |   0
 .../asmdeclarationused/AsmDeclarationUsed.ql  |   4 +
 .../test.cpp                                  |   0
 .../AsmDeclarationUsed_shared.ql              |   4 -
 .../AtofAtoiAtolAndAtollUsed.expected}        |   0
 .../AtofAtoiAtolAndAtollUsed.ql               |   4 +
 .../test.cpp                                  |   0
 .../AtofAtoiAtolAndAtollUsed_shared.ql        |   4 -
 .../BackslashCharacterMisuse.expected}        |   0
 .../BackslashCharacterMisuse.ql               |   4 +
 .../test.cpp                                  |   0
 .../BackslashCharacterMisuse_shared.ql        |   4 -
 ...tFieldShallHaveAnAppropriateType.expected} |   0
 .../BitFieldShallHaveAnAppropriateType.ql     |   4 +
 .../test.cpp                                  |   0
 ...tFieldShallHaveAnAppropriateType_shared.ql |   4 -
 ...ratorAppliedToUnsignedExpression.expected} |   0
 ...aryOperatorAppliedToUnsignedExpression.ql} |   7 +-
 .../test.cpp                                  |   0
 ...PointerToFunctionAndAnyOtherType.expected} |   0
 ...tweenAPointerToFunctionAndAnyOtherType.ql} |   6 +-
 .../test.cpp                                  |   0
 ...SequenceUsedWithinACStyleComment.expected} |   0
 ...racterSequenceUsedWithinACStyleComment.ql} |   5 +-
 .../test.cpp                                  |   0
 ...gnmentsShallHandleSelfAssignment.expected} |   0
 ...veAssignmentsShallHandleSelfAssignment.ql} |   7 +-
 .../test.cpp                                  |   0
 .../CsignalFunctionsUsed.expected}            |   0
 .../CsignalFunctionsUsed.ql                   |   4 +
 .../test.cpp                                  |   0
 .../CsignalFunctionsUsed_shared.ql            |   4 -
 .../CsignalTypesUsed.expected}                |   0
 .../csignaltypesused/CsignalTypesUsed.ql      |   4 +
 .../test.cpp                                  |   0
 .../CsignalTypesUsed_shared.ql                |   4 -
 .../CstdioFunctionsUsed.expected}             |   0
 .../CstdioFunctionsUsed.ql                    |   4 +
 .../test.cpp                                  |   0
 .../CstdioFunctionsUsed_shared.ql             |   4 -
 .../CstdioMacrosUsed.expected}                |   0
 .../cstdiomacrosused/CstdioMacrosUsed.ql      |   4 +
 .../test.cpp                                  |   0
 .../CstdioMacrosUsed_shared.ql                |   4 -
 .../CstdioTypesUsed.expected}                 |   0
 .../rules/cstdiotypesused/CstdioTypesUsed.ql  |   4 +
 .../test.cpp                                  |   0
 .../CstdioTypesUsed_shared.ql                 |   4 -
 ...otConsideredForUnqualifiedLookup.expected} |   0
 ...itionNotConsideredForUnqualifiedLookup.ql} |   5 +-
 .../test.cpp                                  |   0
 ...mptyThrowOnlyWithinACatchHandler.expected} |   0
 .../EmptyThrowOnlyWithinACatchHandler.ql      |   4 +
 .../test.cpp                                  |   0
 ...mptyThrowOnlyWithinACatchHandler_shared.ql |   4 -
 ...inedWithAnExplicitUnderlyingType.expected} |   0
 ...NotDefinedWithAnExplicitUnderlyingType.ql} |   7 +-
 .../test.cpp                                  |   0
 .../ExceptionObjectHavePointerType.expected}  |   0
 .../ExceptionObjectHavePointerType.ql         |   4 +
 .../test.cpp                                  |   0
 .../ExceptionObjectHavePointerType_shared.ql  |   4 -
 ...erencesAndForwardNotUsedTogether.expected} |   0
 ...ingReferencesAndForwardNotUsedTogether.ql} |   6 +-
 .../test.cpp                                  |   0
 .../FunctionLikeMacrosDefined.expected}       |   0
 .../FunctionLikeMacrosDefined.ql              |   4 +
 .../test.cpp                                  |   0
 .../FunctionLikeMacrosDefined_shared.ql       |   4 -
 ...selvesEitherDirectlyOrIndirectly.expected} |   0
 ...llThemselvesEitherDirectlyOrIndirectly.ql} |   7 +-
 .../test.cpp                                  |   0
 ...onTemplatesExplicitlySpecialized.expected} |   0
 ...FunctionTemplatesExplicitlySpecialized.ql} |   4 +-
 .../test.cpp                                  |   0
 .../GlobalNamespaceDeclarations.expected}     |   0
 .../GlobalNamespaceDeclarations.ql            |   4 +
 .../test.cpp                                  |   0
 .../GlobalNamespaceDeclarations_shared.ql     |   4 -
 ...balSizedOperatorDeleteNotDefined.expected} |   0
 .../GlobalSizedOperatorDeleteNotDefined.ql    |   4 +
 .../test.cpp                                  |   0
 ...balSizedOperatorDeleteNotDefined_shared.ql |   4 -
 ...lUnsizedOperatorDeleteNotDefined.expected} |   0
 .../GlobalUnsizedOperatorDeleteNotDefined.ql} |   4 +-
 .../test.cpp                                  |   0
 ...eferenceALabelInSurroundingBlock.expected} |   0
 .../GotoReferenceALabelInSurroundingBlock.ql} |   4 +-
 .../test.cpp                                  |   0
 .../GotoStatementShouldNotBeUsed.expected}    |   0
 .../GotoStatementShouldNotBeUsed.ql           |   4 +
 .../test.cpp                                  |   0
 .../GotoStatementShouldNotBeUsed_shared.ql    |   4 -
 ...itedNonOverridableMemberFunction.expected} |   0
 ...nInheritedNonOverridableMemberFunction.ql} |   5 +-
 .../test.cpp                                  |   0
 ...heritedOverridableMemberFunction.expected} |   0
 ...ddenInheritedOverridableMemberFunction.ql} |   5 +-
 .../test.cpp                                  |   0
 .../InitializeAllVirtualBaseClasses.expected} |   0
 .../InitializeAllVirtualBaseClasses.ql        |   4 +
 .../test.cpp                                  |   0
 .../InitializeAllVirtualBaseClasses_shared.ql |   4 -
 ...tConstructorIsTheOnlyConstructor.expected} |   0
 ...zerListConstructorIsTheOnlyConstructor.ql} |   6 +-
 .../test.cpp                                  |   0
 .../LineSplicingUsedInComments.expected}      |   0
 .../LineSplicingUsedInComments.ql             |   4 +
 .../test.cpp                                  |   0
 .../LineSplicingUsedInComments_shared.ql      |   4 -
 .../LoopCompoundCondition.expected}           |   0
 .../LoopCompoundCondition.ql                  |   4 +
 .../test.cpp                                  |   0
 .../LoopCompoundCondition_shared.ql           |   4 -
 .../LowercaseLStartsInLiteralSuffix.expected} |   0
 .../LowercaseLStartsInLiteralSuffix.ql        |   4 +
 .../README.md                                 |   0
 .../test.cpp                                  |   0
 .../LowercaseLStartsInLiteralSuffix_shared.ql |   4 -
 .../MacroOffsetofUsed.expected                |   0
 .../MacroOffsetofUsed.expected.gcc            |   0
 .../MacroOffsetofUsed.expected.qcc            |   0
 .../macrooffsetofused/MacroOffsetofUsed.ql    |   4 +
 .../test.cpp                                  |   0
 .../MacroOffsetofUsed_shared.expected         |   1 -
 .../MacroOffsetofUsed_shared.ql               |   4 -
 .../MacroParameterFollowingHash.expected}     |   0
 .../MacroParameterFollowingHash.ql            |   4 +
 .../test.cpp                                  |   0
 .../MacroParameterFollowingHash_shared.ql     |   4 -
 ...rationsNotSequencedAppropriately.expected} |   0
 ...oryOperationsNotSequencedAppropriately.ql} |   5 +-
 .../test.cpp                                  |   0
 ...ultipleGlobalOrMemberDeclarators.expected} |   0
 .../MultipleGlobalOrMemberDeclarators.ql      |   4 +
 .../test.cpp                                  |   0
 ...ultipleGlobalOrMemberDeclarators_shared.ql |   4 -
 .../MultipleLocalDeclarators.expected}        |   0
 .../MultipleLocalDeclarators.ql               |   4 +
 .../test.cpp                                  |   0
 .../MultipleLocalDeclarators_shared.ql        |   4 -
 ...edBitFieldsWithSignedIntegerType.expected} |   0
 .../NamedBitFieldsWithSignedIntegerType.ql    |   4 +
 .../test.cpp                                  |   0
 ...edBitFieldsWithSignedIntegerType_shared.ql |   4 -
 ...tReferredUsingAQualifiedIdOrThis.expected} |   0
 ...NameNotReferredUsingAQualifiedIdOrThis.ql} |   4 +-
 .../test.cpp                                  |   0
 ...rredUsingAQualifiedIdOrThisAudit.expected} |   0
 ...otReferredUsingAQualifiedIdOrThisAudit.ql} |   5 +-
 .../test.cpp                                  |   0
 ...ionShouldNotPropagateToTheCaller.expected} |   0
 ...tFunctionShouldNotPropagateToTheCaller.ql} |   6 +-
 .../test.cpp                                  |   0
 .../NonGlobalFunctionMain.expected}           |   0
 .../NonGlobalFunctionMain.ql                  |   4 +
 .../test.cpp                                  |   0
 .../NonGlobalFunctionMain_shared.ql           |   4 -
 .../NonTerminatedEscapeSequences.expected}    |   0
 .../NonTerminatedEscapeSequences.ql           |   4 +
 .../test.cpp                                  |   0
 .../NonTerminatedEscapeSequences_shared.ql    |   4 -
 .../NonUniqueEnumerationConstant.expected}    |   0
 .../NonUniqueEnumerationConstant.ql           |   4 +
 .../test.cpp                                  |   0
 .../NonUniqueEnumerationConstant_shared.ql    |   4 -
 ...OnlyFormOfTheNullPointerConstant.expected} |   0
 ...rmOfTheNullPointerConstant.expected.clang} |   0
 ...FormOfTheNullPointerConstant.expected.gcc} |   0
 ...FormOfTheNullPointerConstant.expected.qcc} |   0
 ...NotTheOnlyFormOfTheNullPointerConstant.ql} |   6 +-
 .../test.cpp                                  |   0
 .../test.cpp.clang                            |   0
 .../test.cpp.gcc                              |   0
 .../test.cpp.qcc                              |   0
 ...eUsedFromConstructorOrDestructor.expected} |   0
 ...micTypeUsedFromConstructorOrDestructor.ql} |   7 +-
 .../test.cpp                                  |   0
 ...SpecifyDifferentDefaultArguments.expected} |   0
 ...gShallSpecifyDifferentDefaultArguments.ql} |   7 +-
 .../test.cpp                                  |   0
 ...tualPointerOnlyComparesToNullptr.expected} |   0
 ...llyVirtualPointerOnlyComparesToNullptr.ql} |   6 +-
 .../test.cpp                                  |   0
 .../ReinterpretCastUsed.expected}             |   0
 .../ReinterpretCastUsed.ql                    |   4 +
 .../test.cpp                                  |   0
 .../ReinterpretCastUsed_shared.ql             |   4 -
 ...ssignmentOperatorShouldNotBeUsed.expected} |   0
 ...tOfAnAssignmentOperatorShouldNotBeUsed.ql} |   5 +-
 .../test.cpp                                  |   0
 ...rPointerToAutomaticLocalVariable.expected} |   0
 ...renceOrPointerToAutomaticLocalVariable.ql} |   7 +-
 .../test.cpp                                  |   0
 .../SwitchCompoundCondition.expected}         |   0
 .../SwitchCompoundCondition.ql                |   4 +
 .../test.cpp                                  |   0
 .../SwitchCompoundCondition_shared.ql         |   4 -
 ...LiteralsNotAppropriatelySuffixed.expected} |   0
 ...ntegerLiteralsNotAppropriatelySuffixed.ql} |   7 +-
 .../test.cpp                                  |   0
 ...erationWithConstantOperandsWraps.expected} |   0
 ...gnedOperationWithConstantOperandsWraps.ql} |   5 +-
 .../test.cpp                                  |   0
 .../UseOfNonZeroOctalLiteral.expected}        |   0
 .../UseOfNonZeroOctalLiteral.ql               |   4 +
 .../test.cpp                                  |   0
 .../UseOfNonZeroOctalLiteral_shared.ql        |   4 -
 ...orShouldNotBeSpecializedWithBool.expected} |   0
 ...ouldNotBeSpecializedWithBool.expected.qcc} |   0
 .../VectorShouldNotBeSpecializedWithBool.ql}  |   4 +-
 .../test.cpp                                  |   0
 ...AndNonVirtualClassInTheHierarchy.expected} |   0
 ...irtualAndNonVirtualClassInTheHierarchy.ql} |   4 +-
 .../test.cpp                                  |   0
 ...oveAssignmentsShallHandleSelfAssignment.ql |   4 +-
 .../UseSingleGlobalOrMemberDeclarators.ql     |   4 +-
 .../RULE-10-0-1/UseSingleLocalDeclarators.ql  |   4 +-
 ...nNotDefinedWithAnExplicitUnderlyingType.ql |   4 +-
 .../AsmDeclarationShallNotBeUsed.ql           |   4 +-
 .../NonUniqueEnumerationConstant.ql           |   4 +-
 .../BitFieldShallHaveAnAppropriateType.ql     |   4 +-
 ...IntegerNamedBitFieldHaveALengthOfOneBit.ql |   4 +-
 ...VirtualAndNonVirtualClassInTheHierarchy.ql |   4 +-
 ...ngShallSpecifyDifferentDefaultArguments.ql |   4 +-
 ...allyVirtualPointerOnlyComparesToNullptr.ql |   4 +-
 ...amicTypeUsedFromConstructorOrDestructor.ql |   4 +-
 .../InitializeAllVirtualBaseClasses.ql        |   4 +-
 ...izerListConstructorIsTheOnlyConstructor.ql |   4 +-
 .../AddressOfOperatorOverloaded.ql            |   4 +-
 .../FunctionTemplatesExplicitlySpecialized.ql |   4 +-
 .../ExceptionObjectHavePointerType.ql         |   4 +-
 .../EmptyThrowOnlyWithinACatchHandler.ql      |   4 +-
 ...ptFunctionShouldNotPropagateToTheCaller.ql |   4 +-
 .../RULE-19-0-2/FunctionLikeMacrosDefined.ql  |   4 +-
 .../MacroParameterFollowingHash.ql            |   4 +-
 ...MixedUseMacroArgumentSubjectToExpansion.ql |   4 +-
 .../RULE-21-10-3/CsignalFacilitiesUsed.ql     |   4 +-
 .../CsignalTypesShallNotBeUsed.ql             |   4 +-
 .../RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql   |   4 +-
 .../MacroOffsetofShallNotBeUsed.ql            |   4 +-
 ...GlobalSizedOperatorDeleteShallBeDefined.ql |   4 +-
 ...obalUnsizedOperatorDeleteShallBeDefined.ql |   4 +-
 .../VectorShouldNotBeSpecializedWithBool.ql   |   4 +-
 ...dingReferencesAndForwardNotUsedTogether.ql |   4 +-
 .../CstdioFunctionsShallNotBeUsed.ql          |   4 +-
 .../RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql |   4 +-
 .../RULE-30-0-1/CstdioTypesShallNotBeUsed.ql  |   4 +-
 ...moryOperationsNotSequencedAppropriately.ql |   4 +-
 .../RULE-5-13-1/BackslashCharacterMisuse.ql   |   4 +-
 .../NonTerminatedEscapeSequences.ql           |   4 +-
 .../rules/RULE-5-13-3/OctalConstantsUsed.ql   |   4 +-
 ...IntegerLiteralsNotAppropriatelySuffixed.ql |   4 +-
 .../LowercaseLStartsInLiteralSuffix.ql        |   4 +-
 ...aracterSequenceUsedWithinACStyleComment.ql |   4 +-
 .../RULE-5-7-3/LineSplicingUsedInComments.ql  |   4 +-
 .../RULE-6-0-3/GlobalNamespaceDeclarations.ql |   4 +-
 .../rules/RULE-6-0-4/NonGlobalFunctionMain.ql |   4 +-
 ...onShallBeConsideredForUnqualifiedLookup.ql |   4 +-
 .../InheritedNonOverridableMemberFunction.ql  |   4 +-
 .../InheritedOverridableMemberFunction.ql     |   4 +-
 ...eShallBeReferredUsingAQualifiedIdOrThis.ql |   4 +-
 ...lBeReferredUsingAQualifiedIdOrThisAudit.ql |   4 +-
 ...erenceOrPointerToAutomaticLocalVariable.ql |   4 +-
 ...rNotTheOnlyFormOfTheNullPointerConstant.ql |   4 +-
 ...PassedAsFunctionArgumentDecayToAPointer.ql |   4 +-
 ...ltOfAnAssignmentOperatorShouldNotBeUsed.ql |   4 +-
 ...allThemselvesEitherDirectlyOrIndirectly.ql |   4 +-
 ...etweenAPointerToFunctionAndAnyOtherType.ql |   4 +-
 .../ReinterpretCastShallNotBeUsed.ql          |   4 +-
 ...ignedOperationWithConstantOperandsWraps.ql |   4 +-
 ...naryOperatorAppliedToUnsignedExpression.ql |   4 +-
 .../RULE-9-3-1/LoopBodyCompoundCondition.ql   |   4 +-
 .../RULE-9-3-1/SwitchBodyCompoundCondition.ql |   4 +-
 .../GotoStatementShouldNotBeUsed.ql           |   4 +-
 .../GotoReferenceALabelInSurroundingBlock.ql  |   4 +-
 ...signmentsShallHandleSelfAssignment.testref |   2 +-
 .../MultipleGlobalOrMemberDeclarators.testref |   2 +-
 .../MultipleLocalDeclarators.testref          |   2 +-
 ...UseSingleGlobalOrMemberDeclarators.testref |   2 +-
 .../UseSingleLocalDeclarators.testref         |   2 +-
 ...efinedWithAnExplicitUnderlyingType.testref |   2 +-
 .../AsmDeclarationShallNotBeUsed.testref      |   2 +-
 .../NonUniqueEnumerationConstant.testref      |   2 +-
 ...BitFieldShallHaveAnAppropriateType.testref |   2 +-
 ...erNamedBitFieldHaveALengthOfOneBit.testref |   2 +-
 ...alAndNonVirtualClassInTheHierarchy.testref |   2 +-
 ...llSpecifyDifferentDefaultArguments.testref |   2 +-
 ...irtualPointerOnlyComparesToNullptr.testref |   2 +-
 ...ypeUsedFromConstructorOrDestructor.testref |   2 +-
 .../InitializeAllVirtualBaseClasses.testref   |   2 +-
 ...istConstructorIsTheOnlyConstructor.testref |   2 +-
 .../AddressOfOperatorOverloaded.testref       |   2 +-
 ...tionTemplatesExplicitlySpecialized.testref |   2 +-
 .../ExceptionObjectHavePointerType.testref    |   2 +-
 .../EmptyThrowOnlyWithinACatchHandler.testref |   2 +-
 ...ctionShouldNotPropagateToTheCaller.testref |   2 +-
 .../FunctionLikeMacrosDefined.testref         |   2 +-
 .../MacroParameterFollowingHash.testref       |   2 +-
 ...UseMacroArgumentSubjectToExpansion.testref |   2 +-
 .../CsignalFacilitiesUsed.testref             |   2 +-
 .../CsignalTypesShallNotBeUsed.testref        |   2 +-
 .../RULE-21-10-3/CsignalTypesUsed.testref     |   2 +-
 .../AtofAtoiAtolAndAtollUsed.testref          |   2 +-
 .../MacroOffsetofShallNotBeUsed.testref       |   2 +-
 ...lSizedOperatorDeleteShallBeDefined.testref |   2 +-
 ...nsizedOperatorDeleteShallBeDefined.testref |   2 +-
 ...ctorShouldNotBeSpecializedWithBool.testref |   2 +-
 ...eferencesAndForwardNotUsedTogether.testref |   2 +-
 .../CstdioFunctionsShallNotBeUsed.testref     |   2 +-
 .../CstdioMacrosShallNotBeUsed.testref        |   2 +-
 .../CstdioTypesShallNotBeUsed.testref         |   2 +-
 ...perationsNotSequencedAppropriately.testref |   2 +-
 .../BackslashCharacterMisuse.testref          |   2 +-
 .../NonTerminatedEscapeSequences.testref      |   2 +-
 .../RULE-5-13-3/OctalConstantsUsed.testref    |   2 +-
 ...erLiteralsNotAppropriatelySuffixed.testref |   2 +-
 .../LowercaseLStartsInLiteralSuffix.testref   |   2 +-
 ...erSequenceUsedWithinACStyleComment.testref |   2 +-
 .../LineSplicingUsedInComments.testref        |   2 +-
 .../GlobalNamespaceDeclarations.testref       |   2 +-
 .../RULE-6-0-4/NonGlobalFunctionMain.testref  |   2 +-
 ...llBeConsideredForUnqualifiedLookup.testref |   2 +-
 ...eritedNonOverridableMemberFunction.testref |   2 +-
 ...InheritedOverridableMemberFunction.testref |   2 +-
 ...lBeReferredUsingAQualifiedIdOrThis.testref |   2 +-
 ...ferredUsingAQualifiedIdOrThisAudit.testref |   2 +-
 ...eOrPointerToAutomaticLocalVariable.testref |   2 +-
 ...heOnlyFormOfTheNullPointerConstant.testref |   2 +-
 ...dAsFunctionArgumentDecayToAPointer.testref |   2 +-
 ...nAssignmentOperatorShouldNotBeUsed.testref |   2 +-
 ...emselvesEitherDirectlyOrIndirectly.testref |   2 +-
 ...nAPointerToFunctionAndAnyOtherType.testref |   2 +-
 .../ReinterpretCastShallNotBeUsed.testref     |   2 +-
 ...OperationWithConstantOperandsWraps.testref |   2 +-
 ...peratorAppliedToUnsignedExpression.testref |   2 +-
 .../LoopBodyCompoundCondition.testref         |   2 +-
 .../SwitchBodyCompoundCondition.testref       |   2 +-
 .../GotoStatementShouldNotBeUsed.testref      |   2 +-
 ...oReferenceALabelInSurroundingBlock.testref |   2 +-
 rule_packages/c/Banned.json                   |   4 +-
 rule_packages/c/BitfieldTypes.json            |   4 +-
 rule_packages/c/Declarations7.json            |   2 +-
 rule_packages/c/IntegerOverflow.json          |   2 +-
 rule_packages/c/Preprocessor2.json            |   4 +-
 rule_packages/c/Preprocessor6.json            |   2 +-
 rule_packages/c/SideEffects1.json             |   2 +-
 rule_packages/c/SideEffects3.json             |   2 +-
 rule_packages/c/Statements2.json              |   2 +-
 rule_packages/c/Statements6.json              |   2 +-
 rule_packages/c/Syntax.json                   |   4 +-
 rule_packages/cpp/BannedFunctions.json        |   2 +-
 rule_packages/cpp/BannedLibraries.json        |  10 +-
 rule_packages/cpp/BannedSyntax.json           |   6 +-
 rule_packages/cpp/BannedTypes.json            |   2 +-
 rule_packages/cpp/Comments.json               |   4 +-
 rule_packages/cpp/Conditionals.json           |   4 +-
 rule_packages/cpp/Declarations.json           |   6 +-
 rule_packages/cpp/Exceptions1.json            |   6 +-
 rule_packages/cpp/Functions.json              |   4 +-
 rule_packages/cpp/ImportMisra23.json          | 122 +++++++++---------
 rule_packages/cpp/Inheritance.json            |   4 +-
 rule_packages/cpp/Initialization.json         |   8 +-
 rule_packages/cpp/Literals.json               |   8 +-
 rule_packages/cpp/MoveForward.json            |   2 +-
 rule_packages/cpp/Naming.json                 |   2 +-
 rule_packages/cpp/OperatorInvariants.json     |   2 +-
 rule_packages/cpp/Operators.json              |   4 +-
 rule_packages/cpp/Pointers.json               |   6 +-
 rule_packages/cpp/Representation.json         |   2 +-
 rule_packages/cpp/Scope.json                  |   8 +-
 rule_packages/cpp/Templates.json              |   6 +-
 rule_packages/cpp/VirtualFunctions.json       |   2 +-
 .../templates/shared_library.ql.template      |   3 +-
 647 files changed, 1107 insertions(+), 1037 deletions(-)
 rename c/common/test/rules/{amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected => amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.expected} (100%)
 rename c/common/test/rules/{amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql => amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql} (61%)
 rename c/common/test/rules/{amixedusemacroargumentsubjecttoexpansion_shared => amixedusemacroargumentsubjecttoexpansion}/test.c (100%)
 rename c/common/test/rules/{atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected => atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.expected} (100%)
 create mode 100644 c/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
 rename c/common/test/rules/{atofatoiatolandatollused_shared => atofatoiatolandatollused}/test.c (100%)
 delete mode 100644 c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
 rename c/common/test/rules/{bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected => bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.expected} (100%)
 create mode 100644 c/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
 rename c/common/test/rules/{bitfieldshallhaveanappropriatetype_shared => bitfieldshallhaveanappropriatetype}/test.c (100%)
 delete mode 100644 c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
 rename c/common/test/rules/{functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected => functionlikemacrosdefined/FunctionLikeMacrosDefined.expected} (100%)
 create mode 100644 c/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
 rename c/common/test/rules/{functionlikemacrosdefined_shared => functionlikemacrosdefined}/test.c (100%)
 delete mode 100644 c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
 rename c/common/test/rules/{gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected => gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.expected} (100%)
 rename c/common/test/rules/{gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql => gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql} (63%)
 rename c/common/test/rules/{gotoreferencealabelinsurroundingblock_shared => gotoreferencealabelinsurroundingblock}/test.c (100%)
 rename c/common/test/rules/{gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected => gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.expected} (100%)
 create mode 100644 c/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
 rename c/common/test/rules/{gotostatementshouldnotbeused_shared => gotostatementshouldnotbeused}/test.c (100%)
 delete mode 100644 c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
 rename c/common/test/rules/{lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected => lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.expected} (100%)
 create mode 100644 c/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
 rename c/common/test/rules/{lowercaselstartsinliteralsuffix_shared => lowercaselstartsinliteralsuffix}/test.c (100%)
 delete mode 100644 c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
 rename c/common/test/rules/{macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected => macroparameterfollowinghash/MacroParameterFollowingHash.expected} (100%)
 create mode 100644 c/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
 rename c/common/test/rules/{macroparameterfollowinghash_shared => macroparameterfollowinghash}/test.c (100%)
 delete mode 100644 c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
 rename c/common/test/rules/{memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected => memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected} (100%)
 rename c/common/test/rules/{memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql => memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql} (60%)
 rename c/common/test/rules/{memoryoperationsnotsequencedappropriately_shared => memoryoperationsnotsequencedappropriately}/test.c (100%)
 rename c/common/test/rules/{namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected => namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.expected} (100%)
 create mode 100644 c/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
 rename c/common/test/rules/{namedbitfieldswithsignedintegertype_shared => namedbitfieldswithsignedintegertype}/test.c (100%)
 delete mode 100644 c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
 rename c/common/test/rules/{nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected => nonterminatedescapesequences/NonTerminatedEscapeSequences.expected} (100%)
 create mode 100644 c/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
 rename c/common/test/rules/{nonterminatedescapesequences_shared => nonterminatedescapesequences}/test.c (100%)
 delete mode 100644 c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
 rename c/common/test/rules/{nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected => nonuniqueenumerationconstant/NonUniqueEnumerationConstant.expected} (100%)
 create mode 100644 c/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
 rename c/common/test/rules/{nonuniqueenumerationconstant_shared => nonuniqueenumerationconstant}/test.c (100%)
 delete mode 100644 c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
 rename c/common/test/rules/{resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected => resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected} (100%)
 rename c/common/test/rules/{resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql => resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql} (59%)
 rename c/common/test/rules/{resultofanassignmentoperatorshouldnotbeused_shared => resultofanassignmentoperatorshouldnotbeused}/test.c (100%)
 rename c/common/test/rules/{unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected => unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.expected} (100%)
 rename c/common/test/rules/{unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql => unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql} (59%)
 rename c/common/test/rules/{unsignedoperationwithconstantoperandswraps_shared => unsignedoperationwithconstantoperandswraps}/test.c (100%)
 rename c/common/test/rules/{useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected => useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.expected} (100%)
 create mode 100644 c/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
 rename c/common/test/rules/{useofnonzerooctalliteral_shared => useofnonzerooctalliteral}/test.c (100%)
 delete mode 100644 c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
 rename cpp/common/src/codingstandards/cpp/rules/{addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll => addressofoperatoroverloaded/AddressOfOperatorOverloaded.qll} (62%)
 rename cpp/common/src/codingstandards/cpp/rules/{amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll => amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.qll} (80%)
 rename cpp/common/src/codingstandards/cpp/rules/{arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll => arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll} (86%)
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/asmdeclarationused/AsmDeclarationUsed.qll
 delete mode 100644 cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll
 rename cpp/common/src/codingstandards/cpp/rules/{atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll => atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.qll} (60%)
 rename cpp/common/src/codingstandards/cpp/rules/{backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll => backslashcharactermisuse/BackslashCharacterMisuse.qll} (56%)
 rename cpp/common/src/codingstandards/cpp/rules/{bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll => bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.qll} (82%)
 rename cpp/common/src/codingstandards/cpp/rules/{builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll => builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll} (69%)
 rename cpp/common/src/codingstandards/cpp/rules/{castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll => castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll} (63%)
 rename cpp/common/src/codingstandards/cpp/rules/{charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll => charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.qll} (57%)
 rename cpp/common/src/codingstandards/cpp/rules/{copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll => copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll} (80%)
 rename cpp/common/src/codingstandards/cpp/rules/{csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll => csignalfunctionsused/CsignalFunctionsUsed.qll} (57%)
 rename cpp/common/src/codingstandards/cpp/rules/{csignaltypesused_shared/CsignalTypesUsed_shared.qll => csignaltypesused/CsignalTypesUsed.qll} (57%)
 rename cpp/common/src/codingstandards/cpp/rules/{cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll => cstdiofunctionsused/CstdioFunctionsUsed.qll} (75%)
 rename cpp/common/src/codingstandards/cpp/rules/{cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll => cstdiomacrosused/CstdioMacrosUsed.qll} (57%)
 rename cpp/common/src/codingstandards/cpp/rules/{cstdiotypesused_shared/CstdioTypesUsed_shared.qll => cstdiotypesused/CstdioTypesUsed.qll} (65%)
 rename cpp/common/src/codingstandards/cpp/rules/{definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll => definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.qll} (87%)
 rename cpp/common/src/codingstandards/cpp/rules/{emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll => emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.qll} (57%)
 delete mode 100644 cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll
 rename cpp/common/src/codingstandards/cpp/rules/{exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll => exceptionobjecthavepointertype/ExceptionObjectHavePointerType.qll} (65%)
 rename cpp/common/src/codingstandards/cpp/rules/{forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll => forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll} (76%)
 rename cpp/common/src/codingstandards/cpp/rules/{functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll => functionlikemacrosdefined/FunctionLikeMacrosDefined.qll} (74%)
 rename cpp/common/src/codingstandards/cpp/rules/{functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll => functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll} (80%)
 rename cpp/common/src/codingstandards/cpp/rules/{functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll => functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.qll} (67%)
 rename cpp/common/src/codingstandards/cpp/rules/{globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll => globalnamespacedeclarations/GlobalNamespaceDeclarations.qll} (68%)
 rename cpp/common/src/codingstandards/cpp/rules/{globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll => globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.qll} (66%)
 rename cpp/common/src/codingstandards/cpp/rules/{globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll => globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.qll} (66%)
 rename cpp/common/src/codingstandards/cpp/rules/{gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll => gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.qll} (87%)
 rename cpp/common/src/codingstandards/cpp/rules/{gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll => gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.qll} (62%)
 rename cpp/common/src/codingstandards/cpp/rules/{hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll => hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.qll} (86%)
 rename cpp/common/src/codingstandards/cpp/rules/{hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll => hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.qll} (88%)
 rename cpp/common/src/codingstandards/cpp/rules/{initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll => initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll} (82%)
 rename cpp/common/src/codingstandards/cpp/rules/{initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll => initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll} (89%)
 rename cpp/common/src/codingstandards/cpp/rules/{linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll => linesplicingusedincomments/LineSplicingUsedInComments.qll} (50%)
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition/LoopCompoundCondition.qll
 delete mode 100644 cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll
 rename cpp/common/src/codingstandards/cpp/rules/{lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll => lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.qll} (60%)
 rename cpp/common/src/codingstandards/cpp/rules/{macrooffsetofused_shared/MacroOffsetofUsed_shared.qll => macrooffsetofused/MacroOffsetofUsed.qll} (55%)
 rename cpp/common/src/codingstandards/cpp/rules/{macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll => macroparameterfollowinghash/MacroParameterFollowingHash.qll} (66%)
 rename cpp/common/src/codingstandards/cpp/rules/{memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll => memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll} (97%)
 rename cpp/common/src/codingstandards/cpp/rules/{multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll => multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.qll} (90%)
 rename cpp/common/src/codingstandards/cpp/rules/{multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll => multiplelocaldeclarators/MultipleLocalDeclarators.qll} (59%)
 rename cpp/common/src/codingstandards/cpp/rules/{namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll => namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.qll} (67%)
 rename cpp/common/src/codingstandards/cpp/rules/{namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll => namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.qll} (78%)
 rename cpp/common/src/codingstandards/cpp/rules/{namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll => namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.qll} (79%)
 rename cpp/common/src/codingstandards/cpp/rules/{noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll => noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll} (76%)
 rename cpp/common/src/codingstandards/cpp/rules/{nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll => nonglobalfunctionmain/NonGlobalFunctionMain.qll} (52%)
 rename cpp/common/src/codingstandards/cpp/rules/{nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll => nonterminatedescapesequences/NonTerminatedEscapeSequences.qll} (81%)
 rename cpp/common/src/codingstandards/cpp/rules/{nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll => nonuniqueenumerationconstant/NonUniqueEnumerationConstant.qll} (80%)
 rename cpp/common/src/codingstandards/cpp/rules/{nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll => nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll} (74%)
 rename cpp/common/src/codingstandards/cpp/rules/{objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll => objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll} (92%)
 rename cpp/common/src/codingstandards/cpp/rules/{overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll => overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll} (78%)
 rename cpp/common/src/codingstandards/cpp/rules/{potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll => potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll} (78%)
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/reinterpretcastused/ReinterpretCastUsed.qll
 delete mode 100644 cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll
 rename cpp/common/src/codingstandards/cpp/rules/{resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll => resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.qll} (58%)
 rename cpp/common/src/codingstandards/cpp/rules/{returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll => returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll} (74%)
 rename cpp/common/src/codingstandards/cpp/rules/{switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll => switchcompoundcondition/SwitchCompoundCondition.qll} (79%)
 rename cpp/common/src/codingstandards/cpp/rules/{unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll => unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll} (79%)
 rename cpp/common/src/codingstandards/cpp/rules/{unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll => unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.qll} (80%)
 rename cpp/common/src/codingstandards/cpp/rules/{useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll => useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.qll} (60%)
 rename cpp/common/src/codingstandards/cpp/rules/{vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll => vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.qll} (68%)
 rename cpp/common/src/codingstandards/cpp/rules/{virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll => virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.qll} (82%)
 rename cpp/common/test/rules/{addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.expected => addressofoperatoroverloaded/AddressOfOperatorOverloaded.expected} (100%)
 create mode 100644 cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.ql
 rename cpp/common/test/rules/{addressofoperatoroverloaded_shared => addressofoperatoroverloaded}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
 rename cpp/common/test/rules/{amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected => amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.expected} (100%)
 rename cpp/common/test/rules/{amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql => amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql} (61%)
 rename cpp/common/test/rules/{amixedusemacroargumentsubjecttoexpansion_shared => amixedusemacroargumentsubjecttoexpansion}/test.cpp (100%)
 rename cpp/common/test/rules/{arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.expected => arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.expected} (100%)
 rename cpp/common/test/rules/{arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql => arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql} (58%)
 rename cpp/common/test/rules/{arraypassedasfunctionargumentdecaytoapointer_shared => arraypassedasfunctionargumentdecaytoapointer}/test.cpp (100%)
 rename cpp/common/test/rules/{asmdeclarationused_shared/AsmDeclarationUsed_shared.expected => asmdeclarationused/AsmDeclarationUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.ql
 rename cpp/common/test/rules/{asmdeclarationused_shared => asmdeclarationused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
 rename cpp/common/test/rules/{atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected => atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
 rename cpp/common/test/rules/{atofatoiatolandatollused_shared => atofatoiatolandatollused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
 rename cpp/common/test/rules/{backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.expected => backslashcharactermisuse/BackslashCharacterMisuse.expected} (100%)
 create mode 100644 cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.ql
 rename cpp/common/test/rules/{backslashcharactermisuse_shared => backslashcharactermisuse}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
 rename cpp/common/test/rules/{bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected => bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.expected} (100%)
 create mode 100644 cpp/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
 rename cpp/common/test/rules/{bitfieldshallhaveanappropriatetype_shared => bitfieldshallhaveanappropriatetype}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
 rename cpp/common/test/rules/{builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.expected => builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.expected} (100%)
 rename cpp/common/test/rules/{builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql => builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql} (56%)
 rename cpp/common/test/rules/{builtinunaryoperatorappliedtounsignedexpression_shared => builtinunaryoperatorappliedtounsignedexpression}/test.cpp (100%)
 rename cpp/common/test/rules/{castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.expected => castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.expected} (100%)
 rename cpp/common/test/rules/{castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql => castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.ql} (57%)
 rename cpp/common/test/rules/{castsbetweenapointertofunctionandanyothertype_shared => castsbetweenapointertofunctionandanyothertype}/test.cpp (100%)
 rename cpp/common/test/rules/{charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.expected => charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.expected} (100%)
 rename cpp/common/test/rules/{charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql => charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.ql} (60%)
 rename cpp/common/test/rules/{charactersequenceusedwithinacstylecomment_shared => charactersequenceusedwithinacstylecomment}/test.cpp (100%)
 rename cpp/common/test/rules/{copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.expected => copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.expected} (100%)
 rename cpp/common/test/rules/{copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql => copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql} (56%)
 rename cpp/common/test/rules/{copyandmoveassignmentsshallhandleselfassignment_shared => copyandmoveassignmentsshallhandleselfassignment}/test.cpp (100%)
 rename cpp/common/test/rules/{csignalfunctionsused_shared/CsignalFunctionsUsed_shared.expected => csignalfunctionsused/CsignalFunctionsUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/csignalfunctionsused/CsignalFunctionsUsed.ql
 rename cpp/common/test/rules/{csignalfunctionsused_shared => csignalfunctionsused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
 rename cpp/common/test/rules/{csignaltypesused_shared/CsignalTypesUsed_shared.expected => csignaltypesused/CsignalTypesUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.ql
 rename cpp/common/test/rules/{csignaltypesused_shared => csignaltypesused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
 rename cpp/common/test/rules/{cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.expected => cstdiofunctionsused/CstdioFunctionsUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.ql
 rename cpp/common/test/rules/{cstdiofunctionsused_shared => cstdiofunctionsused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
 rename cpp/common/test/rules/{cstdiomacrosused_shared/CstdioMacrosUsed_shared.expected => cstdiomacrosused/CstdioMacrosUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.ql
 rename cpp/common/test/rules/{cstdiomacrosused_shared => cstdiomacrosused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
 rename cpp/common/test/rules/{cstdiotypesused_shared/CstdioTypesUsed_shared.expected => cstdiotypesused/CstdioTypesUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.ql
 rename cpp/common/test/rules/{cstdiotypesused_shared => cstdiotypesused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
 rename cpp/common/test/rules/{definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.expected => definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.expected} (100%)
 rename cpp/common/test/rules/{definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql => definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.ql} (59%)
 rename cpp/common/test/rules/{definitionnotconsideredforunqualifiedlookup_shared => definitionnotconsideredforunqualifiedlookup}/test.cpp (100%)
 rename cpp/common/test/rules/{emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.expected => emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.expected} (100%)
 create mode 100644 cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.ql
 rename cpp/common/test/rules/{emptythrowonlywithinacatchhandler_shared => emptythrowonlywithinacatchhandler}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
 rename cpp/common/test/rules/{enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.expected => enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.expected} (100%)
 rename cpp/common/test/rules/{enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql => enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql} (55%)
 rename cpp/common/test/rules/{enumerationnotdefinedwithanexplicitunderlyingtype_shared => enumerationnotdefinedwithanexplicitunderlyingtype}/test.cpp (100%)
 rename cpp/common/test/rules/{exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.expected => exceptionobjecthavepointertype/ExceptionObjectHavePointerType.expected} (100%)
 create mode 100644 cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.ql
 rename cpp/common/test/rules/{exceptionobjecthavepointertype_shared => exceptionobjecthavepointertype}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
 rename cpp/common/test/rules/{forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.expected => forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.expected} (100%)
 rename cpp/common/test/rules/{forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql => forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.ql} (57%)
 rename cpp/common/test/rules/{forwardingreferencesandforwardnotusedtogether_shared => forwardingreferencesandforwardnotusedtogether}/test.cpp (100%)
 rename cpp/common/test/rules/{functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected => functionlikemacrosdefined/FunctionLikeMacrosDefined.expected} (100%)
 create mode 100644 cpp/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
 rename cpp/common/test/rules/{functionlikemacrosdefined_shared => functionlikemacrosdefined}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
 rename cpp/common/test/rules/{functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.expected => functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.expected} (100%)
 rename cpp/common/test/rules/{functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql => functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql} (55%)
 rename cpp/common/test/rules/{functionscallthemselveseitherdirectlyorindirectly_shared => functionscallthemselveseitherdirectlyorindirectly}/test.cpp (100%)
 rename cpp/common/test/rules/{functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.expected => functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.expected} (100%)
 rename cpp/common/test/rules/{functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql => functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.ql} (62%)
 rename cpp/common/test/rules/{functiontemplatesexplicitlyspecialized_shared => functiontemplatesexplicitlyspecialized}/test.cpp (100%)
 rename cpp/common/test/rules/{globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.expected => globalnamespacedeclarations/GlobalNamespaceDeclarations.expected} (100%)
 create mode 100644 cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.ql
 rename cpp/common/test/rules/{globalnamespacedeclarations_shared => globalnamespacedeclarations}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
 rename cpp/common/test/rules/{globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.expected => globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.expected} (100%)
 create mode 100644 cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.ql
 rename cpp/common/test/rules/{globalsizedoperatordeletenotdefined_shared => globalsizedoperatordeletenotdefined}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
 rename cpp/common/test/rules/{globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.expected => globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.expected} (100%)
 rename cpp/common/test/rules/{globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql => globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.ql} (63%)
 rename cpp/common/test/rules/{globalunsizedoperatordeletenotdefined_shared => globalunsizedoperatordeletenotdefined}/test.cpp (100%)
 rename cpp/common/test/rules/{gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected => gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.expected} (100%)
 rename cpp/common/test/rules/{gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql => gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql} (63%)
 rename cpp/common/test/rules/{gotoreferencealabelinsurroundingblock_shared => gotoreferencealabelinsurroundingblock}/test.cpp (100%)
 rename cpp/common/test/rules/{gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected => gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
 rename cpp/common/test/rules/{gotostatementshouldnotbeused_shared => gotostatementshouldnotbeused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
 rename cpp/common/test/rules/{hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.expected => hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.expected} (100%)
 rename cpp/common/test/rules/{hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql => hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.ql} (59%)
 rename cpp/common/test/rules/{hiddeninheritednonoverridablememberfunction_shared => hiddeninheritednonoverridablememberfunction}/test.cpp (100%)
 rename cpp/common/test/rules/{hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.expected => hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.expected} (100%)
 rename cpp/common/test/rules/{hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql => hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.ql} (61%)
 rename cpp/common/test/rules/{hiddeninheritedoverridablememberfunction_shared => hiddeninheritedoverridablememberfunction}/test.cpp (100%)
 rename cpp/common/test/rules/{initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.expected => initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.expected} (100%)
 create mode 100644 cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.ql
 rename cpp/common/test/rules/{initializeallvirtualbaseclasses_shared => initializeallvirtualbaseclasses}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
 rename cpp/common/test/rules/{initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.expected => initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.expected} (100%)
 rename cpp/common/test/rules/{initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql => initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.ql} (56%)
 rename cpp/common/test/rules/{initializerlistconstructoristheonlyconstructor_shared => initializerlistconstructoristheonlyconstructor}/test.cpp (100%)
 rename cpp/common/test/rules/{linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.expected => linesplicingusedincomments/LineSplicingUsedInComments.expected} (100%)
 create mode 100644 cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.ql
 rename cpp/common/test/rules/{linesplicingusedincomments_shared => linesplicingusedincomments}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
 rename cpp/common/test/rules/{loopcompoundcondition_shared/LoopCompoundCondition_shared.expected => loopcompoundcondition/LoopCompoundCondition.expected} (100%)
 create mode 100644 cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.ql
 rename cpp/common/test/rules/{loopcompoundcondition_shared => loopcompoundcondition}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
 rename cpp/common/test/rules/{lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected => lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.expected} (100%)
 create mode 100644 cpp/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
 rename cpp/common/test/rules/{lowercaselstartsinliteralsuffix_shared => lowercaselstartsinliteralsuffix}/README.md (100%)
 rename cpp/common/test/rules/{lowercaselstartsinliteralsuffix_shared => lowercaselstartsinliteralsuffix}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
 rename cpp/common/test/rules/{macrooffsetofused_shared => macrooffsetofused}/MacroOffsetofUsed.expected (100%)
 rename cpp/common/test/rules/{macrooffsetofused_shared => macrooffsetofused}/MacroOffsetofUsed.expected.gcc (100%)
 rename cpp/common/test/rules/{macrooffsetofused_shared => macrooffsetofused}/MacroOffsetofUsed.expected.qcc (100%)
 create mode 100644 cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.ql
 rename cpp/common/test/rules/{macrooffsetofused_shared => macrooffsetofused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected
 delete mode 100644 cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
 rename cpp/common/test/rules/{macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected => macroparameterfollowinghash/MacroParameterFollowingHash.expected} (100%)
 create mode 100644 cpp/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
 rename cpp/common/test/rules/{macroparameterfollowinghash_shared => macroparameterfollowinghash}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
 rename cpp/common/test/rules/{memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected => memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected} (100%)
 rename cpp/common/test/rules/{memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql => memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql} (60%)
 rename cpp/common/test/rules/{memoryoperationsnotsequencedappropriately_shared => memoryoperationsnotsequencedappropriately}/test.cpp (100%)
 rename cpp/common/test/rules/{multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.expected => multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.expected} (100%)
 create mode 100644 cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql
 rename cpp/common/test/rules/{multipleglobalormemberdeclarators_shared => multipleglobalormemberdeclarators}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
 rename cpp/common/test/rules/{multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.expected => multiplelocaldeclarators/MultipleLocalDeclarators.expected} (100%)
 create mode 100644 cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql
 rename cpp/common/test/rules/{multiplelocaldeclarators_shared => multiplelocaldeclarators}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
 rename cpp/common/test/rules/{namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected => namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.expected} (100%)
 create mode 100644 cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
 rename cpp/common/test/rules/{namedbitfieldswithsignedintegertype_shared => namedbitfieldswithsignedintegertype}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
 rename cpp/common/test/rules/{namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.expected => namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.expected} (100%)
 rename cpp/common/test/rules/{namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql => namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.ql} (62%)
 rename cpp/common/test/rules/{namenotreferredusingaqualifiedidorthis_shared => namenotreferredusingaqualifiedidorthis}/test.cpp (100%)
 rename cpp/common/test/rules/{namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.expected => namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.expected} (100%)
 rename cpp/common/test/rules/{namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql => namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.ql} (59%)
 rename cpp/common/test/rules/{namenotreferredusingaqualifiedidorthisaudit_shared => namenotreferredusingaqualifiedidorthisaudit}/test.cpp (100%)
 rename cpp/common/test/rules/{noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.expected => noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.expected} (100%)
 rename cpp/common/test/rules/{noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql => noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.ql} (57%)
 rename cpp/common/test/rules/{noexceptfunctionshouldnotpropagatetothecaller_shared => noexceptfunctionshouldnotpropagatetothecaller}/test.cpp (100%)
 rename cpp/common/test/rules/{nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.expected => nonglobalfunctionmain/NonGlobalFunctionMain.expected} (100%)
 create mode 100644 cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql
 rename cpp/common/test/rules/{nonglobalfunctionmain_shared => nonglobalfunctionmain}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
 rename cpp/common/test/rules/{nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected => nonterminatedescapesequences/NonTerminatedEscapeSequences.expected} (100%)
 create mode 100644 cpp/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
 rename cpp/common/test/rules/{nonterminatedescapesequences_shared => nonterminatedescapesequences}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
 rename cpp/common/test/rules/{nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected => nonuniqueenumerationconstant/NonUniqueEnumerationConstant.expected} (100%)
 create mode 100644 cpp/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
 rename cpp/common/test/rules/{nonuniqueenumerationconstant_shared => nonuniqueenumerationconstant}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected => nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected} (100%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.clang => nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.clang} (100%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.gcc => nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.gcc} (100%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.qcc => nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.qcc} (100%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql => nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql} (57%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared => nullptrnottheonlyformofthenullpointerconstant}/test.cpp (100%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared => nullptrnottheonlyformofthenullpointerconstant}/test.cpp.clang (100%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared => nullptrnottheonlyformofthenullpointerconstant}/test.cpp.gcc (100%)
 rename cpp/common/test/rules/{nullptrnottheonlyformofthenullpointerconstant_shared => nullptrnottheonlyformofthenullpointerconstant}/test.cpp.qcc (100%)
 rename cpp/common/test/rules/{objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.expected => objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.expected} (100%)
 rename cpp/common/test/rules/{objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql => objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql} (55%)
 rename cpp/common/test/rules/{objectsdynamictypeusedfromconstructorordestructor_shared => objectsdynamictypeusedfromconstructorordestructor}/test.cpp (100%)
 rename cpp/common/test/rules/{overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.expected => overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.expected} (100%)
 rename cpp/common/test/rules/{overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql => overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql} (56%)
 rename cpp/common/test/rules/{overridingshallspecifydifferentdefaultarguments_shared => overridingshallspecifydifferentdefaultarguments}/test.cpp (100%)
 rename cpp/common/test/rules/{potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.expected => potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.expected} (100%)
 rename cpp/common/test/rules/{potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql => potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql} (56%)
 rename cpp/common/test/rules/{potentiallyvirtualpointeronlycomparestonullptr_shared => potentiallyvirtualpointeronlycomparestonullptr}/test.cpp (100%)
 rename cpp/common/test/rules/{reinterpretcastused_shared/ReinterpretCastUsed_shared.expected => reinterpretcastused/ReinterpretCastUsed.expected} (100%)
 create mode 100644 cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.ql
 rename cpp/common/test/rules/{reinterpretcastused_shared => reinterpretcastused}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
 rename cpp/common/test/rules/{resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected => resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected} (100%)
 rename cpp/common/test/rules/{resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql => resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql} (59%)
 rename cpp/common/test/rules/{resultofanassignmentoperatorshouldnotbeused_shared => resultofanassignmentoperatorshouldnotbeused}/test.cpp (100%)
 rename cpp/common/test/rules/{returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.expected => returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.expected} (100%)
 rename cpp/common/test/rules/{returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql => returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.ql} (55%)
 rename cpp/common/test/rules/{returnreferenceorpointertoautomaticlocalvariable_shared => returnreferenceorpointertoautomaticlocalvariable}/test.cpp (100%)
 rename cpp/common/test/rules/{switchcompoundcondition_shared/SwitchCompoundCondition_shared.expected => switchcompoundcondition/SwitchCompoundCondition.expected} (100%)
 create mode 100644 cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.ql
 rename cpp/common/test/rules/{switchcompoundcondition_shared => switchcompoundcondition}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
 rename cpp/common/test/rules/{unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.expected => unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected} (100%)
 rename cpp/common/test/rules/{unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql => unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql} (56%)
 rename cpp/common/test/rules/{unsignedintegerliteralsnotappropriatelysuffixed_shared => unsignedintegerliteralsnotappropriatelysuffixed}/test.cpp (100%)
 rename cpp/common/test/rules/{unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected => unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.expected} (100%)
 rename cpp/common/test/rules/{unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql => unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql} (59%)
 rename cpp/common/test/rules/{unsignedoperationwithconstantoperandswraps_shared => unsignedoperationwithconstantoperandswraps}/test.cpp (100%)
 rename cpp/common/test/rules/{useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected => useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.expected} (100%)
 create mode 100644 cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
 rename cpp/common/test/rules/{useofnonzerooctalliteral_shared => useofnonzerooctalliteral}/test.cpp (100%)
 delete mode 100644 cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
 rename cpp/common/test/rules/{vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected => vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.expected} (100%)
 rename cpp/common/test/rules/{vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected.qcc => vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.expected.qcc} (100%)
 rename cpp/common/test/rules/{vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql => vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.ql} (64%)
 rename cpp/common/test/rules/{vectorshouldnotbespecializedwithbool_shared => vectorshouldnotbespecializedwithbool}/test.cpp (100%)
 rename cpp/common/test/rules/{virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.expected => virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.expected} (100%)
 rename cpp/common/test/rules/{virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql => virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql} (61%)
 rename cpp/common/test/rules/{virtualandnonvirtualclassinthehierarchy_shared => virtualandnonvirtualclassinthehierarchy}/test.cpp (100%)

diff --git a/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql b/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql
index 6019b7b0d6..1c7ae3e31b 100644
--- a/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql
+++ b/c/cert/src/rules/INT30-C/UnsignedIntegerOperationsWrapAround.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps.UnsignedOperationWithConstantOperandsWraps
 
-class UnsignedIntegerOperationsWrapAroundQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery
+class UnsignedIntegerOperationsWrapAroundQuery extends UnsignedOperationWithConstantOperandsWrapsSharedQuery
 {
   UnsignedIntegerOperationsWrapAroundQuery() {
     this = IntegerOverflowPackage::unsignedIntegerOperationsWrapAroundQuery()
diff --git a/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref b/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref
index 2cc69bff5a..c9bc9d9637 100644
--- a/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref
+++ b/c/cert/test/rules/INT30-C/UnsignedIntegerOperationsWrapAround.testref
@@ -1 +1 @@
-c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
\ No newline at end of file
+c/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
\ No newline at end of file
diff --git a/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.expected
similarity index 100%
rename from c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
rename to c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.expected
diff --git a/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
similarity index 61%
rename from c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
rename to c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
index 8fc299b7f3..5aa514e86d 100644
--- a/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
+++ b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion.AMixedUseMacroArgumentSubjectToExpansion
 
-class TestFileQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends AMixedUseMacroArgumentSubjectToExpansionSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.c b/c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/test.c
similarity index 100%
rename from c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.c
rename to c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/test.c
diff --git a/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected b/c/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.expected
similarity index 100%
rename from c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
rename to c/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.expected
diff --git a/c/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql b/c/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
new file mode 100644
index 0000000000..6da5fe6097
--- /dev/null
+++ b/c/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.atofatoiatolandatollused.AtofAtoiAtolAndAtollUsed
+
+class TestFileQuery extends AtofAtoiAtolAndAtollUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/atofatoiatolandatollused_shared/test.c b/c/common/test/rules/atofatoiatolandatollused/test.c
similarity index 100%
rename from c/common/test/rules/atofatoiatolandatollused_shared/test.c
rename to c/common/test/rules/atofatoiatolandatollused/test.c
diff --git a/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql b/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
deleted file mode 100644
index 75b1a7ea10..0000000000
--- a/c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
-
-class TestFileQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected b/c/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.expected
similarity index 100%
rename from c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
rename to c/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.expected
diff --git a/c/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql b/c/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
new file mode 100644
index 0000000000..a3e1ecc76c
--- /dev/null
+++ b/c/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype.BitFieldShallHaveAnAppropriateType
+
+class TestFileQuery extends BitFieldShallHaveAnAppropriateTypeSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.c b/c/common/test/rules/bitfieldshallhaveanappropriatetype/test.c
similarity index 100%
rename from c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.c
rename to c/common/test/rules/bitfieldshallhaveanappropriatetype/test.c
diff --git a/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql b/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
deleted file mode 100644
index e460832dc7..0000000000
--- a/c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
-
-class TestFileQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected b/c/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.expected
similarity index 100%
rename from c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
rename to c/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.expected
diff --git a/c/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql b/c/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
new file mode 100644
index 0000000000..29088c4458
--- /dev/null
+++ b/c/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functionlikemacrosdefined.FunctionLikeMacrosDefined
+
+class TestFileQuery extends FunctionLikeMacrosDefinedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/functionlikemacrosdefined_shared/test.c b/c/common/test/rules/functionlikemacrosdefined/test.c
similarity index 100%
rename from c/common/test/rules/functionlikemacrosdefined_shared/test.c
rename to c/common/test/rules/functionlikemacrosdefined/test.c
diff --git a/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql b/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
deleted file mode 100644
index 062cce047c..0000000000
--- a/c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
-
-class TestFileQuery extends FunctionLikeMacrosDefined_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected b/c/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.expected
similarity index 100%
rename from c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
rename to c/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.expected
diff --git a/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql b/c/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
similarity index 63%
rename from c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
rename to c/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
index f905b9a46c..f553135683 100644
--- a/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
+++ b/c/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock.GotoReferenceALabelInSurroundingBlock
 
-class TestFileQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends GotoReferenceALabelInSurroundingBlockSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.c b/c/common/test/rules/gotoreferencealabelinsurroundingblock/test.c
similarity index 100%
rename from c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.c
rename to c/common/test/rules/gotoreferencealabelinsurroundingblock/test.c
diff --git a/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected b/c/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.expected
similarity index 100%
rename from c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
rename to c/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.expected
diff --git a/c/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql b/c/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
new file mode 100644
index 0000000000..1a117d5ddd
--- /dev/null
+++ b/c/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotostatementshouldnotbeused.GotoStatementShouldNotBeUsed
+
+class TestFileQuery extends GotoStatementShouldNotBeUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/gotostatementshouldnotbeused_shared/test.c b/c/common/test/rules/gotostatementshouldnotbeused/test.c
similarity index 100%
rename from c/common/test/rules/gotostatementshouldnotbeused_shared/test.c
rename to c/common/test/rules/gotostatementshouldnotbeused/test.c
diff --git a/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql b/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
deleted file mode 100644
index e7ae4fcebb..0000000000
--- a/c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
-
-class TestFileQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected b/c/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.expected
similarity index 100%
rename from c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
rename to c/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.expected
diff --git a/c/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql b/c/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
new file mode 100644
index 0000000000..ab353ca8a9
--- /dev/null
+++ b/c/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix.LowercaseLStartsInLiteralSuffix
+
+class TestFileQuery extends LowercaseLStartsInLiteralSuffixSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.c b/c/common/test/rules/lowercaselstartsinliteralsuffix/test.c
similarity index 100%
rename from c/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.c
rename to c/common/test/rules/lowercaselstartsinliteralsuffix/test.c
diff --git a/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql b/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
deleted file mode 100644
index 8d7d9f0be8..0000000000
--- a/c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix_shared.LowercaseLStartsInLiteralSuffix_shared
-
-class TestFileQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected b/c/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.expected
similarity index 100%
rename from c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
rename to c/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.expected
diff --git a/c/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql b/c/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
new file mode 100644
index 0000000000..f753b75463
--- /dev/null
+++ b/c/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.macroparameterfollowinghash.MacroParameterFollowingHash
+
+class TestFileQuery extends MacroParameterFollowingHashSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/macroparameterfollowinghash_shared/test.c b/c/common/test/rules/macroparameterfollowinghash/test.c
similarity index 100%
rename from c/common/test/rules/macroparameterfollowinghash_shared/test.c
rename to c/common/test/rules/macroparameterfollowinghash/test.c
diff --git a/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql b/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
deleted file mode 100644
index 8c3dd270d0..0000000000
--- a/c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
-
-class TestFileQuery extends MacroParameterFollowingHash_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected b/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
similarity index 100%
rename from c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
rename to c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql b/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
similarity index 60%
rename from c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
rename to c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
index e49f82c8fd..63351377f0 100644
--- a/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
+++ b/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
 
-class TestFileQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery, TestQuery { }
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.c b/c/common/test/rules/memoryoperationsnotsequencedappropriately/test.c
similarity index 100%
rename from c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.c
rename to c/common/test/rules/memoryoperationsnotsequencedappropriately/test.c
diff --git a/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected b/c/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.expected
similarity index 100%
rename from c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
rename to c/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.expected
diff --git a/c/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql b/c/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
new file mode 100644
index 0000000000..a82fa7905a
--- /dev/null
+++ b/c/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype.NamedBitFieldsWithSignedIntegerType
+
+class TestFileQuery extends NamedBitFieldsWithSignedIntegerTypeSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.c b/c/common/test/rules/namedbitfieldswithsignedintegertype/test.c
similarity index 100%
rename from c/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.c
rename to c/common/test/rules/namedbitfieldswithsignedintegertype/test.c
diff --git a/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql b/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
deleted file mode 100644
index 09b98ff226..0000000000
--- a/c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
-
-class TestFileQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected b/c/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.expected
similarity index 100%
rename from c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
rename to c/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.expected
diff --git a/c/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql b/c/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
new file mode 100644
index 0000000000..c1aae3c31b
--- /dev/null
+++ b/c/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonterminatedescapesequences.NonTerminatedEscapeSequences
+
+class TestFileQuery extends NonTerminatedEscapeSequencesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonterminatedescapesequences_shared/test.c b/c/common/test/rules/nonterminatedescapesequences/test.c
similarity index 100%
rename from c/common/test/rules/nonterminatedescapesequences_shared/test.c
rename to c/common/test/rules/nonterminatedescapesequences/test.c
diff --git a/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql b/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
deleted file mode 100644
index 6cbb2220bb..0000000000
--- a/c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
-
-class TestFileQuery extends NonTerminatedEscapeSequences_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected b/c/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.expected
similarity index 100%
rename from c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
rename to c/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.expected
diff --git a/c/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql b/c/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
new file mode 100644
index 0000000000..97ba6f516e
--- /dev/null
+++ b/c/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonuniqueenumerationconstant.NonUniqueEnumerationConstant
+
+class TestFileQuery extends NonUniqueEnumerationConstantSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/nonuniqueenumerationconstant_shared/test.c b/c/common/test/rules/nonuniqueenumerationconstant/test.c
similarity index 100%
rename from c/common/test/rules/nonuniqueenumerationconstant_shared/test.c
rename to c/common/test/rules/nonuniqueenumerationconstant/test.c
diff --git a/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql b/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
deleted file mode 100644
index f01ef52853..0000000000
--- a/c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
-
-class TestFileQuery extends NonUniqueEnumerationConstant_sharedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected
similarity index 100%
rename from c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
rename to c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected
diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
similarity index 59%
rename from c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
rename to c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index af3f7697f7..286e4424a4 100644
--- a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused.ResultOfAnAssignmentOperatorShouldNotBeUsed
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsedSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.c b/c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/test.c
similarity index 100%
rename from c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.c
rename to c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/test.c
diff --git a/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected b/c/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.expected
similarity index 100%
rename from c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
rename to c/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.expected
diff --git a/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql b/c/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
similarity index 59%
rename from c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
rename to c/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
index 24780bcc5d..b88e7637c1 100644
--- a/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
+++ b/c/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps.UnsignedOperationWithConstantOperandsWraps
 
-class TestFileQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnsignedOperationWithConstantOperandsWrapsSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.c b/c/common/test/rules/unsignedoperationwithconstantoperandswraps/test.c
similarity index 100%
rename from c/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.c
rename to c/common/test/rules/unsignedoperationwithconstantoperandswraps/test.c
diff --git a/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected b/c/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.expected
similarity index 100%
rename from c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
rename to c/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.expected
diff --git a/c/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql b/c/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
new file mode 100644
index 0000000000..0404a7bc0c
--- /dev/null
+++ b/c/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.useofnonzerooctalliteral.UseOfNonZeroOctalLiteral
+
+class TestFileQuery extends UseOfNonZeroOctalLiteralSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/useofnonzerooctalliteral_shared/test.c b/c/common/test/rules/useofnonzerooctalliteral/test.c
similarity index 100%
rename from c/common/test/rules/useofnonzerooctalliteral_shared/test.c
rename to c/common/test/rules/useofnonzerooctalliteral/test.c
diff --git a/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql b/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
deleted file mode 100644
index dcd6042639..0000000000
--- a/c/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
-
-class TestFileQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery, TestQuery { }
diff --git a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
index 64a62e495e..3d8a51f219 100644
--- a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
+++ b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
+import codingstandards.cpp.rules.functionlikemacrosdefined.FunctionLikeMacrosDefined
 
-class FunctionOverFunctionLikeMacroQuery extends FunctionLikeMacrosDefined_sharedSharedQuery {
+class FunctionOverFunctionLikeMacroQuery extends FunctionLikeMacrosDefinedSharedQuery {
   FunctionOverFunctionLikeMacroQuery() {
     this = Preprocessor6Package::functionOverFunctionLikeMacroQuery()
   }
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index f2517abc21..80a9c540c1 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
 
-class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery
+class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery
 {
   UnsequencedSideEffectsQuery() { this = SideEffects3Package::unsequencedSideEffectsQuery() }
 }
diff --git a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index 5a105ca27f..69a5d57f25 100644
--- a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused.ResultOfAnAssignmentOperatorShouldNotBeUsed
 
-class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery
+class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsedSharedQuery
 {
   ResultOfAnAssignmentOperatorShouldNotBeUsedQuery() {
     this = SideEffects1Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery()
diff --git a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
index 845d36f798..d1c9aadadd 100644
--- a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
+++ b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
@@ -13,8 +13,8 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
+import codingstandards.cpp.rules.gotostatementshouldnotbeused.GotoStatementShouldNotBeUsed
 
-class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
+class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsedSharedQuery {
   GotoStatementUsedQuery() { this = Statements6Package::gotoStatementUsedQuery() }
 }
diff --git a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
index 16f24fd75e..1f9f066f53 100644
--- a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
+++ b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
@@ -14,8 +14,8 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock.GotoReferenceALabelInSurroundingBlock
 
-class GotoLabelBlockConditionQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery {
+class GotoLabelBlockConditionQuery extends GotoReferenceALabelInSurroundingBlockSharedQuery {
   GotoLabelBlockConditionQuery() { this = Statements2Package::gotoLabelBlockConditionQuery() }
 }
diff --git a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
index 55aa607723..8717afb4f1 100644
--- a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
+++ b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
+import codingstandards.cpp.rules.macroparameterfollowinghash.MacroParameterFollowingHash
 
-class MoreThanOneHashOperatorInMacroDefinitionQuery extends MacroParameterFollowingHash_sharedSharedQuery
+class MoreThanOneHashOperatorInMacroDefinitionQuery extends MacroParameterFollowingHashSharedQuery
 {
   MoreThanOneHashOperatorInMacroDefinitionQuery() {
     this = Preprocessor2Package::moreThanOneHashOperatorInMacroDefinitionQuery()
diff --git a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
index efe083efc0..8b9d6ca763 100644
--- a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
+++ b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion.AMixedUseMacroArgumentSubjectToExpansion
 
-class MacroParameterUsedAsHashOperandQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery
+class MacroParameterUsedAsHashOperandQuery extends AMixedUseMacroArgumentSubjectToExpansionSharedQuery
 {
   MacroParameterUsedAsHashOperandQuery() {
     this = Preprocessor2Package::macroParameterUsedAsHashOperandQuery()
diff --git a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
index 69733b6308..7263e91d53 100644
--- a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
+import codingstandards.cpp.rules.atofatoiatolandatollused.AtofAtoiAtolAndAtollUsed
 
-class AtofAtoiAtolAndAtollOfStdlibhUsedQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery {
+class AtofAtoiAtolAndAtollOfStdlibhUsedQuery extends AtofAtoiAtolAndAtollUsedSharedQuery {
   AtofAtoiAtolAndAtollOfStdlibhUsedQuery() {
     this = BannedPackage::atofAtoiAtolAndAtollOfStdlibhUsedQuery()
   }
diff --git a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
index e9d5f7b97c..fd77f1a688 100644
--- a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
+++ b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
+import codingstandards.cpp.rules.nonterminatedescapesequences.NonTerminatedEscapeSequences
 
-class OctalAndHexadecimalEscapeSequencesNotTerminatedQuery extends NonTerminatedEscapeSequences_sharedSharedQuery
+class OctalAndHexadecimalEscapeSequencesNotTerminatedQuery extends NonTerminatedEscapeSequencesSharedQuery
 {
   OctalAndHexadecimalEscapeSequencesNotTerminatedQuery() {
     this = SyntaxPackage::octalAndHexadecimalEscapeSequencesNotTerminatedQuery()
diff --git a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
index aaf7ff68a6..f5bc589a4d 100644
--- a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
+++ b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
@@ -12,9 +12,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype.BitFieldShallHaveAnAppropriateType
 
-class BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery
+class BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateTypeSharedQuery
 {
   BitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery() {
     this = BitfieldTypesPackage::bitFieldsShallOnlyBeDeclaredWithAnAppropriateTypeQuery()
diff --git a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
index 630f60cb92..d699c1c9b7 100644
--- a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
+++ b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
@@ -12,9 +12,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype.NamedBitFieldsWithSignedIntegerType
 
-class SingleBitNamedBitFieldsOfASignedTypeQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery
+class SingleBitNamedBitFieldsOfASignedTypeQuery extends NamedBitFieldsWithSignedIntegerTypeSharedQuery
 {
   SingleBitNamedBitFieldsOfASignedTypeQuery() {
     this = BitfieldTypesPackage::singleBitNamedBitFieldsOfASignedTypeQuery()
diff --git a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
index a2685db53c..a4fcb0e4f3 100644
--- a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
+++ b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
+import codingstandards.cpp.rules.nonuniqueenumerationconstant.NonUniqueEnumerationConstant
 
-class ValueImplicitEnumerationConstantNotUniqueQuery extends NonUniqueEnumerationConstant_sharedSharedQuery
+class ValueImplicitEnumerationConstantNotUniqueQuery extends NonUniqueEnumerationConstantSharedQuery
 {
   ValueImplicitEnumerationConstantNotUniqueQuery() {
     this = Declarations7Package::valueImplicitEnumerationConstantNotUniqueQuery()
diff --git a/c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref b/c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref
index cd897ee364..fb033c44e4 100644
--- a/c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref
+++ b/c/misra/test/rules/DIR-4-9/FunctionOverFunctionLikeMacro.testref
@@ -1 +1 @@
-c/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
\ No newline at end of file
+c/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
index 6131c93357..4623176d42 100644
--- a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
+++ b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
@@ -1 +1 @@
-c/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
\ No newline at end of file
+c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref b/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
index 0bda23895c..41e225624c 100644
--- a/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
+++ b/c/misra/test/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
@@ -1 +1 @@
-c/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
\ No newline at end of file
+c/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref b/c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref
index 94fa27a461..1834c6e140 100644
--- a/c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref
+++ b/c/misra/test/rules/RULE-15-1/GotoStatementUsed.testref
@@ -1 +1 @@
-c/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
\ No newline at end of file
+c/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref
index 81d6739cb7..cf558d9350 100644
--- a/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref
+++ b/c/misra/test/rules/RULE-15-3/GotoLabelBlockCondition.testref
@@ -1 +1 @@
-c/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
\ No newline at end of file
+c/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref b/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref
index ff0bf76291..be7ebf2815 100644
--- a/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref
+++ b/c/misra/test/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.testref
@@ -1 +1 @@
-c/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
\ No newline at end of file
+c/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref b/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref
index 4c511bd34e..d1cc5971c7 100644
--- a/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref
+++ b/c/misra/test/rules/RULE-20-12/MacroParameterUsedAsHashOperand.testref
@@ -1 +1 @@
-c/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
\ No newline at end of file
+c/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref b/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref
index 441b3f33c2..fccafa2049 100644
--- a/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref
+++ b/c/misra/test/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.testref
@@ -1 +1 @@
-c/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
\ No newline at end of file
+c/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref b/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref
index 7cece164a3..f8b5396a9c 100644
--- a/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref
+++ b/c/misra/test/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.testref
@@ -1 +1 @@
-c/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
\ No newline at end of file
+c/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref b/c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref
index 7b535ba5ce..9d02a25700 100644
--- a/c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref
+++ b/c/misra/test/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.testref
@@ -1 +1 @@
-c/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
\ No newline at end of file
+c/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref b/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref
index a068a4ff61..edc2f5a16d 100644
--- a/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref
+++ b/c/misra/test/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.testref
@@ -1 +1 @@
-c/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
\ No newline at end of file
+c/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref b/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref
index e9f0d150e9..1fc7164d80 100644
--- a/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref
+++ b/c/misra/test/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.testref
@@ -1 +1 @@
-c/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
\ No newline at end of file
+c/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref b/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref
index bf49fc0b00..7db7d79d72 100644
--- a/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref
+++ b/c/misra/test/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.testref
@@ -1 +1 @@
-c/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
\ No newline at end of file
+c/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql b/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
index e97c540d08..66fe0345dc 100644
--- a/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
+++ b/cpp/autosar/src/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
+import codingstandards.cpp.rules.initializeallvirtualbaseclasses.InitializeAllVirtualBaseClasses
 
-class ExplicitConstructorBaseClassInitializationQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery
+class ExplicitConstructorBaseClassInitializationQuery extends InitializeAllVirtualBaseClassesSharedQuery
 {
   ExplicitConstructorBaseClassInitializationQuery() {
     this = InitializationPackage::explicitConstructorBaseClassInitializationQuery()
diff --git a/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql b/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
index 789327e5e9..9697176711 100644
--- a/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
+++ b/cpp/autosar/src/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.ql
@@ -17,9 +17,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
+import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment.CopyAndMoveAssignmentsShallHandleSelfAssignment
 
-class CopyAssignmentAndAMoveHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery
+class CopyAssignmentAndAMoveHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery
 {
   CopyAssignmentAndAMoveHandleSelfAssignmentQuery() {
     this = OperatorInvariantsPackage::copyAssignmentAndAMoveHandleSelfAssignmentQuery()
diff --git a/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql b/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
index 9f6063d568..86218a47d6 100644
--- a/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
+++ b/cpp/autosar/src/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
+import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized.FunctionTemplatesExplicitlySpecialized
 
-class ExplicitSpecializationsOfFunctionTemplatesUsedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery
+class ExplicitSpecializationsOfFunctionTemplatesUsedQuery extends FunctionTemplatesExplicitlySpecializedSharedQuery
 {
   ExplicitSpecializationsOfFunctionTemplatesUsedQuery() {
     this = TemplatesPackage::explicitSpecializationsOfFunctionTemplatesUsedQuery()
diff --git a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
index 3187174576..b2f101082f 100644
--- a/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
+++ b/cpp/autosar/src/rules/A15-1-2/PointerExceptionObject.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.exceptionobjecthavepointertype_shared.ExceptionObjectHavePointerType_shared
+import codingstandards.cpp.rules.exceptionobjecthavepointertype.ExceptionObjectHavePointerType
 
-class PointerExceptionObjectQuery extends ExceptionObjectHavePointerType_sharedSharedQuery {
+class PointerExceptionObjectQuery extends ExceptionObjectHavePointerTypeSharedQuery {
   PointerExceptionObjectQuery() { this = Exceptions1Package::pointerExceptionObjectQuery() }
 }
diff --git a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
index 3c32b3970f..56494147f4 100644
--- a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
+++ b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
+import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller.NoexceptFunctionShouldNotPropagateToTheCaller
 
-class NoExceptFunctionThrowsQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery
+class NoExceptFunctionThrowsQuery extends NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery
 {
   NoExceptFunctionThrowsQuery() { this = Exceptions1Package::noExceptFunctionThrowsQuery() }
 }
diff --git a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
index 36a4a448a7..6c517675f6 100644
--- a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
@@ -17,9 +17,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
+import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool.VectorShouldNotBeSpecializedWithBool
 
-class VectorboolSpecializationUsedQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery
+class VectorboolSpecializationUsedQuery extends VectorShouldNotBeSpecializedWithBoolSharedQuery
 {
   VectorboolSpecializationUsedQuery() {
     this = BannedTypesPackage::vectorboolSpecializationUsedQuery()
diff --git a/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql b/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql
index c701c154cd..274b18301c 100644
--- a/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql
+++ b/cpp/autosar/src/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined_shared.GlobalSizedOperatorDeleteNotDefined_shared
+import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined.GlobalSizedOperatorDeleteNotDefined
 
-class GlobalSizedOperatorDeleteNotDefinedQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery
+class GlobalSizedOperatorDeleteNotDefinedQuery extends GlobalSizedOperatorDeleteNotDefinedSharedQuery
 {
   GlobalSizedOperatorDeleteNotDefinedQuery() {
     this = DeclarationsPackage::globalSizedOperatorDeleteNotDefinedQuery()
diff --git a/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql b/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql
index c4ee4a6569..2bd0ada800 100644
--- a/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql
+++ b/cpp/autosar/src/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined_shared.GlobalUnsizedOperatorDeleteNotDefined_shared
+import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined.GlobalUnsizedOperatorDeleteNotDefined
 
-class GlobalUnsizedOperatorDeleteNotDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery
+class GlobalUnsizedOperatorDeleteNotDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefinedSharedQuery
 {
   GlobalUnsizedOperatorDeleteNotDefinedQuery() {
     this = DeclarationsPackage::globalUnsizedOperatorDeleteNotDefinedQuery()
diff --git a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
index 02c46fe544..72de362ebc 100644
--- a/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
+++ b/cpp/autosar/src/rules/A18-9-2/ForwardingValuesToOtherFunctions.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
+import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether.ForwardingReferencesAndForwardNotUsedTogether
 
-class ForwardingValuesToOtherFunctionsQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery
+class ForwardingValuesToOtherFunctionsQuery extends ForwardingReferencesAndForwardNotUsedTogetherSharedQuery
 {
   ForwardingValuesToOtherFunctionsQuery() {
     this = MoveForwardPackage::forwardingValuesToOtherFunctionsQuery()
diff --git a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
index 0c1ffe818a..0f1d9a3271 100644
--- a/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
+++ b/cpp/autosar/src/rules/A2-13-1/EscapeSequenceOutsideISO.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
+import codingstandards.cpp.rules.backslashcharactermisuse.BackslashCharacterMisuse
 
-class EscapeSequenceOutsideISOQuery extends BackslashCharacterMisuse_sharedSharedQuery {
+class EscapeSequenceOutsideISOQuery extends BackslashCharacterMisuseSharedQuery {
   EscapeSequenceOutsideISOQuery() { this = LiteralsPackage::escapeSequenceOutsideISOQuery() }
 }
diff --git a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
index eee2d6fa6d..cd7d7c42cd 100644
--- a/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
+++ b/cpp/autosar/src/rules/A2-7-1/SingleLineCommentEndsWithSlash.ql
@@ -17,9 +17,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.linesplicingusedincomments_shared.LineSplicingUsedInComments_shared
+import codingstandards.cpp.rules.linesplicingusedincomments.LineSplicingUsedInComments
 
-class SingleLineCommentEndsWithSlashQuery extends LineSplicingUsedInComments_sharedSharedQuery {
+class SingleLineCommentEndsWithSlashQuery extends LineSplicingUsedInCommentsSharedQuery {
   SingleLineCommentEndsWithSlashQuery() {
     this = CommentsPackage::singleLineCommentEndsWithSlashQuery()
   }
diff --git a/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql b/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
index 577a1646c6..ce3c6f8461 100644
--- a/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
+++ b/cpp/autosar/src/rules/A4-10-1/NullPointerConstantNotNullptr.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
+import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant.NullptrNotTheOnlyFormOfTheNullPointerConstant
 
-class NullPointerConstantNotNullptrQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery
+class NullPointerConstantNotNullptrQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery
 {
   NullPointerConstantNotNullptrQuery() {
     this = LiteralsPackage::nullPointerConstantNotNullptrQuery()
diff --git a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
index ee3d47611a..01a45e75f7 100644
--- a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
+++ b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
 
-class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery
+class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
 {
   VirtualPointerOnlyComparesToNullptrConstantQuery() {
     this = PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery()
diff --git a/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql b/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
index 4a051167f6..bf5805698d 100644
--- a/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
+++ b/cpp/autosar/src/rules/A5-2-4/ReinterpretCastUsed.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.reinterpretcastused_shared.ReinterpretCastUsed_shared
+import codingstandards.cpp.rules.reinterpretcastused.ReinterpretCastUsed
 
-class ReinterpretCastUsedQuery extends ReinterpretCastUsed_sharedSharedQuery {
+class ReinterpretCastUsedQuery extends ReinterpretCastUsedSharedQuery {
   ReinterpretCastUsedQuery() { this = BannedSyntaxPackage::reinterpretCastUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
index 74042c2dc2..03b891e6db 100644
--- a/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
+++ b/cpp/autosar/src/rules/A6-6-1/GotoStatementUsed.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
+import codingstandards.cpp.rules.gotostatementshouldnotbeused.GotoStatementShouldNotBeUsed
 
-class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
+class GotoStatementUsedQuery extends GotoStatementShouldNotBeUsedSharedQuery {
   GotoStatementUsedQuery() { this = BannedSyntaxPackage::gotoStatementUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
index 00538a0ada..a630b51c00 100644
--- a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
+++ b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
@@ -16,10 +16,9 @@
  */
 
 import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
+import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype.EnumerationNotDefinedWithAnExplicitUnderlyingType
 
-class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery
+class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery
 {
   EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery() {
     this = DeclarationsPackage::enumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery()
diff --git a/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql b/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
index 56e73edce0..75cb2016b5 100644
--- a/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
+++ b/cpp/autosar/src/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
+import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup.DefinitionNotConsideredForUnqualifiedLookup
 
-class DefinitionNotConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery
+class DefinitionNotConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookupSharedQuery
 {
   DefinitionNotConsideredForUnqualifiedLookupQuery() {
     this = ScopePackage::definitionNotConsideredForUnqualifiedLookupQuery()
diff --git a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
index 76d6ac8f69..fd9602f218 100644
--- a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
+++ b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
+import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction.HiddenInheritedNonOverridableMemberFunction
 
-class HiddenInheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery
+class HiddenInheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunctionSharedQuery
 {
   HiddenInheritedNonOverridableMemberFunctionQuery() {
     this = ScopePackage::hiddenInheritedNonOverridableMemberFunctionQuery()
diff --git a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
index 4f999f160c..aa9105f9de 100644
--- a/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
+++ b/cpp/autosar/src/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
+import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction.HiddenInheritedOverridableMemberFunction
 
-class HiddenInheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery
+class HiddenInheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunctionSharedQuery
 {
   HiddenInheritedOverridableMemberFunctionQuery() {
     this = ScopePackage::hiddenInheritedOverridableMemberFunctionQuery()
diff --git a/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql b/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
index 71a703e089..44489151da 100644
--- a/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
+++ b/cpp/autosar/src/rules/A7-4-1/AsmDeclarationUsed.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.asmdeclarationused_shared.AsmDeclarationUsed_shared
+import codingstandards.cpp.rules.asmdeclarationused.AsmDeclarationUsed
 
-class AsmDeclarationUsedQuery extends AsmDeclarationUsed_sharedSharedQuery {
+class AsmDeclarationUsedQuery extends AsmDeclarationUsedSharedQuery {
   AsmDeclarationUsedQuery() { this = BannedSyntaxPackage::asmDeclarationUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql b/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
index bf287b894d..6b305d9ca9 100644
--- a/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
+++ b/cpp/autosar/src/rules/A7-5-2/RecursiveFunctions.ql
@@ -16,9 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
+import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly.FunctionsCallThemselvesEitherDirectlyOrIndirectly
 
-class RecursiveFunctionsQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery
-{
+class RecursiveFunctionsQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery {
   RecursiveFunctionsQuery() { this = FunctionsPackage::recursiveFunctionsQuery() }
 }
diff --git a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
index 60178e1a2f..180cbf7224 100644
--- a/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
+++ b/cpp/autosar/src/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.ql
@@ -17,9 +17,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
+import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor.InitializerListConstructorIsTheOnlyConstructor
 
-class ConfusingUseOfInitializerListConstructorsQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery
+class ConfusingUseOfInitializerListConstructorsQuery extends InitializerListConstructorIsTheOnlyConstructorSharedQuery
 {
   ConfusingUseOfInitializerListConstructorsQuery() {
     this = InitializationPackage::confusingUseOfInitializerListConstructorsQuery()
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
index 0f2bd30614..2e189ddd24 100644
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
 
-class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery
+class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
 {
   AccessibleBaseClassBothVirtualAndNonVirtualQuery() {
     this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery()
diff --git a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
index 0f16dc6171..4b6c037aba 100644
--- a/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
+++ b/cpp/autosar/src/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
+import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor.ObjectsDynamicTypeUsedFromConstructorOrDestructor
 
-class DynamicTypeOfThisUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery
+class DynamicTypeOfThisUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery
 {
   DynamicTypeOfThisUsedFromConstructorOrDestructorQuery() {
     this = InheritancePackage::dynamicTypeOfThisUsedFromConstructorOrDestructorQuery()
diff --git a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
index 09cc806c24..486a428474 100644
--- a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
+++ b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis.NameNotReferredUsingAQualifiedIdOrThis
 
-class NameNotReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery
+class NameNotReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThisSharedQuery
 {
   NameNotReferredUsingAQualifiedIdOrThisQuery() {
     this = TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisQuery()
diff --git a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
index 313f82c0d5..ea56b841ed 100644
--- a/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
+++ b/cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit.NameNotReferredUsingAQualifiedIdOrThisAudit
 
-class NameNotReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery
+class NameNotReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAuditSharedQuery
 {
   NameNotReferredUsingAQualifiedIdOrThisAuditQuery() {
     this = TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisAuditQuery()
diff --git a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
index d13df36fc5..9f99e7c356 100644
--- a/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
+++ b/cpp/autosar/src/rules/M15-1-3/EmptyThrowOutsideCatch.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
+import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler.EmptyThrowOnlyWithinACatchHandler
 
-class EmptyThrowOutsideCatchQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery {
+class EmptyThrowOutsideCatchQuery extends EmptyThrowOnlyWithinACatchHandlerSharedQuery {
   EmptyThrowOutsideCatchQuery() { this = Exceptions1Package::emptyThrowOutsideCatchQuery() }
 }
diff --git a/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql b/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
index 5daa29bd28..cd347be44d 100644
--- a/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
+++ b/cpp/autosar/src/rules/M18-2-1/MacroOffsetofUsed.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.macrooffsetofused_shared.MacroOffsetofUsed_shared
+import codingstandards.cpp.rules.macrooffsetofused.MacroOffsetofUsed
 
-class MacroOffsetofUsedQuery extends MacroOffsetofUsed_sharedSharedQuery {
+class MacroOffsetofUsedQuery extends MacroOffsetofUsedSharedQuery {
   MacroOffsetofUsedQuery() { this = BannedFunctionsPackage::macroOffsetofUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql b/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
index 9f384e60a8..4df4715848 100644
--- a/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
+++ b/cpp/autosar/src/rules/M18-7-1/CsignalFunctionsUsed.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
+import codingstandards.cpp.rules.csignalfunctionsused.CsignalFunctionsUsed
 
-class CsignalFunctionsUsedQuery extends CsignalFunctionsUsed_sharedSharedQuery {
+class CsignalFunctionsUsedQuery extends CsignalFunctionsUsedSharedQuery {
   CsignalFunctionsUsedQuery() { this = BannedLibrariesPackage::csignalFunctionsUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql b/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
index cf65c25e91..89e9ca169a 100644
--- a/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
+++ b/cpp/autosar/src/rules/M18-7-1/CsignalTypesUsed.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.csignaltypesused_shared.CsignalTypesUsed_shared
+import codingstandards.cpp.rules.csignaltypesused.CsignalTypesUsed
 
-class CsignalTypesUsedQuery extends CsignalTypesUsed_sharedSharedQuery {
+class CsignalTypesUsedQuery extends CsignalTypesUsedSharedQuery {
   CsignalTypesUsedQuery() { this = BannedLibrariesPackage::csignalTypesUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
index 6f82348233..b689edab6b 100644
--- a/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
+++ b/cpp/autosar/src/rules/M2-13-2/UseOfNonZeroOctalLiteral.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
+import codingstandards.cpp.rules.useofnonzerooctalliteral.UseOfNonZeroOctalLiteral
 
-class UseOfNonZeroOctalLiteralQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery {
+class UseOfNonZeroOctalLiteralQuery extends UseOfNonZeroOctalLiteralSharedQuery {
   UseOfNonZeroOctalLiteralQuery() { this = LiteralsPackage::useOfNonZeroOctalLiteralQuery() }
 }
diff --git a/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql b/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
index 95c97deab6..5bfa338864 100644
--- a/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
+++ b/cpp/autosar/src/rules/M2-13-3/MissingUSuffix.ql
@@ -18,8 +18,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
+import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed.UnsignedIntegerLiteralsNotAppropriatelySuffixed
 
-class MissingUSuffixQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery {
+class MissingUSuffixQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery {
   MissingUSuffixQuery() { this = LiteralsPackage::missingUSuffixQuery() }
 }
diff --git a/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql b/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
index 4d61dc8088..356a361cb1 100644
--- a/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
+++ b/cpp/autosar/src/rules/M2-7-1/SlashStarUsedWithinACStyleComment.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
+import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment.CharacterSequenceUsedWithinACStyleComment
 
-class SlashStarUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery
+class SlashStarUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleCommentSharedQuery
 {
   SlashStarUsedWithinACStyleCommentQuery() {
     this = CommentsPackage::slashStarUsedWithinACStyleCommentQuery()
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
index e5b83633e2..5656fc2edf 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioFunctionsUsed.ql
@@ -17,8 +17,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.cstdiofunctionsused_shared.CstdioFunctionsUsed_shared
+import codingstandards.cpp.rules.cstdiofunctionsused.CstdioFunctionsUsed
 
-class CstdioFunctionsUsedQuery extends CstdioFunctionsUsed_sharedSharedQuery {
+class CstdioFunctionsUsedQuery extends CstdioFunctionsUsedSharedQuery {
   CstdioFunctionsUsedQuery() { this = BannedLibrariesPackage::cstdioFunctionsUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
index 88bb148e65..311baeb195 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioMacrosUsed.ql
@@ -17,8 +17,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.cstdiomacrosused_shared.CstdioMacrosUsed_shared
+import codingstandards.cpp.rules.cstdiomacrosused.CstdioMacrosUsed
 
-class CstdioMacrosUsedQuery extends CstdioMacrosUsed_sharedSharedQuery {
+class CstdioMacrosUsedQuery extends CstdioMacrosUsedSharedQuery {
   CstdioMacrosUsedQuery() { this = BannedLibrariesPackage::cstdioMacrosUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql b/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
index 82bdbe6ac2..3a1f647c22 100644
--- a/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
+++ b/cpp/autosar/src/rules/M27-0-1/CstdioTypesUsed.ql
@@ -17,8 +17,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
+import codingstandards.cpp.rules.cstdiotypesused.CstdioTypesUsed
 
-class CstdioTypesUsedQuery extends CstdioTypesUsed_sharedSharedQuery {
+class CstdioTypesUsedQuery extends CstdioTypesUsedSharedQuery {
   CstdioTypesUsedQuery() { this = BannedLibrariesPackage::cstdioTypesUsedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
index 14fd286a44..6d1ee297a8 100644
--- a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
+import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
 
-class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery
+class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
 {
   IdentifierPassedAsFunctionArgumentDecayToAPointerQuery() {
     this = PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery()
diff --git a/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql b/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
index 50c7914b16..5a8df45ab1 100644
--- a/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
+++ b/cpp/autosar/src/rules/M5-2-6/CastNotConvertPointerToFunction.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
+import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype.CastsBetweenAPointerToFunctionAndAnyOtherType
 
-class CastNotConvertPointerToFunctionQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery
+class CastNotConvertPointerToFunctionQuery extends CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery
 {
   CastNotConvertPointerToFunctionQuery() {
     this = PointersPackage::castNotConvertPointerToFunctionQuery()
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
index 0f67d4143f..cac08b5bf2 100644
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
+import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
 
-class UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery
+class UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
 {
   UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
     this = OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery()
diff --git a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
index 216388c448..94f0bc6062 100644
--- a/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
+++ b/cpp/autosar/src/rules/M5-3-3/UnaryOperatorOverloaded.ql
@@ -13,8 +13,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.addressofoperatoroverloaded_shared.AddressOfOperatorOverloaded_shared
+import codingstandards.cpp.rules.addressofoperatoroverloaded.AddressOfOperatorOverloaded
 
-class UnaryOperatorOverloadedQuery extends AddressOfOperatorOverloaded_sharedSharedQuery {
+class UnaryOperatorOverloadedQuery extends AddressOfOperatorOverloadedSharedQuery {
   UnaryOperatorOverloadedQuery() { this = OperatorsPackage::unaryOperatorOverloadedQuery() }
 }
diff --git a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
index db71931f80..b3566a1e27 100644
--- a/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/LoopCompoundCondition.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
+import codingstandards.cpp.rules.loopcompoundcondition.LoopCompoundCondition
 
-class LoopCompoundConditionQuery extends LoopCompoundCondition_sharedSharedQuery {
+class LoopCompoundConditionQuery extends LoopCompoundConditionSharedQuery {
   LoopCompoundConditionQuery() { this = ConditionalsPackage::loopCompoundConditionQuery() }
 }
diff --git a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
index 13e9ec067a..f550a456dc 100644
--- a/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
+++ b/cpp/autosar/src/rules/M6-3-1/SwitchCompoundCondition.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.switchcompoundcondition_shared.SwitchCompoundCondition_shared
+import codingstandards.cpp.rules.switchcompoundcondition.SwitchCompoundCondition
 
-class SwitchCompoundConditionQuery extends SwitchCompoundCondition_sharedSharedQuery {
+class SwitchCompoundConditionQuery extends SwitchCompoundConditionSharedQuery {
   SwitchCompoundConditionQuery() { this = ConditionalsPackage::switchCompoundConditionQuery() }
 }
diff --git a/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql b/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql
index edc09e074b..e359880027 100644
--- a/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql
+++ b/cpp/autosar/src/rules/M7-3-1/GlobalNamespaceMembershipViolation.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.globalnamespacedeclarations_shared.GlobalNamespaceDeclarations_shared
+import codingstandards.cpp.rules.globalnamespacedeclarations.GlobalNamespaceDeclarations
 
-class GlobalNamespaceMembershipViolationQuery extends GlobalNamespaceDeclarations_sharedSharedQuery {
+class GlobalNamespaceMembershipViolationQuery extends GlobalNamespaceDeclarationsSharedQuery {
   GlobalNamespaceMembershipViolationQuery() {
     this = ScopePackage::globalNamespaceMembershipViolationQuery()
   }
diff --git a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
index ddcc45356a..2d263f4683 100644
--- a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
+++ b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
+import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
 
-class IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery extends NonGlobalFunctionMain_sharedSharedQuery
+class IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery extends NonGlobalFunctionMainSharedQuery
 {
   IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
     this = NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery()
diff --git a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
index 9fe9a0f945..cb5aa9d105 100644
--- a/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
+++ b/cpp/autosar/src/rules/M7-5-1/FunctionReturnAutomaticVarCondition.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
+import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable.ReturnReferenceOrPointerToAutomaticLocalVariable
 
-class FunctionReturnAutomaticVarConditionQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery
+class FunctionReturnAutomaticVarConditionQuery extends ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery
 {
   FunctionReturnAutomaticVarConditionQuery() {
     this = FunctionsPackage::functionReturnAutomaticVarConditionQuery()
diff --git a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
index cdbc1f6baf..c615ae9d55 100644
--- a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
+++ b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
+import codingstandards.cpp.rules.multipleglobalormemberdeclarators.MultipleGlobalOrMemberDeclarators
 
-class MultipleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery
+class MultipleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclaratorsSharedQuery
 {
   MultipleGlobalOrMemberDeclaratorsQuery() {
     this = InitializationPackage::multipleGlobalOrMemberDeclaratorsQuery()
diff --git a/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql b/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
index d352bc05aa..6198ab7a5a 100644
--- a/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
+++ b/cpp/autosar/src/rules/M8-0-1/MultipleLocalDeclarators.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
+import codingstandards.cpp.rules.multiplelocaldeclarators.MultipleLocalDeclarators
 
-class MultipleLocalDeclaratorsQuery extends MultipleLocalDeclarators_sharedSharedQuery {
+class MultipleLocalDeclaratorsQuery extends MultipleLocalDeclaratorsSharedQuery {
   MultipleLocalDeclaratorsQuery() { this = InitializationPackage::multipleLocalDeclaratorsQuery() }
 }
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
index 7b306b2492..833585d096 100644
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
+import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
 
-class VirtualFunctionParametersUseSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery
+class VirtualFunctionParametersUseSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
 {
   VirtualFunctionParametersUseSameDefaultArgumentsQuery() {
     this = VirtualFunctionsPackage::virtualFunctionParametersUseSameDefaultArgumentsQuery()
diff --git a/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref b/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref
index 1bf7e7fffb..ac8c5e1a83 100644
--- a/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref
+++ b/cpp/autosar/test/rules/A12-1-1/ExplicitConstructorBaseClassInitialization.testref
@@ -1 +1 @@
-cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
\ No newline at end of file
+cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref b/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref
index 23e38dba55..65fc614121 100644
--- a/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref
+++ b/cpp/autosar/test/rules/A12-8-5/CopyAssignmentAndAMoveHandleSelfAssignment.testref
@@ -1 +1 @@
-cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
\ No newline at end of file
+cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref b/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref
index 04c3f5a724..6a284e2cbb 100644
--- a/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref
+++ b/cpp/autosar/test/rules/A14-8-2/ExplicitSpecializationsOfFunctionTemplatesUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
\ No newline at end of file
+cpp/common/test/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref b/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref
index 41eabfe5a6..24d4229225 100644
--- a/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref
+++ b/cpp/autosar/test/rules/A15-1-2/PointerExceptionObject.testref
@@ -1 +1 @@
-cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref b/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref
index 089cce1ccf..76dc55827f 100644
--- a/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref
+++ b/cpp/autosar/test/rules/A15-4-2/NoExceptFunctionThrows.testref
@@ -1 +1 @@
-cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
\ No newline at end of file
+cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref b/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref
index 96d8385f5f..a934690acb 100644
--- a/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref
+++ b/cpp/autosar/test/rules/A18-1-2/VectorboolSpecializationUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
\ No newline at end of file
+cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref b/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref
index bd7e582a38..4d1e21d4cb 100644
--- a/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref
+++ b/cpp/autosar/test/rules/A18-5-4/GlobalSizedOperatorDeleteNotDefined.testref
@@ -1 +1 @@
-cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
+cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref b/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref
index 781d037067..f2fcc2eded 100644
--- a/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref
+++ b/cpp/autosar/test/rules/A18-5-4/GlobalUnsizedOperatorDeleteNotDefined.testref
@@ -1 +1 @@
-cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
+cpp/common/test/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref b/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref
index 16fd01273f..d56acb8415 100644
--- a/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref
+++ b/cpp/autosar/test/rules/A18-9-2/ForwardingValuesToOtherFunctions.testref
@@ -1 +1 @@
-cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
\ No newline at end of file
+cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref b/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref
index a257ad6ab7..924122e38e 100644
--- a/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref
+++ b/cpp/autosar/test/rules/A2-13-1/EscapeSequenceOutsideISO.testref
@@ -1 +1 @@
-cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
\ No newline at end of file
+cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref b/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref
index d4f66ed35e..7874a476a0 100644
--- a/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref
+++ b/cpp/autosar/test/rules/A2-7-1/SingleLineCommentEndsWithSlash.testref
@@ -1 +1 @@
-cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
\ No newline at end of file
+cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref b/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref
index 495d8eddba..aeb655a341 100644
--- a/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref
+++ b/cpp/autosar/test/rules/A4-10-1/NullPointerConstantNotNullptr.testref
@@ -1 +1 @@
-cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
\ No newline at end of file
+cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref b/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref
index 2a9e8b2eef..ca8eab9681 100644
--- a/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref
+++ b/cpp/autosar/test/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.testref
@@ -1 +1 @@
-cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref b/cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
index 2a9e8b2eef..ca8eab9681 100644
--- a/cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
+++ b/cpp/autosar/test/rules/A5-10-1/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
@@ -1 +1 @@
-cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref b/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
index 2a9e8b2eef..ca8eab9681 100644
--- a/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
+++ b/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
@@ -1 +1 @@
-cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref b/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref
index a553240f19..81f18c2d9c 100644
--- a/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref
+++ b/cpp/autosar/test/rules/A5-2-4/ReinterpretCastUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref b/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref
index 3f2f4508b1..44d306f80c 100644
--- a/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref
+++ b/cpp/autosar/test/rules/A6-6-1/GotoStatementUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref b/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref
index 3b04b2950f..7a5ae74d2e 100644
--- a/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref
+++ b/cpp/autosar/test/rules/A7-3-1/DefinitionNotConsideredForUnqualifiedLookup.testref
@@ -1 +1 @@
-cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
\ No newline at end of file
+cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref
index 371b80ead3..2fb9608ee8 100644
--- a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref
+++ b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedNonOverridableMemberFunction.testref
@@ -1 +1 @@
-cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
\ No newline at end of file
+cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref
index 3fcc2ed7e7..e768ced8d3 100644
--- a/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref
+++ b/cpp/autosar/test/rules/A7-3-1/HiddenInheritedOverridableMemberFunction.testref
@@ -1 +1 @@
-cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
\ No newline at end of file
+cpp/common/test/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref b/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref
index d0a190a3eb..f643f6a9c7 100644
--- a/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref
+++ b/cpp/autosar/test/rules/A7-4-1/AsmDeclarationUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref b/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref
index 1ebf3d5742..f459a29bf1 100644
--- a/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref
+++ b/cpp/autosar/test/rules/A7-5-2/RecursiveFunctions.testref
@@ -1 +1 @@
-cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
\ No newline at end of file
+cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref b/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref
index b9075dec6f..49b73d06a9 100644
--- a/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref
+++ b/cpp/autosar/test/rules/A8-5-4/ConfusingUseOfInitializerListConstructors.testref
@@ -1 +1 @@
-cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
\ No newline at end of file
+cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
index 966337628d..fe57c50fe3 100644
--- a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
+++ b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
@@ -1 +1 @@
-cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
\ No newline at end of file
+cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref
index 966337628d..fe57c50fe3 100644
--- a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref
+++ b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.testref
@@ -1 +1 @@
-cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
\ No newline at end of file
+cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref b/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref
index 985c209460..596f74b010 100644
--- a/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref
+++ b/cpp/autosar/test/rules/M12-1-1/DynamicTypeOfThisUsedFromConstructorOrDestructor.testref
@@ -1 +1 @@
-cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
\ No newline at end of file
+cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref
index 34df16815b..ad5590bc1f 100644
--- a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref
+++ b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.testref
@@ -1 +1 @@
-cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
\ No newline at end of file
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref
index 0bef5586dd..f7ff9100a6 100644
--- a/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref
+++ b/cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.testref
@@ -1 +1 @@
-cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
\ No newline at end of file
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref b/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref
index 01a7dde1dd..f3c961d8f1 100644
--- a/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref
+++ b/cpp/autosar/test/rules/M15-1-3/EmptyThrowOutsideCatch.testref
@@ -1 +1 @@
-cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
\ No newline at end of file
+cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref b/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref
index f53f8d6f9f..022fef6071 100644
--- a/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref
+++ b/cpp/autosar/test/rules/M18-2-1/MacroOffsetofUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref b/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref
index b48ce80edb..a09406a932 100644
--- a/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref
+++ b/cpp/autosar/test/rules/M18-7-1/CsignalFunctionsUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/csignalfunctionsused/CsignalFunctionsUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref b/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref
index 3ea4c7008d..3d398d799b 100644
--- a/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref
+++ b/cpp/autosar/test/rules/M18-7-1/CsignalTypesUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref
index 5b23b86826..97c466a866 100644
--- a/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref
+++ b/cpp/autosar/test/rules/M2-13-2/UseOfNonZeroOctalLiteral.testref
@@ -1 +1 @@
-cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
\ No newline at end of file
+cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref b/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref
index 1a58c1eee1..9133a84ce4 100644
--- a/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref
+++ b/cpp/autosar/test/rules/M2-13-3/MissingUSuffix.testref
@@ -1 +1 @@
-cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref b/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref
index 8073a976cd..971b1953f7 100644
--- a/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref
+++ b/cpp/autosar/test/rules/M2-7-1/SlashStarUsedWithinACStyleComment.testref
@@ -1 +1 @@
-cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
\ No newline at end of file
+cpp/common/test/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref b/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref
index 595b7fcffa..5f8b3d8a9a 100644
--- a/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref
+++ b/cpp/autosar/test/rules/M27-0-1/CstdioFunctionsUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref b/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref
index 8bc3a8fcde..a1ba376c3b 100644
--- a/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref
+++ b/cpp/autosar/test/rules/M27-0-1/CstdioMacrosUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref b/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref
index 4020d6427e..4c08a75cfe 100644
--- a/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref
+++ b/cpp/autosar/test/rules/M27-0-1/CstdioTypesUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref b/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
index 97edef0af2..06f2ec8fbb 100644
--- a/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
+++ b/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
@@ -1 +1 @@
-cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
\ No newline at end of file
+cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref b/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref
index 5eeeea570a..e7bde2ea08 100644
--- a/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref
+++ b/cpp/autosar/test/rules/M5-2-6/CastNotConvertPointerToFunction.testref
@@ -1 +1 @@
-cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
index 48a20b03f1..bd12c39fbd 100644
--- a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
+++ b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
@@ -1 +1 @@
-cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
\ No newline at end of file
+cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref b/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref
index f9c1d69467..1f2a126671 100644
--- a/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref
+++ b/cpp/autosar/test/rules/M5-3-3/UnaryOperatorOverloaded.testref
@@ -1 +1 @@
-cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
\ No newline at end of file
+cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref b/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref
index e301b04020..84dc7caf76 100644
--- a/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref
+++ b/cpp/autosar/test/rules/M6-3-1/LoopCompoundCondition.testref
@@ -1 +1 @@
-cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
\ No newline at end of file
+cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref b/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref
index e48ef207a0..f02b02ba85 100644
--- a/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref
+++ b/cpp/autosar/test/rules/M6-3-1/SwitchCompoundCondition.testref
@@ -1 +1 @@
-cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
\ No newline at end of file
+cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref b/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref
index 93764c480e..8f71738005 100644
--- a/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref
+++ b/cpp/autosar/test/rules/M7-3-1/GlobalNamespaceMembershipViolation.testref
@@ -1 +1 @@
-cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
\ No newline at end of file
+cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
index 528412284f..e149f3a33b 100644
--- a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
+++ b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
@@ -1 +1 @@
-cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
\ No newline at end of file
+cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref
index 528412284f..e149f3a33b 100644
--- a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref
+++ b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.testref
@@ -1 +1 @@
-cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
\ No newline at end of file
+cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref b/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref
index 676e414381..45dbffde00 100644
--- a/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref
+++ b/cpp/autosar/test/rules/M7-5-1/FunctionReturnAutomaticVarCondition.testref
@@ -1 +1 @@
-cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
\ No newline at end of file
+cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref b/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref
index b848fce94f..434cb47456 100644
--- a/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref
+++ b/cpp/autosar/test/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.testref
@@ -1 +1 @@
-cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
\ No newline at end of file
+cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref b/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref
index 2d7784cea0..be7c9ac352 100644
--- a/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref
+++ b/cpp/autosar/test/rules/M8-0-1/MultipleLocalDeclarators.testref
@@ -1 +1 @@
-cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
\ No newline at end of file
+cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
index c89e908ada..7e06403515 100644
--- a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
+++ b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
@@ -1 +1 @@
-cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
\ No newline at end of file
+cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref
index c89e908ada..7e06403515 100644
--- a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref
+++ b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.testref
@@ -1 +1 @@
-cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
\ No newline at end of file
+cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref b/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref
index a2543b0769..5dd7991a37 100644
--- a/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref
+++ b/cpp/autosar/test/rules/M9-6-4/NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit.testref
@@ -1 +1 @@
-cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll b/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.qll
similarity index 62%
rename from cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.qll
index f210e2aab5..603a75bd01 100644
--- a/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The address-of operator shall not be overloaded.
  */
 
 import cpp
@@ -7,9 +8,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Operator
 
-abstract class AddressOfOperatorOverloaded_sharedSharedQuery extends Query { }
+abstract class AddressOfOperatorOverloadedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof AddressOfOperatorOverloaded_sharedSharedQuery }
+Query getQuery() { result instanceof AddressOfOperatorOverloadedSharedQuery }
 
 query predicate problems(UnaryAddressOfOperator e, string message) {
   not isExcluded(e, getQuery()) and message = "The unary & operator overloaded."
diff --git a/cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll b/cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.qll
similarity index 80%
rename from cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.qll
index bf2ff2fbae..da17706f54 100644
--- a/cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The argument to a mixed-use macro parameter shall not be subject to further
+ * expansion.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Macro
 
-abstract class AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery extends Query { }
+abstract class AMixedUseMacroArgumentSubjectToExpansionSharedQuery extends Query { }
 
-Query getQuery() { result instanceof AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery }
+Query getQuery() { result instanceof AMixedUseMacroArgumentSubjectToExpansionSharedQuery }
 
 query predicate problems(FunctionLikeMacro m, string message) {
   exists(MacroInvocation mi, int i, string expanded, string param |
diff --git a/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll b/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll
similarity index 86%
rename from cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll
index fa61d89aea..675bb1d85f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll
@@ -1,15 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * An array passed as a function argument shall not decay to a pointer.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery extends Query { }
+abstract class ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery
+  result instanceof ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
 }
 
 predicate arrayToPointerDecay(Access ae, Parameter p) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused/AsmDeclarationUsed.qll b/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused/AsmDeclarationUsed.qll
new file mode 100644
index 0000000000..c6748683da
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused/AsmDeclarationUsed.qll
@@ -0,0 +1,16 @@
+/**
+ * Provides a library with a `problems` predicate for the following issue:
+ * The asm declaration shall not be used.
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class AsmDeclarationUsedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof AsmDeclarationUsedSharedQuery }
+
+query predicate problems(AsmStmt e, string message) {
+  not isExcluded(e, getQuery()) and message = "Use of asm declaration"
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll
deleted file mode 100644
index cce1de8cee..0000000000
--- a/cpp/common/src/codingstandards/cpp/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Provides a library which includes a `problems` predicate for reporting....
- */
-
-import cpp
-import codingstandards.cpp.Customizations
-import codingstandards.cpp.Exclusions
-
-abstract class AsmDeclarationUsed_sharedSharedQuery extends Query { }
-
-Query getQuery() { result instanceof AsmDeclarationUsed_sharedSharedQuery }
-
-query predicate problems(AsmStmt e, string message) {
-  not isExcluded(e, getQuery()) and message = "Use of asm declaration"
-}
diff --git a/cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.qll
similarity index 60%
rename from cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.qll
index a187b586b1..295e346913 100644
--- a/cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used.
  */
 
 import cpp
@@ -8,9 +9,9 @@ import codingstandards.cpp.Exclusions
 
 private string atoi() { result = ["atof", "atoi", "atol", "atoll"] }
 
-abstract class AtofAtoiAtolAndAtollUsed_sharedSharedQuery extends Query { }
+abstract class AtofAtoiAtolAndAtollUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof AtofAtoiAtolAndAtollUsed_sharedSharedQuery }
+Query getQuery() { result instanceof AtofAtoiAtolAndAtollUsedSharedQuery }
 
 query predicate problems(FunctionCall fc, string message) {
   exists(Function f |
diff --git a/cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll b/cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse/BackslashCharacterMisuse.qll
similarity index 56%
rename from cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse/BackslashCharacterMisuse.qll
index ffad0f540b..34cb93fb39 100644
--- a/cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/backslashcharactermisuse/BackslashCharacterMisuse.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * In character literals and non-raw string literals, \ shall only be used to form a
+ * defined escape sequence or universal character name.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class BackslashCharacterMisuse_sharedSharedQuery extends Query { }
+abstract class BackslashCharacterMisuseSharedQuery extends Query { }
 
-Query getQuery() { result instanceof BackslashCharacterMisuse_sharedSharedQuery }
+Query getQuery() { result instanceof BackslashCharacterMisuseSharedQuery }
 
 query predicate problems(StringLiteral l, string message) {
   exists(string es |
diff --git a/cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.qll
similarity index 82%
rename from cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.qll
index 766913db58..27048b2d25 100644
--- a/cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A bit-field shall have an appropriate type.
  */
 
 import cpp
@@ -7,9 +8,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Compiler
 
-abstract class BitFieldShallHaveAnAppropriateType_sharedSharedQuery extends Query { }
+abstract class BitFieldShallHaveAnAppropriateTypeSharedQuery extends Query { }
 
-Query getQuery() { result instanceof BitFieldShallHaveAnAppropriateType_sharedSharedQuery }
+Query getQuery() { result instanceof BitFieldShallHaveAnAppropriateTypeSharedQuery }
 
 Type getSupportedBitFieldType(Compiler compiler) {
   compiler instanceof UnsupportedCompiler and
diff --git a/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll b/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll
similarity index 69%
rename from cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll
index a1e7d5b490..e704617a16 100644
--- a/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll
@@ -1,15 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The built-in unary - operator should not be applied to an expression of unsigned
+ * type.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery extends Query { }
+abstract class BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery
+  result instanceof BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
 }
 
 query predicate problems(Element e, string message) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll
similarity index 63%
rename from cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll
index d09009cc29..f33531e371 100644
--- a/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll
@@ -1,15 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Casts shall not be performed between a pointer to function and any other type.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery extends Query { }
+abstract class CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery
+  result instanceof CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery
 }
 
 query predicate problems(Cast c, string message) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll b/cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.qll
similarity index 57%
rename from cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.qll
index a6719c3c4e..676b2d3030 100644
--- a/cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The presence of a nested /* comment can indicate accidentally commented out code.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery extends Query { }
+abstract class CharacterSequenceUsedWithinACStyleCommentSharedQuery extends Query { }
 
-Query getQuery() { result instanceof CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery }
+Query getQuery() { result instanceof CharacterSequenceUsedWithinACStyleCommentSharedQuery }
 
 query predicate problems(CStyleComment c, string message) {
   not isExcluded(c, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/commaoperatorused/CommaOperatorUsed.qll b/cpp/common/src/codingstandards/cpp/rules/commaoperatorused/CommaOperatorUsed.qll
index a6a80969b8..6985f7fc1e 100644
--- a/cpp/common/src/codingstandards/cpp/rules/commaoperatorused/CommaOperatorUsed.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/commaoperatorused/CommaOperatorUsed.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The comma operator shall not be used.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll b/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll
index f4636b6b13..2f672a1181 100644
--- a/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/constlikereturnvalue/ConstLikeReturnValue.qll
@@ -1,5 +1,8 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The pointers returned by the Standard Library functions localeconv, getenv,
+ * setlocale or, strerror shall only be used as if they have pointer to
+ * const-qualified type.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll b/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll
similarity index 80%
rename from cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll
index 8e8c35365d..b11db11100 100644
--- a/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * User-provided copy assignment operators and move assignment operators shall handle
+ * self-assignment.
  */
 
 import cpp
@@ -7,10 +9,10 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Operator
 
-abstract class CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery extends Query { }
+abstract class CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery
+  result instanceof CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery
 }
 
 predicate isUserCopyOrUserMove(Operator o) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused/CsignalFunctionsUsed.qll
similarity index 57%
rename from cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused/CsignalFunctionsUsed.qll
index 6a1e2270ff..15c71018f9 100644
--- a/cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/csignalfunctionsused/CsignalFunctionsUsed.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Signal handling contains implementation-defined and undefined behaviour.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class CsignalFunctionsUsed_sharedSharedQuery extends Query { }
+abstract class CsignalFunctionsUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof CsignalFunctionsUsed_sharedSharedQuery }
+Query getQuery() { result instanceof CsignalFunctionsUsedSharedQuery }
 
 query predicate problems(FunctionCall fc, string message) {
   exists(Function f |
diff --git a/cpp/common/src/codingstandards/cpp/rules/csignaltypesused_shared/CsignalTypesUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/csignaltypesused/CsignalTypesUsed.qll
similarity index 57%
rename from cpp/common/src/codingstandards/cpp/rules/csignaltypesused_shared/CsignalTypesUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/csignaltypesused/CsignalTypesUsed.qll
index 07293c9e75..21de1066f6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/csignaltypesused_shared/CsignalTypesUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/csignaltypesused/CsignalTypesUsed.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Signal handling contains implementation-defined and undefined behaviour.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class CsignalTypesUsed_sharedSharedQuery extends Query { }
+abstract class CsignalTypesUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof CsignalTypesUsed_sharedSharedQuery }
+Query getQuery() { result instanceof CsignalTypesUsedSharedQuery }
 
 query predicate problems(TypeMention tm, string message) {
   exists(UserType ut |
diff --git a/cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused/CstdioFunctionsUsed.qll
similarity index 75%
rename from cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused/CstdioFunctionsUsed.qll
index b89a2349a4..284997dc19 100644
--- a/cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/cstdiofunctionsused/CstdioFunctionsUsed.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Streams and file I/O have a large number of unspecified, undefined, and
+ * implementation-defined behaviours associated with them.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class CstdioFunctionsUsed_sharedSharedQuery extends Query { }
+abstract class CstdioFunctionsUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof CstdioFunctionsUsed_sharedSharedQuery }
+Query getQuery() { result instanceof CstdioFunctionsUsedSharedQuery }
 
 query predicate problems(FunctionCall fc, string message) {
   exists(Function f |
diff --git a/cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused/CstdioMacrosUsed.qll
similarity index 57%
rename from cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused/CstdioMacrosUsed.qll
index 0f56127110..d610b6a166 100644
--- a/cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/cstdiomacrosused/CstdioMacrosUsed.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Streams and file I/O have a large number of unspecified, undefined, and
+ * implementation-defined behaviours associated with them.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class CstdioMacrosUsed_sharedSharedQuery extends Query { }
+abstract class CstdioMacrosUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof CstdioMacrosUsed_sharedSharedQuery }
+Query getQuery() { result instanceof CstdioMacrosUsedSharedQuery }
 
 query predicate problems(MacroInvocation mi, string message) {
   not isExcluded(mi, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/cstdiotypesused/CstdioTypesUsed.qll
similarity index 65%
rename from cpp/common/src/codingstandards/cpp/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/cstdiotypesused/CstdioTypesUsed.qll
index f4d4529fe2..d517d78c8b 100644
--- a/cpp/common/src/codingstandards/cpp/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/cstdiotypesused/CstdioTypesUsed.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Streams and file I/O have a large number of unspecified, undefined, and
+ * implementation-defined behaviours associated with them.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class CstdioTypesUsed_sharedSharedQuery extends Query { }
+abstract class CstdioTypesUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof CstdioTypesUsed_sharedSharedQuery }
+Query getQuery() { result instanceof CstdioTypesUsedSharedQuery }
 
 query predicate problems(TypeMention tm, string message) {
   exists(UserType ut |
diff --git a/cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll b/cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.qll
similarity index 87%
rename from cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.qll
index e85491f271..c2b857d600 100644
--- a/cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.qll
@@ -1,14 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A using declaration that makes a symbol available for unqualified lookup does not
+ * included definitions defined after the using declaration which can result in
+ * unexpected behavior.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery extends Query { }
+abstract class DefinitionNotConsideredForUnqualifiedLookupSharedQuery extends Query { }
 
-Query getQuery() { result instanceof DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery }
+Query getQuery() { result instanceof DefinitionNotConsideredForUnqualifiedLookupSharedQuery }
 
 /**
  * Holds if `functionDecl` is a possible intended target of the `usingDecl`.
diff --git a/cpp/common/src/codingstandards/cpp/rules/dereferenceofnullpointer/DereferenceOfNullPointer.qll b/cpp/common/src/codingstandards/cpp/rules/dereferenceofnullpointer/DereferenceOfNullPointer.qll
index 5e3328cb63..950b14df3d 100644
--- a/cpp/common/src/codingstandards/cpp/rules/dereferenceofnullpointer/DereferenceOfNullPointer.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/dereferenceofnullpointer/DereferenceOfNullPointer.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Dereferencing a NULL pointer leads to undefined behavior.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.qll b/cpp/common/src/codingstandards/cpp/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.qll
index 6c39b62fec..1441b6ec97 100644
--- a/cpp/common/src/codingstandards/cpp/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The macro setjmp and function longjmp shall not be used.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll b/cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.qll
similarity index 57%
rename from cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.qll
index 31669cb0dc..3dba1a3aa3 100644
--- a/cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Empty throws with no currently handled exception can cause abrupt program
+ * termination.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery extends Query { }
+abstract class EmptyThrowOnlyWithinACatchHandlerSharedQuery extends Query { }
 
-Query getQuery() { result instanceof EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery }
+Query getQuery() { result instanceof EmptyThrowOnlyWithinACatchHandlerSharedQuery }
 
 query predicate problems(ReThrowExpr re, string message) {
   not isExcluded(re, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
index 4c35140d00..44013997fa 100644
--- a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Although scoped enum will implicitly define an underlying type of int, the underlying base type of enumeration should always be explicitly defined with a type that will be large enough to store all enumerators.
  */
 
 import cpp
@@ -8,8 +9,12 @@ import codingstandards.cpp.Exclusions
 
 abstract class EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery extends Query { }
 
-Query getQuery() { result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery }
+Query getQuery() {
+  result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery
+}
 
-query predicate problems(Element e, string message) {
-  not isExcluded(e, getQuery()) and message = "<replace with problem alert message for >"
+query predicate problems(Enum e, string message) {
+  not isExcluded(e, getQuery()) and
+  not e.hasExplicitUnderlyingType() and
+  message = "Base type of enumeration is not explicitly specified."
 }
diff --git a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll
deleted file mode 100644
index c4c9d33f35..0000000000
--- a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Provides a library which includes a `problems` predicate for reporting....
- */
-
-import cpp
-import codingstandards.cpp.Customizations
-import codingstandards.cpp.Exclusions
-
-abstract class EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery extends Query { }
-
-Query getQuery() {
-  result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery
-}
-
-query predicate problems(Enum e, string message) {
-  not isExcluded(e, getQuery()) and
-  not e.hasExplicitUnderlyingType() and
-  message = "Base type of enumeration is not explicitly specified."
-}
diff --git a/cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.qll
similarity index 65%
rename from cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.qll
index f9fded32cd..1989afbc8b 100644
--- a/cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Throwing an exception of pointer type can lead to use-after-free or memory leak
+ * issues.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class ExceptionObjectHavePointerType_sharedSharedQuery extends Query { }
+abstract class ExceptionObjectHavePointerTypeSharedQuery extends Query { }
 
-Query getQuery() { result instanceof ExceptionObjectHavePointerType_sharedSharedQuery }
+Query getQuery() { result instanceof ExceptionObjectHavePointerTypeSharedQuery }
 
 query predicate problems(Expr thrownExpr, string message) {
   not isExcluded(thrownExpr, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll b/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll
similarity index 76%
rename from cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll
index 71c03b6e94..eb5347816b 100644
--- a/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Forwarding references and std::forward shall be used together.
  */
 
 import cpp
@@ -7,10 +8,10 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.standardlibrary.Utility
 
-abstract class ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery extends Query { }
+abstract class ForwardingReferencesAndForwardNotUsedTogetherSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery
+  result instanceof ForwardingReferencesAndForwardNotUsedTogetherSharedQuery
 }
 
 query predicate problems(FunctionCall c, string message, Parameter a, string a_string) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll b/cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.qll
similarity index 74%
rename from cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.qll
index 71b7c09a18..73e4181640 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Function-like macros shall not be defined.
  */
 
 import cpp
@@ -7,9 +8,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.IrreplaceableFunctionLikeMacro
 
-abstract class FunctionLikeMacrosDefined_sharedSharedQuery extends Query { }
+abstract class FunctionLikeMacrosDefinedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof FunctionLikeMacrosDefined_sharedSharedQuery }
+Query getQuery() { result instanceof FunctionLikeMacrosDefinedSharedQuery }
 
 predicate partOfConstantExpr(MacroInvocation i) {
   exists(Expr e |
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
similarity index 80%
rename from cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
index 18ad403ffe..4b4ec74bbb 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
@@ -1,15 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Using recursive functions can lead to stack overflows and limit scalability and
+ * portability of the program.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery extends Query { }
+abstract class FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery
+  result instanceof FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery
 }
 
 class RecursiveCall extends FunctionCall {
diff --git a/cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll b/cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.qll
similarity index 67%
rename from cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.qll
index e39ab569b7..d0f98d233e 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Function templates shall not be explicitly specialized.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class FunctionTemplatesExplicitlySpecialized_sharedSharedQuery extends Query { }
+abstract class FunctionTemplatesExplicitlySpecializedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof FunctionTemplatesExplicitlySpecialized_sharedSharedQuery }
+Query getQuery() { result instanceof FunctionTemplatesExplicitlySpecializedSharedQuery }
 
 query predicate problems(
   FunctionTemplateSpecialization f, string message, TemplateFunction tf, string tf_string
diff --git a/cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll b/cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.qll
similarity index 68%
rename from cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.qll
index 89dee4dd8b..285ccd909a 100644
--- a/cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The only declarations in the global namespace should be main, namespace declarations
+ * and extern "C" declarations.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class GlobalNamespaceDeclarations_sharedSharedQuery extends Query { }
+abstract class GlobalNamespaceDeclarationsSharedQuery extends Query { }
 
-Query getQuery() { result instanceof GlobalNamespaceDeclarations_sharedSharedQuery }
+Query getQuery() { result instanceof GlobalNamespaceDeclarationsSharedQuery }
 
 query predicate problems(DeclarationEntry e, string message) {
   not isExcluded(e, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll b/cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.qll
similarity index 66%
rename from cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.qll
index 112ff0b674..c445c06253 100644
--- a/cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * If a project has the unsized version of operator 'delete' globally defined, then the
+ * sized version shall be defined.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.OperatorDelete
 
-abstract class GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery extends Query { }
+abstract class GlobalSizedOperatorDeleteNotDefinedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery }
+Query getQuery() { result instanceof GlobalSizedOperatorDeleteNotDefinedSharedQuery }
 
 query predicate problems(OperatorDelete unsized_delete, string message) {
   not isExcluded(unsized_delete, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll b/cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.qll
similarity index 66%
rename from cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.qll
index 031b4674c5..b99887ee03 100644
--- a/cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * If a project has the sized version of operator 'delete' globally defined, then the
+ * unsized version shall be defined.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.OperatorDelete
 
-abstract class GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery extends Query { }
+abstract class GlobalUnsizedOperatorDeleteNotDefinedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery }
+Query getQuery() { result instanceof GlobalUnsizedOperatorDeleteNotDefinedSharedQuery }
 
 query predicate problems(OperatorDelete sized_delete, string message) {
   not isExcluded(sized_delete, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll b/cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.qll
similarity index 87%
rename from cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.qll
index 11c09e2298..f329fff12d 100644
--- a/cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A goto statement shall reference a label in a surrounding block.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class GotoReferenceALabelInSurroundingBlock_sharedSharedQuery extends Query { }
+abstract class GotoReferenceALabelInSurroundingBlockSharedQuery extends Query { }
 
-Query getQuery() { result instanceof GotoReferenceALabelInSurroundingBlock_sharedSharedQuery }
+Query getQuery() { result instanceof GotoReferenceALabelInSurroundingBlockSharedQuery }
 
 predicate isPartOfSwitch(Stmt goto) {
   exists(SwitchStmt switch | switch.getStmt() = goto.getParent())
diff --git a/cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.qll
similarity index 62%
rename from cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.qll
index 7ec5ddb557..6a13ea083c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The goto statement shall not be used.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class GotoStatementShouldNotBeUsed_sharedSharedQuery extends Query { }
+abstract class GotoStatementShouldNotBeUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof GotoStatementShouldNotBeUsed_sharedSharedQuery }
+Query getQuery() { result instanceof GotoStatementShouldNotBeUsedSharedQuery }
 
 query predicate problems(Stmt s, string message) {
   not isExcluded(s, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.qll b/cpp/common/src/codingstandards/cpp/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.qll
index ccc0a23460..8d859f726d 100644
--- a/cpp/common/src/codingstandards/cpp/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/handleallexceptionsduringstartup/HandleAllExceptionsDuringStartup.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Exceptions thrown before main begins executing cannot be caught.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.qll
similarity index 86%
rename from cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.qll
index 080d686b9f..1c371da20c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A non-overriding member function definition that hides an inherited member function
+ * can result in unexpected behavior.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Class
 
-abstract class HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery extends Query { }
+abstract class HiddenInheritedNonOverridableMemberFunctionSharedQuery extends Query { }
 
-Query getQuery() { result instanceof HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery }
+Query getQuery() { result instanceof HiddenInheritedNonOverridableMemberFunctionSharedQuery }
 
 /**
  * Holds if the class has a non-virtual member function with the given name.
diff --git a/cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.qll
similarity index 88%
rename from cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.qll
index b41bebf6f4..ef99e01973 100644
--- a/cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * An overriding member function definition thats hides an overload of the overridden
+ * inherited member function can result in unexpected behavior.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class HiddenInheritedOverridableMemberFunction_sharedSharedQuery extends Query { }
+abstract class HiddenInheritedOverridableMemberFunctionSharedQuery extends Query { }
 
-Query getQuery() { result instanceof HiddenInheritedOverridableMemberFunction_sharedSharedQuery }
+Query getQuery() { result instanceof HiddenInheritedOverridableMemberFunctionSharedQuery }
 
 query predicate problems(
   FunctionDeclarationEntry overridingDecl, string message, FunctionDeclarationEntry hiddenDecl,
diff --git a/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll b/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll
index dc71ba843e..9534c2f78a 100644
--- a/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll
@@ -1,5 +1,8 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Use of an identifier declared in an inner scope with an identical name to an
+ * identifier in an outer scope can lead to inadvertent errors if the incorrect
+ * identifier is modified.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.qll b/cpp/common/src/codingstandards/cpp/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.qll
index 17808841eb..806315b43c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/identifierwithexternallinkageonedefinitionshared/IdentifierWithExternalLinkageOneDefinitionShared.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * An identifier with multiple definitions in different translation units
+ * leads to undefined behavior.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/ifelseterminationconstruct/IfElseTerminationConstruct.qll b/cpp/common/src/codingstandards/cpp/rules/ifelseterminationconstruct/IfElseTerminationConstruct.qll
index 5755ed8f38..3c6f25e151 100644
--- a/cpp/common/src/codingstandards/cpp/rules/ifelseterminationconstruct/IfElseTerminationConstruct.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/ifelseterminationconstruct/IfElseTerminationConstruct.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The final else statement is a defensive programming technique.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll b/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll
similarity index 82%
rename from cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll
index 0143a88ca7..b3cfe203ac 100644
--- a/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * All constructors of a class should explicitly initialize all of its virtual base
+ * classes and immediate base classes.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Constructor
 
-abstract class InitializeAllVirtualBaseClasses_sharedSharedQuery extends Query { }
+abstract class InitializeAllVirtualBaseClassesSharedQuery extends Query { }
 
-Query getQuery() { result instanceof InitializeAllVirtualBaseClasses_sharedSharedQuery }
+Query getQuery() { result instanceof InitializeAllVirtualBaseClassesSharedQuery }
 
 query predicate problems(
   Constructor c, string message, Class declaringType, string declaringType_string, Class baseClass,
diff --git a/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll b/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll
similarity index 89%
rename from cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll
index 75fd17761e..c0024b4463 100644
--- a/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll
@@ -1,15 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A class shall only define an initializer-list constructor when it is the only
+ * constructor.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery extends Query { }
+abstract class InitializerListConstructorIsTheOnlyConstructorSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery
+  result instanceof InitializerListConstructorIsTheOnlyConstructorSharedQuery
 }
 
 class StdInitializerList extends Class {
diff --git a/cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll b/cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments/LineSplicingUsedInComments.qll
similarity index 50%
rename from cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments/LineSplicingUsedInComments.qll
index 454f95b070..52dcf9a3f1 100644
--- a/cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/linesplicingusedincomments/LineSplicingUsedInComments.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Entering a newline following a '\\' character can erroneously commenting out
+ * regions of code.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class LineSplicingUsedInComments_sharedSharedQuery extends Query { }
+abstract class LineSplicingUsedInCommentsSharedQuery extends Query { }
 
-Query getQuery() { result instanceof LineSplicingUsedInComments_sharedSharedQuery }
+Query getQuery() { result instanceof LineSplicingUsedInCommentsSharedQuery }
 
 query predicate problems(CppStyleComment c, string message) {
   not isExcluded(c, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition/LoopCompoundCondition.qll b/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition/LoopCompoundCondition.qll
new file mode 100644
index 0000000000..b71c193c8e
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition/LoopCompoundCondition.qll
@@ -0,0 +1,19 @@
+/**
+ * Provides a library with a `problems` predicate for the following issue:
+ * If the body of a loop is not enclosed in braces, then this can lead to incorrect
+ * execution, and hard for developers to maintain.
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class LoopCompoundConditionSharedQuery extends Query { }
+
+Query getQuery() { result instanceof LoopCompoundConditionSharedQuery }
+
+query predicate problems(Loop loop, string message) {
+  not isExcluded(loop, getQuery()) and
+  not loop.getStmt() instanceof BlockStmt and
+  message = "Loop body not enclosed within braces."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll b/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll
deleted file mode 100644
index 14fee7001e..0000000000
--- a/cpp/common/src/codingstandards/cpp/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.qll
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Provides a library which includes a `problems` predicate for reporting....
- */
-
-import cpp
-import codingstandards.cpp.Customizations
-import codingstandards.cpp.Exclusions
-
-abstract class LoopCompoundCondition_sharedSharedQuery extends Query { }
-
-Query getQuery() { result instanceof LoopCompoundCondition_sharedSharedQuery }
-
-query predicate problems(Loop loop, string message) {
-  not isExcluded(loop, getQuery()) and
-  not loop.getStmt() instanceof BlockStmt and
-  message = "Loop body not enclosed within braces."
-}
diff --git a/cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll b/cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.qll
similarity index 60%
rename from cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.qll
index 6316367c0d..b12cddba0b 100644
--- a/cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The lowercase form of L shall not be used as the first character in a literal
+ * suffix.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Literals
 
-abstract class LowercaseLStartsInLiteralSuffix_sharedSharedQuery extends Query { }
+abstract class LowercaseLStartsInLiteralSuffixSharedQuery extends Query { }
 
-Query getQuery() { result instanceof LowercaseLStartsInLiteralSuffix_sharedSharedQuery }
+Query getQuery() { result instanceof LowercaseLStartsInLiteralSuffixSharedQuery }
 
 query predicate problems(IntegerLiteral l, string message) {
   not isExcluded(l, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused/MacroOffsetofUsed.qll
similarity index 55%
rename from cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/macrooffsetofused/MacroOffsetofUsed.qll
index 090238a1de..b475dc655e 100644
--- a/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/macrooffsetofused/MacroOffsetofUsed.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The macro offsetof shall not be used.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class MacroOffsetofUsed_sharedSharedQuery extends Query { }
+abstract class MacroOffsetofUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof MacroOffsetofUsed_sharedSharedQuery }
+Query getQuery() { result instanceof MacroOffsetofUsedSharedQuery }
 
 query predicate problems(MacroInvocation mi, string message) {
   not isExcluded(mi, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll b/cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash/MacroParameterFollowingHash.qll
similarity index 66%
rename from cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash/MacroParameterFollowingHash.qll
index 4eaf97123a..ae20368e67 100644
--- a/cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/macroparameterfollowinghash/MacroParameterFollowingHash.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A macro parameter immediately following a # operator shall not be immediately
+ * followed by a ## operator.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Macro
 
-abstract class MacroParameterFollowingHash_sharedSharedQuery extends Query { }
+abstract class MacroParameterFollowingHashSharedQuery extends Query { }
 
-Query getQuery() { result instanceof MacroParameterFollowingHash_sharedSharedQuery }
+Query getQuery() { result instanceof MacroParameterFollowingHashSharedQuery }
 
 query predicate problems(Macro m, string message) {
   not isExcluded(m, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.qll b/cpp/common/src/codingstandards/cpp/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.qll
index 693ae36906..314d1dbe4c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/macroparameternotenclosedinparentheses/MacroParameterNotEnclosedInParentheses.qll
@@ -1,5 +1,8 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * In the definition of a function-like macro, each instance of a parameter
+ * shall be enclosed in parentheses, otherwise the result of preprocessor macro
+ * substitition may not be as expected.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll b/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll
similarity index 97%
rename from cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll
index df7e0af73d..83c5ac1c8f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Operations on a memory location shall be sequenced appropriately.
  */
 
 import cpp
@@ -9,9 +10,9 @@ import codingstandards.cpp.Exclusions
 import codingstandards.cpp.SideEffects
 import codingstandards.cpp.COrdering
 
-abstract class MemoryOperationsNotSequencedAppropriately_sharedSharedQuery extends Query { }
+abstract class MemoryOperationsNotSequencedAppropriatelySharedQuery extends Query { }
 
-Query getQuery() { result instanceof MemoryOperationsNotSequencedAppropriately_sharedSharedQuery }
+Query getQuery() { result instanceof MemoryOperationsNotSequencedAppropriatelySharedQuery }
 
 class VariableEffectOrAccess extends Expr {
   VariableEffectOrAccess() {
diff --git a/cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll b/cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.qll
similarity index 90%
rename from cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.qll
index 317605cd1f..05821d7270 100644
--- a/cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A declaration should not declare more than one variable or member variable.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class MultipleGlobalOrMemberDeclarators_sharedSharedQuery extends Query { }
+abstract class MultipleGlobalOrMemberDeclaratorsSharedQuery extends Query { }
 
-Query getQuery() { result instanceof MultipleGlobalOrMemberDeclarators_sharedSharedQuery }
+Query getQuery() { result instanceof MultipleGlobalOrMemberDeclaratorsSharedQuery }
 
 /*
  * Unfortunately, we do not have an equivalent of `DeclStmt` for non-local declarations, so we
diff --git a/cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll b/cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators/MultipleLocalDeclarators.qll
similarity index 59%
rename from cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators/MultipleLocalDeclarators.qll
index 41c396bddc..2269f36d97 100644
--- a/cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/multiplelocaldeclarators/MultipleLocalDeclarators.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A declaration should not declare more than one variable or member variable.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class MultipleLocalDeclarators_sharedSharedQuery extends Query { }
+abstract class MultipleLocalDeclaratorsSharedQuery extends Query { }
 
-Query getQuery() { result instanceof MultipleLocalDeclarators_sharedSharedQuery }
+Query getQuery() { result instanceof MultipleLocalDeclaratorsSharedQuery }
 
 query predicate problems(DeclStmt ds, string message) {
   not isExcluded(ds, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll b/cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.qll
similarity index 67%
rename from cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.qll
index 6542caf889..326886dda6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A named bit-field with signed integer type shall not have a length of one bit.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class NamedBitFieldsWithSignedIntegerType_sharedSharedQuery extends Query { }
+abstract class NamedBitFieldsWithSignedIntegerTypeSharedQuery extends Query { }
 
-Query getQuery() { result instanceof NamedBitFieldsWithSignedIntegerType_sharedSharedQuery }
+Query getQuery() { result instanceof NamedBitFieldsWithSignedIntegerTypeSharedQuery }
 
 query predicate problems(BitField bitField, string message) {
   not isExcluded(bitField, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.qll
similarity index 78%
rename from cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.qll
index 49149ef171..a4c9255c89 100644
--- a/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Not using a qualified-id or `this->` syntax for identifiers used in a class template
+ * makes the code more difficult to understand.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.NameInDependentBase
 
-abstract class NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery extends Query { }
+abstract class NameNotReferredUsingAQualifiedIdOrThisSharedQuery extends Query { }
 
-Query getQuery() { result instanceof NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery }
+Query getQuery() { result instanceof NameNotReferredUsingAQualifiedIdOrThisSharedQuery }
 
 query predicate problems(
   NameQualifiableElement fn, string message, Element actualTarget, string targetName,
diff --git a/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.qll
similarity index 79%
rename from cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.qll
index 1b97c1f56d..d0a6251908 100644
--- a/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Not using a qualified-id or `this->` syntax for identifiers used in a class template
+ * makes the code more difficult to understand.
  */
 
 import cpp
@@ -7,9 +9,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.NameInDependentBase
 
-abstract class NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery extends Query { }
+abstract class NameNotReferredUsingAQualifiedIdOrThisAuditSharedQuery extends Query { }
 
-Query getQuery() { result instanceof NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery }
+Query getQuery() { result instanceof NameNotReferredUsingAQualifiedIdOrThisAuditSharedQuery }
 
 query predicate problems(
   NameQualifiableElement fn, string message, Element actualTarget, string targetName,
diff --git a/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll b/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll
similarity index 76%
rename from cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll
index 31a606c0db..f53c558fa0 100644
--- a/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * If a function is declared to be noexcept, noexcept(true) or noexcept(<true
+ * condition>), then it shall not exit with an exception.
  */
 
 import cpp
@@ -9,10 +11,10 @@ import codingstandards.cpp.exceptions.ExceptionFlow
 import ExceptionPathGraph
 import codingstandards.cpp.exceptions.ExceptionSpecifications
 
-abstract class NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery extends Query { }
+abstract class NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery
+  result instanceof NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery
 }
 
 class NoExceptThrowingFunction extends ExceptionThrowingFunction {
diff --git a/cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain/NonGlobalFunctionMain.qll
similarity index 52%
rename from cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain/NonGlobalFunctionMain.qll
index 69a7e7e091..7366849d0c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/nonglobalfunctionmain/NonGlobalFunctionMain.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The identifier main shall not be used for a function other than the global function
+ * main.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class NonGlobalFunctionMain_sharedSharedQuery extends Query { }
+abstract class NonGlobalFunctionMainSharedQuery extends Query { }
 
-Query getQuery() { result instanceof NonGlobalFunctionMain_sharedSharedQuery }
+Query getQuery() { result instanceof NonGlobalFunctionMainSharedQuery }
 
 query predicate problems(Function f, string message) {
   not isExcluded(f, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.qll
similarity index 81%
rename from cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.qll
index 4f479a5bdb..f23965ea7c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Octal escape sequences, hexadecimal escape sequences, and universal character names
+ * shall be terminated.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class NonTerminatedEscapeSequences_sharedSharedQuery extends Query { }
+abstract class NonTerminatedEscapeSequencesSharedQuery extends Query { }
 
-Query getQuery() { result instanceof NonTerminatedEscapeSequences_sharedSharedQuery }
+Query getQuery() { result instanceof NonTerminatedEscapeSequencesSharedQuery }
 
 bindingset[s]
 predicate isOctalEscape(string s) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.qll
similarity index 80%
rename from cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.qll
index a9831d9ead..f7afe8b3e7 100644
--- a/cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Within an enumerator list, the value of an implicitly-specified enumeration constant
+ * shall be unique.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class NonUniqueEnumerationConstant_sharedSharedQuery extends Query { }
+abstract class NonUniqueEnumerationConstantSharedQuery extends Query { }
 
-Query getQuery() { result instanceof NonUniqueEnumerationConstant_sharedSharedQuery }
+Query getQuery() { result instanceof NonUniqueEnumerationConstantSharedQuery }
 
 /**
  * An `EnumConstant` that has an implicitly specified value:
diff --git a/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll b/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll
index 2d6767f664..093b804e0f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Using nondistinct external identifiers results in undefined behaviour.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll b/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll
similarity index 74%
rename from cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll
index 992a1ac645..c997595ac6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * nullptr shall be the only form of the null-pointer-constant.
  */
 
 import cpp
@@ -7,10 +8,10 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import semmle.code.cpp.commons.NULL
 
-abstract class NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery extends Query { }
+abstract class NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery
+  result instanceof NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery
 }
 
 query predicate problems(Literal l, string message) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll b/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll
similarity index 92%
rename from cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll
index 992b568f2a..6bb9590d33 100644
--- a/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll
@@ -1,15 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * An object’s dynamic type shall not be used from within its constructor or
+ * destructor.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery extends Query { }
+abstract class ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery
+  result instanceof ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery
 }
 
 predicate thisCall(FunctionCall c) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll b/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll
similarity index 78%
rename from cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll
index f9438cefc8..d4a85cbaac 100644
--- a/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll
@@ -1,15 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Parameters in an overriding virtual function shall not specify different default
+ * arguments.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery extends Query { }
+abstract class OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery
+  result instanceof OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
 }
 
 query predicate problems(VirtualFunction f2, string message, VirtualFunction f1, string f1_string) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll b/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll
similarity index 78%
rename from cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll
index be93180112..12d9a297b9 100644
--- a/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll
@@ -1,15 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * A comparison of a potentially virtual pointer to member function shall only be with
+ * nullptr.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery extends Query { }
+abstract class PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery
+  result instanceof PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
 }
 
 query predicate problems(
diff --git a/cpp/common/src/codingstandards/cpp/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.qll b/cpp/common/src/codingstandards/cpp/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.qll
index a8b6ab7576..bf47c1f649 100644
--- a/cpp/common/src/codingstandards/cpp/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/predicatefunctionobjectsshouldnotbemutable/PredicateFunctionObjectsShouldNotBeMutable.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * "Non-static data members or captured values of predicate function objects
+ * that are state related to this object's identity shall not be copied.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.qll b/cpp/common/src/codingstandards/cpp/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.qll
index 8b8609ab7b..8361a07a31 100644
--- a/cpp/common/src/codingstandards/cpp/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/preprocessingdirectivewithinmacroargument/PreprocessingDirectiveWithinMacroArgument.qll
@@ -1,5 +1,7 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Arguments to a function-like macro shall not contain tokens that look like
+ * pre-processing directives or else behaviour after macro expansion is unpredictable.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused/ReinterpretCastUsed.qll b/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused/ReinterpretCastUsed.qll
new file mode 100644
index 0000000000..b49a488ab2
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused/ReinterpretCastUsed.qll
@@ -0,0 +1,16 @@
+/**
+ * Provides a library with a `problems` predicate for the following issue:
+ * The statement reinterpret_cast shall not be used.
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class ReinterpretCastUsedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof ReinterpretCastUsedSharedQuery }
+
+query predicate problems(ReinterpretCast rc, string message) {
+  not isExcluded(rc, getQuery()) and message = "Use of reinterpret_cast."
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll
deleted file mode 100644
index b325b8ba47..0000000000
--- a/cpp/common/src/codingstandards/cpp/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Provides a library which includes a `problems` predicate for reporting....
- */
-
-import cpp
-import codingstandards.cpp.Customizations
-import codingstandards.cpp.Exclusions
-
-abstract class ReinterpretCastUsed_sharedSharedQuery extends Query { }
-
-Query getQuery() { result instanceof ReinterpretCastUsed_sharedSharedQuery }
-
-query predicate problems(ReinterpretCast rc, string message) {
-  not isExcluded(rc, getQuery()) and message = "Use of reinterpret_cast."
-}
diff --git a/cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.qll
similarity index 58%
rename from cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.qll
index d44d3d2b8e..04a106b5c4 100644
--- a/cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.qll
@@ -1,14 +1,15 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The result of an assignment operator should not be used.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery extends Query { }
+abstract class ResultOfAnAssignmentOperatorShouldNotBeUsedSharedQuery extends Query { }
 
-Query getQuery() { result instanceof ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery }
+Query getQuery() { result instanceof ResultOfAnAssignmentOperatorShouldNotBeUsedSharedQuery }
 
 query predicate problems(AssignExpr e, string message) {
   not isExcluded(e, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll b/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll
similarity index 74%
rename from cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll
index e3444fe368..dce050d9d7 100644
--- a/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll
@@ -1,15 +1,17 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Functions that return a reference or a pointer to an automatic variable (including
+ * parameters) potentially lead to undefined behaviour.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery extends Query { }
+abstract class ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery
+  result instanceof ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery
 }
 
 query predicate problems(
diff --git a/cpp/common/src/codingstandards/cpp/rules/switchcasepositioncondition/SwitchCasePositionCondition.qll b/cpp/common/src/codingstandards/cpp/rules/switchcasepositioncondition/SwitchCasePositionCondition.qll
index 68ba9850af..979621762d 100644
--- a/cpp/common/src/codingstandards/cpp/rules/switchcasepositioncondition/SwitchCasePositionCondition.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/switchcasepositioncondition/SwitchCasePositionCondition.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The switch statement syntax is weak and may lead to unspecified behaviour.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll b/cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition/SwitchCompoundCondition.qll
similarity index 79%
rename from cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition/SwitchCompoundCondition.qll
index 2db252da61..ab888abfec 100644
--- a/cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/switchcompoundcondition/SwitchCompoundCondition.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * If the body of a switch is not enclosed in braces, then this can lead to incorrect
+ * execution, and hard for developers to maintain.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class SwitchCompoundCondition_sharedSharedQuery extends Query { }
+abstract class SwitchCompoundConditionSharedQuery extends Query { }
 
-Query getQuery() { result instanceof SwitchCompoundCondition_sharedSharedQuery }
+Query getQuery() { result instanceof SwitchCompoundConditionSharedQuery }
 
 /**
  * Class to differentiate between extractor generated blockstmt and actual blockstmt. The extractor
diff --git a/cpp/common/src/codingstandards/cpp/rules/switchnotwellformed/SwitchNotWellFormed.qll b/cpp/common/src/codingstandards/cpp/rules/switchnotwellformed/SwitchNotWellFormed.qll
index ee04228a95..cb2e61c3ad 100644
--- a/cpp/common/src/codingstandards/cpp/rules/switchnotwellformed/SwitchNotWellFormed.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/switchnotwellformed/SwitchNotWellFormed.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The switch statement syntax is weak and may lead to unspecified behaviour.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/typeomitted/TypeOmitted.qll b/cpp/common/src/codingstandards/cpp/rules/typeomitted/TypeOmitted.qll
index 8c1cb3b80a..0906a1de4f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/typeomitted/TypeOmitted.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/typeomitted/TypeOmitted.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Omission of type specifiers may not be supported by some compilers.
  */
 
 import cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
similarity index 79%
rename from cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
index a59a4e6fd5..00745b6f7f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Unsigned integer literals shall be appropriately suffixed.
  */
 
 import cpp
@@ -7,10 +8,10 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Cpp14Literal
 
-abstract class UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery extends Query { }
+abstract class UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery extends Query { }
 
 Query getQuery() {
-  result instanceof UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery
+  result instanceof UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery
 }
 
 query predicate problems(Cpp14Literal::NumericLiteral nl, string message) {
diff --git a/cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll b/cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.qll
similarity index 80%
rename from cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.qll
index 9020e9c5f0..bc0c6d8fc1 100644
--- a/cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * An unsigned arithmetic operation with constant operands should not wrap.
  */
 
 import cpp
@@ -9,9 +10,9 @@ import codingstandards.cpp.Overflow
 import semmle.code.cpp.controlflow.Guards
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 
-abstract class UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery extends Query { }
+abstract class UnsignedOperationWithConstantOperandsWrapsSharedQuery extends Query { }
 
-Query getQuery() { result instanceof UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery }
+Query getQuery() { result instanceof UnsignedOperationWithConstantOperandsWrapsSharedQuery }
 
 query predicate problems(InterestingOverflowingOperation op, string message) {
   not isExcluded(op, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll b/cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.qll
similarity index 60%
rename from cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.qll
index 8c952da18e..f5d1834723 100644
--- a/cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.qll
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * Octal constants shall not be used.
  */
 
 import cpp
@@ -7,9 +8,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Cpp14Literal
 
-abstract class UseOfNonZeroOctalLiteral_sharedSharedQuery extends Query { }
+abstract class UseOfNonZeroOctalLiteralSharedQuery extends Query { }
 
-Query getQuery() { result instanceof UseOfNonZeroOctalLiteral_sharedSharedQuery }
+Query getQuery() { result instanceof UseOfNonZeroOctalLiteralSharedQuery }
 
 query predicate problems(Cpp14Literal::OctalLiteral octalLiteral, string message) {
   not isExcluded(octalLiteral, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll b/cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.qll
similarity index 68%
rename from cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.qll
index 1fda305df2..ca23306c55 100644
--- a/cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.qll
@@ -1,5 +1,8 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * The std::vector<bool> specialization differs from all other containers
+ * std::vector<T> such that sizeof bool is implementation defined which causes errors
+ * when using some STL algorithms.
  */
 
 import cpp
@@ -7,9 +10,9 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.StdNamespace
 
-abstract class VectorShouldNotBeSpecializedWithBool_sharedSharedQuery extends Query { }
+abstract class VectorShouldNotBeSpecializedWithBoolSharedQuery extends Query { }
 
-Query getQuery() { result instanceof VectorShouldNotBeSpecializedWithBool_sharedSharedQuery }
+Query getQuery() { result instanceof VectorShouldNotBeSpecializedWithBoolSharedQuery }
 
 predicate isVectorBool(ClassTemplateInstantiation c) {
   c.getNamespace() instanceof StdNS and
diff --git a/cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll b/cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.qll
similarity index 82%
rename from cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll
rename to cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.qll
index 44e814c29b..f29d69d1ac 100644
--- a/cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.qll
@@ -1,14 +1,16 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * An accessible base class shall not be both virtual and non-virtual in the same
+ * hierarchy.
  */
 
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 
-abstract class VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery extends Query { }
+abstract class VirtualAndNonVirtualClassInTheHierarchySharedQuery extends Query { }
 
-Query getQuery() { result instanceof VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery }
+Query getQuery() { result instanceof VirtualAndNonVirtualClassInTheHierarchySharedQuery }
 
 query predicate problems(
   Class c3, string message, Class base, string base_string, ClassDerivation cd1, string cd1_string,
diff --git a/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.expected b/cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.expected
similarity index 100%
rename from cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.expected
rename to cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.expected
diff --git a/cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.ql b/cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.ql
new file mode 100644
index 0000000000..ee8ba0d5d5
--- /dev/null
+++ b/cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.addressofoperatoroverloaded.AddressOfOperatorOverloaded
+
+class TestFileQuery extends AddressOfOperatorOverloadedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/addressofoperatoroverloaded_shared/test.cpp b/cpp/common/test/rules/addressofoperatoroverloaded/test.cpp
similarity index 100%
rename from cpp/common/test/rules/addressofoperatoroverloaded_shared/test.cpp
rename to cpp/common/test/rules/addressofoperatoroverloaded/test.cpp
diff --git a/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql b/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
deleted file mode 100644
index 0a40e9b1b9..0000000000
--- a/cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.addressofoperatoroverloaded_shared.AddressOfOperatorOverloaded_shared
-
-class TestFileQuery extends AddressOfOperatorOverloaded_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.expected
similarity index 100%
rename from cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.expected
rename to cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.expected
diff --git a/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
similarity index 61%
rename from cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
rename to cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
index 8fc299b7f3..5aa514e86d 100644
--- a/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
+++ b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion.AMixedUseMacroArgumentSubjectToExpansion
 
-class TestFileQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends AMixedUseMacroArgumentSubjectToExpansionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.cpp b/cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/test.cpp
similarity index 100%
rename from cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/test.cpp
rename to cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/test.cpp
diff --git a/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.expected b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.expected
similarity index 100%
rename from cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.expected
rename to cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.expected
diff --git a/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
similarity index 58%
rename from cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
rename to cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
index fd61a27184..929e5affdf 100644
--- a/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
+++ b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
@@ -1,6 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
+import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
 
-class TestFileQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/test.cpp b/cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/test.cpp
similarity index 100%
rename from cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/test.cpp
rename to cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/test.cpp
diff --git a/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.expected b/cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.expected
similarity index 100%
rename from cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.expected
rename to cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.expected
diff --git a/cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.ql b/cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.ql
new file mode 100644
index 0000000000..5e60570f5a
--- /dev/null
+++ b/cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.asmdeclarationused.AsmDeclarationUsed
+
+class TestFileQuery extends AsmDeclarationUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/asmdeclarationused_shared/test.cpp b/cpp/common/test/rules/asmdeclarationused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/asmdeclarationused_shared/test.cpp
rename to cpp/common/test/rules/asmdeclarationused/test.cpp
diff --git a/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql b/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
deleted file mode 100644
index 129fb3a5eb..0000000000
--- a/cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.asmdeclarationused_shared.AsmDeclarationUsed_shared
-
-class TestFileQuery extends AsmDeclarationUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected b/cpp/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.expected
similarity index 100%
rename from cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.expected
rename to cpp/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.expected
diff --git a/cpp/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql b/cpp/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
new file mode 100644
index 0000000000..6da5fe6097
--- /dev/null
+++ b/cpp/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.atofatoiatolandatollused.AtofAtoiAtolAndAtollUsed
+
+class TestFileQuery extends AtofAtoiAtolAndAtollUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/atofatoiatolandatollused_shared/test.cpp b/cpp/common/test/rules/atofatoiatolandatollused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/atofatoiatolandatollused_shared/test.cpp
rename to cpp/common/test/rules/atofatoiatolandatollused/test.cpp
diff --git a/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql b/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
deleted file mode 100644
index 75b1a7ea10..0000000000
--- a/cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
-
-class TestFileQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.expected b/cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.expected
similarity index 100%
rename from cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.expected
rename to cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.expected
diff --git a/cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.ql b/cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.ql
new file mode 100644
index 0000000000..aa32fa3096
--- /dev/null
+++ b/cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.backslashcharactermisuse.BackslashCharacterMisuse
+
+class TestFileQuery extends BackslashCharacterMisuseSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/backslashcharactermisuse_shared/test.cpp b/cpp/common/test/rules/backslashcharactermisuse/test.cpp
similarity index 100%
rename from cpp/common/test/rules/backslashcharactermisuse_shared/test.cpp
rename to cpp/common/test/rules/backslashcharactermisuse/test.cpp
diff --git a/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql b/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
deleted file mode 100644
index ad9a9eb112..0000000000
--- a/cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
-
-class TestFileQuery extends BackslashCharacterMisuse_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.expected
similarity index 100%
rename from cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.expected
rename to cpp/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.expected
diff --git a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
new file mode 100644
index 0000000000..a3e1ecc76c
--- /dev/null
+++ b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype.BitFieldShallHaveAnAppropriateType
+
+class TestFileQuery extends BitFieldShallHaveAnAppropriateTypeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.cpp b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype/test.cpp
similarity index 100%
rename from cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/test.cpp
rename to cpp/common/test/rules/bitfieldshallhaveanappropriatetype/test.cpp
diff --git a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql b/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
deleted file mode 100644
index e460832dc7..0000000000
--- a/cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
-
-class TestFileQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.expected b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.expected
similarity index 100%
rename from cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.expected
rename to cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.expected
diff --git a/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
similarity index 56%
rename from cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
rename to cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
index d7b6f1d4cb..3f5110e299 100644
--- a/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
+++ b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
+import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
 
-class TestFileQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/test.cpp b/cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/test.cpp
similarity index 100%
rename from cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/test.cpp
rename to cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/test.cpp
diff --git a/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.expected b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.expected
similarity index 100%
rename from cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.expected
rename to cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.expected
diff --git a/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
similarity index 57%
rename from cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
rename to cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
index 5fb036e12f..fd716b8570 100644
--- a/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
+++ b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
@@ -1,6 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
+import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype.CastsBetweenAPointerToFunctionAndAnyOtherType
 
-class TestFileQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/test.cpp b/cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/test.cpp
similarity index 100%
rename from cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/test.cpp
rename to cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/test.cpp
diff --git a/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.expected b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.expected
similarity index 100%
rename from cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.expected
rename to cpp/common/test/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.expected
diff --git a/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.ql
similarity index 60%
rename from cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
rename to cpp/common/test/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.ql
index d172827f54..3fd1cf77ba 100644
--- a/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
+++ b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
+import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment.CharacterSequenceUsedWithinACStyleComment
 
-class TestFileQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends CharacterSequenceUsedWithinACStyleCommentSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/test.cpp b/cpp/common/test/rules/charactersequenceusedwithinacstylecomment/test.cpp
similarity index 100%
rename from cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/test.cpp
rename to cpp/common/test/rules/charactersequenceusedwithinacstylecomment/test.cpp
diff --git a/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.expected b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.expected
similarity index 100%
rename from cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.expected
rename to cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.expected
diff --git a/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
similarity index 56%
rename from cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
rename to cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
index 8d4b1e8f6f..9e84431f65 100644
--- a/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
+++ b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
+import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment.CopyAndMoveAssignmentsShallHandleSelfAssignment
 
-class TestFileQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/test.cpp b/cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/test.cpp
similarity index 100%
rename from cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/test.cpp
rename to cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/test.cpp
diff --git a/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.expected b/cpp/common/test/rules/csignalfunctionsused/CsignalFunctionsUsed.expected
similarity index 100%
rename from cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.expected
rename to cpp/common/test/rules/csignalfunctionsused/CsignalFunctionsUsed.expected
diff --git a/cpp/common/test/rules/csignalfunctionsused/CsignalFunctionsUsed.ql b/cpp/common/test/rules/csignalfunctionsused/CsignalFunctionsUsed.ql
new file mode 100644
index 0000000000..1d39069ae7
--- /dev/null
+++ b/cpp/common/test/rules/csignalfunctionsused/CsignalFunctionsUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.csignalfunctionsused.CsignalFunctionsUsed
+
+class TestFileQuery extends CsignalFunctionsUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/csignalfunctionsused_shared/test.cpp b/cpp/common/test/rules/csignalfunctionsused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/csignalfunctionsused_shared/test.cpp
rename to cpp/common/test/rules/csignalfunctionsused/test.cpp
diff --git a/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql b/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
deleted file mode 100644
index d17d984621..0000000000
--- a/cpp/common/test/rules/csignalfunctionsused_shared/CsignalFunctionsUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
-
-class TestFileQuery extends CsignalFunctionsUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.expected b/cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.expected
similarity index 100%
rename from cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.expected
rename to cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.expected
diff --git a/cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.ql b/cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.ql
new file mode 100644
index 0000000000..76cc8aad04
--- /dev/null
+++ b/cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.csignaltypesused.CsignalTypesUsed
+
+class TestFileQuery extends CsignalTypesUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/csignaltypesused_shared/test.cpp b/cpp/common/test/rules/csignaltypesused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/csignaltypesused_shared/test.cpp
rename to cpp/common/test/rules/csignaltypesused/test.cpp
diff --git a/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql b/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
deleted file mode 100644
index 57b937cb94..0000000000
--- a/cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.csignaltypesused_shared.CsignalTypesUsed_shared
-
-class TestFileQuery extends CsignalTypesUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.expected b/cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.expected
similarity index 100%
rename from cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.expected
rename to cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.expected
diff --git a/cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.ql b/cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.ql
new file mode 100644
index 0000000000..16dbb974b6
--- /dev/null
+++ b/cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.cstdiofunctionsused.CstdioFunctionsUsed
+
+class TestFileQuery extends CstdioFunctionsUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiofunctionsused_shared/test.cpp b/cpp/common/test/rules/cstdiofunctionsused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/cstdiofunctionsused_shared/test.cpp
rename to cpp/common/test/rules/cstdiofunctionsused/test.cpp
diff --git a/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql b/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
deleted file mode 100644
index f7066f041f..0000000000
--- a/cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.cstdiofunctionsused_shared.CstdioFunctionsUsed_shared
-
-class TestFileQuery extends CstdioFunctionsUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.expected b/cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.expected
similarity index 100%
rename from cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.expected
rename to cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.expected
diff --git a/cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.ql b/cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.ql
new file mode 100644
index 0000000000..79ab6086b1
--- /dev/null
+++ b/cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.cstdiomacrosused.CstdioMacrosUsed
+
+class TestFileQuery extends CstdioMacrosUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiomacrosused_shared/test.cpp b/cpp/common/test/rules/cstdiomacrosused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/cstdiomacrosused_shared/test.cpp
rename to cpp/common/test/rules/cstdiomacrosused/test.cpp
diff --git a/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql b/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
deleted file mode 100644
index 3b1a3d4dae..0000000000
--- a/cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.cstdiomacrosused_shared.CstdioMacrosUsed_shared
-
-class TestFileQuery extends CstdioMacrosUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.expected b/cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.expected
similarity index 100%
rename from cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.expected
rename to cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.expected
diff --git a/cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.ql b/cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.ql
new file mode 100644
index 0000000000..c5bac15c65
--- /dev/null
+++ b/cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.cstdiotypesused.CstdioTypesUsed
+
+class TestFileQuery extends CstdioTypesUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/cstdiotypesused_shared/test.cpp b/cpp/common/test/rules/cstdiotypesused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/cstdiotypesused_shared/test.cpp
rename to cpp/common/test/rules/cstdiotypesused/test.cpp
diff --git a/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql b/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
deleted file mode 100644
index 5e03cf9517..0000000000
--- a/cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
-
-class TestFileQuery extends CstdioTypesUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.expected b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.expected
similarity index 100%
rename from cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.expected
rename to cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.expected
diff --git a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.ql
similarity index 59%
rename from cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
rename to cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.ql
index 97943daa7f..05457c997c 100644
--- a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
+++ b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
+import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup.DefinitionNotConsideredForUnqualifiedLookup
 
-class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends DefinitionNotConsideredForUnqualifiedLookupSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/test.cpp b/cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/test.cpp
similarity index 100%
rename from cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/test.cpp
rename to cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/test.cpp
diff --git a/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.expected b/cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.expected
similarity index 100%
rename from cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.expected
rename to cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.expected
diff --git a/cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.ql b/cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.ql
new file mode 100644
index 0000000000..a07b861639
--- /dev/null
+++ b/cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler.EmptyThrowOnlyWithinACatchHandler
+
+class TestFileQuery extends EmptyThrowOnlyWithinACatchHandlerSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/test.cpp b/cpp/common/test/rules/emptythrowonlywithinacatchhandler/test.cpp
similarity index 100%
rename from cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/test.cpp
rename to cpp/common/test/rules/emptythrowonlywithinacatchhandler/test.cpp
diff --git a/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql b/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
deleted file mode 100644
index 388419946e..0000000000
--- a/cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
-
-class TestFileQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.expected b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.expected
similarity index 100%
rename from cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.expected
rename to cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.expected
diff --git a/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
similarity index 55%
rename from cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql
rename to cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
index 2ede7c3cea..999f505c5f 100644
--- a/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql
+++ b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
+import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype.EnumerationNotDefinedWithAnExplicitUnderlyingType
 
-class TestFileQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/test.cpp b/cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/test.cpp
similarity index 100%
rename from cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/test.cpp
rename to cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/test.cpp
diff --git a/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.expected b/cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.expected
similarity index 100%
rename from cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.expected
rename to cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.expected
diff --git a/cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.ql b/cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.ql
new file mode 100644
index 0000000000..d0727790d3
--- /dev/null
+++ b/cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.exceptionobjecthavepointertype.ExceptionObjectHavePointerType
+
+class TestFileQuery extends ExceptionObjectHavePointerTypeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/exceptionobjecthavepointertype_shared/test.cpp b/cpp/common/test/rules/exceptionobjecthavepointertype/test.cpp
similarity index 100%
rename from cpp/common/test/rules/exceptionobjecthavepointertype_shared/test.cpp
rename to cpp/common/test/rules/exceptionobjecthavepointertype/test.cpp
diff --git a/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql b/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
deleted file mode 100644
index 43fec407b5..0000000000
--- a/cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.exceptionobjecthavepointertype_shared.ExceptionObjectHavePointerType_shared
-
-class TestFileQuery extends ExceptionObjectHavePointerType_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.expected b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.expected
similarity index 100%
rename from cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.expected
rename to cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.expected
diff --git a/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.ql
similarity index 57%
rename from cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
rename to cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.ql
index 98ee8b8c23..4f08530f35 100644
--- a/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
+++ b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.ql
@@ -1,6 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
+import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether.ForwardingReferencesAndForwardNotUsedTogether
 
-class TestFileQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends ForwardingReferencesAndForwardNotUsedTogetherSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/test.cpp b/cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/test.cpp
similarity index 100%
rename from cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/test.cpp
rename to cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/test.cpp
diff --git a/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected b/cpp/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.expected
similarity index 100%
rename from cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.expected
rename to cpp/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.expected
diff --git a/cpp/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql b/cpp/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
new file mode 100644
index 0000000000..29088c4458
--- /dev/null
+++ b/cpp/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functionlikemacrosdefined.FunctionLikeMacrosDefined
+
+class TestFileQuery extends FunctionLikeMacrosDefinedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp b/cpp/common/test/rules/functionlikemacrosdefined/test.cpp
similarity index 100%
rename from cpp/common/test/rules/functionlikemacrosdefined_shared/test.cpp
rename to cpp/common/test/rules/functionlikemacrosdefined/test.cpp
diff --git a/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql b/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
deleted file mode 100644
index 062cce047c..0000000000
--- a/cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
-
-class TestFileQuery extends FunctionLikeMacrosDefined_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.expected b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.expected
similarity index 100%
rename from cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.expected
rename to cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.expected
diff --git a/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
similarity index 55%
rename from cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
rename to cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
index 91a244c8a4..e95ba9b7f7 100644
--- a/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
+++ b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
+import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly.FunctionsCallThemselvesEitherDirectlyOrIndirectly
 
-class TestFileQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/test.cpp b/cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/test.cpp
similarity index 100%
rename from cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/test.cpp
rename to cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/test.cpp
diff --git a/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.expected b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.expected
similarity index 100%
rename from cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.expected
rename to cpp/common/test/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.expected
diff --git a/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.ql
similarity index 62%
rename from cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
rename to cpp/common/test/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.ql
index 9301154455..a64a9786b6 100644
--- a/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
+++ b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
+import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized.FunctionTemplatesExplicitlySpecialized
 
-class TestFileQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends FunctionTemplatesExplicitlySpecializedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/test.cpp b/cpp/common/test/rules/functiontemplatesexplicitlyspecialized/test.cpp
similarity index 100%
rename from cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/test.cpp
rename to cpp/common/test/rules/functiontemplatesexplicitlyspecialized/test.cpp
diff --git a/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.expected b/cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.expected
similarity index 100%
rename from cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.expected
rename to cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.expected
diff --git a/cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.ql b/cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.ql
new file mode 100644
index 0000000000..19482c5b09
--- /dev/null
+++ b/cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.globalnamespacedeclarations.GlobalNamespaceDeclarations
+
+class TestFileQuery extends GlobalNamespaceDeclarationsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/globalnamespacedeclarations_shared/test.cpp b/cpp/common/test/rules/globalnamespacedeclarations/test.cpp
similarity index 100%
rename from cpp/common/test/rules/globalnamespacedeclarations_shared/test.cpp
rename to cpp/common/test/rules/globalnamespacedeclarations/test.cpp
diff --git a/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql b/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
deleted file mode 100644
index ea066bfd33..0000000000
--- a/cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.globalnamespacedeclarations_shared.GlobalNamespaceDeclarations_shared
-
-class TestFileQuery extends GlobalNamespaceDeclarations_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.expected b/cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.expected
similarity index 100%
rename from cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.expected
rename to cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.expected
diff --git a/cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.ql b/cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.ql
new file mode 100644
index 0000000000..61d492f0c6
--- /dev/null
+++ b/cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined.GlobalSizedOperatorDeleteNotDefined
+
+class TestFileQuery extends GlobalSizedOperatorDeleteNotDefinedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/test.cpp b/cpp/common/test/rules/globalsizedoperatordeletenotdefined/test.cpp
similarity index 100%
rename from cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/test.cpp
rename to cpp/common/test/rules/globalsizedoperatordeletenotdefined/test.cpp
diff --git a/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql b/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
deleted file mode 100644
index 5fd76da92d..0000000000
--- a/cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined_shared.GlobalSizedOperatorDeleteNotDefined_shared
-
-class TestFileQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.expected b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.expected
similarity index 100%
rename from cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.expected
rename to cpp/common/test/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.expected
diff --git a/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.ql
similarity index 63%
rename from cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
rename to cpp/common/test/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.ql
index 8ea177a305..c415cbcd70 100644
--- a/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
+++ b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined_shared.GlobalUnsizedOperatorDeleteNotDefined_shared
+import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined.GlobalUnsizedOperatorDeleteNotDefined
 
-class TestFileQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends GlobalUnsizedOperatorDeleteNotDefinedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/test.cpp b/cpp/common/test/rules/globalunsizedoperatordeletenotdefined/test.cpp
similarity index 100%
rename from cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/test.cpp
rename to cpp/common/test/rules/globalunsizedoperatordeletenotdefined/test.cpp
diff --git a/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.expected
similarity index 100%
rename from cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.expected
rename to cpp/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.expected
diff --git a/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
similarity index 63%
rename from cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
rename to cpp/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
index f905b9a46c..f553135683 100644
--- a/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
+++ b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock.GotoReferenceALabelInSurroundingBlock
 
-class TestFileQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends GotoReferenceALabelInSurroundingBlockSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.cpp b/cpp/common/test/rules/gotoreferencealabelinsurroundingblock/test.cpp
similarity index 100%
rename from cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/test.cpp
rename to cpp/common/test/rules/gotoreferencealabelinsurroundingblock/test.cpp
diff --git a/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected b/cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.expected
similarity index 100%
rename from cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.expected
rename to cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.expected
diff --git a/cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql b/cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
new file mode 100644
index 0000000000..1a117d5ddd
--- /dev/null
+++ b/cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.gotostatementshouldnotbeused.GotoStatementShouldNotBeUsed
+
+class TestFileQuery extends GotoStatementShouldNotBeUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/gotostatementshouldnotbeused_shared/test.cpp b/cpp/common/test/rules/gotostatementshouldnotbeused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/gotostatementshouldnotbeused_shared/test.cpp
rename to cpp/common/test/rules/gotostatementshouldnotbeused/test.cpp
diff --git a/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql b/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
deleted file mode 100644
index e7ae4fcebb..0000000000
--- a/cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
-
-class TestFileQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.expected b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.expected
similarity index 100%
rename from cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.expected
rename to cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.expected
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.ql
similarity index 59%
rename from cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
rename to cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.ql
index b822664218..30953eacf3 100644
--- a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
+++ b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
+import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction.HiddenInheritedNonOverridableMemberFunction
 
-class TestFileQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends HiddenInheritedNonOverridableMemberFunctionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/test.cpp b/cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/test.cpp
similarity index 100%
rename from cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/test.cpp
rename to cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/test.cpp
diff --git a/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.expected b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.expected
similarity index 100%
rename from cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.expected
rename to cpp/common/test/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.expected
diff --git a/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.ql
similarity index 61%
rename from cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
rename to cpp/common/test/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.ql
index a8fd6220e8..072f672efb 100644
--- a/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
+++ b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
+import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction.HiddenInheritedOverridableMemberFunction
 
-class TestFileQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends HiddenInheritedOverridableMemberFunctionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/test.cpp b/cpp/common/test/rules/hiddeninheritedoverridablememberfunction/test.cpp
similarity index 100%
rename from cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/test.cpp
rename to cpp/common/test/rules/hiddeninheritedoverridablememberfunction/test.cpp
diff --git a/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.expected b/cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.expected
similarity index 100%
rename from cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.expected
rename to cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.expected
diff --git a/cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.ql b/cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.ql
new file mode 100644
index 0000000000..89f720b125
--- /dev/null
+++ b/cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.initializeallvirtualbaseclasses.InitializeAllVirtualBaseClasses
+
+class TestFileQuery extends InitializeAllVirtualBaseClassesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/test.cpp b/cpp/common/test/rules/initializeallvirtualbaseclasses/test.cpp
similarity index 100%
rename from cpp/common/test/rules/initializeallvirtualbaseclasses_shared/test.cpp
rename to cpp/common/test/rules/initializeallvirtualbaseclasses/test.cpp
diff --git a/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql b/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
deleted file mode 100644
index 6ef0476388..0000000000
--- a/cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
-
-class TestFileQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.expected b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.expected
similarity index 100%
rename from cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.expected
rename to cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.expected
diff --git a/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.ql
similarity index 56%
rename from cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
rename to cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.ql
index d2b4aa6c89..a2b023a3dd 100644
--- a/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
+++ b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.ql
@@ -1,6 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
+import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor.InitializerListConstructorIsTheOnlyConstructor
 
-class TestFileQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends InitializerListConstructorIsTheOnlyConstructorSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/test.cpp b/cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/test.cpp
similarity index 100%
rename from cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/test.cpp
rename to cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/test.cpp
diff --git a/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.expected b/cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.expected
similarity index 100%
rename from cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.expected
rename to cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.expected
diff --git a/cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.ql b/cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.ql
new file mode 100644
index 0000000000..55803eab88
--- /dev/null
+++ b/cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.linesplicingusedincomments.LineSplicingUsedInComments
+
+class TestFileQuery extends LineSplicingUsedInCommentsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/linesplicingusedincomments_shared/test.cpp b/cpp/common/test/rules/linesplicingusedincomments/test.cpp
similarity index 100%
rename from cpp/common/test/rules/linesplicingusedincomments_shared/test.cpp
rename to cpp/common/test/rules/linesplicingusedincomments/test.cpp
diff --git a/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql b/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
deleted file mode 100644
index f10ee1f3ad..0000000000
--- a/cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.linesplicingusedincomments_shared.LineSplicingUsedInComments_shared
-
-class TestFileQuery extends LineSplicingUsedInComments_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.expected b/cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.expected
similarity index 100%
rename from cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.expected
rename to cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.expected
diff --git a/cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.ql b/cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.ql
new file mode 100644
index 0000000000..3961d76d15
--- /dev/null
+++ b/cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.loopcompoundcondition.LoopCompoundCondition
+
+class TestFileQuery extends LoopCompoundConditionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/loopcompoundcondition_shared/test.cpp b/cpp/common/test/rules/loopcompoundcondition/test.cpp
similarity index 100%
rename from cpp/common/test/rules/loopcompoundcondition_shared/test.cpp
rename to cpp/common/test/rules/loopcompoundcondition/test.cpp
diff --git a/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql b/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
deleted file mode 100644
index 7ca1d2643e..0000000000
--- a/cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
-
-class TestFileQuery extends LoopCompoundCondition_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected b/cpp/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.expected
similarity index 100%
rename from cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.expected
rename to cpp/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.expected
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql b/cpp/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
new file mode 100644
index 0000000000..ab353ca8a9
--- /dev/null
+++ b/cpp/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix.LowercaseLStartsInLiteralSuffix
+
+class TestFileQuery extends LowercaseLStartsInLiteralSuffixSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/README.md b/cpp/common/test/rules/lowercaselstartsinliteralsuffix/README.md
similarity index 100%
rename from cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/README.md
rename to cpp/common/test/rules/lowercaselstartsinliteralsuffix/README.md
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp b/cpp/common/test/rules/lowercaselstartsinliteralsuffix/test.cpp
similarity index 100%
rename from cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/test.cpp
rename to cpp/common/test/rules/lowercaselstartsinliteralsuffix/test.cpp
diff --git a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql b/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
deleted file mode 100644
index 8d7d9f0be8..0000000000
--- a/cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix_shared.LowercaseLStartsInLiteralSuffix_shared
-
-class TestFileQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected b/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected
similarity index 100%
rename from cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected
rename to cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.gcc b/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc
similarity index 100%
rename from cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.gcc
rename to cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.qcc b/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.qcc
similarity index 100%
rename from cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed.expected.qcc
rename to cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.qcc
diff --git a/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.ql b/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.ql
new file mode 100644
index 0000000000..44e30b1a2f
--- /dev/null
+++ b/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.macrooffsetofused.MacroOffsetofUsed
+
+class TestFileQuery extends MacroOffsetofUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/test.cpp b/cpp/common/test/rules/macrooffsetofused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/macrooffsetofused_shared/test.cpp
rename to cpp/common/test/rules/macrooffsetofused/test.cpp
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected
deleted file mode 100644
index 88647b9f36..0000000000
--- a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.cpp:9:32:9:51 | offsetof(t,d) | Use of banned macro offsetof. |
diff --git a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql b/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
deleted file mode 100644
index b1e69f5a8a..0000000000
--- a/cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.macrooffsetofused_shared.MacroOffsetofUsed_shared
-
-class TestFileQuery extends MacroOffsetofUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected b/cpp/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.expected
similarity index 100%
rename from cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.expected
rename to cpp/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.expected
diff --git a/cpp/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql b/cpp/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
new file mode 100644
index 0000000000..f753b75463
--- /dev/null
+++ b/cpp/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.macroparameterfollowinghash.MacroParameterFollowingHash
+
+class TestFileQuery extends MacroParameterFollowingHashSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/macroparameterfollowinghash_shared/test.cpp b/cpp/common/test/rules/macroparameterfollowinghash/test.cpp
similarity index 100%
rename from cpp/common/test/rules/macroparameterfollowinghash_shared/test.cpp
rename to cpp/common/test/rules/macroparameterfollowinghash/test.cpp
diff --git a/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql b/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
deleted file mode 100644
index 8c3dd270d0..0000000000
--- a/cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
-
-class TestFileQuery extends MacroParameterFollowingHash_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
similarity index 100%
rename from cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.expected
rename to cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
similarity index 60%
rename from cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
rename to cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
index e49f82c8fd..63351377f0 100644
--- a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
+++ b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
 
-class TestFileQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.cpp b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/test.cpp
similarity index 100%
rename from cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/test.cpp
rename to cpp/common/test/rules/memoryoperationsnotsequencedappropriately/test.cpp
diff --git a/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.expected b/cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.expected
similarity index 100%
rename from cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.expected
rename to cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.expected
diff --git a/cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql b/cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql
new file mode 100644
index 0000000000..2f4d3cbdea
--- /dev/null
+++ b/cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.multipleglobalormemberdeclarators.MultipleGlobalOrMemberDeclarators
+
+class TestFileQuery extends MultipleGlobalOrMemberDeclaratorsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/test.cpp b/cpp/common/test/rules/multipleglobalormemberdeclarators/test.cpp
similarity index 100%
rename from cpp/common/test/rules/multipleglobalormemberdeclarators_shared/test.cpp
rename to cpp/common/test/rules/multipleglobalormemberdeclarators/test.cpp
diff --git a/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql b/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
deleted file mode 100644
index 061e572c73..0000000000
--- a/cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
-
-class TestFileQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.expected b/cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.expected
similarity index 100%
rename from cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.expected
rename to cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.expected
diff --git a/cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql b/cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql
new file mode 100644
index 0000000000..7e2fe57b24
--- /dev/null
+++ b/cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.multiplelocaldeclarators.MultipleLocalDeclarators
+
+class TestFileQuery extends MultipleLocalDeclaratorsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/multiplelocaldeclarators_shared/test.cpp b/cpp/common/test/rules/multiplelocaldeclarators/test.cpp
similarity index 100%
rename from cpp/common/test/rules/multiplelocaldeclarators_shared/test.cpp
rename to cpp/common/test/rules/multiplelocaldeclarators/test.cpp
diff --git a/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql b/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
deleted file mode 100644
index b578fb7eca..0000000000
--- a/cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
-
-class TestFileQuery extends MultipleLocalDeclarators_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected b/cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.expected
similarity index 100%
rename from cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.expected
rename to cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.expected
diff --git a/cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql b/cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
new file mode 100644
index 0000000000..a82fa7905a
--- /dev/null
+++ b/cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype.NamedBitFieldsWithSignedIntegerType
+
+class TestFileQuery extends NamedBitFieldsWithSignedIntegerTypeSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.cpp b/cpp/common/test/rules/namedbitfieldswithsignedintegertype/test.cpp
similarity index 100%
rename from cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/test.cpp
rename to cpp/common/test/rules/namedbitfieldswithsignedintegertype/test.cpp
diff --git a/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql b/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
deleted file mode 100644
index 09b98ff226..0000000000
--- a/cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
-
-class TestFileQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.expected b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.expected
similarity index 100%
rename from cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.expected
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.expected
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.ql
similarity index 62%
rename from cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.ql
index 6f8e2c1e7f..731d7b1f84 100644
--- a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis.NameNotReferredUsingAQualifiedIdOrThis
 
-class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/test.cpp b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/test.cpp
similarity index 100%
rename from cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/test.cpp
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/test.cpp
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.expected b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.expected
similarity index 100%
rename from cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.expected
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.expected
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
similarity index 59%
rename from cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
index abc15222c5..46ffea0b3d 100644
--- a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
+++ b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit.NameNotReferredUsingAQualifiedIdOrThisAudit
 
-class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends NameNotReferredUsingAQualifiedIdOrThisAuditSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/test.cpp b/cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/test.cpp
similarity index 100%
rename from cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/test.cpp
rename to cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/test.cpp
diff --git a/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.expected b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.expected
similarity index 100%
rename from cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.expected
rename to cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.expected
diff --git a/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.ql
similarity index 57%
rename from cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
rename to cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.ql
index 4a405daaaf..e8906287da 100644
--- a/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
+++ b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.ql
@@ -1,6 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
+import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller.NoexceptFunctionShouldNotPropagateToTheCaller
 
-class TestFileQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/test.cpp b/cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/test.cpp
similarity index 100%
rename from cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/test.cpp
rename to cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/test.cpp
diff --git a/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.expected b/cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.expected
similarity index 100%
rename from cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.expected
rename to cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.expected
diff --git a/cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql b/cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql
new file mode 100644
index 0000000000..02edcf3732
--- /dev/null
+++ b/cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
+
+class TestFileQuery extends NonGlobalFunctionMainSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonglobalfunctionmain_shared/test.cpp b/cpp/common/test/rules/nonglobalfunctionmain/test.cpp
similarity index 100%
rename from cpp/common/test/rules/nonglobalfunctionmain_shared/test.cpp
rename to cpp/common/test/rules/nonglobalfunctionmain/test.cpp
diff --git a/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql b/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
deleted file mode 100644
index 611b3d0f77..0000000000
--- a/cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
-
-class TestFileQuery extends NonGlobalFunctionMain_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected b/cpp/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.expected
similarity index 100%
rename from cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.expected
rename to cpp/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.expected
diff --git a/cpp/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql b/cpp/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
new file mode 100644
index 0000000000..c1aae3c31b
--- /dev/null
+++ b/cpp/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonterminatedescapesequences.NonTerminatedEscapeSequences
+
+class TestFileQuery extends NonTerminatedEscapeSequencesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonterminatedescapesequences_shared/test.cpp b/cpp/common/test/rules/nonterminatedescapesequences/test.cpp
similarity index 100%
rename from cpp/common/test/rules/nonterminatedescapesequences_shared/test.cpp
rename to cpp/common/test/rules/nonterminatedescapesequences/test.cpp
diff --git a/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql b/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
deleted file mode 100644
index 6cbb2220bb..0000000000
--- a/cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
-
-class TestFileQuery extends NonTerminatedEscapeSequences_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected b/cpp/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.expected
similarity index 100%
rename from cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.expected
rename to cpp/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.expected
diff --git a/cpp/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql b/cpp/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
new file mode 100644
index 0000000000..97ba6f516e
--- /dev/null
+++ b/cpp/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.nonuniqueenumerationconstant.NonUniqueEnumerationConstant
+
+class TestFileQuery extends NonUniqueEnumerationConstantSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nonuniqueenumerationconstant_shared/test.cpp b/cpp/common/test/rules/nonuniqueenumerationconstant/test.cpp
similarity index 100%
rename from cpp/common/test/rules/nonuniqueenumerationconstant_shared/test.cpp
rename to cpp/common/test/rules/nonuniqueenumerationconstant/test.cpp
diff --git a/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql b/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
deleted file mode 100644
index f01ef52853..0000000000
--- a/cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
-
-class TestFileQuery extends NonUniqueEnumerationConstant_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.clang b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.clang
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.clang
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.clang
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.gcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.gcc
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.gcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.gcc
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.qcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.qcc
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.expected.qcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.expected.qcc
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
similarity index 57%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
index 6b9f1d2ac5..e3d6c4841f 100644
--- a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
+++ b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
@@ -1,6 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
+import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant.NullptrNotTheOnlyFormOfTheNullPointerConstant
 
-class TestFileQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.clang b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp.clang
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.clang
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp.clang
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.gcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp.gcc
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.gcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp.gcc
diff --git a/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.qcc b/cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp.qcc
similarity index 100%
rename from cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/test.cpp.qcc
rename to cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/test.cpp.qcc
diff --git a/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.expected b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.expected
similarity index 100%
rename from cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.expected
rename to cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.expected
diff --git a/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
similarity index 55%
rename from cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
rename to cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
index 784e94366f..151af6a5a3 100644
--- a/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
+++ b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
+import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor.ObjectsDynamicTypeUsedFromConstructorOrDestructor
 
-class TestFileQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/test.cpp b/cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/test.cpp
similarity index 100%
rename from cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/test.cpp
rename to cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/test.cpp
diff --git a/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.expected b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.expected
similarity index 100%
rename from cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.expected
rename to cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.expected
diff --git a/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql
similarity index 56%
rename from cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
rename to cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql
index 81578b5174..2bb15bb684 100644
--- a/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
+++ b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
+import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
 
-class TestFileQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/test.cpp b/cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/test.cpp
similarity index 100%
rename from cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/test.cpp
rename to cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/test.cpp
diff --git a/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.expected b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.expected
similarity index 100%
rename from cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.expected
rename to cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.expected
diff --git a/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
similarity index 56%
rename from cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
rename to cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
index b3f05d17a9..84263abc91 100644
--- a/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
+++ b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
@@ -1,6 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
 
-class TestFileQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/test.cpp b/cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/test.cpp
similarity index 100%
rename from cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/test.cpp
rename to cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/test.cpp
diff --git a/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.expected b/cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.expected
similarity index 100%
rename from cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.expected
rename to cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.expected
diff --git a/cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.ql b/cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.ql
new file mode 100644
index 0000000000..b58a7f4dbb
--- /dev/null
+++ b/cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.reinterpretcastused.ReinterpretCastUsed
+
+class TestFileQuery extends ReinterpretCastUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/reinterpretcastused_shared/test.cpp b/cpp/common/test/rules/reinterpretcastused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/reinterpretcastused_shared/test.cpp
rename to cpp/common/test/rules/reinterpretcastused/test.cpp
diff --git a/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql b/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
deleted file mode 100644
index af9a8f0ebe..0000000000
--- a/cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.reinterpretcastused_shared.ReinterpretCastUsed_shared
-
-class TestFileQuery extends ReinterpretCastUsed_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected
similarity index 100%
rename from cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.expected
rename to cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.expected
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
similarity index 59%
rename from cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
rename to cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index af3f7697f7..286e4424a4 100644
--- a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
+++ b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused.ResultOfAnAssignmentOperatorShouldNotBeUsed
 
-class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery, TestQuery
-{ }
+class TestFileQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.cpp b/cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/test.cpp
similarity index 100%
rename from cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/test.cpp
rename to cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/test.cpp
diff --git a/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.expected b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.expected
similarity index 100%
rename from cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.expected
rename to cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.expected
diff --git a/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
similarity index 55%
rename from cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
rename to cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
index 7184897c6e..c6c9c9e8fc 100644
--- a/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
+++ b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
+import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable.ReturnReferenceOrPointerToAutomaticLocalVariable
 
-class TestFileQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/test.cpp b/cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/test.cpp
similarity index 100%
rename from cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/test.cpp
rename to cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/test.cpp
diff --git a/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.expected b/cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.expected
similarity index 100%
rename from cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.expected
rename to cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.expected
diff --git a/cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.ql b/cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.ql
new file mode 100644
index 0000000000..8fb855036c
--- /dev/null
+++ b/cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.switchcompoundcondition.SwitchCompoundCondition
+
+class TestFileQuery extends SwitchCompoundConditionSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/switchcompoundcondition_shared/test.cpp b/cpp/common/test/rules/switchcompoundcondition/test.cpp
similarity index 100%
rename from cpp/common/test/rules/switchcompoundcondition_shared/test.cpp
rename to cpp/common/test/rules/switchcompoundcondition/test.cpp
diff --git a/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql b/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
deleted file mode 100644
index 9c296a8a24..0000000000
--- a/cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.switchcompoundcondition_shared.SwitchCompoundCondition_shared
-
-class TestFileQuery extends SwitchCompoundCondition_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.expected b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
similarity index 100%
rename from cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.expected
rename to cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
similarity index 56%
rename from cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
rename to cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
index 3ed0fc3b14..30f07a3f22 100644
--- a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
@@ -1,6 +1,5 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
+import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed.UnsignedIntegerLiteralsNotAppropriatelySuffixed
 
-class TestFileQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery,
-  TestQuery
-{ }
+class TestFileQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery, TestQuery {
+}
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/test.cpp b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
similarity index 100%
rename from cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/test.cpp
rename to cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
diff --git a/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.expected
similarity index 100%
rename from cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.expected
rename to cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.expected
diff --git a/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
similarity index 59%
rename from cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
rename to cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
index 24780bcc5d..b88e7637c1 100644
--- a/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
+++ b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
@@ -1,5 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps.UnsignedOperationWithConstantOperandsWraps
 
-class TestFileQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery, TestQuery {
-}
+class TestFileQuery extends UnsignedOperationWithConstantOperandsWrapsSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.cpp b/cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/test.cpp
similarity index 100%
rename from cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/test.cpp
rename to cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/test.cpp
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected b/cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.expected
similarity index 100%
rename from cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.expected
rename to cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.expected
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql b/cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
new file mode 100644
index 0000000000..0404a7bc0c
--- /dev/null
+++ b/cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.useofnonzerooctalliteral.UseOfNonZeroOctalLiteral
+
+class TestFileQuery extends UseOfNonZeroOctalLiteralSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp b/cpp/common/test/rules/useofnonzerooctalliteral/test.cpp
similarity index 100%
rename from cpp/common/test/rules/useofnonzerooctalliteral_shared/test.cpp
rename to cpp/common/test/rules/useofnonzerooctalliteral/test.cpp
diff --git a/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql b/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
deleted file mode 100644
index dcd6042639..0000000000
--- a/cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
-
-class TestFileQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.expected
similarity index 100%
rename from cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected
rename to cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.expected
diff --git a/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected.qcc b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.expected.qcc
similarity index 100%
rename from cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.expected.qcc
rename to cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.expected.qcc
diff --git a/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.ql
similarity index 64%
rename from cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
rename to cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.ql
index 6bedf0ab1c..a965d5e5d6 100644
--- a/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
+++ b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
+import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool.VectorShouldNotBeSpecializedWithBool
 
-class TestFileQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends VectorShouldNotBeSpecializedWithBoolSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/test.cpp b/cpp/common/test/rules/vectorshouldnotbespecializedwithbool/test.cpp
similarity index 100%
rename from cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/test.cpp
rename to cpp/common/test/rules/vectorshouldnotbespecializedwithbool/test.cpp
diff --git a/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.expected b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.expected
similarity index 100%
rename from cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.expected
rename to cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.expected
diff --git a/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql
similarity index 61%
rename from cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
rename to cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql
index 38348b693b..2137cbeb66 100644
--- a/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
+++ b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
 
-class TestFileQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/test.cpp b/cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/test.cpp
similarity index 100%
rename from cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/test.cpp
rename to cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/test.cpp
diff --git a/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql b/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
index 52f876e891..daf6e89530 100644
--- a/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
+++ b/cpp/misra/src/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment_shared.CopyAndMoveAssignmentsShallHandleSelfAssignment_shared
+import codingstandards.cpp.rules.copyandmoveassignmentsshallhandleselfassignment.CopyAndMoveAssignmentsShallHandleSelfAssignment
 
-class CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignment_sharedSharedQuery
+class CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery extends CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery
 {
   CopyAndMoveAssignmentsShallHandleSelfAssignmentQuery() {
     this = ImportMisra23Package::copyAndMoveAssignmentsShallHandleSelfAssignmentQuery()
diff --git a/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
index b8b2bc528b..b7117682e2 100644
--- a/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
+++ b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.multipleglobalormemberdeclarators_shared.MultipleGlobalOrMemberDeclarators_shared
+import codingstandards.cpp.rules.multipleglobalormemberdeclarators.MultipleGlobalOrMemberDeclarators
 
-class UseSingleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclarators_sharedSharedQuery
+class UseSingleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclaratorsSharedQuery
 {
   UseSingleGlobalOrMemberDeclaratorsQuery() {
     this = ImportMisra23Package::useSingleGlobalOrMemberDeclaratorsQuery()
diff --git a/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql b/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
index fcfe438f85..6d756daa87 100644
--- a/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
+++ b/cpp/misra/src/rules/RULE-10-0-1/UseSingleLocalDeclarators.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.multiplelocaldeclarators_shared.MultipleLocalDeclarators_shared
+import codingstandards.cpp.rules.multiplelocaldeclarators.MultipleLocalDeclarators
 
-class UseSingleLocalDeclaratorsQuery extends MultipleLocalDeclarators_sharedSharedQuery {
+class UseSingleLocalDeclaratorsQuery extends MultipleLocalDeclaratorsSharedQuery {
   UseSingleLocalDeclaratorsQuery() { this = ImportMisra23Package::useSingleLocalDeclaratorsQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql b/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
index d014d6e119..ab4b6a19a1 100644
--- a/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
+++ b/cpp/misra/src/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype_shared.EnumerationNotDefinedWithAnExplicitUnderlyingType_shared
+import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype.EnumerationNotDefinedWithAnExplicitUnderlyingType
 
-class EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingType_sharedSharedQuery
+class EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery
 {
   EnumerationNotDefinedWithAnExplicitUnderlyingTypeQuery() {
     this = ImportMisra23Package::enumerationNotDefinedWithAnExplicitUnderlyingTypeQuery()
diff --git a/cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql
index 7ef737a0a3..5a2f4c4265 100644
--- a/cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.asmdeclarationused_shared.AsmDeclarationUsed_shared
+import codingstandards.cpp.rules.asmdeclarationused.AsmDeclarationUsed
 
-class AsmDeclarationShallNotBeUsedQuery extends AsmDeclarationUsed_sharedSharedQuery {
+class AsmDeclarationShallNotBeUsedQuery extends AsmDeclarationUsedSharedQuery {
   AsmDeclarationShallNotBeUsedQuery() {
     this = ImportMisra23Package::asmDeclarationShallNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql b/cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql
index bfcc9414ac..faa0880a75 100644
--- a/cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql
+++ b/cpp/misra/src/rules/RULE-11-6-3/NonUniqueEnumerationConstant.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.nonuniqueenumerationconstant_shared.NonUniqueEnumerationConstant_shared
+import codingstandards.cpp.rules.nonuniqueenumerationconstant.NonUniqueEnumerationConstant
 
-class NonUniqueEnumerationConstantQuery extends NonUniqueEnumerationConstant_sharedSharedQuery {
+class NonUniqueEnumerationConstantQuery extends NonUniqueEnumerationConstantSharedQuery {
   NonUniqueEnumerationConstantQuery() {
     this = ImportMisra23Package::nonUniqueEnumerationConstantQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
index 5006884483..7f7df9cda3 100644
--- a/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
+++ b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype_shared.BitFieldShallHaveAnAppropriateType_shared
+import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype.BitFieldShallHaveAnAppropriateType
 
-class BitFieldShallHaveAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateType_sharedSharedQuery
+class BitFieldShallHaveAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateTypeSharedQuery
 {
   BitFieldShallHaveAnAppropriateTypeQuery() {
     this = ImportMisra23Package::bitFieldShallHaveAnAppropriateTypeQuery()
diff --git a/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql b/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
index 0f03fad533..df547bbec8 100644
--- a/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
+++ b/cpp/misra/src/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype_shared.NamedBitFieldsWithSignedIntegerType_shared
+import codingstandards.cpp.rules.namedbitfieldswithsignedintegertype.NamedBitFieldsWithSignedIntegerType
 
-class SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery extends NamedBitFieldsWithSignedIntegerType_sharedSharedQuery
+class SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery extends NamedBitFieldsWithSignedIntegerTypeSharedQuery
 {
   SignedIntegerNamedBitFieldHaveALengthOfOneBitQuery() {
     this = ImportMisra23Package::signedIntegerNamedBitFieldHaveALengthOfOneBitQuery()
diff --git a/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql b/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
index 28d0a4c185..75030afbfb 100644
--- a/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
+++ b/cpp/misra/src/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy_shared.VirtualAndNonVirtualClassInTheHierarchy_shared
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
 
-class VirtualAndNonVirtualClassInTheHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchy_sharedSharedQuery
+class VirtualAndNonVirtualClassInTheHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
 {
   VirtualAndNonVirtualClassInTheHierarchyQuery() {
     this = ImportMisra23Package::virtualAndNonVirtualClassInTheHierarchyQuery()
diff --git a/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql b/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
index f823da6d2d..519589984e 100644
--- a/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
+++ b/cpp/misra/src/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments_shared.OverridingShallSpecifyDifferentDefaultArguments_shared
+import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
 
-class OverridingShallSpecifyDifferentDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArguments_sharedSharedQuery
+class OverridingShallSpecifyDifferentDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
 {
   OverridingShallSpecifyDifferentDefaultArgumentsQuery() {
     this = ImportMisra23Package::overridingShallSpecifyDifferentDefaultArgumentsQuery()
diff --git a/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql b/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
index 0bdfe750ff..1c528396e0 100644
--- a/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
+++ b/cpp/misra/src/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr_shared.PotentiallyVirtualPointerOnlyComparesToNullptr_shared
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
 
-class PotentiallyVirtualPointerOnlyComparesToNullptrQuery extends PotentiallyVirtualPointerOnlyComparesToNullptr_sharedSharedQuery
+class PotentiallyVirtualPointerOnlyComparesToNullptrQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
 {
   PotentiallyVirtualPointerOnlyComparesToNullptrQuery() {
     this = ImportMisra23Package::potentiallyVirtualPointerOnlyComparesToNullptrQuery()
diff --git a/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql b/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
index 6b23e7d1ac..f23c1afab8 100644
--- a/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
+++ b/cpp/misra/src/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor_shared.ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared
+import codingstandards.cpp.rules.objectsdynamictypeusedfromconstructorordestructor.ObjectsDynamicTypeUsedFromConstructorOrDestructor
 
-class ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructor_sharedSharedQuery
+class ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery extends ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery
 {
   ObjectsDynamicTypeUsedFromConstructorOrDestructorQuery() {
     this = ImportMisra23Package::objectsDynamicTypeUsedFromConstructorOrDestructorQuery()
diff --git a/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
index 42a4813086..d128b2422a 100644
--- a/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
+++ b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.initializeallvirtualbaseclasses_shared.InitializeAllVirtualBaseClasses_shared
+import codingstandards.cpp.rules.initializeallvirtualbaseclasses.InitializeAllVirtualBaseClasses
 
-class InitializeAllVirtualBaseClassesQuery extends InitializeAllVirtualBaseClasses_sharedSharedQuery
+class InitializeAllVirtualBaseClassesQuery extends InitializeAllVirtualBaseClassesSharedQuery
 {
   InitializeAllVirtualBaseClassesQuery() {
     this = ImportMisra23Package::initializeAllVirtualBaseClassesQuery()
diff --git a/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql b/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
index 47d17df3ed..c7cf1856cd 100644
--- a/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
+++ b/cpp/misra/src/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor_shared.InitializerListConstructorIsTheOnlyConstructor_shared
+import codingstandards.cpp.rules.initializerlistconstructoristheonlyconstructor.InitializerListConstructorIsTheOnlyConstructor
 
-class InitializerListConstructorIsTheOnlyConstructorQuery extends InitializerListConstructorIsTheOnlyConstructor_sharedSharedQuery
+class InitializerListConstructorIsTheOnlyConstructorQuery extends InitializerListConstructorIsTheOnlyConstructorSharedQuery
 {
   InitializerListConstructorIsTheOnlyConstructorQuery() {
     this = ImportMisra23Package::initializerListConstructorIsTheOnlyConstructorQuery()
diff --git a/cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql b/cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql
index 11623e996e..937ec4e9e3 100644
--- a/cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql
+++ b/cpp/misra/src/rules/RULE-16-5-2/AddressOfOperatorOverloaded.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.addressofoperatoroverloaded_shared.AddressOfOperatorOverloaded_shared
+import codingstandards.cpp.rules.addressofoperatoroverloaded.AddressOfOperatorOverloaded
 
-class AddressOfOperatorOverloadedQuery extends AddressOfOperatorOverloaded_sharedSharedQuery {
+class AddressOfOperatorOverloadedQuery extends AddressOfOperatorOverloadedSharedQuery {
   AddressOfOperatorOverloadedQuery() {
     this = ImportMisra23Package::addressOfOperatorOverloadedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql b/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
index 7fd2ecafd2..c7b306946b 100644
--- a/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
+++ b/cpp/misra/src/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized_shared.FunctionTemplatesExplicitlySpecialized_shared
+import codingstandards.cpp.rules.functiontemplatesexplicitlyspecialized.FunctionTemplatesExplicitlySpecialized
 
-class FunctionTemplatesExplicitlySpecializedQuery extends FunctionTemplatesExplicitlySpecialized_sharedSharedQuery
+class FunctionTemplatesExplicitlySpecializedQuery extends FunctionTemplatesExplicitlySpecializedSharedQuery
 {
   FunctionTemplatesExplicitlySpecializedQuery() {
     this = ImportMisra23Package::functionTemplatesExplicitlySpecializedQuery()
diff --git a/cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql b/cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql
index db7683c7f2..cbae5c1da4 100644
--- a/cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql
+++ b/cpp/misra/src/rules/RULE-18-1-1/ExceptionObjectHavePointerType.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.exceptionobjecthavepointertype_shared.ExceptionObjectHavePointerType_shared
+import codingstandards.cpp.rules.exceptionobjecthavepointertype.ExceptionObjectHavePointerType
 
-class ExceptionObjectHavePointerTypeQuery extends ExceptionObjectHavePointerType_sharedSharedQuery {
+class ExceptionObjectHavePointerTypeQuery extends ExceptionObjectHavePointerTypeSharedQuery {
   ExceptionObjectHavePointerTypeQuery() {
     this = ImportMisra23Package::exceptionObjectHavePointerTypeQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
index e37025a0af..2bea30cb83 100644
--- a/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
+++ b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler_shared.EmptyThrowOnlyWithinACatchHandler_shared
+import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler.EmptyThrowOnlyWithinACatchHandler
 
-class EmptyThrowOnlyWithinACatchHandlerQuery extends EmptyThrowOnlyWithinACatchHandler_sharedSharedQuery
+class EmptyThrowOnlyWithinACatchHandlerQuery extends EmptyThrowOnlyWithinACatchHandlerSharedQuery
 {
   EmptyThrowOnlyWithinACatchHandlerQuery() {
     this = ImportMisra23Package::emptyThrowOnlyWithinACatchHandlerQuery()
diff --git a/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql b/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
index 6bea89c4ce..61d8a0ebd4 100644
--- a/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
+++ b/cpp/misra/src/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller_shared.NoexceptFunctionShouldNotPropagateToTheCaller_shared
+import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller.NoexceptFunctionShouldNotPropagateToTheCaller
 
-class NoexceptFunctionShouldNotPropagateToTheCallerQuery extends NoexceptFunctionShouldNotPropagateToTheCaller_sharedSharedQuery
+class NoexceptFunctionShouldNotPropagateToTheCallerQuery extends NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery
 {
   NoexceptFunctionShouldNotPropagateToTheCallerQuery() {
     this = ImportMisra23Package::noexceptFunctionShouldNotPropagateToTheCallerQuery()
diff --git a/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql b/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
index 6cc143deb9..d9e4d5a810 100644
--- a/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
+++ b/cpp/misra/src/rules/RULE-19-0-2/FunctionLikeMacrosDefined.ql
@@ -13,8 +13,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.functionlikemacrosdefined_shared.FunctionLikeMacrosDefined_shared
+import codingstandards.cpp.rules.functionlikemacrosdefined.FunctionLikeMacrosDefined
 
-class FunctionLikeMacrosDefinedQuery extends FunctionLikeMacrosDefined_sharedSharedQuery {
+class FunctionLikeMacrosDefinedQuery extends FunctionLikeMacrosDefinedSharedQuery {
   FunctionLikeMacrosDefinedQuery() { this = ImportMisra23Package::functionLikeMacrosDefinedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql b/cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql
index 8c90302b7a..12e95ced04 100644
--- a/cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql
+++ b/cpp/misra/src/rules/RULE-19-3-2/MacroParameterFollowingHash.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.macroparameterfollowinghash_shared.MacroParameterFollowingHash_shared
+import codingstandards.cpp.rules.macroparameterfollowinghash.MacroParameterFollowingHash
 
-class MacroParameterFollowingHashQuery extends MacroParameterFollowingHash_sharedSharedQuery {
+class MacroParameterFollowingHashQuery extends MacroParameterFollowingHashSharedQuery {
   MacroParameterFollowingHashQuery() {
     this = ImportMisra23Package::macroParameterFollowingHashQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql b/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
index b97bcd2905..9cb0a7e9c5 100644
--- a/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
+++ b/cpp/misra/src/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion_shared.AMixedUseMacroArgumentSubjectToExpansion_shared
+import codingstandards.cpp.rules.amixedusemacroargumentsubjecttoexpansion.AMixedUseMacroArgumentSubjectToExpansion
 
-class AMixedUseMacroArgumentSubjectToExpansionQuery extends AMixedUseMacroArgumentSubjectToExpansion_sharedSharedQuery
+class AMixedUseMacroArgumentSubjectToExpansionQuery extends AMixedUseMacroArgumentSubjectToExpansionSharedQuery
 {
   AMixedUseMacroArgumentSubjectToExpansionQuery() {
     this = ImportMisra23Package::aMixedUseMacroArgumentSubjectToExpansionQuery()
diff --git a/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql b/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
index bff43f25e4..3e8c58a8da 100644
--- a/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
+++ b/cpp/misra/src/rules/RULE-21-10-3/CsignalFacilitiesUsed.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.csignalfunctionsused_shared.CsignalFunctionsUsed_shared
+import codingstandards.cpp.rules.csignalfunctionsused.CsignalFunctionsUsed
 
-class CsignalFacilitiesUsedQuery extends CsignalFunctionsUsed_sharedSharedQuery {
+class CsignalFacilitiesUsedQuery extends CsignalFunctionsUsedSharedQuery {
   CsignalFacilitiesUsedQuery() { this = ImportMisra23Package::csignalFacilitiesUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql
index 56172db86e..0fe1b1dfba 100644
--- a/cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.csignaltypesused_shared.CsignalTypesUsed_shared
+import codingstandards.cpp.rules.csignaltypesused.CsignalTypesUsed
 
-class CsignalTypesShallNotBeUsedQuery extends CsignalTypesUsed_sharedSharedQuery {
+class CsignalTypesShallNotBeUsedQuery extends CsignalTypesUsedSharedQuery {
   CsignalTypesShallNotBeUsedQuery() {
     this = ImportMisra23Package::csignalTypesShallNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql b/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
index f8cd5c6672..e5b48d55a7 100644
--- a/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
+++ b/cpp/misra/src/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.ql
@@ -13,8 +13,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.atofatoiatolandatollused_shared.AtofAtoiAtolAndAtollUsed_shared
+import codingstandards.cpp.rules.atofatoiatolandatollused.AtofAtoiAtolAndAtollUsed
 
-class AtofAtoiAtolAndAtollUsedQuery extends AtofAtoiAtolAndAtollUsed_sharedSharedQuery {
+class AtofAtoiAtolAndAtollUsedQuery extends AtofAtoiAtolAndAtollUsedSharedQuery {
   AtofAtoiAtolAndAtollUsedQuery() { this = ImportMisra23Package::atofAtoiAtolAndAtollUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql
index f449463c01..fa6df051ca 100644
--- a/cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.macrooffsetofused_shared.MacroOffsetofUsed_shared
+import codingstandards.cpp.rules.macrooffsetofused.MacroOffsetofUsed
 
-class MacroOffsetofShallNotBeUsedQuery extends MacroOffsetofUsed_sharedSharedQuery {
+class MacroOffsetofShallNotBeUsedQuery extends MacroOffsetofUsedSharedQuery {
   MacroOffsetofShallNotBeUsedQuery() {
     this = ImportMisra23Package::macroOffsetofShallNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql b/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
index 800a638580..eb9be3af15 100644
--- a/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
+++ b/cpp/misra/src/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined_shared.GlobalSizedOperatorDeleteNotDefined_shared
+import codingstandards.cpp.rules.globalsizedoperatordeletenotdefined.GlobalSizedOperatorDeleteNotDefined
 
-class GlobalSizedOperatorDeleteShallBeDefinedQuery extends GlobalSizedOperatorDeleteNotDefined_sharedSharedQuery
+class GlobalSizedOperatorDeleteShallBeDefinedQuery extends GlobalSizedOperatorDeleteNotDefinedSharedQuery
 {
   GlobalSizedOperatorDeleteShallBeDefinedQuery() {
     this = ImportMisra23Package::globalSizedOperatorDeleteShallBeDefinedQuery()
diff --git a/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql b/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
index 06fd6a4385..8a80b36e3f 100644
--- a/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
+++ b/cpp/misra/src/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined_shared.GlobalUnsizedOperatorDeleteNotDefined_shared
+import codingstandards.cpp.rules.globalunsizedoperatordeletenotdefined.GlobalUnsizedOperatorDeleteNotDefined
 
-class GlobalUnsizedOperatorDeleteShallBeDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefined_sharedSharedQuery
+class GlobalUnsizedOperatorDeleteShallBeDefinedQuery extends GlobalUnsizedOperatorDeleteNotDefinedSharedQuery
 {
   GlobalUnsizedOperatorDeleteShallBeDefinedQuery() {
     this = ImportMisra23Package::globalUnsizedOperatorDeleteShallBeDefinedQuery()
diff --git a/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql b/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
index 92e0773e41..90037b5f29 100644
--- a/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
+++ b/cpp/misra/src/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool_shared.VectorShouldNotBeSpecializedWithBool_shared
+import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool.VectorShouldNotBeSpecializedWithBool
 
-class VectorShouldNotBeSpecializedWithBoolQuery extends VectorShouldNotBeSpecializedWithBool_sharedSharedQuery
+class VectorShouldNotBeSpecializedWithBoolQuery extends VectorShouldNotBeSpecializedWithBoolSharedQuery
 {
   VectorShouldNotBeSpecializedWithBoolQuery() {
     this = ImportMisra23Package::vectorShouldNotBeSpecializedWithBoolQuery()
diff --git a/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql b/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
index 27654a32af..dc407512cc 100644
--- a/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
+++ b/cpp/misra/src/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether_shared.ForwardingReferencesAndForwardNotUsedTogether_shared
+import codingstandards.cpp.rules.forwardingreferencesandforwardnotusedtogether.ForwardingReferencesAndForwardNotUsedTogether
 
-class ForwardingReferencesAndForwardNotUsedTogetherQuery extends ForwardingReferencesAndForwardNotUsedTogether_sharedSharedQuery
+class ForwardingReferencesAndForwardNotUsedTogetherQuery extends ForwardingReferencesAndForwardNotUsedTogetherSharedQuery
 {
   ForwardingReferencesAndForwardNotUsedTogetherQuery() {
     this = ImportMisra23Package::forwardingReferencesAndForwardNotUsedTogetherQuery()
diff --git a/cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql
index f05607c77a..58c8a500f4 100644
--- a/cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.cstdiofunctionsused_shared.CstdioFunctionsUsed_shared
+import codingstandards.cpp.rules.cstdiofunctionsused.CstdioFunctionsUsed
 
-class CstdioFunctionsShallNotBeUsedQuery extends CstdioFunctionsUsed_sharedSharedQuery {
+class CstdioFunctionsShallNotBeUsedQuery extends CstdioFunctionsUsedSharedQuery {
   CstdioFunctionsShallNotBeUsedQuery() {
     this = ImportMisra23Package::cstdioFunctionsShallNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql
index 7590aaccb3..8f0b9438e3 100644
--- a/cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.cstdiomacrosused_shared.CstdioMacrosUsed_shared
+import codingstandards.cpp.rules.cstdiomacrosused.CstdioMacrosUsed
 
-class CstdioMacrosShallNotBeUsedQuery extends CstdioMacrosUsed_sharedSharedQuery {
+class CstdioMacrosShallNotBeUsedQuery extends CstdioMacrosUsedSharedQuery {
   CstdioMacrosShallNotBeUsedQuery() {
     this = ImportMisra23Package::cstdioMacrosShallNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
index 351f93106a..6966c85068 100644
--- a/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.ql
@@ -15,8 +15,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.cstdiotypesused_shared.CstdioTypesUsed_shared
+import codingstandards.cpp.rules.cstdiotypesused.CstdioTypesUsed
 
-class CstdioTypesShallNotBeUsedQuery extends CstdioTypesUsed_sharedSharedQuery {
+class CstdioTypesShallNotBeUsedQuery extends CstdioTypesUsedSharedQuery {
   CstdioTypesShallNotBeUsedQuery() { this = ImportMisra23Package::cstdioTypesShallNotBeUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql b/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
index 8d306afea7..20eb2167bf 100644
--- a/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
+++ b/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately_shared.MemoryOperationsNotSequencedAppropriately_shared
+import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
 
-class MemoryOperationsNotSequencedAppropriatelyQuery extends MemoryOperationsNotSequencedAppropriately_sharedSharedQuery
+class MemoryOperationsNotSequencedAppropriatelyQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery
 {
   MemoryOperationsNotSequencedAppropriatelyQuery() {
     this = ImportMisra23Package::memoryOperationsNotSequencedAppropriatelyQuery()
diff --git a/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql b/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
index b7dc604875..fde97e062c 100644
--- a/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
+++ b/cpp/misra/src/rules/RULE-5-13-1/BackslashCharacterMisuse.ql
@@ -14,8 +14,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.backslashcharactermisuse_shared.BackslashCharacterMisuse_shared
+import codingstandards.cpp.rules.backslashcharactermisuse.BackslashCharacterMisuse
 
-class BackslashCharacterMisuseQuery extends BackslashCharacterMisuse_sharedSharedQuery {
+class BackslashCharacterMisuseQuery extends BackslashCharacterMisuseSharedQuery {
   BackslashCharacterMisuseQuery() { this = ImportMisra23Package::backslashCharacterMisuseQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql b/cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql
index 47a06f2512..d21f1ef1f9 100644
--- a/cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql
+++ b/cpp/misra/src/rules/RULE-5-13-2/NonTerminatedEscapeSequences.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.nonterminatedescapesequences_shared.NonTerminatedEscapeSequences_shared
+import codingstandards.cpp.rules.nonterminatedescapesequences.NonTerminatedEscapeSequences
 
-class NonTerminatedEscapeSequencesQuery extends NonTerminatedEscapeSequences_sharedSharedQuery {
+class NonTerminatedEscapeSequencesQuery extends NonTerminatedEscapeSequencesSharedQuery {
   NonTerminatedEscapeSequencesQuery() {
     this = ImportMisra23Package::nonTerminatedEscapeSequencesQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql b/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
index 6499155f7e..38bb96faac 100644
--- a/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
+++ b/cpp/misra/src/rules/RULE-5-13-3/OctalConstantsUsed.ql
@@ -13,8 +13,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.useofnonzerooctalliteral_shared.UseOfNonZeroOctalLiteral_shared
+import codingstandards.cpp.rules.useofnonzerooctalliteral.UseOfNonZeroOctalLiteral
 
-class OctalConstantsUsedQuery extends UseOfNonZeroOctalLiteral_sharedSharedQuery {
+class OctalConstantsUsedQuery extends UseOfNonZeroOctalLiteralSharedQuery {
   OctalConstantsUsedQuery() { this = ImportMisra23Package::octalConstantsUsedQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql b/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
index 7cfe38d007..b3802cf0be 100644
--- a/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
+++ b/cpp/misra/src/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed_shared.UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared
+import codingstandards.cpp.rules.unsignedintegerliteralsnotappropriatelysuffixed.UnsignedIntegerLiteralsNotAppropriatelySuffixed
 
-class UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixed_sharedSharedQuery
+class UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery extends UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery
 {
   UnsignedIntegerLiteralsNotAppropriatelySuffixedQuery() {
     this = ImportMisra23Package::unsignedIntegerLiteralsNotAppropriatelySuffixedQuery()
diff --git a/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
index 5cb88f69da..50e5d7faad 100644
--- a/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
+++ b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix_shared.LowercaseLStartsInLiteralSuffix_shared
+import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix.LowercaseLStartsInLiteralSuffix
 
-class LowercaseLStartsInLiteralSuffixQuery extends LowercaseLStartsInLiteralSuffix_sharedSharedQuery
+class LowercaseLStartsInLiteralSuffixQuery extends LowercaseLStartsInLiteralSuffixSharedQuery
 {
   LowercaseLStartsInLiteralSuffixQuery() {
     this = ImportMisra23Package::lowercaseLStartsInLiteralSuffixQuery()
diff --git a/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql b/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
index e3b8e7b581..1bdb42de77 100644
--- a/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
+++ b/cpp/misra/src/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment_shared.CharacterSequenceUsedWithinACStyleComment_shared
+import codingstandards.cpp.rules.charactersequenceusedwithinacstylecomment.CharacterSequenceUsedWithinACStyleComment
 
-class CharacterSequenceUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleComment_sharedSharedQuery
+class CharacterSequenceUsedWithinACStyleCommentQuery extends CharacterSequenceUsedWithinACStyleCommentSharedQuery
 {
   CharacterSequenceUsedWithinACStyleCommentQuery() {
     this = ImportMisra23Package::characterSequenceUsedWithinACStyleCommentQuery()
diff --git a/cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql b/cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql
index 9708b2da46..ae58fdcda9 100644
--- a/cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql
+++ b/cpp/misra/src/rules/RULE-5-7-3/LineSplicingUsedInComments.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.linesplicingusedincomments_shared.LineSplicingUsedInComments_shared
+import codingstandards.cpp.rules.linesplicingusedincomments.LineSplicingUsedInComments
 
-class LineSplicingUsedInCommentsQuery extends LineSplicingUsedInComments_sharedSharedQuery {
+class LineSplicingUsedInCommentsQuery extends LineSplicingUsedInCommentsSharedQuery {
   LineSplicingUsedInCommentsQuery() {
     this = ImportMisra23Package::lineSplicingUsedInCommentsQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql b/cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql
index e211dfd770..addd8f2eab 100644
--- a/cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql
+++ b/cpp/misra/src/rules/RULE-6-0-3/GlobalNamespaceDeclarations.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.globalnamespacedeclarations_shared.GlobalNamespaceDeclarations_shared
+import codingstandards.cpp.rules.globalnamespacedeclarations.GlobalNamespaceDeclarations
 
-class GlobalNamespaceDeclarationsQuery extends GlobalNamespaceDeclarations_sharedSharedQuery {
+class GlobalNamespaceDeclarationsQuery extends GlobalNamespaceDeclarationsSharedQuery {
   GlobalNamespaceDeclarationsQuery() {
     this = ImportMisra23Package::globalNamespaceDeclarationsQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql b/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
index 810bb42951..f9eb9e1d44 100644
--- a/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
+++ b/cpp/misra/src/rules/RULE-6-0-4/NonGlobalFunctionMain.ql
@@ -14,8 +14,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.nonglobalfunctionmain_shared.NonGlobalFunctionMain_shared
+import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
 
-class NonGlobalFunctionMainQuery extends NonGlobalFunctionMain_sharedSharedQuery {
+class NonGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery {
   NonGlobalFunctionMainQuery() { this = ImportMisra23Package::nonGlobalFunctionMainQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql b/cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql
index bc02bf3f6e..faa0857d62 100644
--- a/cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql
+++ b/cpp/misra/src/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup_shared.DefinitionNotConsideredForUnqualifiedLookup_shared
+import codingstandards.cpp.rules.definitionnotconsideredforunqualifiedlookup.DefinitionNotConsideredForUnqualifiedLookup
 
-class DefinitionShallBeConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookup_sharedSharedQuery
+class DefinitionShallBeConsideredForUnqualifiedLookupQuery extends DefinitionNotConsideredForUnqualifiedLookupSharedQuery
 {
   DefinitionShallBeConsideredForUnqualifiedLookupQuery() {
     this = ImportMisra23Package::definitionShallBeConsideredForUnqualifiedLookupQuery()
diff --git a/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql b/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
index 03ce1b7c53..b81f2a2c4f 100644
--- a/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
+++ b/cpp/misra/src/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction_shared.HiddenInheritedNonOverridableMemberFunction_shared
+import codingstandards.cpp.rules.hiddeninheritednonoverridablememberfunction.HiddenInheritedNonOverridableMemberFunction
 
-class InheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunction_sharedSharedQuery
+class InheritedNonOverridableMemberFunctionQuery extends HiddenInheritedNonOverridableMemberFunctionSharedQuery
 {
   InheritedNonOverridableMemberFunctionQuery() {
     this = ImportMisra23Package::inheritedNonOverridableMemberFunctionQuery()
diff --git a/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql b/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
index d7fda7b940..9fa94560f4 100644
--- a/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
+++ b/cpp/misra/src/rules/RULE-6-4-2/InheritedOverridableMemberFunction.ql
@@ -15,9 +15,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction_shared.HiddenInheritedOverridableMemberFunction_shared
+import codingstandards.cpp.rules.hiddeninheritedoverridablememberfunction.HiddenInheritedOverridableMemberFunction
 
-class InheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunction_sharedSharedQuery
+class InheritedOverridableMemberFunctionQuery extends HiddenInheritedOverridableMemberFunctionSharedQuery
 {
   InheritedOverridableMemberFunctionQuery() {
     this = ImportMisra23Package::inheritedOverridableMemberFunctionQuery()
diff --git a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
index a172b89313..3d43b4134a 100644
--- a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
+++ b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis_shared.NameNotReferredUsingAQualifiedIdOrThis_shared
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthis.NameNotReferredUsingAQualifiedIdOrThis
 
-class NameShallBeReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThis_sharedSharedQuery
+class NameShallBeReferredUsingAQualifiedIdOrThisQuery extends NameNotReferredUsingAQualifiedIdOrThisSharedQuery
 {
   NameShallBeReferredUsingAQualifiedIdOrThisQuery() {
     this = ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisQuery()
diff --git a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
index 238f07d81a..df2180fc7b 100644
--- a/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
+++ b/cpp/misra/src/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit_shared.NameNotReferredUsingAQualifiedIdOrThisAudit_shared
+import codingstandards.cpp.rules.namenotreferredusingaqualifiedidorthisaudit.NameNotReferredUsingAQualifiedIdOrThisAudit
 
-class NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAudit_sharedSharedQuery
+class NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery extends NameNotReferredUsingAQualifiedIdOrThisAuditSharedQuery
 {
   NameShallBeReferredUsingAQualifiedIdOrThisAuditQuery() {
     this = ImportMisra23Package::nameShallBeReferredUsingAQualifiedIdOrThisAuditQuery()
diff --git a/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql b/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
index 8615cbd25b..bcf026cbba 100644
--- a/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
+++ b/cpp/misra/src/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable_shared.ReturnReferenceOrPointerToAutomaticLocalVariable_shared
+import codingstandards.cpp.rules.returnreferenceorpointertoautomaticlocalvariable.ReturnReferenceOrPointerToAutomaticLocalVariable
 
-class ReturnReferenceOrPointerToAutomaticLocalVariableQuery extends ReturnReferenceOrPointerToAutomaticLocalVariable_sharedSharedQuery
+class ReturnReferenceOrPointerToAutomaticLocalVariableQuery extends ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery
 {
   ReturnReferenceOrPointerToAutomaticLocalVariableQuery() {
     this = ImportMisra23Package::returnReferenceOrPointerToAutomaticLocalVariableQuery()
diff --git a/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql b/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
index f335c4d357..a0dfc63799 100644
--- a/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
+++ b/cpp/misra/src/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant_shared.NullptrNotTheOnlyFormOfTheNullPointerConstant_shared
+import codingstandards.cpp.rules.nullptrnottheonlyformofthenullpointerconstant.NullptrNotTheOnlyFormOfTheNullPointerConstant
 
-class NullptrNotTheOnlyFormOfTheNullPointerConstantQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstant_sharedSharedQuery
+class NullptrNotTheOnlyFormOfTheNullPointerConstantQuery extends NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery
 {
   NullptrNotTheOnlyFormOfTheNullPointerConstantQuery() {
     this = ImportMisra23Package::nullptrNotTheOnlyFormOfTheNullPointerConstantQuery()
diff --git a/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
index 28a963de3a..fed33c33de 100644
--- a/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
+++ b/cpp/misra/src/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer_shared.ArrayPassedAsFunctionArgumentDecayToAPointer_shared
+import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
 
-class ArrayPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointer_sharedSharedQuery
+class ArrayPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
 {
   ArrayPassedAsFunctionArgumentDecayToAPointerQuery() {
     this = ImportMisra23Package::arrayPassedAsFunctionArgumentDecayToAPointerQuery()
diff --git a/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index 647c5bd446..6c4b1a82ad 100644
--- a/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused_shared.ResultOfAnAssignmentOperatorShouldNotBeUsed_shared
+import codingstandards.cpp.rules.resultofanassignmentoperatorshouldnotbeused.ResultOfAnAssignmentOperatorShouldNotBeUsed
 
-class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsed_sharedSharedQuery
+class ResultOfAnAssignmentOperatorShouldNotBeUsedQuery extends ResultOfAnAssignmentOperatorShouldNotBeUsedSharedQuery
 {
   ResultOfAnAssignmentOperatorShouldNotBeUsedQuery() {
     this = ImportMisra23Package::resultOfAnAssignmentOperatorShouldNotBeUsedQuery()
diff --git a/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql b/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
index c136e8d3cd..ff0f397572 100644
--- a/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
+++ b/cpp/misra/src/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly_shared.FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared
+import codingstandards.cpp.rules.functionscallthemselveseitherdirectlyorindirectly.FunctionsCallThemselvesEitherDirectlyOrIndirectly
 
-class FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectly_sharedSharedQuery
+class FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery extends FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery
 {
   FunctionsCallThemselvesEitherDirectlyOrIndirectlyQuery() {
     this = ImportMisra23Package::functionsCallThemselvesEitherDirectlyOrIndirectlyQuery()
diff --git a/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql b/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
index e4b2a2dd3c..37c258b722 100644
--- a/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
+++ b/cpp/misra/src/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype_shared.CastsBetweenAPointerToFunctionAndAnyOtherType_shared
+import codingstandards.cpp.rules.castsbetweenapointertofunctionandanyothertype.CastsBetweenAPointerToFunctionAndAnyOtherType
 
-class CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery extends CastsBetweenAPointerToFunctionAndAnyOtherType_sharedSharedQuery
+class CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery extends CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery
 {
   CastsBetweenAPointerToFunctionAndAnyOtherTypeQuery() {
     this = ImportMisra23Package::castsBetweenAPointerToFunctionAndAnyOtherTypeQuery()
diff --git a/cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql b/cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql
index 8af353d948..685ebb7efd 100644
--- a/cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.reinterpretcastused_shared.ReinterpretCastUsed_shared
+import codingstandards.cpp.rules.reinterpretcastused.ReinterpretCastUsed
 
-class ReinterpretCastShallNotBeUsedQuery extends ReinterpretCastUsed_sharedSharedQuery {
+class ReinterpretCastShallNotBeUsedQuery extends ReinterpretCastUsedSharedQuery {
   ReinterpretCastShallNotBeUsedQuery() {
     this = ImportMisra23Package::reinterpretCastShallNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql b/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
index 8676a704c2..e62acb8257 100644
--- a/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
+++ b/cpp/misra/src/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps_shared.UnsignedOperationWithConstantOperandsWraps_shared
+import codingstandards.cpp.rules.unsignedoperationwithconstantoperandswraps.UnsignedOperationWithConstantOperandsWraps
 
-class UnsignedOperationWithConstantOperandsWrapsQuery extends UnsignedOperationWithConstantOperandsWraps_sharedSharedQuery
+class UnsignedOperationWithConstantOperandsWrapsQuery extends UnsignedOperationWithConstantOperandsWrapsSharedQuery
 {
   UnsignedOperationWithConstantOperandsWrapsQuery() {
     this = ImportMisra23Package::unsignedOperationWithConstantOperandsWrapsQuery()
diff --git a/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql b/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
index d9b3f7a8fd..c847348d1c 100644
--- a/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
+++ b/cpp/misra/src/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression_shared.BuiltInUnaryOperatorAppliedToUnsignedExpression_shared
+import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
 
-class BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpression_sharedSharedQuery
+class BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
 {
   BuiltInUnaryOperatorAppliedToUnsignedExpressionQuery() {
     this = ImportMisra23Package::builtInUnaryOperatorAppliedToUnsignedExpressionQuery()
diff --git a/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql b/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
index f2eb867bab..b87009d8c1 100644
--- a/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
+++ b/cpp/misra/src/rules/RULE-9-3-1/LoopBodyCompoundCondition.ql
@@ -16,8 +16,8 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.loopcompoundcondition_shared.LoopCompoundCondition_shared
+import codingstandards.cpp.rules.loopcompoundcondition.LoopCompoundCondition
 
-class LoopBodyCompoundConditionQuery extends LoopCompoundCondition_sharedSharedQuery {
+class LoopBodyCompoundConditionQuery extends LoopCompoundConditionSharedQuery {
   LoopBodyCompoundConditionQuery() { this = ImportMisra23Package::loopBodyCompoundConditionQuery() }
 }
diff --git a/cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql b/cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql
index 8ab562bd38..7bee3c027e 100644
--- a/cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql
+++ b/cpp/misra/src/rules/RULE-9-3-1/SwitchBodyCompoundCondition.ql
@@ -16,9 +16,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.switchcompoundcondition_shared.SwitchCompoundCondition_shared
+import codingstandards.cpp.rules.switchcompoundcondition.SwitchCompoundCondition
 
-class SwitchBodyCompoundConditionQuery extends SwitchCompoundCondition_sharedSharedQuery {
+class SwitchBodyCompoundConditionQuery extends SwitchCompoundConditionSharedQuery {
   SwitchBodyCompoundConditionQuery() {
     this = ImportMisra23Package::switchBodyCompoundConditionQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql b/cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql
index 6db27d6c75..1751aa3c37 100644
--- a/cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql
+++ b/cpp/misra/src/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.gotostatementshouldnotbeused_shared.GotoStatementShouldNotBeUsed_shared
+import codingstandards.cpp.rules.gotostatementshouldnotbeused.GotoStatementShouldNotBeUsed
 
-class GotoStatementShouldNotBeUsedQuery extends GotoStatementShouldNotBeUsed_sharedSharedQuery {
+class GotoStatementShouldNotBeUsedQuery extends GotoStatementShouldNotBeUsedSharedQuery {
   GotoStatementShouldNotBeUsedQuery() {
     this = ImportMisra23Package::gotoStatementShouldNotBeUsedQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql b/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
index e14281b663..6e11a73f7f 100644
--- a/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
+++ b/cpp/misra/src/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.ql
@@ -13,9 +13,9 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock_shared.GotoReferenceALabelInSurroundingBlock_shared
+import codingstandards.cpp.rules.gotoreferencealabelinsurroundingblock.GotoReferenceALabelInSurroundingBlock
 
-class GotoReferenceALabelInSurroundingBlockQuery extends GotoReferenceALabelInSurroundingBlock_sharedSharedQuery
+class GotoReferenceALabelInSurroundingBlockQuery extends GotoReferenceALabelInSurroundingBlockSharedQuery
 {
   GotoReferenceALabelInSurroundingBlockQuery() {
     this = ImportMisra23Package::gotoReferenceALabelInSurroundingBlockQuery()
diff --git a/cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref b/cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref
index 23e38dba55..65fc614121 100644
--- a/cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref
+++ b/cpp/misra/test/rules/DIR-15-8-1/CopyAndMoveAssignmentsShallHandleSelfAssignment.testref
@@ -1 +1 @@
-cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment_shared/CopyAndMoveAssignmentsShallHandleSelfAssignment_shared.ql
\ No newline at end of file
+cpp/common/test/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
index b848fce94f..434cb47456 100644
--- a/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
+++ b/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
@@ -1 +1 @@
-cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
\ No newline at end of file
+cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
index 2d7784cea0..be7c9ac352 100644
--- a/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
+++ b/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
@@ -1 +1 @@
-cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
\ No newline at end of file
+cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref
index b848fce94f..434cb47456 100644
--- a/cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref
+++ b/cpp/misra/test/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.testref
@@ -1 +1 @@
-cpp/common/test/rules/multipleglobalormemberdeclarators_shared/MultipleGlobalOrMemberDeclarators_shared.ql
\ No newline at end of file
+cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref
index 2d7784cea0..be7c9ac352 100644
--- a/cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref
+++ b/cpp/misra/test/rules/RULE-10-0-1/UseSingleLocalDeclarators.testref
@@ -1 +1 @@
-cpp/common/test/rules/multiplelocaldeclarators_shared/MultipleLocalDeclarators_shared.ql
\ No newline at end of file
+cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref b/cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref
index 27391be776..d7a73fd488 100644
--- a/cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref
+++ b/cpp/misra/test/rules/RULE-10-2-1/EnumerationNotDefinedWithAnExplicitUnderlyingType.testref
@@ -1 +1 @@
-cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype_shared/EnumerationNotDefinedWithAnExplicitUnderlyingType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref
index d0a190a3eb..f643f6a9c7 100644
--- a/cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-10-4-1/AsmDeclarationShallNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/asmdeclarationused_shared/AsmDeclarationUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/asmdeclarationused/AsmDeclarationUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref b/cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref
index f25d51bf8d..6606e891ab 100644
--- a/cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref
+++ b/cpp/misra/test/rules/RULE-11-6-3/NonUniqueEnumerationConstant.testref
@@ -1 +1 @@
-cpp/common/test/rules/nonuniqueenumerationconstant_shared/NonUniqueEnumerationConstant_shared.ql
\ No newline at end of file
+cpp/common/test/rules/nonuniqueenumerationconstant/NonUniqueEnumerationConstant.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref b/cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref
index 32867e3bbc..9e4a9a69c7 100644
--- a/cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref
+++ b/cpp/misra/test/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.testref
@@ -1 +1 @@
-cpp/common/test/rules/bitfieldshallhaveanappropriatetype_shared/BitFieldShallHaveAnAppropriateType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/bitfieldshallhaveanappropriatetype/BitFieldShallHaveAnAppropriateType.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref b/cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref
index a2543b0769..5dd7991a37 100644
--- a/cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref
+++ b/cpp/misra/test/rules/RULE-12-2-3/SignedIntegerNamedBitFieldHaveALengthOfOneBit.testref
@@ -1 +1 @@
-cpp/common/test/rules/namedbitfieldswithsignedintegertype_shared/NamedBitFieldsWithSignedIntegerType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/namedbitfieldswithsignedintegertype/NamedBitFieldsWithSignedIntegerType.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref b/cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref
index 966337628d..fe57c50fe3 100644
--- a/cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref
+++ b/cpp/misra/test/rules/RULE-13-1-2/VirtualAndNonVirtualClassInTheHierarchy.testref
@@ -1 +1 @@
-cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy_shared/VirtualAndNonVirtualClassInTheHierarchy_shared.ql
\ No newline at end of file
+cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref b/cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref
index c89e908ada..7e06403515 100644
--- a/cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref
+++ b/cpp/misra/test/rules/RULE-13-3-2/OverridingShallSpecifyDifferentDefaultArguments.testref
@@ -1 +1 @@
-cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments_shared/OverridingShallSpecifyDifferentDefaultArguments_shared.ql
\ No newline at end of file
+cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref b/cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
index 2a9e8b2eef..ca8eab9681 100644
--- a/cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
+++ b/cpp/misra/test/rules/RULE-13-3-4/PotentiallyVirtualPointerOnlyComparesToNullptr.testref
@@ -1 +1 @@
-cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr_shared/PotentiallyVirtualPointerOnlyComparesToNullptr_shared.ql
\ No newline at end of file
+cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref b/cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref
index 985c209460..596f74b010 100644
--- a/cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref
+++ b/cpp/misra/test/rules/RULE-15-1-1/ObjectsDynamicTypeUsedFromConstructorOrDestructor.testref
@@ -1 +1 @@
-cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor_shared/ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared.ql
\ No newline at end of file
+cpp/common/test/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref b/cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref
index 1bf7e7fffb..ac8c5e1a83 100644
--- a/cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref
+++ b/cpp/misra/test/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.testref
@@ -1 +1 @@
-cpp/common/test/rules/initializeallvirtualbaseclasses_shared/InitializeAllVirtualBaseClasses_shared.ql
\ No newline at end of file
+cpp/common/test/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref b/cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref
index b9075dec6f..49b73d06a9 100644
--- a/cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref
+++ b/cpp/misra/test/rules/RULE-15-1-5/InitializerListConstructorIsTheOnlyConstructor.testref
@@ -1 +1 @@
-cpp/common/test/rules/initializerlistconstructoristheonlyconstructor_shared/InitializerListConstructorIsTheOnlyConstructor_shared.ql
\ No newline at end of file
+cpp/common/test/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref b/cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref
index f9c1d69467..1f2a126671 100644
--- a/cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref
+++ b/cpp/misra/test/rules/RULE-16-5-2/AddressOfOperatorOverloaded.testref
@@ -1 +1 @@
-cpp/common/test/rules/addressofoperatoroverloaded_shared/AddressOfOperatorOverloaded_shared.ql
\ No newline at end of file
+cpp/common/test/rules/addressofoperatoroverloaded/AddressOfOperatorOverloaded.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref b/cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref
index 04c3f5a724..6a284e2cbb 100644
--- a/cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref
+++ b/cpp/misra/test/rules/RULE-17-8-1/FunctionTemplatesExplicitlySpecialized.testref
@@ -1 +1 @@
-cpp/common/test/rules/functiontemplatesexplicitlyspecialized_shared/FunctionTemplatesExplicitlySpecialized_shared.ql
\ No newline at end of file
+cpp/common/test/rules/functiontemplatesexplicitlyspecialized/FunctionTemplatesExplicitlySpecialized.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref b/cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref
index 41eabfe5a6..24d4229225 100644
--- a/cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref
+++ b/cpp/misra/test/rules/RULE-18-1-1/ExceptionObjectHavePointerType.testref
@@ -1 +1 @@
-cpp/common/test/rules/exceptionobjecthavepointertype_shared/ExceptionObjectHavePointerType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/exceptionobjecthavepointertype/ExceptionObjectHavePointerType.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref b/cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref
index 01a7dde1dd..f3c961d8f1 100644
--- a/cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref
+++ b/cpp/misra/test/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.testref
@@ -1 +1 @@
-cpp/common/test/rules/emptythrowonlywithinacatchhandler_shared/EmptyThrowOnlyWithinACatchHandler_shared.ql
\ No newline at end of file
+cpp/common/test/rules/emptythrowonlywithinacatchhandler/EmptyThrowOnlyWithinACatchHandler.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref b/cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref
index 089cce1ccf..76dc55827f 100644
--- a/cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref
+++ b/cpp/misra/test/rules/RULE-18-5-1/NoexceptFunctionShouldNotPropagateToTheCaller.testref
@@ -1 +1 @@
-cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller_shared/NoexceptFunctionShouldNotPropagateToTheCaller_shared.ql
\ No newline at end of file
+cpp/common/test/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref b/cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref
index 99791747ae..1f07b047a6 100644
--- a/cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref
+++ b/cpp/misra/test/rules/RULE-19-0-2/FunctionLikeMacrosDefined.testref
@@ -1 +1 @@
-cpp/common/test/rules/functionlikemacrosdefined_shared/FunctionLikeMacrosDefined_shared.ql
\ No newline at end of file
+cpp/common/test/rules/functionlikemacrosdefined/FunctionLikeMacrosDefined.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref b/cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref
index bf61f640dd..a5eb010410 100644
--- a/cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref
+++ b/cpp/misra/test/rules/RULE-19-3-2/MacroParameterFollowingHash.testref
@@ -1 +1 @@
-cpp/common/test/rules/macroparameterfollowinghash_shared/MacroParameterFollowingHash_shared.ql
\ No newline at end of file
+cpp/common/test/rules/macroparameterfollowinghash/MacroParameterFollowingHash.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref b/cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref
index 6cfdd63510..8061bfd2ec 100644
--- a/cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref
+++ b/cpp/misra/test/rules/RULE-19-3-3/AMixedUseMacroArgumentSubjectToExpansion.testref
@@ -1 +1 @@
-cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion_shared/AMixedUseMacroArgumentSubjectToExpansion_shared.ql
\ No newline at end of file
+cpp/common/test/rules/amixedusemacroargumentsubjecttoexpansion/AMixedUseMacroArgumentSubjectToExpansion.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref b/cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref
index e491bc10c7..2342517408 100644
--- a/cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref
+++ b/cpp/misra/test/rules/RULE-21-10-3/CsignalFacilitiesUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/csignalfacilitiesused_shared/CsignalFacilitiesUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/csignalfacilitiesused/CsignalFacilitiesUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref
index 3ea4c7008d..3d398d799b 100644
--- a/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesShallNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref
index 3ea4c7008d..3d398d799b 100644
--- a/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref
+++ b/cpp/misra/test/rules/RULE-21-10-3/CsignalTypesUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/csignaltypesused_shared/CsignalTypesUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/csignaltypesused/CsignalTypesUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref b/cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref
index 67251b4d35..1b12920284 100644
--- a/cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref
+++ b/cpp/misra/test/rules/RULE-21-2-1/AtofAtoiAtolAndAtollUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/atofatoiatolandatollused_shared/AtofAtoiAtolAndAtollUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/atofatoiatolandatollused/AtofAtoiAtolAndAtollUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref
index f53f8d6f9f..022fef6071 100644
--- a/cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-21-2-4/MacroOffsetofShallNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/macrooffsetofused_shared/MacroOffsetofUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref b/cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref
index bd7e582a38..4d1e21d4cb 100644
--- a/cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref
+++ b/cpp/misra/test/rules/RULE-21-6-4/GlobalSizedOperatorDeleteShallBeDefined.testref
@@ -1 +1 @@
-cpp/common/test/rules/globalsizedoperatordeletenotdefined_shared/GlobalSizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
+cpp/common/test/rules/globalsizedoperatordeletenotdefined/GlobalSizedOperatorDeleteNotDefined.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref b/cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref
index 781d037067..f2fcc2eded 100644
--- a/cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref
+++ b/cpp/misra/test/rules/RULE-21-6-4/GlobalUnsizedOperatorDeleteShallBeDefined.testref
@@ -1 +1 @@
-cpp/common/test/rules/globalunsizedoperatordeletenotdefined_shared/GlobalUnsizedOperatorDeleteNotDefined_shared.ql
\ No newline at end of file
+cpp/common/test/rules/globalunsizedoperatordeletenotdefined/GlobalUnsizedOperatorDeleteNotDefined.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref b/cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref
index 96d8385f5f..a934690acb 100644
--- a/cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref
+++ b/cpp/misra/test/rules/RULE-26-3-1/VectorShouldNotBeSpecializedWithBool.testref
@@ -1 +1 @@
-cpp/common/test/rules/vectorshouldnotbespecializedwithbool_shared/VectorShouldNotBeSpecializedWithBool_shared.ql
\ No newline at end of file
+cpp/common/test/rules/vectorshouldnotbespecializedwithbool/VectorShouldNotBeSpecializedWithBool.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref b/cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref
index 16fd01273f..d56acb8415 100644
--- a/cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref
+++ b/cpp/misra/test/rules/RULE-28-6-2/ForwardingReferencesAndForwardNotUsedTogether.testref
@@ -1 +1 @@
-cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether_shared/ForwardingReferencesAndForwardNotUsedTogether_shared.ql
\ No newline at end of file
+cpp/common/test/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref
index 595b7fcffa..5f8b3d8a9a 100644
--- a/cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-30-0-1/CstdioFunctionsShallNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/cstdiofunctionsused_shared/CstdioFunctionsUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/cstdiofunctionsused/CstdioFunctionsUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref
index 8bc3a8fcde..a1ba376c3b 100644
--- a/cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-30-0-1/CstdioMacrosShallNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/cstdiomacrosused_shared/CstdioMacrosUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/cstdiomacrosused/CstdioMacrosUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref
index 4020d6427e..4c08a75cfe 100644
--- a/cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-30-0-1/CstdioTypesShallNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/cstdiotypesused_shared/CstdioTypesUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/cstdiotypesused/CstdioTypesUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref b/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
index 347bf0114c..02034f66c6 100644
--- a/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
+++ b/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
@@ -1 +1 @@
-cpp/common/test/rules/memoryoperationsnotsequencedappropriately_shared/MemoryOperationsNotSequencedAppropriately_shared.ql
\ No newline at end of file
+cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref b/cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref
index a257ad6ab7..924122e38e 100644
--- a/cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref
+++ b/cpp/misra/test/rules/RULE-5-13-1/BackslashCharacterMisuse.testref
@@ -1 +1 @@
-cpp/common/test/rules/backslashcharactermisuse_shared/BackslashCharacterMisuse_shared.ql
\ No newline at end of file
+cpp/common/test/rules/backslashcharactermisuse/BackslashCharacterMisuse.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref b/cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref
index 6212775e36..bfed44b1fd 100644
--- a/cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref
+++ b/cpp/misra/test/rules/RULE-5-13-2/NonTerminatedEscapeSequences.testref
@@ -1 +1 @@
-cpp/common/test/rules/nonterminatedescapesequences_shared/NonTerminatedEscapeSequences_shared.ql
\ No newline at end of file
+cpp/common/test/rules/nonterminatedescapesequences/NonTerminatedEscapeSequences.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref b/cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref
index 5b23b86826..97c466a866 100644
--- a/cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref
+++ b/cpp/misra/test/rules/RULE-5-13-3/OctalConstantsUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/useofnonzerooctalliteral_shared/UseOfNonZeroOctalLiteral_shared.ql
\ No newline at end of file
+cpp/common/test/rules/useofnonzerooctalliteral/UseOfNonZeroOctalLiteral.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref b/cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref
index 1a58c1eee1..9133a84ce4 100644
--- a/cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref
+++ b/cpp/misra/test/rules/RULE-5-13-4/UnsignedIntegerLiteralsNotAppropriatelySuffixed.testref
@@ -1 +1 @@
-cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed_shared/UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref b/cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref
index ab0542973b..760d407a2d 100644
--- a/cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref
+++ b/cpp/misra/test/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.testref
@@ -1 +1 @@
-cpp/common/test/rules/lowercaselstartsinliteralsuffix_shared/LowercaseLStartsInLiteralSuffix_shared.ql
\ No newline at end of file
+cpp/common/test/rules/lowercaselstartsinliteralsuffix/LowercaseLStartsInLiteralSuffix.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref b/cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref
index 8073a976cd..971b1953f7 100644
--- a/cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref
+++ b/cpp/misra/test/rules/RULE-5-7-1/CharacterSequenceUsedWithinACStyleComment.testref
@@ -1 +1 @@
-cpp/common/test/rules/charactersequenceusedwithinacstylecomment_shared/CharacterSequenceUsedWithinACStyleComment_shared.ql
\ No newline at end of file
+cpp/common/test/rules/charactersequenceusedwithinacstylecomment/CharacterSequenceUsedWithinACStyleComment.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref b/cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref
index d4f66ed35e..7874a476a0 100644
--- a/cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref
+++ b/cpp/misra/test/rules/RULE-5-7-3/LineSplicingUsedInComments.testref
@@ -1 +1 @@
-cpp/common/test/rules/linesplicingusedincomments_shared/LineSplicingUsedInComments_shared.ql
\ No newline at end of file
+cpp/common/test/rules/linesplicingusedincomments/LineSplicingUsedInComments.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref b/cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref
index 93764c480e..8f71738005 100644
--- a/cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref
+++ b/cpp/misra/test/rules/RULE-6-0-3/GlobalNamespaceDeclarations.testref
@@ -1 +1 @@
-cpp/common/test/rules/globalnamespacedeclarations_shared/GlobalNamespaceDeclarations_shared.ql
\ No newline at end of file
+cpp/common/test/rules/globalnamespacedeclarations/GlobalNamespaceDeclarations.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref b/cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref
index 528412284f..e149f3a33b 100644
--- a/cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref
+++ b/cpp/misra/test/rules/RULE-6-0-4/NonGlobalFunctionMain.testref
@@ -1 +1 @@
-cpp/common/test/rules/nonglobalfunctionmain_shared/NonGlobalFunctionMain_shared.ql
\ No newline at end of file
+cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref b/cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref
index 3b04b2950f..7a5ae74d2e 100644
--- a/cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref
+++ b/cpp/misra/test/rules/RULE-6-4-2/DefinitionShallBeConsideredForUnqualifiedLookup.testref
@@ -1 +1 @@
-cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup_shared/DefinitionNotConsideredForUnqualifiedLookup_shared.ql
\ No newline at end of file
+cpp/common/test/rules/definitionnotconsideredforunqualifiedlookup/DefinitionNotConsideredForUnqualifiedLookup.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref b/cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref
index 371b80ead3..2fb9608ee8 100644
--- a/cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref
+++ b/cpp/misra/test/rules/RULE-6-4-2/InheritedNonOverridableMemberFunction.testref
@@ -1 +1 @@
-cpp/common/test/rules/hiddeninheritednonoverridablememberfunction_shared/HiddenInheritedNonOverridableMemberFunction_shared.ql
\ No newline at end of file
+cpp/common/test/rules/hiddeninheritednonoverridablememberfunction/HiddenInheritedNonOverridableMemberFunction.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref b/cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref
index 3fcc2ed7e7..e768ced8d3 100644
--- a/cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref
+++ b/cpp/misra/test/rules/RULE-6-4-2/InheritedOverridableMemberFunction.testref
@@ -1 +1 @@
-cpp/common/test/rules/hiddeninheritedoverridablememberfunction_shared/HiddenInheritedOverridableMemberFunction_shared.ql
\ No newline at end of file
+cpp/common/test/rules/hiddeninheritedoverridablememberfunction/HiddenInheritedOverridableMemberFunction.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref
index 34df16815b..ad5590bc1f 100644
--- a/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref
+++ b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThis.testref
@@ -1 +1 @@
-cpp/common/test/rules/namenotreferredusingaqualifiedidorthis_shared/NameNotReferredUsingAQualifiedIdOrThis_shared.ql
\ No newline at end of file
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthis/NameNotReferredUsingAQualifiedIdOrThis.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref
index 0bef5586dd..f7ff9100a6 100644
--- a/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref
+++ b/cpp/misra/test/rules/RULE-6-4-3/NameShallBeReferredUsingAQualifiedIdOrThisAudit.testref
@@ -1 +1 @@
-cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit_shared/NameNotReferredUsingAQualifiedIdOrThisAudit_shared.ql
\ No newline at end of file
+cpp/common/test/rules/namenotreferredusingaqualifiedidorthisaudit/NameNotReferredUsingAQualifiedIdOrThisAudit.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref b/cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref
index 676e414381..45dbffde00 100644
--- a/cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref
+++ b/cpp/misra/test/rules/RULE-6-8-2/ReturnReferenceOrPointerToAutomaticLocalVariable.testref
@@ -1 +1 @@
-cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable_shared/ReturnReferenceOrPointerToAutomaticLocalVariable_shared.ql
\ No newline at end of file
+cpp/common/test/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref b/cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref
index 495d8eddba..aeb655a341 100644
--- a/cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref
+++ b/cpp/misra/test/rules/RULE-7-11-1/NullptrNotTheOnlyFormOfTheNullPointerConstant.testref
@@ -1 +1 @@
-cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant_shared/NullptrNotTheOnlyFormOfTheNullPointerConstant_shared.ql
\ No newline at end of file
+cpp/common/test/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref b/cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref
index 97edef0af2..06f2ec8fbb 100644
--- a/cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref
+++ b/cpp/misra/test/rules/RULE-7-11-2/ArrayPassedAsFunctionArgumentDecayToAPointer.testref
@@ -1 +1 @@
-cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer_shared/ArrayPassedAsFunctionArgumentDecayToAPointer_shared.ql
\ No newline at end of file
+cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref b/cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
index fe502f81be..1e29dba140 100644
--- a/cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-8-18-2/ResultOfAnAssignmentOperatorShouldNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused_shared/ResultOfAnAssignmentOperatorShouldNotBeUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/resultofanassignmentoperatorshouldnotbeused/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref b/cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref
index 1ebf3d5742..f459a29bf1 100644
--- a/cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref
+++ b/cpp/misra/test/rules/RULE-8-2-10/FunctionsCallThemselvesEitherDirectlyOrIndirectly.testref
@@ -1 +1 @@
-cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly_shared/FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared.ql
\ No newline at end of file
+cpp/common/test/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref b/cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref
index 5eeeea570a..e7bde2ea08 100644
--- a/cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref
+++ b/cpp/misra/test/rules/RULE-8-2-4/CastsBetweenAPointerToFunctionAndAnyOtherType.testref
@@ -1 +1 @@
-cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype_shared/CastsBetweenAPointerToFunctionAndAnyOtherType_shared.ql
\ No newline at end of file
+cpp/common/test/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref b/cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref
index a553240f19..81f18c2d9c 100644
--- a/cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-8-2-5/ReinterpretCastShallNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/reinterpretcastused_shared/ReinterpretCastUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/reinterpretcastused/ReinterpretCastUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref b/cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref
index 8b29a5cd46..148997676e 100644
--- a/cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref
+++ b/cpp/misra/test/rules/RULE-8-20-1/UnsignedOperationWithConstantOperandsWraps.testref
@@ -1 +1 @@
-cpp/common/test/rules/unsignedoperationwithconstantoperandswraps_shared/UnsignedOperationWithConstantOperandsWraps_shared.ql
\ No newline at end of file
+cpp/common/test/rules/unsignedoperationwithconstantoperandswraps/UnsignedOperationWithConstantOperandsWraps.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref b/cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref
index 48a20b03f1..bd12c39fbd 100644
--- a/cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref
+++ b/cpp/misra/test/rules/RULE-8-3-1/BuiltInUnaryOperatorAppliedToUnsignedExpression.testref
@@ -1 +1 @@
-cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression_shared/BuiltInUnaryOperatorAppliedToUnsignedExpression_shared.ql
\ No newline at end of file
+cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref b/cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref
index e301b04020..84dc7caf76 100644
--- a/cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref
+++ b/cpp/misra/test/rules/RULE-9-3-1/LoopBodyCompoundCondition.testref
@@ -1 +1 @@
-cpp/common/test/rules/loopcompoundcondition_shared/LoopCompoundCondition_shared.ql
\ No newline at end of file
+cpp/common/test/rules/loopcompoundcondition/LoopCompoundCondition.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref b/cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref
index e48ef207a0..f02b02ba85 100644
--- a/cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref
+++ b/cpp/misra/test/rules/RULE-9-3-1/SwitchBodyCompoundCondition.testref
@@ -1 +1 @@
-cpp/common/test/rules/switchcompoundcondition_shared/SwitchCompoundCondition_shared.ql
\ No newline at end of file
+cpp/common/test/rules/switchcompoundcondition/SwitchCompoundCondition.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref b/cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref
index 3f2f4508b1..44d306f80c 100644
--- a/cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref
+++ b/cpp/misra/test/rules/RULE-9-6-1/GotoStatementShouldNotBeUsed.testref
@@ -1 +1 @@
-cpp/common/test/rules/gotostatementshouldnotbeused_shared/GotoStatementShouldNotBeUsed_shared.ql
\ No newline at end of file
+cpp/common/test/rules/gotostatementshouldnotbeused/GotoStatementShouldNotBeUsed.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref b/cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref
index 7bbaffe1e3..7502d9431c 100644
--- a/cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref
+++ b/cpp/misra/test/rules/RULE-9-6-2/GotoReferenceALabelInSurroundingBlock.testref
@@ -1 +1 @@
-cpp/common/test/rules/gotoreferencealabelinsurroundingblock_shared/GotoReferenceALabelInSurroundingBlock_shared.ql
\ No newline at end of file
+cpp/common/test/rules/gotoreferencealabelinsurroundingblock/GotoReferenceALabelInSurroundingBlock.ql
\ No newline at end of file
diff --git a/rule_packages/c/Banned.json b/rule_packages/c/Banned.json
index e68485b970..cab9ffc8c7 100644
--- a/rule_packages/c/Banned.json
+++ b/rule_packages/c/Banned.json
@@ -245,7 +245,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "AtofAtoiAtolAndAtollOfStdlibhUsed",
-          "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed_shared",
+          "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed",
           "tags": [
             "correctness"
           ]
@@ -338,7 +338,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "OctalConstantsUsed",
-          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral_shared",
+          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral",
           "tags": [
             "readability",
             "correctness",
diff --git a/rule_packages/c/BitfieldTypes.json b/rule_packages/c/BitfieldTypes.json
index 41d109ec3b..76490d73d1 100644
--- a/rule_packages/c/BitfieldTypes.json
+++ b/rule_packages/c/BitfieldTypes.json
@@ -12,7 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "BitFieldsShallOnlyBeDeclaredWithAnAppropriateType",
-          "shared_implementation_short_name": "BitFieldShallHaveAnAppropriateType_shared",
+          "shared_implementation_short_name": "BitFieldShallHaveAnAppropriateType",
           "tags": []
         }
       ],
@@ -30,7 +30,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "SingleBitNamedBitFieldsOfASignedType",
-          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType_shared",
+          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType",
           "tags": []
         }
       ],
diff --git a/rule_packages/c/Declarations7.json b/rule_packages/c/Declarations7.json
index 335a9f3603..b1be4f9d55 100644
--- a/rule_packages/c/Declarations7.json
+++ b/rule_packages/c/Declarations7.json
@@ -57,7 +57,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ValueImplicitEnumerationConstantNotUnique",
-          "shared_implementation_short_name": "NonUniqueEnumerationConstant_shared",
+          "shared_implementation_short_name": "NonUniqueEnumerationConstant",
           "tags": [
             "correctness",
             "readability"
diff --git a/rule_packages/c/IntegerOverflow.json b/rule_packages/c/IntegerOverflow.json
index 0549f0a29e..0fb1c5a4e7 100644
--- a/rule_packages/c/IntegerOverflow.json
+++ b/rule_packages/c/IntegerOverflow.json
@@ -12,7 +12,7 @@
           "precision": "medium",
           "severity": "error",
           "short_name": "UnsignedIntegerOperationsWrapAround",
-          "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps_shared",
+          "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps",
           "tags": [
             "correctness",
             "security"
diff --git a/rule_packages/c/Preprocessor2.json b/rule_packages/c/Preprocessor2.json
index ddce5a7080..546f426135 100644
--- a/rule_packages/c/Preprocessor2.json
+++ b/rule_packages/c/Preprocessor2.json
@@ -12,7 +12,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "MoreThanOneHashOperatorInMacroDefinition",
-          "shared_implementation_short_name": "MacroParameterFollowingHash_shared",
+          "shared_implementation_short_name": "MacroParameterFollowingHash",
           "tags": [
             "correctness"
           ],
@@ -36,7 +36,7 @@
           "precision": "high",
           "severity": "warning",
           "short_name": "MacroParameterUsedAsHashOperand",
-          "shared_implementation_short_name": "AMixedUseMacroArgumentSubjectToExpansion_shared",
+          "shared_implementation_short_name": "AMixedUseMacroArgumentSubjectToExpansion",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/c/Preprocessor6.json b/rule_packages/c/Preprocessor6.json
index 324a2e5fa7..0bb7f34f90 100644
--- a/rule_packages/c/Preprocessor6.json
+++ b/rule_packages/c/Preprocessor6.json
@@ -12,7 +12,7 @@
           "precision": "medium",
           "severity": "recommendation",
           "short_name": "FunctionOverFunctionLikeMacro",
-          "shared_implementation_short_name": "FunctionLikeMacrosDefined_shared",
+          "shared_implementation_short_name": "FunctionLikeMacrosDefined",
           "tags": [
             "external/misra/audit",
             "maintainability",
diff --git a/rule_packages/c/SideEffects1.json b/rule_packages/c/SideEffects1.json
index f45a57e547..821fb24d3c 100644
--- a/rule_packages/c/SideEffects1.json
+++ b/rule_packages/c/SideEffects1.json
@@ -131,7 +131,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed",
-          "shared_implementation_short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed_shared",
+          "shared_implementation_short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed",
           "tags": [
             "correctness",
             "readability"
diff --git a/rule_packages/c/SideEffects3.json b/rule_packages/c/SideEffects3.json
index a6030975fd..19012b9c33 100644
--- a/rule_packages/c/SideEffects3.json
+++ b/rule_packages/c/SideEffects3.json
@@ -12,7 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnsequencedSideEffects",
-          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately_shared",
+          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/c/Statements2.json b/rule_packages/c/Statements2.json
index 0c24ff602f..cb616429be 100644
--- a/rule_packages/c/Statements2.json
+++ b/rule_packages/c/Statements2.json
@@ -33,7 +33,7 @@
           "precision": "high",
           "severity": "recommendation",
           "short_name": "GotoLabelBlockCondition",
-          "shared_implementation_short_name": "GotoReferenceALabelInSurroundingBlock_shared",
+          "shared_implementation_short_name": "GotoReferenceALabelInSurroundingBlock",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/c/Statements6.json b/rule_packages/c/Statements6.json
index eb0eefb437..8d71f11cfd 100644
--- a/rule_packages/c/Statements6.json
+++ b/rule_packages/c/Statements6.json
@@ -12,7 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GotoStatementUsed",
-          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed_shared",
+          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed",
           "tags": [
             "correctness",
             "security"
diff --git a/rule_packages/c/Syntax.json b/rule_packages/c/Syntax.json
index 9b4b6e44bd..b8899ccc97 100644
--- a/rule_packages/c/Syntax.json
+++ b/rule_packages/c/Syntax.json
@@ -53,7 +53,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "OctalAndHexadecimalEscapeSequencesNotTerminated",
-          "shared_implementation_short_name": "NonTerminatedEscapeSequences_shared",
+          "shared_implementation_short_name": "NonTerminatedEscapeSequences",
           "tags": [
             "maintainability",
             "readability",
@@ -138,7 +138,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "LowercaseCharacterLUsedInLiteralSuffix",
-          "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix_shared",
+          "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/cpp/BannedFunctions.json b/rule_packages/cpp/BannedFunctions.json
index c974c3a2d9..8ef93db1a0 100644
--- a/rule_packages/cpp/BannedFunctions.json
+++ b/rule_packages/cpp/BannedFunctions.json
@@ -189,7 +189,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "MacroOffsetofUsed",
-          "shared_implementation_short_name": "MacroOffsetofUsed_shared",
+          "shared_implementation_short_name": "MacroOffsetofUsed",
           "tags": [
             "security",
             "scope/single-translation-unit"
diff --git a/rule_packages/cpp/BannedLibraries.json b/rule_packages/cpp/BannedLibraries.json
index 37b1cf6d2b..fce11b9eca 100644
--- a/rule_packages/cpp/BannedLibraries.json
+++ b/rule_packages/cpp/BannedLibraries.json
@@ -114,7 +114,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CsignalFunctionsUsed",
-          "shared_implementation_short_name": "CsignalFunctionsUsed_shared",
+          "shared_implementation_short_name": "CsignalFunctionsUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -128,7 +128,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CsignalTypesUsed",
-          "shared_implementation_short_name": "CsignalTypesUsed_shared",
+          "shared_implementation_short_name": "CsignalTypesUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -179,7 +179,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioFunctionsUsed",
-          "shared_implementation_short_name": "CstdioFunctionsUsed_shared",
+          "shared_implementation_short_name": "CstdioFunctionsUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -193,7 +193,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioMacrosUsed",
-          "shared_implementation_short_name": "CstdioMacrosUsed_shared",
+          "shared_implementation_short_name": "CstdioMacrosUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -207,7 +207,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioTypesUsed",
-          "shared_implementation_short_name": "CstdioTypesUsed_shared",
+          "shared_implementation_short_name": "CstdioTypesUsed",
           "tags": [
             "maintainability",
             "correctness",
diff --git a/rule_packages/cpp/BannedSyntax.json b/rule_packages/cpp/BannedSyntax.json
index d65fa65e67..8e307c02db 100644
--- a/rule_packages/cpp/BannedSyntax.json
+++ b/rule_packages/cpp/BannedSyntax.json
@@ -169,7 +169,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ReinterpretCastUsed",
-          "shared_implementation_short_name": "ReinterpretCastUsed_shared",
+          "shared_implementation_short_name": "ReinterpretCastUsed",
           "tags": [
             "correctness",
             "security",
@@ -195,7 +195,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GotoStatementUsed",
-          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed_shared",
+          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed",
           "tags": [
             "correctness",
             "security",
@@ -268,7 +268,7 @@
           "name": "The asm declaration shall not be used",
           "precision": "very-high",
           "severity": "error",
-          "shared_implementation_short_name": "AsmDeclarationUsed_shared",
+          "shared_implementation_short_name": "AsmDeclarationUsed",
           "short_name": "AsmDeclarationUsed",
           "tags": [
             "correctness",
diff --git a/rule_packages/cpp/BannedTypes.json b/rule_packages/cpp/BannedTypes.json
index 3f94b9c85b..e84399b928 100644
--- a/rule_packages/cpp/BannedTypes.json
+++ b/rule_packages/cpp/BannedTypes.json
@@ -41,7 +41,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "VectorboolSpecializationUsed",
-          "shared_implementation_short_name": "VectorShouldNotBeSpecializedWithBool_shared",
+          "shared_implementation_short_name": "VectorShouldNotBeSpecializedWithBool",
           "tags": [
             "correctness",
             "scope/single-translation-unit"
diff --git a/rule_packages/cpp/Comments.json b/rule_packages/cpp/Comments.json
index b27832f6c2..2421bec52f 100644
--- a/rule_packages/cpp/Comments.json
+++ b/rule_packages/cpp/Comments.json
@@ -16,7 +16,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "SingleLineCommentEndsWithSlash",
-          "shared_implementation_short_name": "LineSplicingUsedInComments_shared",
+          "shared_implementation_short_name": "LineSplicingUsedInComments",
           "tags": [
             "correctness",
             "readability",
@@ -95,7 +95,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "SlashStarUsedWithinACStyleComment",
-          "shared_implementation_short_name": "CharacterSequenceUsedWithinACStyleComment_shared",
+          "shared_implementation_short_name": "CharacterSequenceUsedWithinACStyleComment",
           "tags": [
             "maintainability",
             "readability",
diff --git a/rule_packages/cpp/Conditionals.json b/rule_packages/cpp/Conditionals.json
index 022c1898c0..584df19420 100644
--- a/rule_packages/cpp/Conditionals.json
+++ b/rule_packages/cpp/Conditionals.json
@@ -78,7 +78,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "SwitchCompoundCondition",
-          "shared_implementation_short_name": "SwitchCompoundCondition_shared",
+          "shared_implementation_short_name": "SwitchCompoundCondition",
           "tags": [
             "maintainability",
             "readability"
@@ -91,7 +91,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "LoopCompoundCondition",
-          "shared_implementation_short_name": "LoopCompoundCondition_shared",
+          "shared_implementation_short_name": "LoopCompoundCondition",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/cpp/Declarations.json b/rule_packages/cpp/Declarations.json
index d64f072751..a5b8ebeec3 100644
--- a/rule_packages/cpp/Declarations.json
+++ b/rule_packages/cpp/Declarations.json
@@ -50,7 +50,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GlobalSizedOperatorDeleteNotDefined",
-          "shared_implementation_short_name": "GlobalSizedOperatorDeleteNotDefined_shared",
+          "shared_implementation_short_name": "GlobalSizedOperatorDeleteNotDefined",
           "tags": [
             "maintainability"
           ]
@@ -62,7 +62,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GlobalUnsizedOperatorDeleteNotDefined",
-          "shared_implementation_short_name": "GlobalUnsizedOperatorDeleteNotDefined_shared",
+          "shared_implementation_short_name": "GlobalUnsizedOperatorDeleteNotDefined",
           "tags": [
             "maintainability"
           ]
@@ -218,7 +218,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "EnumerationUnderlyingBaseTypeNotExplicitlyDefined",
-          "shared_implementation_short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType_shared",
+          "shared_implementation_short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType",
           "tags": [
             "readability",
             "maintainability"
diff --git a/rule_packages/cpp/Exceptions1.json b/rule_packages/cpp/Exceptions1.json
index 45109d9178..23b37778db 100644
--- a/rule_packages/cpp/Exceptions1.json
+++ b/rule_packages/cpp/Exceptions1.json
@@ -90,7 +90,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "PointerExceptionObject",
-          "shared_implementation_short_name": "ExceptionObjectHavePointerType_shared",
+          "shared_implementation_short_name": "ExceptionObjectHavePointerType",
           "tags": [
             "correctness"
           ]
@@ -225,7 +225,7 @@
           "severity": "error",
           "kind": "path-problem",
           "short_name": "NoExceptFunctionThrows",
-          "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller_shared",
+          "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
           "tags": [
             "correctness"
           ]
@@ -430,7 +430,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "EmptyThrowOutsideCatch",
-          "shared_implementation_short_name": "EmptyThrowOnlyWithinACatchHandler_shared",
+          "shared_implementation_short_name": "EmptyThrowOnlyWithinACatchHandler",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Functions.json b/rule_packages/cpp/Functions.json
index 2d72fd08df..367ab67437 100644
--- a/rule_packages/cpp/Functions.json
+++ b/rule_packages/cpp/Functions.json
@@ -87,7 +87,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "RecursiveFunctions",
-          "shared_implementation_short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared",
+          "shared_implementation_short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly",
           "tags": [
             "correctness",
             "maintainability"
@@ -233,7 +233,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "FunctionReturnAutomaticVarCondition",
-          "shared_implementation_short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable_shared",
+          "shared_implementation_short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable",
           "tags": [
             "correctness",
             "security"
diff --git a/rule_packages/cpp/ImportMisra23.json b/rule_packages/cpp/ImportMisra23.json
index 33f437d6b1..96bab2e25f 100644
--- a/rule_packages/cpp/ImportMisra23.json
+++ b/rule_packages/cpp/ImportMisra23.json
@@ -538,7 +538,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment",
-          "shared_implementation_short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment_shared",
+          "shared_implementation_short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment",
           "tags": []
         }
       ],
@@ -557,7 +557,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "UseSingleLocalDeclarators",
-          "shared_implementation_short_name": "MultipleLocalDeclarators_shared",
+          "shared_implementation_short_name": "MultipleLocalDeclarators",
           "tags": [
             "readability",
             "maintainability",
@@ -571,7 +571,7 @@
           "precision": "medium",
           "severity": "recommendation",
           "short_name": "UseSingleGlobalOrMemberDeclarators",
-          "shared_implementation_short_name": "MultipleGlobalOrMemberDeclarators_shared",
+          "shared_implementation_short_name": "MultipleGlobalOrMemberDeclarators",
           "tags": [
             "readability",
             "maintainability",
@@ -594,7 +594,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType",
-          "shared_implementation_short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType_shared",
+          "shared_implementation_short_name": "EnumerationNotDefinedWithAnExplicitUnderlyingType",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -615,7 +615,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "AsmDeclarationShallNotBeUsed",
-          "shared_implementation_short_name": "AsmDeclarationUsed_shared",
+          "shared_implementation_short_name": "AsmDeclarationUsed",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -636,7 +636,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NonUniqueEnumerationConstant",
-          "shared_implementation_short_name": "NonUniqueEnumerationConstant_shared",
+          "shared_implementation_short_name": "NonUniqueEnumerationConstant",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -657,7 +657,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "BitFieldShallHaveAnAppropriateType",
-          "shared_implementation_short_name": "BitFieldShallHaveAnAppropriateType_shared",
+          "shared_implementation_short_name": "BitFieldShallHaveAnAppropriateType",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -678,7 +678,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "SignedIntegerNamedBitFieldHaveALengthOfOneBit",
-          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType_shared",
+          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -699,7 +699,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "VirtualAndNonVirtualClassInTheHierarchy",
-          "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy_shared",
+          "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -720,7 +720,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "OverridingShallSpecifyDifferentDefaultArguments",
-          "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments_shared",
+          "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -741,7 +741,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr",
-          "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr_shared",
+          "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -762,7 +762,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
-          "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared",
+          "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
           "tags": [
             "scope/system"
           ]
@@ -783,7 +783,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "InitializeAllVirtualBaseClasses",
-          "shared_implementation_short_name": "InitializeAllVirtualBaseClasses_shared",
+          "shared_implementation_short_name": "InitializeAllVirtualBaseClasses",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -804,7 +804,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "InitializerListConstructorIsTheOnlyConstructor",
-          "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor_shared",
+          "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -825,7 +825,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "AddressOfOperatorOverloaded",
-          "shared_implementation_short_name": "AddressOfOperatorOverloaded_shared",
+          "shared_implementation_short_name": "AddressOfOperatorOverloaded",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -846,7 +846,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "FunctionTemplatesExplicitlySpecialized",
-          "shared_implementation_short_name": "FunctionTemplatesExplicitlySpecialized_shared",
+          "shared_implementation_short_name": "FunctionTemplatesExplicitlySpecialized",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -867,7 +867,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ExceptionObjectHavePointerType",
-          "shared_implementation_short_name": "ExceptionObjectHavePointerType_shared",
+          "shared_implementation_short_name": "ExceptionObjectHavePointerType",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -888,7 +888,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "EmptyThrowOnlyWithinACatchHandler",
-          "shared_implementation_short_name": "EmptyThrowOnlyWithinACatchHandler_shared",
+          "shared_implementation_short_name": "EmptyThrowOnlyWithinACatchHandler",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -909,7 +909,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
-          "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller_shared",
+          "shared_implementation_short_name": "NoexceptFunctionShouldNotPropagateToTheCaller",
           "tags": [
             "scope/system"
           ]
@@ -930,7 +930,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "FunctionLikeMacrosDefined",
-          "shared_implementation_short_name": "FunctionLikeMacrosDefined_shared",
+          "shared_implementation_short_name": "FunctionLikeMacrosDefined",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -951,7 +951,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "MacroParameterFollowingHash",
-          "shared_implementation_short_name": "MacroParameterFollowingHash_shared",
+          "shared_implementation_short_name": "MacroParameterFollowingHash",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -972,7 +972,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "AMixedUseMacroArgumentSubjectToExpansion",
-          "shared_implementation_short_name": "AMixedUseMacroArgumentSubjectToExpansion_shared",
+          "shared_implementation_short_name": "AMixedUseMacroArgumentSubjectToExpansion",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -993,7 +993,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CsignalFacilitiesUsed",
-          "shared_implementation_short_name": "CsignalFunctionsUsed_shared",
+          "shared_implementation_short_name": "CsignalFunctionsUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -1007,7 +1007,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CsignalTypesShallNotBeUsed",
-          "shared_implementation_short_name": "CsignalTypesUsed_shared",
+          "shared_implementation_short_name": "CsignalTypesUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -1030,7 +1030,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "AtofAtoiAtolAndAtollUsed",
-          "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed_shared",
+          "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1051,7 +1051,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "MacroOffsetofShallNotBeUsed",
-          "shared_implementation_short_name": "MacroOffsetofUsed_shared",
+          "shared_implementation_short_name": "MacroOffsetofUsed",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1072,7 +1072,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GlobalSizedOperatorDeleteShallBeDefined",
-          "shared_implementation_short_name": "GlobalSizedOperatorDeleteNotDefined_shared",
+          "shared_implementation_short_name": "GlobalSizedOperatorDeleteNotDefined",
           "tags": [
             "maintainability",
             "scope/system"
@@ -1085,7 +1085,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GlobalUnsizedOperatorDeleteShallBeDefined",
-          "shared_implementation_short_name": "GlobalUnsizedOperatorDeleteNotDefined_shared",
+          "shared_implementation_short_name": "GlobalUnsizedOperatorDeleteNotDefined",
           "tags": [
             "maintainability",
             "scope/system"
@@ -1107,7 +1107,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "VectorShouldNotBeSpecializedWithBool",
-          "shared_implementation_short_name": "VectorShouldNotBeSpecializedWithBool_shared",
+          "shared_implementation_short_name": "VectorShouldNotBeSpecializedWithBool",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1128,7 +1128,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ForwardingReferencesAndForwardNotUsedTogether",
-          "shared_implementation_short_name": "ForwardingReferencesAndForwardNotUsedTogether_shared",
+          "shared_implementation_short_name": "ForwardingReferencesAndForwardNotUsedTogether",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1149,7 +1149,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioFunctionsShallNotBeUsed",
-          "shared_implementation_short_name": "CstdioFunctionsUsed_shared",
+          "shared_implementation_short_name": "CstdioFunctionsUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -1163,7 +1163,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioMacrosShallNotBeUsed",
-          "shared_implementation_short_name": "CstdioMacrosUsed_shared",
+          "shared_implementation_short_name": "CstdioMacrosUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -1177,7 +1177,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "CstdioTypesShallNotBeUsed",
-          "shared_implementation_short_name": "CstdioTypesUsed_shared",
+          "shared_implementation_short_name": "CstdioTypesUsed",
           "tags": [
             "maintainability",
             "correctness",
@@ -1200,7 +1200,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "MemoryOperationsNotSequencedAppropriately",
-          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately_shared",
+          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately",
           "tags": [
             "scope/system"
           ]
@@ -1221,7 +1221,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "BackslashCharacterMisuse",
-          "shared_implementation_short_name": "BackslashCharacterMisuse_shared",
+          "shared_implementation_short_name": "BackslashCharacterMisuse",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1242,7 +1242,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NonTerminatedEscapeSequences",
-          "shared_implementation_short_name": "NonTerminatedEscapeSequences_shared",
+          "shared_implementation_short_name": "NonTerminatedEscapeSequences",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1263,7 +1263,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "OctalConstantsUsed",
-          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral_shared",
+          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1284,7 +1284,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
-          "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared",
+          "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1305,7 +1305,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "LowercaseLStartsInLiteralSuffix",
-          "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix_shared",
+          "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1326,7 +1326,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CharacterSequenceUsedWithinACStyleComment",
-          "shared_implementation_short_name": "CharacterSequenceUsedWithinACStyleComment_shared",
+          "shared_implementation_short_name": "CharacterSequenceUsedWithinACStyleComment",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1347,7 +1347,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "LineSplicingUsedInComments",
-          "shared_implementation_short_name": "LineSplicingUsedInComments_shared",
+          "shared_implementation_short_name": "LineSplicingUsedInComments",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1368,7 +1368,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GlobalNamespaceDeclarations",
-          "shared_implementation_short_name": "GlobalNamespaceDeclarations_shared",
+          "shared_implementation_short_name": "GlobalNamespaceDeclarations",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1389,7 +1389,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NonGlobalFunctionMain",
-          "shared_implementation_short_name": "NonGlobalFunctionMain_shared",
+          "shared_implementation_short_name": "NonGlobalFunctionMain",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1410,7 +1410,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "InheritedNonOverridableMemberFunction",
-          "shared_implementation_short_name": "HiddenInheritedNonOverridableMemberFunction_shared",
+          "shared_implementation_short_name": "HiddenInheritedNonOverridableMemberFunction",
           "tags": [
             "correctness",
             "scope/single-translation-unit"
@@ -1423,7 +1423,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "InheritedOverridableMemberFunction",
-          "shared_implementation_short_name": "HiddenInheritedOverridableMemberFunction_shared",
+          "shared_implementation_short_name": "HiddenInheritedOverridableMemberFunction",
           "tags": [
             "correctness",
             "scope/single-translation-unit"
@@ -1436,7 +1436,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "DefinitionShallBeConsideredForUnqualifiedLookup",
-          "shared_implementation_short_name": "DefinitionNotConsideredForUnqualifiedLookup_shared",
+          "shared_implementation_short_name": "DefinitionNotConsideredForUnqualifiedLookup",
           "tags": [
             "correctness",
             "scope/single-translation-unit"
@@ -1458,7 +1458,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "NameShallBeReferredUsingAQualifiedIdOrThis",
-          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThis_shared",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThis",
           "tags": [
             "maintainability",
             "readability",
@@ -1472,7 +1472,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "NameShallBeReferredUsingAQualifiedIdOrThisAudit",
-          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit_shared",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit",
           "tags": [
             "maintainability",
             "readability",
@@ -1495,7 +1495,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable",
-          "shared_implementation_short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable_shared",
+          "shared_implementation_short_name": "ReturnReferenceOrPointerToAutomaticLocalVariable",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1516,7 +1516,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant",
-          "shared_implementation_short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant_shared",
+          "shared_implementation_short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1537,7 +1537,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer",
-          "shared_implementation_short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer_shared",
+          "shared_implementation_short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1558,7 +1558,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed",
-          "shared_implementation_short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed_shared",
+          "shared_implementation_short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1579,7 +1579,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly",
-          "shared_implementation_short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly_shared",
+          "shared_implementation_short_name": "FunctionsCallThemselvesEitherDirectlyOrIndirectly",
           "tags": [
             "scope/system"
           ]
@@ -1600,7 +1600,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
-          "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType_shared",
+          "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1621,7 +1621,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ReinterpretCastShallNotBeUsed",
-          "shared_implementation_short_name": "ReinterpretCastUsed_shared",
+          "shared_implementation_short_name": "ReinterpretCastUsed",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1642,7 +1642,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnsignedOperationWithConstantOperandsWraps",
-          "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps_shared",
+          "shared_implementation_short_name": "UnsignedOperationWithConstantOperandsWraps",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1663,7 +1663,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression",
-          "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression_shared",
+          "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1684,7 +1684,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "SwitchBodyCompoundCondition",
-          "shared_implementation_short_name": "SwitchCompoundCondition_shared",
+          "shared_implementation_short_name": "SwitchCompoundCondition",
           "tags": [
             "maintainability",
             "readability",
@@ -1698,7 +1698,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "LoopBodyCompoundCondition",
-          "shared_implementation_short_name": "LoopCompoundCondition_shared",
+          "shared_implementation_short_name": "LoopCompoundCondition",
           "tags": [
             "maintainability",
             "readability",
@@ -1721,7 +1721,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GotoStatementShouldNotBeUsed",
-          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed_shared",
+          "shared_implementation_short_name": "GotoStatementShouldNotBeUsed",
           "tags": [
             "scope/single-translation-unit"
           ]
@@ -1742,7 +1742,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "GotoReferenceALabelInSurroundingBlock",
-          "shared_implementation_short_name": "GotoReferenceALabelInSurroundingBlock_shared",
+          "shared_implementation_short_name": "GotoReferenceALabelInSurroundingBlock",
           "tags": [
             "scope/single-translation-unit"
           ]
diff --git a/rule_packages/cpp/Inheritance.json b/rule_packages/cpp/Inheritance.json
index 09c8b89f18..dd0daec513 100644
--- a/rule_packages/cpp/Inheritance.json
+++ b/rule_packages/cpp/Inheritance.json
@@ -145,7 +145,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "AccessibleBaseClassBothVirtualAndNonVirtual",
-          "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy_shared",
+          "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy",
           "tags": []
         }
       ],
@@ -188,7 +188,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "DynamicTypeOfThisUsedFromConstructorOrDestructor",
-          "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor_shared",
+          "shared_implementation_short_name": "ObjectsDynamicTypeUsedFromConstructorOrDestructor",
           "tags": []
         }
       ],
diff --git a/rule_packages/cpp/Initialization.json b/rule_packages/cpp/Initialization.json
index e839b4fd7e..3ca901a865 100644
--- a/rule_packages/cpp/Initialization.json
+++ b/rule_packages/cpp/Initialization.json
@@ -16,7 +16,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "ExplicitConstructorBaseClassInitialization",
-          "shared_implementation_short_name": "InitializeAllVirtualBaseClasses_shared",
+          "shared_implementation_short_name": "InitializeAllVirtualBaseClasses",
           "tags": [
             "maintainability",
             "correctness"
@@ -305,7 +305,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "ConfusingUseOfInitializerListConstructors",
-          "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor_shared",
+          "shared_implementation_short_name": "InitializerListConstructorIsTheOnlyConstructor",
           "tags": [
             "readability",
             "maintainability"
@@ -330,7 +330,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "MultipleLocalDeclarators",
-          "shared_implementation_short_name": "MultipleLocalDeclarators_shared",
+          "shared_implementation_short_name": "MultipleLocalDeclarators",
           "tags": [
             "readability",
             "maintainability"
@@ -343,7 +343,7 @@
           "precision": "medium",
           "severity": "recommendation",
           "short_name": "MultipleGlobalOrMemberDeclarators",
-          "shared_implementation_short_name": "MultipleGlobalOrMemberDeclarators_shared",
+          "shared_implementation_short_name": "MultipleGlobalOrMemberDeclarators",
           "tags": [
             "readability",
             "maintainability"
diff --git a/rule_packages/cpp/Literals.json b/rule_packages/cpp/Literals.json
index 6c35af04dc..7721b7dd6a 100644
--- a/rule_packages/cpp/Literals.json
+++ b/rule_packages/cpp/Literals.json
@@ -39,7 +39,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "EscapeSequenceOutsideISO",
-          "shared_implementation_short_name": "BackslashCharacterMisuse_shared",
+          "shared_implementation_short_name": "BackslashCharacterMisuse",
           "tags": [
             "correctness"
           ]
@@ -86,7 +86,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "NullPointerConstantNotNullptr",
-          "shared_implementation_short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant_shared",
+          "shared_implementation_short_name": "NullptrNotTheOnlyFormOfTheNullPointerConstant",
           "tags": [
             "readability"
           ]
@@ -134,7 +134,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "UseOfNonZeroOctalLiteral",
-          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral_shared",
+          "shared_implementation_short_name": "UseOfNonZeroOctalLiteral",
           "tags": [
             "readability"
           ]
@@ -169,7 +169,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "MissingUSuffix",
-          "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed_shared",
+          "shared_implementation_short_name": "UnsignedIntegerLiteralsNotAppropriatelySuffixed",
           "tags": [
             "correctness",
             "readability"
diff --git a/rule_packages/cpp/MoveForward.json b/rule_packages/cpp/MoveForward.json
index 13917fcc30..b7e47116f1 100644
--- a/rule_packages/cpp/MoveForward.json
+++ b/rule_packages/cpp/MoveForward.json
@@ -40,7 +40,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ForwardingValuesToOtherFunctions",
-          "shared_implementation_short_name": "ForwardingReferencesAndForwardNotUsedTogether_shared",
+          "shared_implementation_short_name": "ForwardingReferencesAndForwardNotUsedTogether",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Naming.json b/rule_packages/cpp/Naming.json
index 7cf9a97bbf..9e8ff9628a 100644
--- a/rule_packages/cpp/Naming.json
+++ b/rule_packages/cpp/Naming.json
@@ -314,7 +314,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "IdentifierMainUsedForAFunctionOtherThanGlobalMain",
-          "shared_implementation_short_name": "NonGlobalFunctionMain_shared",
+          "shared_implementation_short_name": "NonGlobalFunctionMain",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/cpp/OperatorInvariants.json b/rule_packages/cpp/OperatorInvariants.json
index 68d45942b5..8ba76cd0f7 100644
--- a/rule_packages/cpp/OperatorInvariants.json
+++ b/rule_packages/cpp/OperatorInvariants.json
@@ -39,7 +39,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CopyAssignmentAndAMoveHandleSelfAssignment",
-          "shared_implementation_short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment_shared",
+          "shared_implementation_short_name": "CopyAndMoveAssignmentsShallHandleSelfAssignment",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Operators.json b/rule_packages/cpp/Operators.json
index a04478c3df..e4600769c5 100644
--- a/rule_packages/cpp/Operators.json
+++ b/rule_packages/cpp/Operators.json
@@ -297,7 +297,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnaryMinusOperatorAppliedToAnUnsignedExpression",
-          "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression_shared",
+          "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression",
           "tags": []
         }
       ],
@@ -319,7 +319,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnaryOperatorOverloaded",
-          "shared_implementation_short_name": "AddressOfOperatorOverloaded_shared",
+          "shared_implementation_short_name": "AddressOfOperatorOverloaded",
           "tags": []
         }
       ],
diff --git a/rule_packages/cpp/Pointers.json b/rule_packages/cpp/Pointers.json
index ad5bb34c44..83b77877d9 100644
--- a/rule_packages/cpp/Pointers.json
+++ b/rule_packages/cpp/Pointers.json
@@ -87,7 +87,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "VirtualPointerOnlyComparesToNullptrConstant",
-          "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr_shared",
+          "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr",
           "tags": [
             "correctness"
           ]
@@ -280,7 +280,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "IdentifierPassedAsFunctionArgumentDecayToAPointer",
-          "shared_implementation_short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer_shared",
+          "shared_implementation_short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer",
           "tags": [
             "correctness"
           ]
@@ -327,7 +327,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CastNotConvertPointerToFunction",
-          "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType_shared",
+          "shared_implementation_short_name": "CastsBetweenAPointerToFunctionAndAnyOtherType",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Representation.json b/rule_packages/cpp/Representation.json
index 8cf6e7a3ed..c87094ea4b 100644
--- a/rule_packages/cpp/Representation.json
+++ b/rule_packages/cpp/Representation.json
@@ -96,7 +96,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "NamedBitFieldsWithSignedIntegerTypeShallHaveALengthOfMoreThanOneBit",
-          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType_shared",
+          "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/Scope.json b/rule_packages/cpp/Scope.json
index 665091fdb6..6677b8b81a 100644
--- a/rule_packages/cpp/Scope.json
+++ b/rule_packages/cpp/Scope.json
@@ -64,7 +64,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "HiddenInheritedNonOverridableMemberFunction",
-          "shared_implementation_short_name": "HiddenInheritedNonOverridableMemberFunction_shared",
+          "shared_implementation_short_name": "HiddenInheritedNonOverridableMemberFunction",
           "tags": [
             "correctness"
           ]
@@ -76,7 +76,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "HiddenInheritedOverridableMemberFunction",
-          "shared_implementation_short_name": "HiddenInheritedOverridableMemberFunction_shared",
+          "shared_implementation_short_name": "HiddenInheritedOverridableMemberFunction",
           "tags": [
             "correctness"
           ]
@@ -88,7 +88,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "DefinitionNotConsideredForUnqualifiedLookup",
-          "shared_implementation_short_name": "DefinitionNotConsideredForUnqualifiedLookup_shared",
+          "shared_implementation_short_name": "DefinitionNotConsideredForUnqualifiedLookup",
           "tags": [
             "correctness"
           ]
@@ -231,7 +231,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "GlobalNamespaceMembershipViolation",
-          "shared_implementation_short_name": "GlobalNamespaceDeclarations_shared",
+          "shared_implementation_short_name": "GlobalNamespaceDeclarations",
           "tags": [
             "readability"
           ]
diff --git a/rule_packages/cpp/Templates.json b/rule_packages/cpp/Templates.json
index 5fd2946f1e..a6520a7780 100644
--- a/rule_packages/cpp/Templates.json
+++ b/rule_packages/cpp/Templates.json
@@ -112,7 +112,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "ExplicitSpecializationsOfFunctionTemplatesUsed",
-          "shared_implementation_short_name": "FunctionTemplatesExplicitlySpecialized_shared",
+          "shared_implementation_short_name": "FunctionTemplatesExplicitlySpecialized",
           "tags": [
             "maintainability",
             "readability"
@@ -172,7 +172,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "NameNotReferredUsingAQualifiedIdOrThis",
-          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThis_shared",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThis",
           "tags": [
             "maintainability",
             "readability"
@@ -185,7 +185,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit",
-          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit_shared",
+          "shared_implementation_short_name": "NameNotReferredUsingAQualifiedIdOrThisAudit",
           "tags": [
             "maintainability",
             "readability"
diff --git a/rule_packages/cpp/VirtualFunctions.json b/rule_packages/cpp/VirtualFunctions.json
index 79a286aa2c..692705e8d4 100644
--- a/rule_packages/cpp/VirtualFunctions.json
+++ b/rule_packages/cpp/VirtualFunctions.json
@@ -177,7 +177,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "VirtualFunctionParametersUseSameDefaultArguments",
-          "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments_shared",
+          "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments",
           "tags": [
             "correctness"
           ]
diff --git a/scripts/generate_rules/templates/shared_library.ql.template b/scripts/generate_rules/templates/shared_library.ql.template
index 24431edcc7..8c6540beee 100644
--- a/scripts/generate_rules/templates/shared_library.ql.template
+++ b/scripts/generate_rules/templates/shared_library.ql.template
@@ -1,5 +1,6 @@
 /**
- * Provides a library which includes a `problems` predicate for reporting....
+ * Provides a library with a `problems` predicate for the following issue:
+ * {{ description|join('\n * ') }}
  */
 
 import cpp

From 55ffe9a95d5231a5923c8f80eec320058297f5c1 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 24 Jul 2024 22:26:39 +0200
Subject: [PATCH 060/435] Fix formatting

---
 cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql       | 3 +--
 cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql | 3 +--
 .../src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql     | 3 +--
 .../ArrayPassedAsFunctionArgumentDecayToAPointer.qll          | 4 +---
 .../BuiltInUnaryOperatorAppliedToUnsignedExpression.qll       | 4 +---
 .../CastsBetweenAPointerToFunctionAndAnyOtherType.qll         | 4 +---
 .../CopyAndMoveAssignmentsShallHandleSelfAssignment.qll       | 4 +---
 .../EnumerationNotDefinedWithAnExplicitUnderlyingType.qll     | 4 +---
 .../ForwardingReferencesAndForwardNotUsedTogether.qll         | 4 +---
 .../FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll     | 4 +---
 .../InitializerListConstructorIsTheOnlyConstructor.qll        | 4 +---
 .../NoexceptFunctionShouldNotPropagateToTheCaller.qll         | 4 +---
 .../NullptrNotTheOnlyFormOfTheNullPointerConstant.qll         | 4 +---
 .../ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll     | 4 +---
 .../OverridingShallSpecifyDifferentDefaultArguments.qll       | 4 +---
 .../PotentiallyVirtualPointerOnlyComparesToNullptr.qll        | 4 +---
 .../ReturnReferenceOrPointerToAutomaticLocalVariable.qll      | 4 +---
 .../UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll       | 4 +---
 .../rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql   | 3 +--
 .../rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql   | 3 +--
 .../src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql  | 3 +--
 .../rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql    | 3 +--
 .../src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql  | 3 +--
 23 files changed, 23 insertions(+), 61 deletions(-)

diff --git a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
index 56494147f4..169b5fc8f3 100644
--- a/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
+++ b/cpp/autosar/src/rules/A15-4-2/NoExceptFunctionThrows.ql
@@ -17,7 +17,6 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.noexceptfunctionshouldnotpropagatetothecaller.NoexceptFunctionShouldNotPropagateToTheCaller
 
-class NoExceptFunctionThrowsQuery extends NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery
-{
+class NoExceptFunctionThrowsQuery extends NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery {
   NoExceptFunctionThrowsQuery() { this = Exceptions1Package::noExceptFunctionThrowsQuery() }
 }
diff --git a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
index 6c517675f6..5bbe181927 100644
--- a/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
+++ b/cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql
@@ -19,8 +19,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.vectorshouldnotbespecializedwithbool.VectorShouldNotBeSpecializedWithBool
 
-class VectorboolSpecializationUsedQuery extends VectorShouldNotBeSpecializedWithBoolSharedQuery
-{
+class VectorboolSpecializationUsedQuery extends VectorShouldNotBeSpecializedWithBoolSharedQuery {
   VectorboolSpecializationUsedQuery() {
     this = BannedTypesPackage::vectorboolSpecializationUsedQuery()
   }
diff --git a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
index c615ae9d55..c152821ab2 100644
--- a/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
+++ b/cpp/autosar/src/rules/M8-0-1/MultipleGlobalOrMemberDeclarators.ql
@@ -18,8 +18,7 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.multipleglobalormemberdeclarators.MultipleGlobalOrMemberDeclarators
 
-class MultipleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclaratorsSharedQuery
-{
+class MultipleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclaratorsSharedQuery {
   MultipleGlobalOrMemberDeclaratorsQuery() {
     this = InitializationPackage::multipleGlobalOrMemberDeclaratorsQuery()
   }
diff --git a/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll b/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll
index 675bb1d85f..b7ec4917bd 100644
--- a/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.qll
@@ -9,9 +9,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
-}
+Query getQuery() { result instanceof ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery }
 
 predicate arrayToPointerDecay(Access ae, Parameter p) {
   (
diff --git a/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll b/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll
index e704617a16..0e516a43ec 100644
--- a/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
-}
+Query getQuery() { result instanceof BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery }
 
 query predicate problems(Element e, string message) {
   exists(UnaryMinusExpr ex, IntegralType t |
diff --git a/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll b/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll
index f33531e371..48fa1f0c86 100644
--- a/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/castsbetweenapointertofunctionandanyothertype/CastsBetweenAPointerToFunctionAndAnyOtherType.qll
@@ -9,9 +9,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery
-}
+Query getQuery() { result instanceof CastsBetweenAPointerToFunctionAndAnyOtherTypeSharedQuery }
 
 query predicate problems(Cast c, string message) {
   not isExcluded(c, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll b/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll
index b11db11100..ae87176517 100644
--- a/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/copyandmoveassignmentsshallhandleselfassignment/CopyAndMoveAssignmentsShallHandleSelfAssignment.qll
@@ -11,9 +11,7 @@ import codingstandards.cpp.Operator
 
 abstract class CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery
-}
+Query getQuery() { result instanceof CopyAndMoveAssignmentsShallHandleSelfAssignmentSharedQuery }
 
 predicate isUserCopyOrUserMove(Operator o) {
   o instanceof UserCopyOperator or
diff --git a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
index 44013997fa..d014e7be86 100644
--- a/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/enumerationnotdefinedwithanexplicitunderlyingtype/EnumerationNotDefinedWithAnExplicitUnderlyingType.qll
@@ -9,9 +9,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery
-}
+Query getQuery() { result instanceof EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery }
 
 query predicate problems(Enum e, string message) {
   not isExcluded(e, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll b/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll
index eb5347816b..960b4ba2b6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/forwardingreferencesandforwardnotusedtogether/ForwardingReferencesAndForwardNotUsedTogether.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.standardlibrary.Utility
 
 abstract class ForwardingReferencesAndForwardNotUsedTogetherSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof ForwardingReferencesAndForwardNotUsedTogetherSharedQuery
-}
+Query getQuery() { result instanceof ForwardingReferencesAndForwardNotUsedTogetherSharedQuery }
 
 query predicate problems(FunctionCall c, string message, Parameter a, string a_string) {
   not isExcluded(c, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
index 4b4ec74bbb..87f27c134f 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functionscallthemselveseitherdirectlyorindirectly/FunctionsCallThemselvesEitherDirectlyOrIndirectly.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery
-}
+Query getQuery() { result instanceof FunctionsCallThemselvesEitherDirectlyOrIndirectlySharedQuery }
 
 class RecursiveCall extends FunctionCall {
   RecursiveCall() {
diff --git a/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll b/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll
index c0024b4463..e9579fcfba 100644
--- a/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/initializerlistconstructoristheonlyconstructor/InitializerListConstructorIsTheOnlyConstructor.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class InitializerListConstructorIsTheOnlyConstructorSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof InitializerListConstructorIsTheOnlyConstructorSharedQuery
-}
+Query getQuery() { result instanceof InitializerListConstructorIsTheOnlyConstructorSharedQuery }
 
 class StdInitializerList extends Class {
   StdInitializerList() { hasQualifiedName("std", "initializer_list") }
diff --git a/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll b/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll
index f53c558fa0..bc3b620718 100644
--- a/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/noexceptfunctionshouldnotpropagatetothecaller/NoexceptFunctionShouldNotPropagateToTheCaller.qll
@@ -13,9 +13,7 @@ import codingstandards.cpp.exceptions.ExceptionSpecifications
 
 abstract class NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery
-}
+Query getQuery() { result instanceof NoexceptFunctionShouldNotPropagateToTheCallerSharedQuery }
 
 class NoExceptThrowingFunction extends ExceptionThrowingFunction {
   NoExceptThrowingFunction() {
diff --git a/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll b/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll
index c997595ac6..2b24aa9410 100644
--- a/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/nullptrnottheonlyformofthenullpointerconstant/NullptrNotTheOnlyFormOfTheNullPointerConstant.qll
@@ -10,9 +10,7 @@ import semmle.code.cpp.commons.NULL
 
 abstract class NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery
-}
+Query getQuery() { result instanceof NullptrNotTheOnlyFormOfTheNullPointerConstantSharedQuery }
 
 query predicate problems(Literal l, string message) {
   not isExcluded(l, getQuery()) and // Not the type of the nullptr literal
diff --git a/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll b/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll
index 6bb9590d33..1303646ef5 100644
--- a/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/objectsdynamictypeusedfromconstructorordestructor/ObjectsDynamicTypeUsedFromConstructorOrDestructor.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery
-}
+Query getQuery() { result instanceof ObjectsDynamicTypeUsedFromConstructorOrDestructorSharedQuery }
 
 predicate thisCall(FunctionCall c) {
   c.getQualifier() instanceof ThisExpr or
diff --git a/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll b/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll
index d4a85cbaac..acfa177561 100644
--- a/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
-}
+Query getQuery() { result instanceof OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery }
 
 query predicate problems(VirtualFunction f2, string message, VirtualFunction f1, string f1_string) {
   not isExcluded(f2, getQuery()) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll b/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll
index 12d9a297b9..667480a43a 100644
--- a/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
-}
+Query getQuery() { result instanceof PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery }
 
 query predicate problems(
   EqualityOperation equalityComparison, string message, MemberFunction virtualFunction,
diff --git a/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll b/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll
index dce050d9d7..cd623f711c 100644
--- a/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/returnreferenceorpointertoautomaticlocalvariable/ReturnReferenceOrPointerToAutomaticLocalVariable.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Exclusions
 
 abstract class ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery
-}
+Query getQuery() { result instanceof ReturnReferenceOrPointerToAutomaticLocalVariableSharedQuery }
 
 query predicate problems(
   ReturnStmt rs, string message, Function f, string f_string, Variable auto, string auto_string
diff --git a/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
index 00745b6f7f..0b9ccb17f1 100644
--- a/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
@@ -10,9 +10,7 @@ import codingstandards.cpp.Cpp14Literal
 
 abstract class UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery extends Query { }
 
-Query getQuery() {
-  result instanceof UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery
-}
+Query getQuery() { result instanceof UnsignedIntegerLiteralsNotAppropriatelySuffixedSharedQuery }
 
 query predicate problems(Cpp14Literal::NumericLiteral nl, string message) {
   exists(string literalKind |
diff --git a/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
index b7117682e2..ffbc5bacaf 100644
--- a/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
+++ b/cpp/misra/src/rules/RULE-10-0-1/UseSingleGlobalOrMemberDeclarators.ql
@@ -17,8 +17,7 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.multipleglobalormemberdeclarators.MultipleGlobalOrMemberDeclarators
 
-class UseSingleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclaratorsSharedQuery
-{
+class UseSingleGlobalOrMemberDeclaratorsQuery extends MultipleGlobalOrMemberDeclaratorsSharedQuery {
   UseSingleGlobalOrMemberDeclaratorsQuery() {
     this = ImportMisra23Package::useSingleGlobalOrMemberDeclaratorsQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
index 7f7df9cda3..f5041252f9 100644
--- a/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
+++ b/cpp/misra/src/rules/RULE-12-2-2/BitFieldShallHaveAnAppropriateType.ql
@@ -15,8 +15,7 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.bitfieldshallhaveanappropriatetype.BitFieldShallHaveAnAppropriateType
 
-class BitFieldShallHaveAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateTypeSharedQuery
-{
+class BitFieldShallHaveAnAppropriateTypeQuery extends BitFieldShallHaveAnAppropriateTypeSharedQuery {
   BitFieldShallHaveAnAppropriateTypeQuery() {
     this = ImportMisra23Package::bitFieldShallHaveAnAppropriateTypeQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
index d128b2422a..3dd7b7e3e2 100644
--- a/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
+++ b/cpp/misra/src/rules/RULE-15-1-2/InitializeAllVirtualBaseClasses.ql
@@ -16,8 +16,7 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.initializeallvirtualbaseclasses.InitializeAllVirtualBaseClasses
 
-class InitializeAllVirtualBaseClassesQuery extends InitializeAllVirtualBaseClassesSharedQuery
-{
+class InitializeAllVirtualBaseClassesQuery extends InitializeAllVirtualBaseClassesSharedQuery {
   InitializeAllVirtualBaseClassesQuery() {
     this = ImportMisra23Package::initializeAllVirtualBaseClassesQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
index 2bea30cb83..15ca773943 100644
--- a/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
+++ b/cpp/misra/src/rules/RULE-18-1-2/EmptyThrowOnlyWithinACatchHandler.ql
@@ -15,8 +15,7 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.emptythrowonlywithinacatchhandler.EmptyThrowOnlyWithinACatchHandler
 
-class EmptyThrowOnlyWithinACatchHandlerQuery extends EmptyThrowOnlyWithinACatchHandlerSharedQuery
-{
+class EmptyThrowOnlyWithinACatchHandlerQuery extends EmptyThrowOnlyWithinACatchHandlerSharedQuery {
   EmptyThrowOnlyWithinACatchHandlerQuery() {
     this = ImportMisra23Package::emptyThrowOnlyWithinACatchHandlerQuery()
   }
diff --git a/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
index 50e5d7faad..a47c0ded0c 100644
--- a/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
+++ b/cpp/misra/src/rules/RULE-5-13-5/LowercaseLStartsInLiteralSuffix.ql
@@ -16,8 +16,7 @@ import cpp
 import codingstandards.cpp.misra
 import codingstandards.cpp.rules.lowercaselstartsinliteralsuffix.LowercaseLStartsInLiteralSuffix
 
-class LowercaseLStartsInLiteralSuffixQuery extends LowercaseLStartsInLiteralSuffixSharedQuery
-{
+class LowercaseLStartsInLiteralSuffixQuery extends LowercaseLStartsInLiteralSuffixSharedQuery {
   LowercaseLStartsInLiteralSuffixQuery() {
     this = ImportMisra23Package::lowercaseLStartsInLiteralSuffixQuery()
   }

From 1492e2a44aa51cc380de4517a9ca0df373d15f88 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 24 Jul 2024 22:29:47 +0200
Subject: [PATCH 061/435] Fix formatting

---
 c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql          | 3 +--
 .../RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index 80a9c540c1..b71bb2f1c1 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -15,7 +15,6 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
 
-class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery
-{
+class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery {
   UnsequencedSideEffectsQuery() { this = SideEffects3Package::unsequencedSideEffectsQuery() }
 }
diff --git a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
index 8717afb4f1..42ea398e14 100644
--- a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
+++ b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
@@ -15,8 +15,7 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.macroparameterfollowinghash.MacroParameterFollowingHash
 
-class MoreThanOneHashOperatorInMacroDefinitionQuery extends MacroParameterFollowingHashSharedQuery
-{
+class MoreThanOneHashOperatorInMacroDefinitionQuery extends MacroParameterFollowingHashSharedQuery {
   MoreThanOneHashOperatorInMacroDefinitionQuery() {
     this = Preprocessor2Package::moreThanOneHashOperatorInMacroDefinitionQuery()
   }

From c36bbe7091fe854f28a3fc8f8c22bdac2cde81e0 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 24 Jul 2024 22:55:42 +0200
Subject: [PATCH 062/435] Fix import

---
 .../EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
index a630b51c00..7499ed65f4 100644
--- a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
+++ b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
@@ -16,10 +16,10 @@
  */
 
 import cpp
+import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype.EnumerationNotDefinedWithAnExplicitUnderlyingType
 
-class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery
-{
+class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery {
   EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery() {
     this = DeclarationsPackage::enumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery()
   }

From c22c060db27b822904c6deb4233e598284cf1f4d Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Wed, 24 Jul 2024 23:07:57 +0200
Subject: [PATCH 063/435] Fix formatting

---
 .../EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
index 7499ed65f4..42924945cd 100644
--- a/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
+++ b/cpp/autosar/src/rules/A7-2-2/EnumerationUnderlyingBaseTypeNotExplicitlyDefined.ql
@@ -19,7 +19,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.enumerationnotdefinedwithanexplicitunderlyingtype.EnumerationNotDefinedWithAnExplicitUnderlyingType
 
-class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery {
+class EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery extends EnumerationNotDefinedWithAnExplicitUnderlyingTypeSharedQuery
+{
   EnumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery() {
     this = DeclarationsPackage::enumerationUnderlyingBaseTypeNotExplicitlyDefinedQuery()
   }

From 743c80d7d04015f715678f8c283e15687b4ca67c Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 12:55:12 +0200
Subject: [PATCH 064/435] The implementation of RULE-4-6-1 and RULE-13-2 should
 not be shared

---
 .vscode/settings.json                         |   5 +
 ...OnOrderOfScalarEvaluationForSideEffects.ql |   1 -
 .../common/src/codingstandards/c/Expr.qll     |   0
 .../common/src/codingstandards/c/Ordering.qll |   2 +-
 .../VariableAccessOrdering.qll                |   2 +-
 ...erationsNotSequencedAppropriately.expected |   6 -
 ...moryOperationsNotSequencedAppropriately.ql |   4 -
 ...plicitPrecedenceOfOperatorsInExpression.ql |   2 +-
 .../rules/RULE-13-2/UnsequencedSideEffects.ql | 234 +++++++++++++++-
 .../SideEffectAndCrementInFullExpression.ql   |   2 +-
 .../RULE-13-2/UnsequencedSideEffects.expected |   6 +
 .../RULE-13-2/UnsequencedSideEffects.qlref    |   1 +
 .../RULE-13-2/UnsequencedSideEffects.testref  |   1 -
 .../test/rules/RULE-13-2}/test.c              |   4 +-
 .../cpp/exclusions/cpp/ImportMisra23.qll      |  17 --
 ...oryOperationsNotSequencedAppropriately.qll | 252 ------------------
 ...erationsNotSequencedAppropriately.expected |   6 -
 ...moryOperationsNotSequencedAppropriately.ql |   4 -
 .../test.cpp                                  |  39 ---
 ...moryOperationsNotSequencedAppropriately.ql |  23 --
 ...perationsNotSequencedAppropriately.testref |   1 -
 rule_packages/c/SideEffects3.json             |   1 -
 rule_packages/cpp/ImportMisra23.json          |  21 --
 rules.csv                                     |   2 +-
 24 files changed, 249 insertions(+), 387 deletions(-)
 create mode 100644 .vscode/settings.json
 rename cpp/common/src/codingstandards/cpp/CExpr.qll => c/common/src/codingstandards/c/Expr.qll (100%)
 rename cpp/common/src/codingstandards/cpp/COrdering.qll => c/common/src/codingstandards/c/Ordering.qll (99%)
 delete mode 100644 c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
 delete mode 100644 c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
 create mode 100644 c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected
 create mode 100644 c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref
 delete mode 100644 c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
 rename c/{common/test/rules/memoryoperationsnotsequencedappropriately => misra/test/rules/RULE-13-2}/test.c (86%)
 delete mode 100644 cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll
 delete mode 100644 cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
 delete mode 100644 cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
 delete mode 100644 cpp/common/test/rules/memoryoperationsnotsequencedappropriately/test.cpp
 delete mode 100644 cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
 delete mode 100644 cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..30ba3d548b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "codeQL.cli.executablePath": "/Users/mauro/Desktop/CodeQL/bundles/codeql-2.14.6/codeql",
+    "codeQL.runningQueries.numberOfThreads": 0,
+    "codeQL.runningTests.numberOfThreads": 0
+}
\ No newline at end of file
diff --git a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
index ff616277cd..862f00e822 100644
--- a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
+++ b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
@@ -14,7 +14,6 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.SideEffect
-import codingstandards.cpp.COrdering
 import codingstandards.c.orderofevaluation.VariableAccessOrdering
 
 from
diff --git a/cpp/common/src/codingstandards/cpp/CExpr.qll b/c/common/src/codingstandards/c/Expr.qll
similarity index 100%
rename from cpp/common/src/codingstandards/cpp/CExpr.qll
rename to c/common/src/codingstandards/c/Expr.qll
diff --git a/cpp/common/src/codingstandards/cpp/COrdering.qll b/c/common/src/codingstandards/c/Ordering.qll
similarity index 99%
rename from cpp/common/src/codingstandards/cpp/COrdering.qll
rename to c/common/src/codingstandards/c/Ordering.qll
index be8254aae9..575dc6f3fd 100644
--- a/cpp/common/src/codingstandards/cpp/COrdering.qll
+++ b/c/common/src/codingstandards/c/Ordering.qll
@@ -1,6 +1,6 @@
 import cpp
 import codingstandards.cpp.SideEffect
-import codingstandards.cpp.CExpr
+import codingstandards.c.Expr
 import codingstandards.cpp.Variable
 
 module Ordering {
diff --git a/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll b/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll
index 6293a67d32..4c041e8e4c 100644
--- a/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll
+++ b/c/common/src/codingstandards/c/orderofevaluation/VariableAccessOrdering.qll
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.COrdering
+import codingstandards.c.Ordering
 
 class VariableAccessInFullExpressionOrdering extends Ordering::Configuration {
   VariableAccessInFullExpressionOrdering() { this = "VariableAccessInFullExpressionOrdering" }
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected b/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
deleted file mode 100644
index 4ea36edc69..0000000000
--- a/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| test.c:8:12:8:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:8:12:8:13 | l1 | side effect | test.c:8:17:8:18 | l1 | side effect | test.c:8:12:8:13 | l1 | l1 | test.c:8:17:8:18 | l1 | l1 |
-| test.c:9:12:9:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:9:12:9:13 | l1 | side effect | test.c:9:17:9:18 | l2 | side effect | test.c:9:12:9:13 | l1 | l1 | test.c:9:17:9:18 | l2 | l2 |
-| test.c:19:3:19:21 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:19:8:19:9 | l1 | side effect | test.c:19:13:19:14 | l1 | side effect | test.c:19:8:19:9 | l1 | l1 | test.c:19:13:19:14 | l1 | l1 |
-| test.c:21:3:21:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:21:7:21:8 | l1 | side effect | test.c:21:11:21:12 | l2 | side effect | test.c:21:7:21:8 | l1 | l1 | test.c:21:11:21:12 | l2 | l2 |
-| test.c:27:3:27:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:27:7:27:10 | ... ++ | side effect | test.c:27:13:27:14 | l8 | read | test.c:27:7:27:8 | l8 | l8 | test.c:27:13:27:14 | l8 | l8 |
-| test.c:37:5:37:13 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:37:10:37:12 | ... ++ | side effect | test.c:37:10:37:12 | ... ++ | side effect | test.c:37:10:37:10 | i | i | test.c:37:10:37:10 | i | i |
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql b/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
deleted file mode 100644
index 63351377f0..0000000000
--- a/c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
-
-class TestFileQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery, TestQuery { }
diff --git a/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql b/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
index 7e9362d62a..005fffa32d 100644
--- a/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
+++ b/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
@@ -14,7 +14,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.CExpr
+import codingstandards.c.Expr
 
 int getPrecedence(Expr e) {
   e instanceof PrimaryExpr and result = 16
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index b71bb2f1c1..45bf886dd5 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -13,8 +13,236 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
+import codingstandards.c.Ordering
+import codingstandards.cpp.SideEffects
 
-class UnsequencedSideEffectsQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery {
-  UnsequencedSideEffectsQuery() { this = SideEffects3Package::unsequencedSideEffectsQuery() }
+class VariableEffectOrAccess extends Expr {
+  VariableEffectOrAccess() {
+    this instanceof VariableEffect or
+    this instanceof VariableAccess
+  }
 }
+
+pragma[noinline]
+predicate partOfFullExpr(VariableEffectOrAccess e, FullExpr fe) {
+  (
+    exists(VariableEffect ve | e = ve and ve.getAnAccess() = fe.getAChild+() and not ve.isPartial())
+    or
+    e.(VariableAccess) = fe.getAChild+()
+  )
+}
+
+class ConstituentExprOrdering extends Ordering::Configuration {
+  ConstituentExprOrdering() { this = "ConstituentExprOrdering" }
+
+  override predicate isCandidate(Expr e1, Expr e2) {
+    exists(FullExpr fe |
+      partOfFullExpr(e1, fe) and
+      partOfFullExpr(e2, fe)
+    )
+  }
+}
+
+predicate sameFullExpr(FullExpr fe, VariableAccess va1, VariableAccess va2) {
+  partOfFullExpr(va1, fe) and
+  partOfFullExpr(va2, fe) and
+  va1 != va2 and
+  exists(Variable v1, Variable v2 |
+    // Use `pragma[only_bind_into]` to prevent CP between variable accesses.
+    va1.getTarget() = pragma[only_bind_into](v1) and va2.getTarget() = pragma[only_bind_into](v2)
+  |
+    v1.isVolatile() and v2.isVolatile()
+    or
+    not (v1.isVolatile() and v2.isVolatile()) and
+    v1 = v2
+  )
+}
+
+int getLeafCount(LeftRightOperation bop) {
+  if
+    not bop.getLeftOperand() instanceof BinaryOperation and
+    not bop.getRightOperand() instanceof BinaryOperation
+  then result = 2
+  else
+    if
+      bop.getLeftOperand() instanceof BinaryOperation and
+      not bop.getRightOperand() instanceof BinaryOperation
+    then result = 1 + getLeafCount(bop.getLeftOperand())
+    else
+      if
+        not bop.getLeftOperand() instanceof BinaryOperation and
+        bop.getRightOperand() instanceof BinaryOperation
+      then result = 1 + getLeafCount(bop.getRightOperand())
+      else result = getLeafCount(bop.getLeftOperand()) + getLeafCount(bop.getRightOperand())
+}
+
+class LeftRightOperation extends Expr {
+  LeftRightOperation() {
+    this instanceof BinaryOperation or
+    this instanceof AssignOperation or
+    this instanceof AssignExpr
+  }
+
+  Expr getLeftOperand() {
+    result = this.(BinaryOperation).getLeftOperand()
+    or
+    result = this.(AssignOperation).getLValue()
+    or
+    result = this.(AssignExpr).getLValue()
+  }
+
+  Expr getRightOperand() {
+    result = this.(BinaryOperation).getRightOperand()
+    or
+    result = this.(AssignOperation).getRValue()
+    or
+    result = this.(AssignExpr).getRValue()
+  }
+
+  Expr getAnOperand() {
+    result = getLeftOperand() or
+    result = getRightOperand()
+  }
+}
+
+int getOperandIndexIn(FullExpr fullExpr, Expr operand) {
+  result = getOperandIndex(fullExpr, operand)
+  or
+  fullExpr.(Call).getArgument(result).getAChild*() = operand
+}
+
+int getOperandIndex(LeftRightOperation binop, Expr operand) {
+  if operand = binop.getAnOperand()
+  then
+    operand = binop.getLeftOperand() and
+    result = 0
+    or
+    operand = binop.getRightOperand() and
+    result = getLeafCount(binop.getLeftOperand()) + 1
+    or
+    operand = binop.getRightOperand() and
+    not binop.getLeftOperand() instanceof LeftRightOperation and
+    result = 1
+  else (
+    // Child of left operand that is a binary operation.
+    result = getOperandIndex(binop.getLeftOperand(), operand)
+    or
+    // Child of left operand that is not a binary operation.
+    result = 0 and
+    not binop.getLeftOperand() instanceof LeftRightOperation and
+    binop.getLeftOperand().getAChild+() = operand
+    or
+    // Child of right operand and both left and right operands are binary operations.
+    result =
+      getLeafCount(binop.getLeftOperand()) + getOperandIndex(binop.getRightOperand(), operand)
+    or
+    // Child of right operand and left operand is not a binary operation.
+    result = 1 + getOperandIndex(binop.getRightOperand(), operand) and
+    not binop.getLeftOperand() instanceof LeftRightOperation
+    or
+    // Child of right operand that is not a binary operation and the left operand is a binary operation.
+    result = getLeafCount(binop.getLeftOperand()) + 1 and
+    binop.getRightOperand().getAChild+() = operand and
+    not binop.getRightOperand() instanceof LeftRightOperation
+    or
+    // Child of right operand that is not a binary operation and the left operand is not a binary operation.
+    result = 1 and
+    not binop.getLeftOperand() instanceof LeftRightOperation and
+    not binop.getRightOperand() instanceof LeftRightOperation and
+    binop.getRightOperand().getAChild+() = operand
+  )
+}
+
+predicate inConditionalThen(ConditionalExpr ce, Expr e) {
+  e = ce.getThen()
+  or
+  exists(Expr parent |
+    inConditionalThen(ce, parent) and
+    parent.getAChild() = e
+  )
+}
+
+predicate inConditionalElse(ConditionalExpr ce, Expr e) {
+  e = ce.getElse()
+  or
+  exists(Expr parent |
+    inConditionalElse(ce, parent) and
+    parent.getAChild() = e
+  )
+}
+
+predicate isUnsequencedEffect(
+  ConstituentExprOrdering orderingConfig, FullExpr fullExpr, VariableEffect variableEffect1,
+  VariableAccess va1, VariableAccess va2, Locatable placeHolder, string label
+) {
+  // The two access are scoped to the same full expression.
+  sameFullExpr(fullExpr, va1, va2) and
+  // We are only interested in effects that change an object,
+  // i.e., exclude patterns suchs as `b->data[b->cursor++]` where `b` is considered modified and read or `foo.bar = 1` where `=` modifies to both `foo` and `bar`.
+  not variableEffect1.isPartial() and
+  variableEffect1.getAnAccess() = va1 and
+  (
+    exists(VariableEffect variableEffect2 |
+      not variableEffect2.isPartial() and
+      variableEffect2.getAnAccess() = va2 and
+      // If the effect is not local (happens in a different function) we use the call with the access as a proxy.
+      (
+        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
+        orderingConfig.isUnsequenced(variableEffect1, variableEffect2)
+        or
+        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+        not va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
+        exists(Call call |
+          call.getAnArgument() = va2 and call.getEnclosingStmt() = va1.getEnclosingStmt()
+        |
+          orderingConfig.isUnsequenced(variableEffect1, call)
+        )
+        or
+        not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
+        exists(Call call |
+          call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
+        |
+          orderingConfig.isUnsequenced(call, variableEffect2)
+        )
+      ) and
+      // Break the symmetry of the ordering relation by requiring that the first expression is located before the second.
+      // This builds upon the assumption that the expressions are part of the same full expression as specified in the ordering configuration.
+      getOperandIndexIn(fullExpr, va1) < getOperandIndexIn(fullExpr, va2) and
+      placeHolder = variableEffect2 and
+      label = "side effect"
+    )
+    or
+    placeHolder = va2 and
+    label = "read" and
+    not exists(VariableEffect variableEffect2 | variableEffect1 != variableEffect2 |
+      variableEffect2.getAnAccess() = va2
+    ) and
+    (
+      va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+      orderingConfig.isUnsequenced(variableEffect1, va2)
+      or
+      not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
+      exists(Call call |
+        call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
+      |
+        orderingConfig.isUnsequenced(call, va2)
+      )
+    ) and
+    // The read is not used to compute the effect on the variable.
+    // E.g., exclude x = x + 1
+    not variableEffect1.getAChild+() = va2
+  ) and
+  // Both are evaluated
+  not exists(ConditionalExpr ce | inConditionalThen(ce, va1) and inConditionalElse(ce, va2))
+}
+
+from
+  ConstituentExprOrdering orderingConfig, FullExpr fullExpr, VariableEffect variableEffect1,
+  VariableAccess va1, VariableAccess va2, Locatable placeHolder, string label
+where
+  not isExcluded(fullExpr, SideEffects3Package::unsequencedSideEffectsQuery()) and
+  isUnsequencedEffect(orderingConfig, fullExpr, variableEffect1, va1, va2, placeHolder, label)
+select fullExpr, "The expression contains unsequenced $@ to $@ and $@ to $@.", variableEffect1,
+  "side effect", va1, va1.getTarget().getName(), placeHolder, label, va2, va2.getTarget().getName()
diff --git a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
index c04b9a39ca..4191495b13 100644
--- a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
+++ b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.CExpr
+import codingstandards.c.Expr
 import codingstandards.cpp.SideEffects
 
 from FullExpr e, SideEffect se, CrementOperation op
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected
new file mode 100644
index 0000000000..75bd8169ba
--- /dev/null
+++ b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.expected
@@ -0,0 +1,6 @@
+| test.c:6:12:6:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:6:12:6:13 | l1 | side effect | test.c:6:12:6:13 | l1 | l1 | test.c:6:17:6:18 | l1 | side effect | test.c:6:17:6:18 | l1 | l1 |
+| test.c:7:12:7:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:7:12:7:13 | l1 | side effect | test.c:7:12:7:13 | l1 | l1 | test.c:7:17:7:18 | l2 | side effect | test.c:7:17:7:18 | l2 | l2 |
+| test.c:17:3:17:21 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:17:8:17:9 | l1 | side effect | test.c:17:8:17:9 | l1 | l1 | test.c:17:13:17:14 | l1 | side effect | test.c:17:13:17:14 | l1 | l1 |
+| test.c:19:3:19:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:19:7:19:8 | l1 | side effect | test.c:19:7:19:8 | l1 | l1 | test.c:19:11:19:12 | l2 | side effect | test.c:19:11:19:12 | l2 | l2 |
+| test.c:25:3:25:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:25:7:25:10 | ... ++ | side effect | test.c:25:7:25:8 | l8 | l8 | test.c:25:13:25:14 | l8 | read | test.c:25:13:25:14 | l8 | l8 |
+| test.c:35:5:35:13 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.c:35:10:35:12 | ... ++ | side effect | test.c:35:10:35:10 | i | i | test.c:35:10:35:12 | ... ++ | side effect | test.c:35:10:35:10 | i | i |
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref
new file mode 100644
index 0000000000..0cb8d40dbb
--- /dev/null
+++ b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.qlref
@@ -0,0 +1 @@
+rules/RULE-13-2/UnsequencedSideEffects.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref b/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
deleted file mode 100644
index 4623176d42..0000000000
--- a/c/misra/test/rules/RULE-13-2/UnsequencedSideEffects.testref
+++ /dev/null
@@ -1 +0,0 @@
-c/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
\ No newline at end of file
diff --git a/c/common/test/rules/memoryoperationsnotsequencedappropriately/test.c b/c/misra/test/rules/RULE-13-2/test.c
similarity index 86%
rename from c/common/test/rules/memoryoperationsnotsequencedappropriately/test.c
rename to c/misra/test/rules/RULE-13-2/test.c
index ac04ce01d1..1bebec3775 100644
--- a/c/common/test/rules/memoryoperationsnotsequencedappropriately/test.c
+++ b/c/misra/test/rules/RULE-13-2/test.c
@@ -1,5 +1,3 @@
-// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
-// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 void foo(int, int);
 
 void unsequenced_sideeffects1() {
@@ -29,7 +27,7 @@ void unsequenced_sideeffects1() {
   int l10 = l8++, l11 = l8++; // COMPLIANT
 }
 
-int g1[10], g2[10];
+int g1[], g2[];
 #define test(i) (g1[i] = g2[i])
 void unsequenced_sideeffects2() {
   int i;
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll
index fe0c6ea6e3..d31affb27c 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/ImportMisra23.qll
@@ -61,7 +61,6 @@ newtype ImportMisra23Query =
   TCstdioFunctionsShallNotBeUsedQuery() or
   TCstdioMacrosShallNotBeUsedQuery() or
   TCstdioTypesShallNotBeUsedQuery() or
-  TMemoryOperationsNotSequencedAppropriatelyQuery() or
   TBackslashCharacterMisuseQuery() or
   TNonTerminatedEscapeSequencesQuery() or
   TOctalConstantsUsedQuery() or
@@ -604,15 +603,6 @@ predicate isImportMisra23QueryMetadata(Query query, string queryId, string ruleI
   ruleId = "RULE-30-0-1" and
   category = "required"
   or
-  query =
-    // `Query` instance for the `memoryOperationsNotSequencedAppropriately` query
-    ImportMisra23Package::memoryOperationsNotSequencedAppropriatelyQuery() and
-  queryId =
-    // `@id` for the `memoryOperationsNotSequencedAppropriately` query
-    "cpp/misra/memory-operations-not-sequenced-appropriately" and
-  ruleId = "RULE-4-6-1" and
-  category = "required"
-  or
   query =
     // `Query` instance for the `backslashCharacterMisuse` query
     ImportMisra23Package::backslashCharacterMisuseQuery() and
@@ -1257,13 +1247,6 @@ module ImportMisra23Package {
       TQueryCPP(TImportMisra23PackageQuery(TCstdioTypesShallNotBeUsedQuery()))
   }
 
-  Query memoryOperationsNotSequencedAppropriatelyQuery() {
-    //autogenerate `Query` type
-    result =
-      // `Query` type for `memoryOperationsNotSequencedAppropriately` query
-      TQueryCPP(TImportMisra23PackageQuery(TMemoryOperationsNotSequencedAppropriatelyQuery()))
-  }
-
   Query backslashCharacterMisuseQuery() {
     //autogenerate `Query` type
     result =
diff --git a/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll b/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll
deleted file mode 100644
index 83c5ac1c8f..0000000000
--- a/cpp/common/src/codingstandards/cpp/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.qll
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * Provides a library with a `problems` predicate for the following issue:
- * Operations on a memory location shall be sequenced appropriately.
- */
-
-import cpp
-import codingstandards.cpp.Customizations
-import codingstandards.cpp.CExpr
-import codingstandards.cpp.Exclusions
-import codingstandards.cpp.SideEffects
-import codingstandards.cpp.COrdering
-
-abstract class MemoryOperationsNotSequencedAppropriatelySharedQuery extends Query { }
-
-Query getQuery() { result instanceof MemoryOperationsNotSequencedAppropriatelySharedQuery }
-
-class VariableEffectOrAccess extends Expr {
-  VariableEffectOrAccess() {
-    this instanceof VariableEffect or
-    this instanceof VariableAccess
-  }
-}
-
-pragma[noinline]
-predicate partOfFullExpr(VariableEffectOrAccess e, FullExpr fe) {
-  (
-    exists(VariableEffect ve | e = ve and ve.getAnAccess() = fe.getAChild+() and not ve.isPartial())
-    or
-    e.(VariableAccess) = fe.getAChild+()
-  )
-}
-
-class ConstituentExprOrdering extends Ordering::Configuration {
-  ConstituentExprOrdering() { this = "ConstituentExprOrdering" }
-
-  override predicate isCandidate(Expr e1, Expr e2) {
-    exists(FullExpr fe |
-      partOfFullExpr(e1, fe) and
-      partOfFullExpr(e2, fe)
-    )
-  }
-}
-
-predicate sameFullExpr(FullExpr fe, VariableAccess va1, VariableAccess va2) {
-  partOfFullExpr(va1, fe) and
-  partOfFullExpr(va2, fe) and
-  va1 != va2 and
-  exists(Variable v1, Variable v2 |
-    // Use `pragma[only_bind_into]` to prevent CP between variable accesses.
-    va1.getTarget() = pragma[only_bind_into](v1) and va2.getTarget() = pragma[only_bind_into](v2)
-  |
-    v1.isVolatile() and v2.isVolatile()
-    or
-    not (v1.isVolatile() and v2.isVolatile()) and
-    v1 = v2
-  )
-}
-
-int getLeafCount(LeftRightOperation bop) {
-  if
-    not bop.getLeftOperand() instanceof BinaryOperation and
-    not bop.getRightOperand() instanceof BinaryOperation
-  then result = 2
-  else
-    if
-      bop.getLeftOperand() instanceof BinaryOperation and
-      not bop.getRightOperand() instanceof BinaryOperation
-    then result = 1 + getLeafCount(bop.getLeftOperand())
-    else
-      if
-        not bop.getLeftOperand() instanceof BinaryOperation and
-        bop.getRightOperand() instanceof BinaryOperation
-      then result = 1 + getLeafCount(bop.getRightOperand())
-      else result = getLeafCount(bop.getLeftOperand()) + getLeafCount(bop.getRightOperand())
-}
-
-class LeftRightOperation extends Expr {
-  LeftRightOperation() {
-    this instanceof BinaryOperation or
-    this instanceof AssignOperation or
-    this instanceof AssignExpr
-  }
-
-  Expr getLeftOperand() {
-    result = this.(BinaryOperation).getLeftOperand()
-    or
-    result = this.(AssignOperation).getLValue()
-    or
-    result = this.(AssignExpr).getLValue()
-  }
-
-  Expr getRightOperand() {
-    result = this.(BinaryOperation).getRightOperand()
-    or
-    result = this.(AssignOperation).getRValue()
-    or
-    result = this.(AssignExpr).getRValue()
-  }
-
-  Expr getAnOperand() {
-    result = getLeftOperand() or
-    result = getRightOperand()
-  }
-}
-
-int getOperandIndexIn(FullExpr fullExpr, Expr operand) {
-  result = getOperandIndex(fullExpr, operand)
-  or
-  fullExpr.(Call).getArgument(result).getAChild*() = operand
-}
-
-int getOperandIndex(LeftRightOperation binop, Expr operand) {
-  if operand = binop.getAnOperand()
-  then
-    operand = binop.getLeftOperand() and
-    result = 0
-    or
-    operand = binop.getRightOperand() and
-    result = getLeafCount(binop.getLeftOperand()) + 1
-    or
-    operand = binop.getRightOperand() and
-    not binop.getLeftOperand() instanceof LeftRightOperation and
-    result = 1
-  else (
-    // Child of left operand that is a binary operation.
-    result = getOperandIndex(binop.getLeftOperand(), operand)
-    or
-    // Child of left operand that is not a binary operation.
-    result = 0 and
-    not binop.getLeftOperand() instanceof LeftRightOperation and
-    binop.getLeftOperand().getAChild+() = operand
-    or
-    // Child of right operand and both left and right operands are binary operations.
-    result =
-      getLeafCount(binop.getLeftOperand()) + getOperandIndex(binop.getRightOperand(), operand)
-    or
-    // Child of right operand and left operand is not a binary operation.
-    result = 1 + getOperandIndex(binop.getRightOperand(), operand) and
-    not binop.getLeftOperand() instanceof LeftRightOperation
-    or
-    // Child of right operand that is not a binary operation and the left operand is a binary operation.
-    result = getLeafCount(binop.getLeftOperand()) + 1 and
-    binop.getRightOperand().getAChild+() = operand and
-    not binop.getRightOperand() instanceof LeftRightOperation
-    or
-    // Child of right operand that is not a binary operation and the left operand is not a binary operation.
-    result = 1 and
-    not binop.getLeftOperand() instanceof LeftRightOperation and
-    not binop.getRightOperand() instanceof LeftRightOperation and
-    binop.getRightOperand().getAChild+() = operand
-  )
-}
-
-predicate inConditionalThen(ConditionalExpr ce, Expr e) {
-  e = ce.getThen()
-  or
-  exists(Expr parent |
-    inConditionalThen(ce, parent) and
-    parent.getAChild() = e
-  )
-}
-
-predicate inConditionalElse(ConditionalExpr ce, Expr e) {
-  e = ce.getElse()
-  or
-  exists(Expr parent |
-    inConditionalElse(ce, parent) and
-    parent.getAChild() = e
-  )
-}
-
-predicate isUnsequencedEffect(
-  ConstituentExprOrdering orderingConfig, FullExpr fullExpr, VariableEffect variableEffect1,
-  VariableAccess va1, VariableAccess va2, Locatable placeHolder, string label
-) {
-  // The two access are scoped to the same full expression.
-  sameFullExpr(fullExpr, va1, va2) and
-  // We are only interested in effects that change an object,
-  // i.e., exclude patterns suchs as `b->data[b->cursor++]` where `b` is considered modified and read or `foo.bar = 1` where `=` modifies to both `foo` and `bar`.
-  not variableEffect1.isPartial() and
-  variableEffect1.getAnAccess() = va1 and
-  (
-    exists(VariableEffect variableEffect2 |
-      not variableEffect2.isPartial() and
-      variableEffect2.getAnAccess() = va2 and
-      // If the effect is not local (happens in a different function) we use the call with the access as a proxy.
-      (
-        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
-        orderingConfig.isUnsequenced(variableEffect1, variableEffect2)
-        or
-        va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-        not va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
-        exists(Call call |
-          call.getAnArgument() = va2 and call.getEnclosingStmt() = va1.getEnclosingStmt()
-        |
-          orderingConfig.isUnsequenced(variableEffect1, call)
-        )
-        or
-        not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-        va2.getEnclosingStmt() = variableEffect2.getEnclosingStmt() and
-        exists(Call call |
-          call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
-        |
-          orderingConfig.isUnsequenced(call, variableEffect2)
-        )
-      ) and
-      // Break the symmetry of the ordering relation by requiring that the first expression is located before the second.
-      // This builds upon the assumption that the expressions are part of the same full expression as specified in the ordering configuration.
-      getOperandIndexIn(fullExpr, va1) < getOperandIndexIn(fullExpr, va2) and
-      placeHolder = variableEffect2 and
-      label = "side effect"
-    )
-    or
-    placeHolder = va2 and
-    label = "read" and
-    not exists(VariableEffect variableEffect2 | variableEffect1 != variableEffect2 |
-      variableEffect2.getAnAccess() = va2
-    ) and
-    (
-      va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-      orderingConfig.isUnsequenced(variableEffect1, va2)
-      or
-      not va1.getEnclosingStmt() = variableEffect1.getEnclosingStmt() and
-      exists(Call call |
-        call.getAnArgument() = va1 and call.getEnclosingStmt() = va2.getEnclosingStmt()
-      |
-        orderingConfig.isUnsequenced(call, va2)
-      )
-    ) and
-    // The read is not used to compute the effect on the variable.
-    // E.g., exclude x = x + 1
-    not variableEffect1.getAChild+() = va2
-  ) and
-  // Both are evaluated
-  not exists(ConditionalExpr ce | inConditionalThen(ce, va1) and inConditionalElse(ce, va2))
-}
-
-query predicate problems(
-  FullExpr fullExpr, string message, VariableEffect variableEffect1, string variableEffect1_string,
-  Locatable placeHolder, string label, VariableAccess va1, string va1_string, VariableAccess va2,
-  string va2_string
-) {
-  exists(ConstituentExprOrdering orderingConfig |
-    not isExcluded(fullExpr, getQuery()) and
-    isUnsequencedEffect(orderingConfig, fullExpr, variableEffect1, va1, va2, placeHolder, label) and
-    message = "The expression contains unsequenced $@ to $@ and $@ to $@." and
-    variableEffect1_string = "side effect" and
-    va1_string = va1.getTarget().getName() and
-    va2_string = va2.getTarget().getName()
-  )
-}
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
deleted file mode 100644
index 54c8ee481b..0000000000
--- a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| test.cpp:8:12:8:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:8:12:8:13 | l1 | side effect | test.cpp:8:17:8:18 | l1 | side effect | test.cpp:8:12:8:13 | l1 | l1 | test.cpp:8:17:8:18 | l1 | l1 |
-| test.cpp:9:12:9:18 | ... + ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:9:12:9:13 | l1 | side effect | test.cpp:9:17:9:18 | l2 | side effect | test.cpp:9:12:9:13 | l1 | l1 | test.cpp:9:17:9:18 | l2 | l2 |
-| test.cpp:19:3:19:21 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:19:8:19:9 | l1 | side effect | test.cpp:19:13:19:14 | l1 | side effect | test.cpp:19:8:19:9 | l1 | l1 | test.cpp:19:13:19:14 | l1 | l1 |
-| test.cpp:21:3:21:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:21:7:21:8 | l1 | side effect | test.cpp:21:11:21:12 | l2 | side effect | test.cpp:21:7:21:8 | l1 | l1 | test.cpp:21:11:21:12 | l2 | l2 |
-| test.cpp:27:3:27:5 | call to foo | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:27:7:27:10 | ... ++ | side effect | test.cpp:27:13:27:14 | l8 | read | test.cpp:27:7:27:8 | l8 | l8 | test.cpp:27:13:27:14 | l8 | l8 |
-| test.cpp:37:5:37:13 | ... = ... | The expression contains unsequenced $@ to $@ and $@ to $@. | test.cpp:37:10:37:12 | ... ++ | side effect | test.cpp:37:10:37:12 | ... ++ | side effect | test.cpp:37:10:37:10 | i | i | test.cpp:37:10:37:10 | i | i |
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
deleted file mode 100644
index 63351377f0..0000000000
--- a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-// GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
-
-class TestFileQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/test.cpp b/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/test.cpp
deleted file mode 100644
index 427555d735..0000000000
--- a/cpp/common/test/rules/memoryoperationsnotsequencedappropriately/test.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
-// CHANGES SHOULD BE REFLECTED THERE AS WELL.
-void foo(int, int);
-
-void unsequenced_sideeffects1() {
-  volatile int l1, l2;
-
-  int l3 = l1 + l1; // NON_COMPLIANT
-  int l4 = l1 + l2; // NON_COMPLIANT
-
-  // Store value of volatile object in temporary non-volatile object.
-  int l5 = l1;
-  // Store value of volatile object in temporary non-volatile object.
-  int l6 = l2;
-  int l7 = l5 + l6; // COMPLIANT
-
-  int l8, l9;
-  l1 = l1 & 0x80;      // COMPLIANT
-  l8 = l1 = l1 & 0x80; // NON_COMPLIANT
-
-  foo(l1, l2); // NON_COMPLIANT
-  // Store value of volatile object in temporary non-volatile object.
-  l8 = l1;
-  // Store value of volatile object in temporary non-volatile object.
-  l9 = l2;
-  foo(l8, l9);   // COMPLIANT
-  foo(l8++, l8); // NON_COMPLIANT
-
-  int l10 = l8++, l11 = l8++; // COMPLIANT
-}
-
-int g1[10], g2[10];
-#define test(i) (g1[i] = g2[i])
-void unsequenced_sideeffects2() {
-  int i;
-  for (i = 0; i < 10; i++) {
-    test(i++); // NON_COMPLIANT
-  }
-}
\ No newline at end of file
diff --git a/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql b/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
deleted file mode 100644
index 20eb2167bf..0000000000
--- a/cpp/misra/src/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.ql
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @id cpp/misra/memory-operations-not-sequenced-appropriately
- * @name RULE-4-6-1: Operations on a memory location shall be sequenced appropriately
- * @description Operations on a memory location shall be sequenced appropriately.
- * @kind problem
- * @precision very-high
- * @problem.severity error
- * @tags external/misra/id/rule-4-6-1
- *       scope/system
- *       external/misra/enforcement/undecidable
- *       external/misra/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.misra
-import codingstandards.cpp.rules.memoryoperationsnotsequencedappropriately.MemoryOperationsNotSequencedAppropriately
-
-class MemoryOperationsNotSequencedAppropriatelyQuery extends MemoryOperationsNotSequencedAppropriatelySharedQuery
-{
-  MemoryOperationsNotSequencedAppropriatelyQuery() {
-    this = ImportMisra23Package::memoryOperationsNotSequencedAppropriatelyQuery()
-  }
-}
diff --git a/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref b/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
deleted file mode 100644
index 02034f66c6..0000000000
--- a/cpp/misra/test/rules/RULE-4-6-1/MemoryOperationsNotSequencedAppropriately.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/memoryoperationsnotsequencedappropriately/MemoryOperationsNotSequencedAppropriately.ql
\ No newline at end of file
diff --git a/rule_packages/c/SideEffects3.json b/rule_packages/c/SideEffects3.json
index 19012b9c33..2d67df6e2e 100644
--- a/rule_packages/c/SideEffects3.json
+++ b/rule_packages/c/SideEffects3.json
@@ -12,7 +12,6 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "UnsequencedSideEffects",
-          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately",
           "tags": [
             "correctness"
           ]
diff --git a/rule_packages/cpp/ImportMisra23.json b/rule_packages/cpp/ImportMisra23.json
index 96bab2e25f..243fc7cc20 100644
--- a/rule_packages/cpp/ImportMisra23.json
+++ b/rule_packages/cpp/ImportMisra23.json
@@ -1187,27 +1187,6 @@
       ],
       "title": "The C Library input/output functions shall not be used"
     },
-    "RULE-4-6-1": {
-      "properties": {
-        "enforcement": "undecidable",
-        "obligation": "required"
-      },
-      "queries": [
-        {
-          "description": "Operations on a memory location shall be sequenced appropriately.",
-          "kind": "problem",
-          "name": "Operations on a memory location shall be sequenced appropriately",
-          "precision": "very-high",
-          "severity": "error",
-          "short_name": "MemoryOperationsNotSequencedAppropriately",
-          "shared_implementation_short_name": "MemoryOperationsNotSequencedAppropriately",
-          "tags": [
-            "scope/system"
-          ]
-        }
-      ],
-      "title": "Operations on a memory location shall be sequenced appropriately"
-    },
     "RULE-5-13-1": {
       "properties": {
         "enforcement": "decidable",
diff --git a/rules.csv b/rules.csv
index 8633ebe422..e494a82ea3 100644
--- a/rules.csv
+++ b/rules.csv
@@ -787,7 +787,7 @@ cpp,MISRA-C++-2023,DIR-0-3-2,Yes,Required,,,A function call shall not violate th
 cpp,MISRA-C++-2023,RULE-4-1-1,Yes,Required,Undecidable,System,A program shall conform to ISO/IEC 14882:2017 (C++17),,,Hard,
 cpp,MISRA-C++-2023,RULE-4-1-2,Yes,Advisory,Decidable,Single Translation Unit,Deprecated features should not be used,,,Very Hard,
 cpp,MISRA-C++-2023,RULE-4-1-3,Yes,Required,Undecidable,System,There shall be no occurrence of undefined or critical unspecified behaviour,,,Very Hard,
-cpp,MISRA-C++-2023,RULE-4-6-1,Yes,Required,Undecidable,System,Operations on a memory location shall be sequenced appropriately,RULE-13-2,ImportMisra23,Import,
+cpp,MISRA-C++-2023,RULE-4-6-1,Yes,Required,Undecidable,System,Operations on a memory location shall be sequenced appropriately,RULE-13-2,,Easy,
 cpp,MISRA-C++-2023,RULE-5-0-1,Yes,Advisory,Decidable,Single Translation Unit,Trigraph-like sequences should not be used,A2-5-1,,Very Hard,
 cpp,MISRA-C++-2023,RULE-5-7-1,Yes,Required,Decidable,Single Translation Unit,The character sequence /* shall not be used within a C-style comment,M2-7-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,DIR-5-7-2,Yes,Advisory,,,Sections of code should not be “commented out”,A2-7-2,ImportMisra23,Import,

From e140e375679c9952e9d7090f1e6d030707c45367 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 12:58:01 +0200
Subject: [PATCH 065/435] Delete VSC settings

---
 .vscode/settings.json | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 30ba3d548b..0000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "codeQL.cli.executablePath": "/Users/mauro/Desktop/CodeQL/bundles/codeql-2.14.6/codeql",
-    "codeQL.runningQueries.numberOfThreads": 0,
-    "codeQL.runningTests.numberOfThreads": 0
-}
\ No newline at end of file

From 3aa9843d81a897097d3c0504f9be08a225ce4c69 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 13:12:53 +0200
Subject: [PATCH 066/435] Restore original import

---
 .../EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
index 862f00e822..c478a3d51e 100644
--- a/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
+++ b/c/cert/src/rules/EXP30-C/DependenceOnOrderOfScalarEvaluationForSideEffects.ql
@@ -14,6 +14,7 @@
 import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.SideEffect
+import codingstandards.c.Ordering
 import codingstandards.c.orderofevaluation.VariableAccessOrdering
 
 from

From bd08d1b57a071140e1d156ff5c6ba2fcd210034b Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 13:18:58 +0200
Subject: [PATCH 067/435] Restore original import

---
 c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql | 2 +-
 c/common/test/library/expr/FullExpr.ql                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql b/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql
index 8d65bb0088..f6e29eb28c 100644
--- a/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql
+++ b/c/cert/src/rules/EXP45-C/AssignmentsInSelectionStatements.ql
@@ -13,7 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.CExpr
+import codingstandards.c.Expr
 
 Expr getRightMostOperand(CommaExpr e) {
   result = e.getRightOperand() and not result instanceof CommaExpr
diff --git a/c/common/test/library/expr/FullExpr.ql b/c/common/test/library/expr/FullExpr.ql
index 8760ed1a15..de7edf85c1 100644
--- a/c/common/test/library/expr/FullExpr.ql
+++ b/c/common/test/library/expr/FullExpr.ql
@@ -1,5 +1,5 @@
 import cpp
-import codingstandards.cpp.CExpr
+import codingstandards.c.Expr
 
 from FullExpr e
 select e

From e3113f6200f12c36ca6f16bdb189f683baa10d42 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 19:07:06 +0200
Subject: [PATCH 068/435] Addressing the review comments

---
 c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql | 2 +-
 rule_packages/c/Statements3.json                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
index 8f7b37f0d4..d181ca2d1c 100644
--- a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
@@ -1,6 +1,6 @@
 /**
  * @id c/misra/selection-compound-condition
- * @name RULE-15-6: the statement forming the body of a slection statement shall be a compound statement
+ * @name RULE-15-6: The statement forming the body of a slection statement shall be a compound statement
  * @description if the body of a selection statement is not enclosed in braces, then this can lead
  *              to incorrect execution, and is hard for developers to maintain.
  * @kind problem
diff --git a/rule_packages/c/Statements3.json b/rule_packages/c/Statements3.json
index 6b881f9a95..532a711eb0 100644
--- a/rule_packages/c/Statements3.json
+++ b/rule_packages/c/Statements3.json
@@ -32,7 +32,7 @@
         {
           "description": "if the body of a selection statement is not enclosed in braces, then this can lead to incorrect execution, and is hard for developers to maintain.",
           "kind": "problem",
-          "name": "the statement forming the body of a slection statement shall be a compound statement",
+          "name": "The statement forming the body of a slection statement shall be a compound statement",
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "SelectionCompoundCondition",

From 050bdf76c078ce3f83473d42fec732e77d72301d Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 19:08:14 +0200
Subject: [PATCH 069/435] Addressing the review comments

---
 .../src/codingstandards/c}/SideEffects.qll    |  0
 .../rules/RULE-13-2/UnsequencedSideEffects.ql |  2 +-
 .../SideEffectAndCrementInFullExpression.ql   |  2 +-
 .../rules/RULE-15-6/LoopCompoundCondition.ql  |  2 +-
 .../2024-06-27-misra-cpp-2023-import.md       |  2 --
 ...rVirtualFunctionWithNullPointerConstant.ql | 25 +++++++++++++++
 ...ualPointerOnlyComparesToNullptrConstant.ql |  6 ++--
 ...ssibleBaseClassBothVirtualAndNonVirtual.ql |  6 ++--
 ...lassBothVirtualAndNonVirtualInHierarchy.ql | 23 +++++++++++++
 ...PassedAsFunctionArgumentDecayToAPointer.ql |  6 ++--
 ...PassedAsFunctionArgumentDecayToAPointer.ql | 24 ++++++++++++++
 ...ExpressionWhoseUnderlyingTypeIsUnsigned.ql | 23 +++++++++++++
 ...usOperatorAppliedToAnUnsignedExpression.ql |  6 ++--
 ...MainUsedForAFunctionOtherThanGlobalMain.ql |  6 ++--
 ...AFunctionOtherThanTheGlobalFunctionMain.ql | 24 ++++++++++++++
 ...nctionParametersUseSameDefaultArguments.ql |  6 ++--
 ...ionParametersUseTheSameDefaultArguments.ql | 25 +++++++++++++++
 ...dAsFunctionArgumentDecayToAPointer.testref |  1 +
 ...ssionWhoseUnderlyingTypeIsUnsigned.testref |  1 +
 .../cpp/exclusions/cpp/Inheritance.qll        | 16 +++++-----
 .../cpp/exclusions/cpp/Naming.qll             | 16 +++++-----
 .../cpp/exclusions/cpp/Operators.qll          | 16 +++++-----
 .../cpp/exclusions/cpp/Pointers.qll           | 32 +++++++++----------
 .../cpp/exclusions/cpp/VirtualFunctions.qll   | 16 +++++-----
 .../test/includes/standard-library/assert.h   |  7 +++-
 .../test/includes/standard-library/cassert    |  1 +
 rule_packages/c/Statements3.json              |  2 +-
 rule_packages/cpp/Inheritance.json            |  2 +-
 rule_packages/cpp/Naming.json                 |  2 +-
 rule_packages/cpp/Operators.json              |  2 +-
 rule_packages/cpp/Pointers.json               |  4 +--
 rule_packages/cpp/VirtualFunctions.json       |  2 +-
 .../templates/shared_library.ql.template      |  4 +++
 33 files changed, 233 insertions(+), 79 deletions(-)
 rename {cpp/common/src/codingstandards/cpp => c/common/src/codingstandards/c}/SideEffects.qll (100%)
 delete mode 100644 change_notes/2024-06-27-misra-cpp-2023-import.md
 create mode 100644 cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
 create mode 100644 cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
 create mode 100644 cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
 create mode 100644 cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
 create mode 100644 cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
 create mode 100644 cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
 create mode 100644 cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.testref
 create mode 100644 cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.testref

diff --git a/cpp/common/src/codingstandards/cpp/SideEffects.qll b/c/common/src/codingstandards/c/SideEffects.qll
similarity index 100%
rename from cpp/common/src/codingstandards/cpp/SideEffects.qll
rename to c/common/src/codingstandards/c/SideEffects.qll
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index 45bf886dd5..2497e5d4a3 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -14,7 +14,7 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.c.Ordering
-import codingstandards.cpp.SideEffects
+import codingstandards.c.SideEffects
 
 class VariableEffectOrAccess extends Expr {
   VariableEffectOrAccess() {
diff --git a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
index 4191495b13..3dd03120c8 100644
--- a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
+++ b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
@@ -16,7 +16,7 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.c.Expr
-import codingstandards.cpp.SideEffects
+import codingstandards.c.SideEffects
 
 from FullExpr e, SideEffect se, CrementOperation op
 where
diff --git a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
index c596cb2970..a3e30ec345 100644
--- a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
@@ -1,6 +1,6 @@
 /**
  * @id c/misra/loop-compound-condition
- * @name RULE-15-6: the statement forming the body of a loop shall be a compound statement
+ * @name RULE-15-6: The statement forming the body of a loop shall be a compound statement
  * @description if the body of a loop is not enclosed in braces, then this can lead to incorrect
  *              execution, and is hard for developers to maintain.
  * @kind problem
diff --git a/change_notes/2024-06-27-misra-cpp-2023-import.md b/change_notes/2024-06-27-misra-cpp-2023-import.md
deleted file mode 100644
index 5de144c3af..0000000000
--- a/change_notes/2024-06-27-misra-cpp-2023-import.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- `MISRA C++ 2023`: 
-  - Adds support for `MISRA C++ 2023` rules that are already implemented by existing queries.
diff --git a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
new file mode 100644
index 0000000000..88594062ca
--- /dev/null
+++ b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/autosar/pointer-to-member-virtual-function-with-null-pointer-constant
+ * @name A5-10-1: A pointer to member virtual function shall only be tested for equality with null-pointer-constant
+ * @description A pointer to member virtual function shall only be tested for equality with
+ *              null-pointer-constant, because an equality comparison with anything other than a
+ *              null-pointer-constant is unspecified.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/autosar/id/a5-10-1
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
+
+class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery {
+  PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
+    this = pointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
index 01a45e75f7..28e17ead1a 100644
--- a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
+++ b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
@@ -18,9 +18,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
 
-class VirtualPointerOnlyComparesToNullptrConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
+class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
 {
-  VirtualPointerOnlyComparesToNullptrConstantQuery() {
-    this = PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery()
+  PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
+    this = PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
index 2e189ddd24..5b7086cb54 100644
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
@@ -16,9 +16,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
 
-class AccessibleBaseClassBothVirtualAndNonVirtualQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
+class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
 {
-  AccessibleBaseClassBothVirtualAndNonVirtualQuery() {
-    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery()
+  AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
+    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
new file mode 100644
index 0000000000..df7840496f
--- /dev/null
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/autosar/accessible-base-class-both-virtual-and-non-virtual-in-hierarchy
+ * @name M10-1-3: An accessible base class shall not be both virtual and non-virtual in the same hierarchy
+ * @description A base class must not be virtual and non-virtual in the same hierarchy to avoid
+ *              copies of the object and confusing behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m10-1-3
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
+
+class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery {
+  AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
+    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
index 6d1ee297a8..f1e7bb4a39 100644
--- a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
@@ -17,9 +17,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
 
-class IdentifierPassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
+class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
 {
-  IdentifierPassedAsFunctionArgumentDecayToAPointerQuery() {
-    this = PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery()
+  IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
+    this = PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
new file mode 100644
index 0000000000..852080c571
--- /dev/null
+++ b/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/autosar/identifier-with-array-type-passed-as-function-argument-decay-to-a-pointer
+ * @name M5-2-12: An identifier with array type passed as a function argument shall not decay to a pointer
+ * @description An identifier with array type passed as a function argument shall not decay to a
+ *              pointer to prevent loss of its bounds.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m5-2-12
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
+
+class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery {
+  IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
+    this = pointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
new file mode 100644
index 0000000000..98deff4f78
--- /dev/null
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
@@ -0,0 +1,23 @@
+/**
+ * @id cpp/autosar/unary-minus-operator-applied-to-an-expression-whose-underlying-type-is-unsigned
+ * @name M5-3-2: The unary minus operator shall not be applied to an expression whose underlying type is unsigned
+ * @description The unary minus operator shall not be applied to an expression whose underlying type
+ *              is unsigned.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/autosar/id/m5-3-2
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
+
+class UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery {
+  UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
+    this = OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
index cac08b5bf2..d9406b2553 100644
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
@@ -16,9 +16,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
 
-class UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
+class UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
 {
-  UnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
-    this = OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery()
+  UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
+    this = OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
index 2d263f4683..8b3da17ab1 100644
--- a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
+++ b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
@@ -17,9 +17,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
 
-class IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery extends NonGlobalFunctionMainSharedQuery
+class IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery
 {
-  IdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
-    this = NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery()
+  IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
+    this = NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
new file mode 100644
index 0000000000..a1820f08e3
--- /dev/null
+++ b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
@@ -0,0 +1,24 @@
+/**
+ * @id cpp/autosar/identifier-main-used-for-a-function-other-than-the-global-function-main
+ * @name M7-3-2: The identifier main shall not be used for a function other than the global function main
+ * @description Reusing the name main in non-main contexts can lead to developer confusion.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m7-3-2
+ *       maintainability
+ *       readability
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
+
+class IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery {
+  IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
+    this = NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()
+  }
+}
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
index 833585d096..02e880a909 100644
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
@@ -18,9 +18,9 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
 
-class VirtualFunctionParametersUseSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
+class VirtualFunctionParametersUseTheSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
 {
-  VirtualFunctionParametersUseSameDefaultArgumentsQuery() {
-    this = VirtualFunctionsPackage::virtualFunctionParametersUseSameDefaultArgumentsQuery()
+  VirtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
+    this = VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
new file mode 100644
index 0000000000..6eac6dc430
--- /dev/null
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/autosar/virtual-function-parameters-use-the-same-default-arguments
+ * @name M8-3-1: Parameters in an overriding virtual function shall have the same default arguments or no default arguments
+ * @description Parameters in an overriding virtual function shall either use the same default
+ *              arguments as the function they override, or else shall not specify any default
+ *              arguments.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/autosar/id/m8-3-1
+ *       correctness
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
+
+class VirtualFunctionParametersUseTheSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery {
+  VirtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
+    this = VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()
+  }
+}
diff --git a/cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.testref b/cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.testref
new file mode 100644
index 0000000000..06f2ec8fbb
--- /dev/null
+++ b/cpp/autosar/test/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.testref b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.testref
new file mode 100644
index 0000000000..bd12c39fbd
--- /dev/null
+++ b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll
index 9cb8aa8e03..a3775b87d6 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Inheritance.qll
@@ -10,7 +10,7 @@ newtype InheritanceQuery =
   THierarchiesShouldBeBasedOnInterfaceClassesQuery() or
   TClassesShouldNotBeDerivedFromVirtualBasesQuery() or
   TBaseClassCanBeVirtualOnlyInDiamondHierarchyQuery() or
-  TAccessibleBaseClassBothVirtualAndNonVirtualQuery() or
+  TAccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() or
   TUniqueAccessibleEntityNamesInMultipleInheritanceQuery() or
   TDynamicTypeOfThisUsedFromConstructorOrDestructorQuery() or
   TDowncastingShouldNotBePerformedOnPolymorphicTypesQuery() or
@@ -74,11 +74,11 @@ predicate isInheritanceQueryMetadata(Query query, string queryId, string ruleId,
   category = "required"
   or
   query =
-    // `Query` instance for the `accessibleBaseClassBothVirtualAndNonVirtual` query
-    InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualQuery() and
+    // `Query` instance for the `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
+    InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() and
   queryId =
-    // `@id` for the `accessibleBaseClassBothVirtualAndNonVirtual` query
-    "cpp/autosar/accessible-base-class-both-virtual-and-non-virtual" and
+    // `@id` for the `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
+    "cpp/autosar/accessible-base-class-both-virtual-and-non-virtual-in-hierarchy" and
   ruleId = "M10-1-3" and
   category = "required"
   or
@@ -180,11 +180,11 @@ module InheritancePackage {
       TQueryCPP(TInheritancePackageQuery(TBaseClassCanBeVirtualOnlyInDiamondHierarchyQuery()))
   }
 
-  Query accessibleBaseClassBothVirtualAndNonVirtualQuery() {
+  Query accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `accessibleBaseClassBothVirtualAndNonVirtual` query
-      TQueryCPP(TInheritancePackageQuery(TAccessibleBaseClassBothVirtualAndNonVirtualQuery()))
+      // `Query` type for `accessibleBaseClassBothVirtualAndNonVirtualInHierarchy` query
+      TQueryCPP(TInheritancePackageQuery(TAccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()))
   }
 
   Query uniqueAccessibleEntityNamesInMultipleInheritanceQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll
index ddb58d7deb..18f03e9c66 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Naming.qll
@@ -20,7 +20,7 @@ newtype NamingQuery =
   TNameOfStandardLibraryMacroOrObjectReusedQuery() or
   TNameOfStandardLibraryFunctionIsOverriddenQuery() or
   TDifferentIdentifiersNotTypographicallyUnambiguousQuery() or
-  TIdentifierMainUsedForAFunctionOtherThanGlobalMainQuery() or
+  TIdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() or
   TUnnamedNamespacesInHeaderFileQuery() or
   TNonIdenticalIdentifierUsedForTheParameterInReDeclarationOfAFunctionQuery() or
   TRedefiningOfStandardLibraryNameQuery() or
@@ -178,11 +178,11 @@ predicate isNamingQueryMetadata(Query query, string queryId, string ruleId, stri
   category = "required"
   or
   query =
-    // `Query` instance for the `identifierMainUsedForAFunctionOtherThanGlobalMain` query
-    NamingPackage::identifierMainUsedForAFunctionOtherThanGlobalMainQuery() and
+    // `Query` instance for the `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
+    NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() and
   queryId =
-    // `@id` for the `identifierMainUsedForAFunctionOtherThanGlobalMain` query
-    "cpp/autosar/identifier-main-used-for-a-function-other-than-global-main" and
+    // `@id` for the `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
+    "cpp/autosar/identifier-main-used-for-a-function-other-than-the-global-function-main" and
   ruleId = "M7-3-2" and
   category = "required"
   or
@@ -390,11 +390,11 @@ module NamingPackage {
       TQueryCPP(TNamingPackageQuery(TDifferentIdentifiersNotTypographicallyUnambiguousQuery()))
   }
 
-  Query identifierMainUsedForAFunctionOtherThanGlobalMainQuery() {
+  Query identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `identifierMainUsedForAFunctionOtherThanGlobalMain` query
-      TQueryCPP(TNamingPackageQuery(TIdentifierMainUsedForAFunctionOtherThanGlobalMainQuery()))
+      // `Query` type for `identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain` query
+      TQueryCPP(TNamingPackageQuery(TIdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()))
   }
 
   Query unnamedNamespacesInHeaderFileQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll
index 29febc4430..fe71289dbc 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Operators.qll
@@ -17,7 +17,7 @@ newtype OperatorsQuery =
   TUnsignedBitwiseOperatorWithoutCastQuery() or
   TCommaOperatorAndOperatorAndTheOperatorOverloadedQuery() or
   TEachOperandOfTheOperatorTheLogicalAndOrTheLogicalOperatorsShallHaveTypeBoolQuery() or
-  TUnaryMinusOperatorAppliedToAnUnsignedExpressionQuery() or
+  TUnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() or
   TUnaryOperatorOverloadedQuery()
 
 predicate isOperatorsQueryMetadata(Query query, string queryId, string ruleId, string category) {
@@ -139,11 +139,11 @@ predicate isOperatorsQueryMetadata(Query query, string queryId, string ruleId, s
   category = "required"
   or
   query =
-    // `Query` instance for the `unaryMinusOperatorAppliedToAnUnsignedExpression` query
-    OperatorsPackage::unaryMinusOperatorAppliedToAnUnsignedExpressionQuery() and
+    // `Query` instance for the `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
+    OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() and
   queryId =
-    // `@id` for the `unaryMinusOperatorAppliedToAnUnsignedExpression` query
-    "cpp/autosar/unary-minus-operator-applied-to-an-unsigned-expression" and
+    // `@id` for the `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
+    "cpp/autosar/unary-minus-operator-applied-to-an-expression-whose-underlying-type-is-unsigned" and
   ruleId = "M5-3-2" and
   category = "required"
   or
@@ -249,11 +249,11 @@ module OperatorsPackage {
       TQueryCPP(TOperatorsPackageQuery(TEachOperandOfTheOperatorTheLogicalAndOrTheLogicalOperatorsShallHaveTypeBoolQuery()))
   }
 
-  Query unaryMinusOperatorAppliedToAnUnsignedExpressionQuery() {
+  Query unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `unaryMinusOperatorAppliedToAnUnsignedExpression` query
-      TQueryCPP(TOperatorsPackageQuery(TUnaryMinusOperatorAppliedToAnUnsignedExpressionQuery()))
+      // `Query` type for `unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned` query
+      TQueryCPP(TOperatorsPackageQuery(TUnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()))
   }
 
   Query unaryOperatorOverloadedQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll
index fda7ecb0ed..1dd5bef4c8 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Pointers.qll
@@ -7,7 +7,7 @@ newtype PointersQuery =
   TPointerToAnElementOfAnArrayPassedToASmartPointerQuery() or
   TDeclarationContainLessThanTwoLevelsOfIndirectionQuery() or
   TPointerArithmeticUsedWithPointersToNonFinalClassesQuery() or
-  TVirtualPointerOnlyComparesToNullptrConstantQuery() or
+  TPointerToMemberVirtualFunctionWithNullPointerConstantQuery() or
   TDeletingPointerToIncompleteTypeQuery() or
   TPointerToMemberAccessNonExistentClassMembersQuery() or
   TNullPointerToMemberAccessNonExistentClassMembersQuery() or
@@ -16,7 +16,7 @@ newtype PointersQuery =
   TPointerAndDerivedPointerAccessDifferentArrayQuery() or
   TPointerSubtractionOnDifferentArraysQuery() or
   TAppliedToObjectsOfPointerTypeQuery() or
-  TIdentifierPassedAsFunctionArgumentDecayToAPointerQuery() or
+  TIdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() or
   TPointerToAVirtualBaseClassCastToAPointerQuery() or
   TCastNotConvertPointerToFunctionQuery() or
   TIntegerOrPointerToVoidConvertedToPointerTypeQuery() or
@@ -57,11 +57,11 @@ predicate isPointersQueryMetadata(Query query, string queryId, string ruleId, st
   category = "required"
   or
   query =
-    // `Query` instance for the `virtualPointerOnlyComparesToNullptrConstant` query
-    PointersPackage::virtualPointerOnlyComparesToNullptrConstantQuery() and
+    // `Query` instance for the `pointerToMemberVirtualFunctionWithNullPointerConstant` query
+    PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery() and
   queryId =
-    // `@id` for the `virtualPointerOnlyComparesToNullptrConstant` query
-    "cpp/autosar/virtual-pointer-only-compares-to-nullptr-constant" and
+    // `@id` for the `pointerToMemberVirtualFunctionWithNullPointerConstant` query
+    "cpp/autosar/pointer-to-member-virtual-function-with-null-pointer-constant" and
   ruleId = "A5-10-1" and
   category = "required"
   or
@@ -138,11 +138,11 @@ predicate isPointersQueryMetadata(Query query, string queryId, string ruleId, st
   category = "required"
   or
   query =
-    // `Query` instance for the `identifierPassedAsFunctionArgumentDecayToAPointer` query
-    PointersPackage::identifierPassedAsFunctionArgumentDecayToAPointerQuery() and
+    // `Query` instance for the `identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer` query
+    PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() and
   queryId =
-    // `@id` for the `identifierPassedAsFunctionArgumentDecayToAPointer` query
-    "cpp/autosar/identifier-passed-as-function-argument-decay-to-a-pointer" and
+    // `@id` for the `identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer` query
+    "cpp/autosar/identifier-with-array-type-passed-as-function-argument-decay-to-a-pointer" and
   ruleId = "M5-2-12" and
   category = "required"
   or
@@ -259,11 +259,11 @@ module PointersPackage {
       TQueryCPP(TPointersPackageQuery(TPointerArithmeticUsedWithPointersToNonFinalClassesQuery()))
   }
 
-  Query virtualPointerOnlyComparesToNullptrConstantQuery() {
+  Query pointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `virtualPointerOnlyComparesToNullptrConstant` query
-      TQueryCPP(TPointersPackageQuery(TVirtualPointerOnlyComparesToNullptrConstantQuery()))
+      // `Query` type for `pointerToMemberVirtualFunctionWithNullPointerConstant` query
+      TQueryCPP(TPointersPackageQuery(TPointerToMemberVirtualFunctionWithNullPointerConstantQuery()))
   }
 
   Query deletingPointerToIncompleteTypeQuery() {
@@ -322,11 +322,11 @@ module PointersPackage {
       TQueryCPP(TPointersPackageQuery(TAppliedToObjectsOfPointerTypeQuery()))
   }
 
-  Query identifierPassedAsFunctionArgumentDecayToAPointerQuery() {
+  Query identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `identifierPassedAsFunctionArgumentDecayToAPointer` query
-      TQueryCPP(TPointersPackageQuery(TIdentifierPassedAsFunctionArgumentDecayToAPointerQuery()))
+      // `Query` type for `identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer` query
+      TQueryCPP(TPointersPackageQuery(TIdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()))
   }
 
   Query pointerToAVirtualBaseClassCastToAPointerQuery() {
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll
index e11ce49f1f..e2c73fc33d 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/VirtualFunctions.qll
@@ -11,7 +11,7 @@ newtype VirtualFunctionsQuery =
   TDestructorOfABaseClassNotPublicVirtualQuery() or
   TNonVirtualPublicDestructorInNonFinalClassQuery() or
   TVirtualFunctionOverriddenByAPureVirtualFunctionQuery() or
-  TVirtualFunctionParametersUseSameDefaultArgumentsQuery()
+  TVirtualFunctionParametersUseTheSameDefaultArgumentsQuery()
 
 predicate isVirtualFunctionsQueryMetadata(
   Query query, string queryId, string ruleId, string category
@@ -80,11 +80,11 @@ predicate isVirtualFunctionsQueryMetadata(
   category = "required"
   or
   query =
-    // `Query` instance for the `virtualFunctionParametersUseSameDefaultArguments` query
-    VirtualFunctionsPackage::virtualFunctionParametersUseSameDefaultArgumentsQuery() and
+    // `Query` instance for the `virtualFunctionParametersUseTheSameDefaultArguments` query
+    VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery() and
   queryId =
-    // `@id` for the `virtualFunctionParametersUseSameDefaultArguments` query
-    "cpp/autosar/virtual-function-parameters-use-same-default-arguments" and
+    // `@id` for the `virtualFunctionParametersUseTheSameDefaultArguments` query
+    "cpp/autosar/virtual-function-parameters-use-the-same-default-arguments" and
   ruleId = "M8-3-1" and
   category = "required"
 }
@@ -139,10 +139,10 @@ module VirtualFunctionsPackage {
       TQueryCPP(TVirtualFunctionsPackageQuery(TVirtualFunctionOverriddenByAPureVirtualFunctionQuery()))
   }
 
-  Query virtualFunctionParametersUseSameDefaultArgumentsQuery() {
+  Query virtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `virtualFunctionParametersUseSameDefaultArguments` query
-      TQueryCPP(TVirtualFunctionsPackageQuery(TVirtualFunctionParametersUseSameDefaultArgumentsQuery()))
+      // `Query` type for `virtualFunctionParametersUseTheSameDefaultArguments` query
+      TQueryCPP(TVirtualFunctionsPackageQuery(TVirtualFunctionParametersUseTheSameDefaultArgumentsQuery()))
   }
 }
diff --git a/cpp/common/test/includes/standard-library/assert.h b/cpp/common/test/includes/standard-library/assert.h
index ee60d0748f..e8ba88d635 100644
--- a/cpp/common/test/includes/standard-library/assert.h
+++ b/cpp/common/test/includes/standard-library/assert.h
@@ -1 +1,6 @@
-#define	assert(x) (void)0
+#ifndef _GHLIBCPP_ASSERT
+#define _GHLIBCPP_ASSERT
+
+#define assert(x) (void)0
+
+#endif // _GHLIBCPP_ASSERT
\ No newline at end of file
diff --git a/cpp/common/test/includes/standard-library/cassert b/cpp/common/test/includes/standard-library/cassert
index e69de29bb2..0477057664 100644
--- a/cpp/common/test/includes/standard-library/cassert
+++ b/cpp/common/test/includes/standard-library/cassert
@@ -0,0 +1 @@
+#include "assert.h"
\ No newline at end of file
diff --git a/rule_packages/c/Statements3.json b/rule_packages/c/Statements3.json
index 532a711eb0..5471749a49 100644
--- a/rule_packages/c/Statements3.json
+++ b/rule_packages/c/Statements3.json
@@ -20,7 +20,7 @@
         {
           "description": "if the body of a loop is not enclosed in braces, then this can lead to incorrect execution, and is hard for developers to maintain.",
           "kind": "problem",
-          "name": "the statement forming the body of a loop shall be a compound statement",
+          "name": "The statement forming the body of a loop shall be a compound statement",
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "LoopCompoundCondition",
diff --git a/rule_packages/cpp/Inheritance.json b/rule_packages/cpp/Inheritance.json
index dd0daec513..efc241a8e6 100644
--- a/rule_packages/cpp/Inheritance.json
+++ b/rule_packages/cpp/Inheritance.json
@@ -144,7 +144,7 @@
           "name": "An accessible base class shall not be both virtual and non-virtual in the same hierarchy",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "AccessibleBaseClassBothVirtualAndNonVirtual",
+          "short_name": "AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy",
           "shared_implementation_short_name": "VirtualAndNonVirtualClassInTheHierarchy",
           "tags": []
         }
diff --git a/rule_packages/cpp/Naming.json b/rule_packages/cpp/Naming.json
index 9e8ff9628a..441979c3c9 100644
--- a/rule_packages/cpp/Naming.json
+++ b/rule_packages/cpp/Naming.json
@@ -313,7 +313,7 @@
           "name": "The identifier main shall not be used for a function other than the global function main",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "IdentifierMainUsedForAFunctionOtherThanGlobalMain",
+          "short_name": "IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain",
           "shared_implementation_short_name": "NonGlobalFunctionMain",
           "tags": [
             "maintainability",
diff --git a/rule_packages/cpp/Operators.json b/rule_packages/cpp/Operators.json
index e4600769c5..76be8a732a 100644
--- a/rule_packages/cpp/Operators.json
+++ b/rule_packages/cpp/Operators.json
@@ -296,7 +296,7 @@
           "name": "The unary minus operator shall not be applied to an expression whose underlying type is unsigned",
           "precision": "very-high",
           "severity": "error",
-          "short_name": "UnaryMinusOperatorAppliedToAnUnsignedExpression",
+          "short_name": "UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned",
           "shared_implementation_short_name": "BuiltInUnaryOperatorAppliedToUnsignedExpression",
           "tags": []
         }
diff --git a/rule_packages/cpp/Pointers.json b/rule_packages/cpp/Pointers.json
index 83b77877d9..b6a0aaef09 100644
--- a/rule_packages/cpp/Pointers.json
+++ b/rule_packages/cpp/Pointers.json
@@ -86,7 +86,7 @@
           "name": "A pointer to member virtual function shall only be tested for equality with null-pointer-constant",
           "precision": "very-high",
           "severity": "error",
-          "short_name": "VirtualPointerOnlyComparesToNullptrConstant",
+          "short_name": "PointerToMemberVirtualFunctionWithNullPointerConstant",
           "shared_implementation_short_name": "PotentiallyVirtualPointerOnlyComparesToNullptr",
           "tags": [
             "correctness"
@@ -279,7 +279,7 @@
           "name": "An identifier with array type passed as a function argument shall not decay to a pointer",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "IdentifierPassedAsFunctionArgumentDecayToAPointer",
+          "short_name": "IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer",
           "shared_implementation_short_name": "ArrayPassedAsFunctionArgumentDecayToAPointer",
           "tags": [
             "correctness"
diff --git a/rule_packages/cpp/VirtualFunctions.json b/rule_packages/cpp/VirtualFunctions.json
index 692705e8d4..eff4e15beb 100644
--- a/rule_packages/cpp/VirtualFunctions.json
+++ b/rule_packages/cpp/VirtualFunctions.json
@@ -176,7 +176,7 @@
           "name": "Parameters in an overriding virtual function shall have the same default arguments or no default arguments",
           "precision": "very-high",
           "severity": "warning",
-          "short_name": "VirtualFunctionParametersUseSameDefaultArguments",
+          "short_name": "VirtualFunctionParametersUseTheSameDefaultArguments",
           "shared_implementation_short_name": "OverridingShallSpecifyDifferentDefaultArguments",
           "tags": [
             "correctness"
diff --git a/scripts/generate_rules/templates/shared_library.ql.template b/scripts/generate_rules/templates/shared_library.ql.template
index 8c6540beee..93dc503510 100644
--- a/scripts/generate_rules/templates/shared_library.ql.template
+++ b/scripts/generate_rules/templates/shared_library.ql.template
@@ -1,3 +1,7 @@
+{# 
+    The autogenerated description of the shared query is copied from 
+    the first matching query in `rule_packages`.
+#}
 /**
  * Provides a library with a `problems` predicate for the following issue:
  * {{ description|join('\n * ') }}

From 5423ee84f09d4c976428209c3042b2bb89513c37 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 19:33:17 +0200
Subject: [PATCH 070/435] Remove renamed queries

---
 ...rVirtualFunctionWithNullPointerConstant.ql |  2 +-
 ...ualPointerOnlyComparesToNullptrConstant.ql | 26 -------------------
 ...ssibleBaseClassBothVirtualAndNonVirtual.ql | 24 -----------------
 ...PassedAsFunctionArgumentDecayToAPointer.ql | 25 ------------------
 ...PassedAsFunctionArgumentDecayToAPointer.ql |  2 +-
 ...usOperatorAppliedToAnUnsignedExpression.ql | 24 -----------------
 ...MainUsedForAFunctionOtherThanGlobalMain.ql | 25 ------------------
 ...nctionParametersUseSameDefaultArguments.ql | 26 -------------------
 ...interOnlyComparesToNullptrConstant.testref |  1 -
 ...eBaseClassBothVirtualAndNonVirtual.testref |  1 -
 ...dAsFunctionArgumentDecayToAPointer.testref |  1 -
 ...ratorAppliedToAnUnsignedExpression.testref |  1 -
 ...sedForAFunctionOtherThanGlobalMain.testref |  1 -
 ...nParametersUseSameDefaultArguments.testref |  1 -
 14 files changed, 2 insertions(+), 158 deletions(-)
 delete mode 100644 cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
 delete mode 100644 cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
 delete mode 100644 cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
 delete mode 100644 cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
 delete mode 100644 cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
 delete mode 100644 cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
 delete mode 100644 cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
 delete mode 100644 cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
 delete mode 100644 cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
 delete mode 100644 cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
 delete mode 100644 cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
 delete mode 100644 cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref

diff --git a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
index 88594062ca..de5ab0f10d 100644
--- a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
+++ b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
@@ -20,6 +20,6 @@ import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.
 
 class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery {
   PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
-    this = pointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
+    this = PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql b/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
deleted file mode 100644
index 28e17ead1a..0000000000
--- a/cpp/autosar/src/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.ql
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @id cpp/autosar/virtual-pointer-only-compares-to-nullptr-constant
- * @name A5-10-1: A pointer to member virtual function shall only be tested for equality with null-pointer-constant
- * @description A pointer to member virtual function shall only be tested for equality with
- *              null-pointer-constant, because an equality comparison with anything other than a
- *              null-pointer-constant is unspecified.
- * @kind problem
- * @precision very-high
- * @problem.severity error
- * @tags external/autosar/id/a5-10-1
- *       correctness
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
-
-class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
-{
-  PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
-    this = PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
-  }
-}
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
deleted file mode 100644
index 5b7086cb54..0000000000
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.ql
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @id cpp/autosar/accessible-base-class-both-virtual-and-non-virtual
- * @name M10-1-3: An accessible base class shall not be both virtual and non-virtual in the same hierarchy
- * @description A base class must not be virtual and non-virtual in the same hierarchy to avoid
- *              copies of the object and confusing behavior.
- * @kind problem
- * @precision very-high
- * @problem.severity warning
- * @tags external/autosar/id/m10-1-3
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
-
-class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
-{
-  AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
-    this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
-  }
-}
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
deleted file mode 100644
index f1e7bb4a39..0000000000
--- a/cpp/autosar/src/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.ql
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @id cpp/autosar/identifier-passed-as-function-argument-decay-to-a-pointer
- * @name M5-2-12: An identifier with array type passed as a function argument shall not decay to a pointer
- * @description An identifier with array type passed as a function argument shall not decay to a
- *              pointer to prevent loss of its bounds.
- * @kind problem
- * @precision very-high
- * @problem.severity warning
- * @tags external/autosar/id/m5-2-12
- *       correctness
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
-
-class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
-{
-  IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
-    this = PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
-  }
-}
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
index 852080c571..ceb7ca9ecb 100644
--- a/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
@@ -19,6 +19,6 @@ import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.Ar
 
 class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery {
   IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
-    this = pointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
+    this = PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
deleted file mode 100644
index d9406b2553..0000000000
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.ql
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @id cpp/autosar/unary-minus-operator-applied-to-an-unsigned-expression
- * @name M5-3-2: The unary minus operator shall not be applied to an expression whose underlying type is unsigned
- * @description The unary minus operator shall not be applied to an expression whose underlying type
- *              is unsigned.
- * @kind problem
- * @precision very-high
- * @problem.severity error
- * @tags external/autosar/id/m5-3-2
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
-
-class UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
-{
-  UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
-    this = OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()
-  }
-}
diff --git a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
deleted file mode 100644
index 8b3da17ab1..0000000000
--- a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.ql
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @id cpp/autosar/identifier-main-used-for-a-function-other-than-global-main
- * @name M7-3-2: The identifier main shall not be used for a function other than the global function main
- * @description Reusing the name main in non-main contexts can lead to developer confusion.
- * @kind problem
- * @precision very-high
- * @problem.severity warning
- * @tags external/autosar/id/m7-3-2
- *       maintainability
- *       readability
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
-
-class IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery
-{
-  IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
-    this = NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()
-  }
-}
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
deleted file mode 100644
index 02e880a909..0000000000
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.ql
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @id cpp/autosar/virtual-function-parameters-use-same-default-arguments
- * @name M8-3-1: Parameters in an overriding virtual function shall have the same default arguments or no default arguments
- * @description Parameters in an overriding virtual function shall either use the same default
- *              arguments as the function they override, or else shall not specify any default
- *              arguments.
- * @kind problem
- * @precision very-high
- * @problem.severity warning
- * @tags external/autosar/id/m8-3-1
- *       correctness
- *       external/autosar/allocated-target/implementation
- *       external/autosar/enforcement/automated
- *       external/autosar/obligation/required
- */
-
-import cpp
-import codingstandards.cpp.autosar
-import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
-
-class VirtualFunctionParametersUseTheSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
-{
-  VirtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
-    this = VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()
-  }
-}
diff --git a/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref b/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
deleted file mode 100644
index ca8eab9681..0000000000
--- a/cpp/autosar/test/rules/A5-10-1/VirtualPointerOnlyComparesToNullptrConstant.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/potentiallyvirtualpointeronlycomparestonullptr/PotentiallyVirtualPointerOnlyComparesToNullptr.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref b/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
deleted file mode 100644
index fe57c50fe3..0000000000
--- a/cpp/autosar/test/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtual.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/virtualandnonvirtualclassinthehierarchy/VirtualAndNonVirtualClassInTheHierarchy.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref b/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
deleted file mode 100644
index 06f2ec8fbb..0000000000
--- a/cpp/autosar/test/rules/M5-2-12/IdentifierPassedAsFunctionArgumentDecayToAPointer.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/arraypassedasfunctionargumentdecaytoapointer/ArrayPassedAsFunctionArgumentDecayToAPointer.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref b/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
deleted file mode 100644
index bd12c39fbd..0000000000
--- a/cpp/autosar/test/rules/M5-3-2/UnaryMinusOperatorAppliedToAnUnsignedExpression.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/builtinunaryoperatorappliedtounsignedexpression/BuiltInUnaryOperatorAppliedToUnsignedExpression.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref b/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
deleted file mode 100644
index e149f3a33b..0000000000
--- a/cpp/autosar/test/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanGlobalMain.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/nonglobalfunctionmain/NonGlobalFunctionMain.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref b/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
deleted file mode 100644
index 7e06403515..0000000000
--- a/cpp/autosar/test/rules/M8-3-1/VirtualFunctionParametersUseSameDefaultArguments.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/overridingshallspecifydifferentdefaultarguments/OverridingShallSpecifyDifferentDefaultArguments.ql
\ No newline at end of file

From 2b4dc1a1b84b0955720767b6d1de760b3b96752b Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 19:40:53 +0200
Subject: [PATCH 071/435] Fix formatting

---
 ...PointerToMemberVirtualFunctionWithNullPointerConstant.ql | 3 ++-
 ...ccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql | 3 ++-
 ...rWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql | 3 ++-
 ...torAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql | 6 ++++--
 ...ierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql | 3 ++-
 .../VirtualFunctionParametersUseTheSameDefaultArguments.ql  | 3 ++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
index de5ab0f10d..825347754d 100644
--- a/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
+++ b/cpp/autosar/src/rules/A5-10-1/PointerToMemberVirtualFunctionWithNullPointerConstant.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.potentiallyvirtualpointeronlycomparestonullptr.PotentiallyVirtualPointerOnlyComparesToNullptr
 
-class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery {
+class PointerToMemberVirtualFunctionWithNullPointerConstantQuery extends PotentiallyVirtualPointerOnlyComparesToNullptrSharedQuery
+{
   PointerToMemberVirtualFunctionWithNullPointerConstantQuery() {
     this = PointersPackage::pointerToMemberVirtualFunctionWithNullPointerConstantQuery()
   }
diff --git a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
index df7840496f..c16e5461f0 100644
--- a/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
+++ b/cpp/autosar/src/rules/M10-1-3/AccessibleBaseClassBothVirtualAndNonVirtualInHierarchy.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.virtualandnonvirtualclassinthehierarchy.VirtualAndNonVirtualClassInTheHierarchy
 
-class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery {
+class AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery extends VirtualAndNonVirtualClassInTheHierarchySharedQuery
+{
   AccessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery() {
     this = InheritancePackage::accessibleBaseClassBothVirtualAndNonVirtualInHierarchyQuery()
   }
diff --git a/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql b/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
index ceb7ca9ecb..943fc026e8 100644
--- a/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
+++ b/cpp/autosar/src/rules/M5-2-12/IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointer.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.arraypassedasfunctionargumentdecaytoapointer.ArrayPassedAsFunctionArgumentDecayToAPointer
 
-class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery {
+class IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery extends ArrayPassedAsFunctionArgumentDecayToAPointerSharedQuery
+{
   IdentifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery() {
     this = PointersPackage::identifierWithArrayTypePassedAsFunctionArgumentDecayToAPointerQuery()
   }
diff --git a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
index 98deff4f78..7017d5e7de 100644
--- a/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
+++ b/cpp/autosar/src/rules/M5-3-2/UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsigned.ql
@@ -16,8 +16,10 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.builtinunaryoperatorappliedtounsignedexpression.BuiltInUnaryOperatorAppliedToUnsignedExpression
 
-class UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery {
+class UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery extends BuiltInUnaryOperatorAppliedToUnsignedExpressionSharedQuery
+{
   UnaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery() {
-    this = OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()
+    this =
+      OperatorsPackage::unaryMinusOperatorAppliedToAnExpressionWhoseUnderlyingTypeIsUnsignedQuery()
   }
 }
diff --git a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
index a1820f08e3..25a01c66f8 100644
--- a/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
+++ b/cpp/autosar/src/rules/M7-3-2/IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMain.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.nonglobalfunctionmain.NonGlobalFunctionMain
 
-class IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery {
+class IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery extends NonGlobalFunctionMainSharedQuery
+{
   IdentifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery() {
     this = NamingPackage::identifierMainUsedForAFunctionOtherThanTheGlobalFunctionMainQuery()
   }
diff --git a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
index 6eac6dc430..a0ef5143e9 100644
--- a/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
+++ b/cpp/autosar/src/rules/M8-3-1/VirtualFunctionParametersUseTheSameDefaultArguments.ql
@@ -18,7 +18,8 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.rules.overridingshallspecifydifferentdefaultarguments.OverridingShallSpecifyDifferentDefaultArguments
 
-class VirtualFunctionParametersUseTheSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery {
+class VirtualFunctionParametersUseTheSameDefaultArgumentsQuery extends OverridingShallSpecifyDifferentDefaultArgumentsSharedQuery
+{
   VirtualFunctionParametersUseTheSameDefaultArgumentsQuery() {
     this = VirtualFunctionsPackage::virtualFunctionParametersUseTheSameDefaultArgumentsQuery()
   }

From 9bdc84df2ba4caf4b8241135fe95fb0138900306 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 20:01:14 +0200
Subject: [PATCH 072/435] Remove renamed tests

---
 .../rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref  | 1 -
 .../test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref      | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
 delete mode 100644 cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref

diff --git a/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
deleted file mode 100644
index 434cb47456..0000000000
--- a/cpp/misra/test/rules/RULE-10-0-1/MultipleGlobalOrMemberDeclarators.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/multipleglobalormemberdeclarators/MultipleGlobalOrMemberDeclarators.ql
\ No newline at end of file
diff --git a/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref b/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
deleted file mode 100644
index be7c9ac352..0000000000
--- a/cpp/misra/test/rules/RULE-10-0-1/MultipleLocalDeclarators.testref
+++ /dev/null
@@ -1 +0,0 @@
-cpp/common/test/rules/multiplelocaldeclarators/MultipleLocalDeclarators.ql
\ No newline at end of file

From 0c200662d4ccb8de83792676e9d2f3d0030d7cd2 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Fri, 26 Jul 2024 09:14:17 +0900
Subject: [PATCH 073/435] Add a non-compliant case.

---
 cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected | 1 +
 cpp/autosar/test/rules/M0-1-10.1/test.cpp                | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected b/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected
index e69de29bb2..3f58065520 100644
--- a/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected
+++ b/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected
@@ -0,0 +1 @@
+| test.cpp:23:14:23:26 | uncalled_func | Function uncalled_func is never called. |
diff --git a/cpp/autosar/test/rules/M0-1-10.1/test.cpp b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
index 272f295a35..6c176f95d1 100644
--- a/cpp/autosar/test/rules/M0-1-10.1/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
@@ -20,6 +20,11 @@ std::int32_t func1() {         // COMPLIANT: Called from main
   return mains::var + func2(); // func2 called here.
 }
 
+std::int32_t uncalled_func() // NON COMPLIANT: Not called.
+{
+  return mains::var + func1(); // func1 called here.
+}
+
 // @brief main
 // @return exit code
 std::int32_t main(void) {

From 6a1b283118eccb5c386eff6ebbacb6dbc72397f9 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Fri, 26 Jul 2024 09:16:21 +0900
Subject: [PATCH 074/435] Modify comment to follow standard convention.

---
 cpp/autosar/test/rules/M0-1-10.1/test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/test/rules/M0-1-10.1/test.cpp b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
index 6c176f95d1..5b9c68a827 100644
--- a/cpp/autosar/test/rules/M0-1-10.1/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
@@ -20,7 +20,7 @@ std::int32_t func1() {         // COMPLIANT: Called from main
   return mains::var + func2(); // func2 called here.
 }
 
-std::int32_t uncalled_func() // NON COMPLIANT: Not called.
+std::int32_t uncalled_func() // NON_COMPLIANT: Not called.
 {
   return mains::var + func1(); // func1 called here.
 }

From a0d99293280c52e8658495899225055294851cb2 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 26 Jul 2024 12:09:56 +0100
Subject: [PATCH 075/435] Add MISRA C++ 2023 to release testing and automation

---
 scripts/PSCodingStandards/Config.ps1              | 2 +-
 scripts/PSCodingStandards/Get-TestDirectory.ps1   | 3 +++
 scripts/matrix_testing/CreateMatrixTestReport.ps1 | 4 ++--
 scripts/release/create_supported_rules_list.py    | 2 +-
 scripts/release/generate_release_notes.py         | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/PSCodingStandards/Config.ps1 b/scripts/PSCodingStandards/Config.ps1
index 2dc8d8e5bc..53605c89f3 100644
--- a/scripts/PSCodingStandards/Config.ps1
+++ b/scripts/PSCodingStandards/Config.ps1
@@ -1,2 +1,2 @@
-$AVAILABLE_SUITES = @("CERT-C++", "AUTOSAR", "MISRA-C-2012", "CERT-C")
+$AVAILABLE_SUITES = @("CERT-C++", "AUTOSAR", "MISRA-C-2012", "CERT-C", "MISRA-C++-2023")
 $AVAILABLE_LANGUAGES = @("c", "cpp")
\ No newline at end of file
diff --git a/scripts/PSCodingStandards/Get-TestDirectory.ps1 b/scripts/PSCodingStandards/Get-TestDirectory.ps1
index 341cb3d7d9..154a49dabe 100644
--- a/scripts/PSCodingStandards/Get-TestDirectory.ps1
+++ b/scripts/PSCodingStandards/Get-TestDirectory.ps1
@@ -27,6 +27,9 @@ function Get-TestDirectory {
         elseif ($RuleObject.__memberof_suite -eq "MISRA-C-2012") {
             $standardString = "misra"
         }
+        elseif ($RuleObject.__memberof_suite -eq "MISRA-C++-2023") {
+            $standardString = "misra"
+        }
         else {
             throw "Unknown standard $($RuleObject.__memberof_suite)"
         }
diff --git a/scripts/matrix_testing/CreateMatrixTestReport.ps1 b/scripts/matrix_testing/CreateMatrixTestReport.ps1
index 6f570c1b82..a8de5034ce 100644
--- a/scripts/matrix_testing/CreateMatrixTestReport.ps1
+++ b/scripts/matrix_testing/CreateMatrixTestReport.ps1
@@ -147,9 +147,9 @@ param(
     $Configuration,
 
     # For a suite, the suites we support. Valid values are 'CERT-C++' and
-    # 'AUTOSAR' and MISRA-C-2012 and CERT-C
+    # 'AUTOSAR' and MISRA-C-2012, MISRA-C++-2023 and CERT-C
     [Parameter(Mandatory, ParameterSetName = 'Suite')] 
-    [ValidateSet("CERT-C++", "AUTOSAR", "MISRA-C-2012", "CERT-C")]
+    [ValidateSet("CERT-C++", "AUTOSAR", "MISRA-C-2012", "CERT-C", "MISRA-C++-2023")]
     [string]
     $SuiteName,
 
diff --git a/scripts/release/create_supported_rules_list.py b/scripts/release/create_supported_rules_list.py
index e3294ed3b1..6d8f3e0991 100644
--- a/scripts/release/create_supported_rules_list.py
+++ b/scripts/release/create_supported_rules_list.py
@@ -27,7 +27,7 @@
 
 repo_root = Path(__file__).parent.parent.parent
 
-rules_covered = {"AUTOSAR" : {}, "CERT-C++" : {}, "MISRA-C-2012" : {}, "CERT-C" : {}}
+rules_covered = {"AUTOSAR" : {}, "CERT-C++" : {}, "MISRA-C-2012" : {}, "CERT-C" : {}, "MISRA-C++-2023" : {},}
 
 # Iterate over rule packages
 for language_name in ["cpp", "c"]:
diff --git a/scripts/release/generate_release_notes.py b/scripts/release/generate_release_notes.py
index c6cea8d19f..3852a5eeb7 100644
--- a/scripts/release/generate_release_notes.py
+++ b/scripts/release/generate_release_notes.py
@@ -79,7 +79,7 @@ def transform_legacy_rule_path(p):
 diff_from_last_release = latest_release_commit.diff(head_commit)
 
 # Store a mapping from standard -> rules with new queries -> new queries for those rules
-new_rules = {"AUTOSAR" : {}, "CERT-C++" : {}, "MISRA-C-2012" : {}, "CERT-C" : {}}
+new_rules = {"AUTOSAR" : {}, "CERT-C++" : {}, "MISRA-C-2012" : {}, "CERT-C" : {}, "MISRA-C++-2023" : {}}
 # Store the text of the newly added change notes
 change_notes = []
 # Store the names of the rule packages with new queries

From daddf4d44c9877a9749be73958e3427b13afc471 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 29 Jul 2024 11:34:00 +0100
Subject: [PATCH 076/435] Set packages for MISRA C++ 2023

---
 rules.csv | 206 +++++++++++++++++++++++++++---------------------------
 1 file changed, 103 insertions(+), 103 deletions(-)

diff --git a/rules.csv b/rules.csv
index e494a82ea3..0e08bef58f 100644
--- a/rules.csv
+++ b/rules.csv
@@ -774,182 +774,182 @@ c,MISRA-C-2012,RULE-22-7,Yes,Required,,,The macro EOF shall only be compared wit
 c,MISRA-C-2012,RULE-22-8,Yes,Required,,,The value of errno shall be set to zero prior to a call to an errno-setting-function,ERR30-C,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-9,Yes,Required,,,The value of errno shall be tested against zero after calling an errno-setting-function,,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-10,Yes,Required,,,The value of errno shall only be tested when the last function to be called was an errno-setting-function,,Contracts3,Medium,
-cpp,MISRA-C++-2023,RULE-0-0-1,Yes,Required,Decidable,Single Translation Unit,A function shall not contain unreachable statements,M0-1-1,,Medium,
-cpp,MISRA-C++-2023,RULE-0-0-2,Yes,Advisory,Undecidable,System,Controlling expressions should not be invariant,M0-1-2,,Easy,
-cpp,MISRA-C++-2023,RULE-0-1-1,Yes,Advisory,Undecidable,System,A value should not be unnecessarily written to a local object,A0-1-1,,Medium,
-cpp,MISRA-C++-2023,RULE-0-1-2,Yes,Required,Decidable,Single Translation Unit,The value returned by a function shall be used,A0-1-2,,Easy,
-cpp,MISRA-C++-2023,RULE-0-2-1,Yes,Advisory,Decidable,Single Translation Unit,Variables with limited visibility should be used at least once,M0-1-3,,Easy,
-cpp,MISRA-C++-2023,RULE-0-2-2,Yes,Required,Decidable,Single Translation Unit,A named function parameter shall be used at least once,"A0-1-4, A0-1-5",,Easy,
-cpp,MISRA-C++-2023,RULE-0-2-3,Yes,Advisory,Decidable,Single Translation Unit,Types with limited visibility should be used at least once,A0-1-6,,Easy,
-cpp,MISRA-C++-2023,RULE-0-2-4,Yes,Advisory,Decidable,System,Functions with limited visibility should be used at least once,A0-1-3,,Easy,
-cpp,MISRA-C++-2023,DIR-0-3-1,Yes,Advisory,,,Floating-point arithmetic should be used appropriately,,,Hard,
-cpp,MISRA-C++-2023,DIR-0-3-2,Yes,Required,,,A function call shall not violate the function’s preconditions,,,Hard,
-cpp,MISRA-C++-2023,RULE-4-1-1,Yes,Required,Undecidable,System,A program shall conform to ISO/IEC 14882:2017 (C++17),,,Hard,
-cpp,MISRA-C++-2023,RULE-4-1-2,Yes,Advisory,Decidable,Single Translation Unit,Deprecated features should not be used,,,Very Hard,
-cpp,MISRA-C++-2023,RULE-4-1-3,Yes,Required,Undecidable,System,There shall be no occurrence of undefined or critical unspecified behaviour,,,Very Hard,
-cpp,MISRA-C++-2023,RULE-4-6-1,Yes,Required,Undecidable,System,Operations on a memory location shall be sequenced appropriately,RULE-13-2,,Easy,
-cpp,MISRA-C++-2023,RULE-5-0-1,Yes,Advisory,Decidable,Single Translation Unit,Trigraph-like sequences should not be used,A2-5-1,,Very Hard,
+cpp,MISRA-C++-2023,RULE-0-0-1,Yes,Required,Decidable,Single Translation Unit,A function shall not contain unreachable statements,M0-1-1,DeadCode2,Medium,
+cpp,MISRA-C++-2023,RULE-0-0-2,Yes,Advisory,Undecidable,System,Controlling expressions should not be invariant,M0-1-2,DeadCode2,Easy,
+cpp,MISRA-C++-2023,RULE-0-1-1,Yes,Advisory,Undecidable,System,A value should not be unnecessarily written to a local object,A0-1-1,DeadCode2,Medium,
+cpp,MISRA-C++-2023,RULE-0-1-2,Yes,Required,Decidable,Single Translation Unit,The value returned by a function shall be used,A0-1-2,DeadCode2,Easy,
+cpp,MISRA-C++-2023,RULE-0-2-1,Yes,Advisory,Decidable,Single Translation Unit,Variables with limited visibility should be used at least once,M0-1-3,DeadCode2,Easy,
+cpp,MISRA-C++-2023,RULE-0-2-2,Yes,Required,Decidable,Single Translation Unit,A named function parameter shall be used at least once,"A0-1-4, A0-1-5",DeadCode2,Easy,
+cpp,MISRA-C++-2023,RULE-0-2-3,Yes,Advisory,Decidable,Single Translation Unit,Types with limited visibility should be used at least once,A0-1-6,DeadCode2,Easy,
+cpp,MISRA-C++-2023,RULE-0-2-4,Yes,Advisory,Decidable,System,Functions with limited visibility should be used at least once,A0-1-3,DeadCode2,Easy,
+cpp,MISRA-C++-2023,DIR-0-3-1,Yes,Advisory,,,Floating-point arithmetic should be used appropriately,,FloatingPoint,Hard,
+cpp,MISRA-C++-2023,DIR-0-3-2,Yes,Required,,,A function call shall not violate the function’s preconditions,,Preconditions,Hard,
+cpp,MISRA-C++-2023,RULE-4-1-1,Yes,Required,Undecidable,System,A program shall conform to ISO/IEC 14882:2017 (C++17),,Toolchain2,Hard,
+cpp,MISRA-C++-2023,RULE-4-1-2,Yes,Advisory,Decidable,Single Translation Unit,Deprecated features should not be used,,Toolchain2,Very Hard,
+cpp,MISRA-C++-2023,RULE-4-1-3,Yes,Required,Undecidable,System,There shall be no occurrence of undefined or critical unspecified behaviour,,Undefined,Very Hard,
+cpp,MISRA-C++-2023,RULE-4-6-1,Yes,Required,Undecidable,System,Operations on a memory location shall be sequenced appropriately,RULE-13-2,SideEffects3,Easy,
+cpp,MISRA-C++-2023,RULE-5-0-1,Yes,Advisory,Decidable,Single Translation Unit,Trigraph-like sequences should not be used,A2-5-1,Trigraph,Very Hard,
 cpp,MISRA-C++-2023,RULE-5-7-1,Yes,Required,Decidable,Single Translation Unit,The character sequence /* shall not be used within a C-style comment,M2-7-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,DIR-5-7-2,Yes,Advisory,,,Sections of code should not be “commented out”,A2-7-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-7-3,Yes,Required,Decidable,Single Translation Unit,Line-splicing shall not be used in // comments,A2-7-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-5-10-1,Yes,Required,Decidable,Single Translation Unit,User-defined identifiers shall have an appropriate form,,,Easy,
+cpp,MISRA-C++-2023,RULE-5-10-1,Yes,Required,Decidable,Single Translation Unit,User-defined identifiers shall have an appropriate form,,Naming,Easy,
 cpp,MISRA-C++-2023,RULE-5-13-1,Yes,Required,Decidable,Single Translation Unit,"In character literals and non-raw string literals, \ shall only be used to form a defined escape sequence or universal character name",A2-13-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-13-2,Yes,Required,Decidable,Single Translation Unit,"Octal escape sequences, hexadecimal escape sequences, and universal character names shall be terminated",RULE-4-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-13-3,Yes,Required,Decidable,Single Translation Unit,Octal constants shall not be used,M2-13-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-13-4,Yes,Required,Decidable,Single Translation Unit,Unsigned integer literals shall be appropriately suffixed,M2-13-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-13-5,Yes,Required,Decidable,Single Translation Unit,The lowercase form of L shall not be used as the first character in a literal suffix,RULE-7-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-5-13-6,Yes,Required,Decidable,Single Translation Unit,An integer-literal of type long long shall not use a single L or l in any suffix,,,Easy,
+cpp,MISRA-C++-2023,RULE-5-13-6,Yes,Required,Decidable,Single Translation Unit,An integer-literal of type long long shall not use a single L or l in any suffix,,Expressions2,Easy,
 cpp,MISRA-C++-2023,RULE-5-13-7,No,Required,Decidable,Single Translation Unit,String literals with different encoding prefixes shall not be concatenated,A2-13-2,,,
-cpp,MISRA-C++-2023,RULE-6-0-1,Yes,Required,Decidable,Single Translation Unit,Block scope declarations shall not be visually ambiguous,"M3-1-2,DCL53-CPP",,Easy,
-cpp,MISRA-C++-2023,RULE-6-0-2,Yes,Advisory,Decidable,Single Translation Unit,"When an array with external linkage is declared, its size should be explicitly specified",RULE-18-8,,Easy,
+cpp,MISRA-C++-2023,RULE-6-0-1,Yes,Required,Decidable,Single Translation Unit,Block scope declarations shall not be visually ambiguous,"M3-1-2,DCL53-CPP",Declarations2,Easy,
+cpp,MISRA-C++-2023,RULE-6-0-2,Yes,Advisory,Decidable,Single Translation Unit,"When an array with external linkage is declared, its size should be explicitly specified",RULE-18-8,Linkage,Easy,
 cpp,MISRA-C++-2023,RULE-6-0-3,Yes,Advisory,Decidable,Single Translation Unit,"The only declarations in the global namespace should be main, namespace declarations and extern ""C"" declarations",M7-3-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-0-4,Yes,Required,Decidable,Single Translation Unit,The identifier main shall not be used for a function other than the global function main,M7-3-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-2-1,Yes,Required,Decidable,System,The one-definition rule shall not be violated,M3-2-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-6-2-2,Yes,Required,Decidable,System,All declarations of a variable or function shall have the same type,"M3-9-1,DCL40-C",,Easy,
-cpp,MISRA-C++-2023,RULE-6-2-3,Yes,Required,Decidable,System,The source code used to implement an entity shall appear only once,,,Medium,
-cpp,MISRA-C++-2023,RULE-6-2-4,Yes,Required,Decidable,Single Translation Unit,A header file shall not contain definitions of functions or objects that are non-inline and have external linkage,,,Easy,
+cpp,MISRA-C++-2023,RULE-6-2-2,Yes,Required,Decidable,System,All declarations of a variable or function shall have the same type,"M3-9-1,DCL40-C",Declarations2,Easy,
+cpp,MISRA-C++-2023,RULE-6-2-3,Yes,Required,Decidable,System,The source code used to implement an entity shall appear only once,,Declarations2,Medium,
+cpp,MISRA-C++-2023,RULE-6-2-4,Yes,Required,Decidable,Single Translation Unit,A header file shall not contain definitions of functions or objects that are non-inline and have external linkage,,Linkage,Easy,
 cpp,MISRA-C++-2023,RULE-6-4-1,Yes,Required,Decidable,Single Translation Unit,A variable declared in an inner scope shall not hide a variable declared in an outer scope,A2-10-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-4-2,Yes,Required,Decidable,Single Translation Unit,Derived classes shall not conceal functions that are inherited from their bases,A7-3-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-4-3,Yes,Required,Decidable,Single Translation Unit,A name that is present in a dependent base shall not be resolved by unqualified lookup,M14-6-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-6-5-1,Yes,Advisory,Decidable,Single Translation Unit,A function or object with external linkage should be introduced in a header file,,,Medium,
-cpp,MISRA-C++-2023,RULE-6-5-2,Yes,Advisory,Decidable,Single Translation Unit,Internal linkage should be specified appropriately,,,Medium,
-cpp,MISRA-C++-2023,RULE-6-7-1,Yes,Required,Decidable,Single Translation Unit,Local variables shall not have static storage duration,,,Easy,
-cpp,MISRA-C++-2023,RULE-6-7-2,Yes,Required,Decidable,Single Translation Unit,Global variables shall not be used,,,Easy,
+cpp,MISRA-C++-2023,RULE-6-5-1,Yes,Advisory,Decidable,Single Translation Unit,A function or object with external linkage should be introduced in a header file,,Linkage,Medium,
+cpp,MISRA-C++-2023,RULE-6-5-2,Yes,Advisory,Decidable,Single Translation Unit,Internal linkage should be specified appropriately,,Linkage,Medium,
+cpp,MISRA-C++-2023,RULE-6-7-1,Yes,Required,Decidable,Single Translation Unit,Local variables shall not have static storage duration,,Declarations2,Easy,
+cpp,MISRA-C++-2023,RULE-6-7-2,Yes,Required,Decidable,Single Translation Unit,Global variables shall not be used,,Banned,Easy,
 cpp,MISRA-C++-2023,RULE-6-8-1,Yes,Required,Undecidable,System,An object shall not be accessed outside of its lifetime,A3-8-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-6-8-2,Yes,Mandatory,Decidable,Single Translation Unit,A function must not return a reference or a pointer to a local variable with automatic storage duration,M7-5-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-6-8-3,Yes,Required,Decidable,Single Translation Unit,An assignment operator shall not assign the address of an object with automatic storage duration to an object with a greater lifetime,,,Medium,
-cpp,MISRA-C++-2023,RULE-6-8-4,Yes,Advisory,Decidable,Single Translation Unit,Member functions returning references to their object should be refqualified appropriately,,,Medium,
-cpp,MISRA-C++-2023,RULE-6-9-1,Yes,Required,Decidable,Single Translation Unit,The same type aliases shall be used in all declarations of the same entity,,,Medium,
-cpp,MISRA-C++-2023,RULE-6-9-2,Yes,Advisory,Decidable,Single Translation Unit,The names of the standard signed integer types and standard unsigned integer types should not be used,A3-9-1,,Easy,
-cpp,MISRA-C++-2023,RULE-7-0-1,Yes,Required,Decidable,Single Translation Unit,There shall be no conversion from type bool,,,Easy,
-cpp,MISRA-C++-2023,RULE-7-0-2,Yes,Required,Decidable,Single Translation Unit,There shall be no conversion to type bool,,,Easy,
-cpp,MISRA-C++-2023,RULE-7-0-3,Yes,Required,Decidable,Single Translation Unit,The numerical value of a character shall not be used,M5-0-11,,Medium,
-cpp,MISRA-C++-2023,RULE-7-0-4,Yes,Required,Decidable,Single Translation Unit,The operands of bitwise operators and shift operators shall be appropriate,RULE-10-1,,Medium,
-cpp,MISRA-C++-2023,RULE-7-0-5,Yes,Required,Decidable,Single Translation Unit,Integral promotion and the usual arithmetic conversions shall not change the signedness or the type category of an operand,"M5-0-4,M5-0-9,INT31-C",,Medium,
-cpp,MISRA-C++-2023,RULE-7-0-6,Yes,Required,Decidable,Single Translation Unit,Assignment between numeric types shall be appropriate,,,Hard,
+cpp,MISRA-C++-2023,RULE-6-8-3,Yes,Required,Decidable,Single Translation Unit,An assignment operator shall not assign the address of an object with automatic storage duration to an object with a greater lifetime,,Lifetime,Medium,
+cpp,MISRA-C++-2023,RULE-6-8-4,Yes,Advisory,Decidable,Single Translation Unit,Member functions returning references to their object should be refqualified appropriately,,Declarations2,Medium,
+cpp,MISRA-C++-2023,RULE-6-9-1,Yes,Required,Decidable,Single Translation Unit,The same type aliases shall be used in all declarations of the same entity,,Declarations2,Medium,
+cpp,MISRA-C++-2023,RULE-6-9-2,Yes,Advisory,Decidable,Single Translation Unit,The names of the standard signed integer types and standard unsigned integer types should not be used,A3-9-1,BannedAPIs,Easy,
+cpp,MISRA-C++-2023,RULE-7-0-1,Yes,Required,Decidable,Single Translation Unit,There shall be no conversion from type bool,,Conversions,Easy,
+cpp,MISRA-C++-2023,RULE-7-0-2,Yes,Required,Decidable,Single Translation Unit,There shall be no conversion to type bool,,Conversions,Easy,
+cpp,MISRA-C++-2023,RULE-7-0-3,Yes,Required,Decidable,Single Translation Unit,The numerical value of a character shall not be used,M5-0-11,Conversions,Medium,
+cpp,MISRA-C++-2023,RULE-7-0-4,Yes,Required,Decidable,Single Translation Unit,The operands of bitwise operators and shift operators shall be appropriate,RULE-10-1,Preconditions,Medium,
+cpp,MISRA-C++-2023,RULE-7-0-5,Yes,Required,Decidable,Single Translation Unit,Integral promotion and the usual arithmetic conversions shall not change the signedness or the type category of an operand,"M5-0-4,M5-0-9,INT31-C",Conversions,Medium,
+cpp,MISRA-C++-2023,RULE-7-0-6,Yes,Required,Decidable,Single Translation Unit,Assignment between numeric types shall be appropriate,,Conversions,Hard,
 cpp,MISRA-C++-2023,RULE-7-11-1,Yes,Required,Decidable,Single Translation Unit,nullptr shall be the only form of the null-pointer-constant,A4-10-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-7-11-2,Yes,Required,Decidable,Single Translation Unit,An array passed as a function argument shall not decay to a pointer,M5-2-12,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-7-11-3,Yes,Required,Decidable,Single Translation Unit,A conversion from function type to pointer-to-function type shall only occur in appropriate contexts,,,Easy,
-cpp,MISRA-C++-2023,RULE-8-0-1,Yes,Advisory,Decidable,Single Translation Unit,Parentheses should be used to make the meaning of an expression appropriately explicit,M5-0-2,,Medium,
-cpp,MISRA-C++-2023,RULE-8-1-1,Yes,Required,Decidable,Single Translation Unit,A non-transient lambda shall not implicitly capture this,,,Easy,
-cpp,MISRA-C++-2023,RULE-8-1-2,Yes,Advisory,Decidable,Single Translation Unit,Variables should be captured explicitly in a non-transient lambda,A5-1-2,,Easy,
-cpp,MISRA-C++-2023,RULE-8-2-1,Yes,Required,Decidable,Single Translation Unit,A virtual base class shall only be cast to a derived class by means of dynamic_cast,,,Easy,
-cpp,MISRA-C++-2023,RULE-8-2-2,Yes,Required,Decidable,Single Translation Unit,C-style casts and functional notation casts shall not be used,A5-2-2,,Easy,
+cpp,MISRA-C++-2023,RULE-7-11-3,Yes,Required,Decidable,Single Translation Unit,A conversion from function type to pointer-to-function type shall only occur in appropriate contexts,,Conversions,Easy,
+cpp,MISRA-C++-2023,RULE-8-0-1,Yes,Advisory,Decidable,Single Translation Unit,Parentheses should be used to make the meaning of an expression appropriately explicit,M5-0-2,Expressions2,Medium,
+cpp,MISRA-C++-2023,RULE-8-1-1,Yes,Required,Decidable,Single Translation Unit,A non-transient lambda shall not implicitly capture this,,Expressions2,Easy,
+cpp,MISRA-C++-2023,RULE-8-1-2,Yes,Advisory,Decidable,Single Translation Unit,Variables should be captured explicitly in a non-transient lambda,A5-1-2,Expressions2,Easy,
+cpp,MISRA-C++-2023,RULE-8-2-1,Yes,Required,Decidable,Single Translation Unit,A virtual base class shall only be cast to a derived class by means of dynamic_cast,,Conversions,Easy,
+cpp,MISRA-C++-2023,RULE-8-2-2,Yes,Required,Decidable,Single Translation Unit,C-style casts and functional notation casts shall not be used,A5-2-2,Conversions,Easy,
 cpp,MISRA-C++-2023,RULE-8-2-3,Yes,Required,Decidable,Single Translation Unit,A cast shall not remove any const or volatile qualification from the type accessed via a pointer or by reference,A5-2-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-8-2-4,Yes,Required,Decidable,Single Translation Unit,Casts shall not be performed between a pointer to function and any other type,M5-2-6,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-8-2-5,Yes,Required,Decidable,Single Translation Unit,reinterpret_cast shall not be used,A5-2-4,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-8-2-6,Yes,Required,Decidable,Single Translation Unit,"An object with integral, enumerated, or pointer to void type shall not be cast to a pointer type","RULE-11-6, INT36-C",,Easy,
-cpp,MISRA-C++-2023,RULE-8-2-7,Yes,Advisory,Decidable,Single Translation Unit,A cast should not convert a pointer type to an integral type,"RULE-11-6, INT36-C",,Easy,
-cpp,MISRA-C++-2023,RULE-8-2-8,Yes,Required,Decidable,Single Translation Unit,An object pointer type shall not be cast to an integral type other than std::uintptr_t or std::intptr_t,"RULE-11-6, INT36-C",,Easy,
-cpp,MISRA-C++-2023,RULE-8-2-9,Yes,Required,Decidable,Single Translation Unit,The operand to typeid shall not be an expression of polymorphic class type,,,Easy,
+cpp,MISRA-C++-2023,RULE-8-2-6,Yes,Required,Decidable,Single Translation Unit,"An object with integral, enumerated, or pointer to void type shall not be cast to a pointer type","RULE-11-6, INT36-C",Conversions,Easy,
+cpp,MISRA-C++-2023,RULE-8-2-7,Yes,Advisory,Decidable,Single Translation Unit,A cast should not convert a pointer type to an integral type,"RULE-11-6, INT36-C",Conversions,Easy,
+cpp,MISRA-C++-2023,RULE-8-2-8,Yes,Required,Decidable,Single Translation Unit,An object pointer type shall not be cast to an integral type other than std::uintptr_t or std::intptr_t,"RULE-11-6, INT36-C",Conversions,Easy,
+cpp,MISRA-C++-2023,RULE-8-2-9,Yes,Required,Decidable,Single Translation Unit,The operand to typeid shall not be an expression of polymorphic class type,,Preconditions,Easy,
 cpp,MISRA-C++-2023,RULE-8-2-10,Yes,Required,Undecidable,System,"Functions shall not call themselves, either directly or indirectly",A7-5-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-8-2-11,Yes,Required,Decidable,Single Translation Unit,An argument passed via ellipsis shall have an appropriate type,,,Easy,
+cpp,MISRA-C++-2023,RULE-8-2-11,Yes,Required,Decidable,Single Translation Unit,An argument passed via ellipsis shall have an appropriate type,,Preconditions,Easy,
 cpp,MISRA-C++-2023,RULE-8-3-1,Yes,Advisory,Decidable,Single Translation Unit,The built-in unary - operator should not be applied to an expression of unsigned type,M5-3-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-8-3-2,Yes,Advisory,Decidable,Single Translation Unit,The built-in unary + operator should not be used,,,Easy,
-cpp,MISRA-C++-2023,RULE-8-7-1,Yes,Required,Undecidable,System,Pointer arithmetic shall not form an invalid pointer,ARR30-C,,Easy,
-cpp,MISRA-C++-2023,RULE-8-7-2,Yes,Required,Undecidable,System,Subtraction between pointers shall only be applied to pointers that address elements of the same array,ARR36-C,,Easy,
-cpp,MISRA-C++-2023,RULE-8-9-1,Yes,Required,Undecidable,System,"The built-in relational operators >, >=, < and <= shall not be applied to objects of pointer type, except where they point to elements of the same array",ARR36-C,,Easy,
-cpp,MISRA-C++-2023,RULE-8-14-1,Yes,Advisory,Undecidable,System,The right-hand operand of a logical && or operator should not contain persistent side effects,"M5-14-1, RULE-13-5",,Medium,
-cpp,MISRA-C++-2023,RULE-8-18-1,Yes,Mandatory,Undecidable,System,An object or subobject must not be copied to an overlapping object,"M0-2-1, RULE-19-1",,Hard,
+cpp,MISRA-C++-2023,RULE-8-3-2,Yes,Advisory,Decidable,Single Translation Unit,The built-in unary + operator should not be used,,Banned,Easy,
+cpp,MISRA-C++-2023,RULE-8-7-1,Yes,Required,Undecidable,System,Pointer arithmetic shall not form an invalid pointer,ARR30-C,Memory,Easy,
+cpp,MISRA-C++-2023,RULE-8-7-2,Yes,Required,Undecidable,System,Subtraction between pointers shall only be applied to pointers that address elements of the same array,ARR36-C,Memory,Easy,
+cpp,MISRA-C++-2023,RULE-8-9-1,Yes,Required,Undecidable,System,"The built-in relational operators >, >=, < and <= shall not be applied to objects of pointer type, except where they point to elements of the same array",ARR36-C,Memory,Easy,
+cpp,MISRA-C++-2023,RULE-8-14-1,Yes,Advisory,Undecidable,System,The right-hand operand of a logical && or operator should not contain persistent side effects,"M5-14-1, RULE-13-5",SideEffects3,Medium,
+cpp,MISRA-C++-2023,RULE-8-18-1,Yes,Mandatory,Undecidable,System,An object or subobject must not be copied to an overlapping object,"M0-2-1, RULE-19-1",Memory,Hard,
 cpp,MISRA-C++-2023,RULE-8-18-2,Yes,Advisory,Decidable,Single Translation Unit,The result of an assignment operator should not be used,RULE-13-4,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-8-19-1,Yes,Advisory,Decidable,Single Translation Unit,The comma operator should not be used,M5-18-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-8-20-1,Yes,Advisory,Decidable,Single Translation Unit,An unsigned arithmetic operation with constant operands should not wrap,INT30-C,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-9-2-1,Yes,Required,Decidable,Single Translation Unit,An explicit type conversion shall not be an expression statement,DCL53-CPP,,Easy,
+cpp,MISRA-C++-2023,RULE-9-2-1,Yes,Required,Decidable,Single Translation Unit,An explicit type conversion shall not be an expression statement,DCL53-CPP,Conversions,Easy,
 cpp,MISRA-C++-2023,RULE-9-3-1,Yes,Required,Decidable,Single Translation Unit,The body of an iteration-statement or a selection-statement shall be a compound-statement,RULE-15-6,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-4-1,Yes,Required,Decidable,Single Translation Unit,All if ... else if constructs shall be terminated with an else statement,RULE-15-7,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-9-4-2,Yes,Required,Decidable,Single Translation Unit,The structure of a switch statement shall be appropriate,"RULE-16-1, RULE-16-2,RULE-16-3,RULE-16-4,RULE-16-5,RULE-16-6,RULE-16-7",,Medium,
-cpp,MISRA-C++-2023,RULE-9-5-1,Yes,Advisory,Decidable,Single Translation Unit,Legacy for statements should be simple,,,Hard,
-cpp,MISRA-C++-2023,RULE-9-5-2,Yes,Required,Decidable,Single Translation Unit,A for-range-initializer shall contain at most one function call,,,Easy,
+cpp,MISRA-C++-2023,RULE-9-4-2,Yes,Required,Decidable,Single Translation Unit,The structure of a switch statement shall be appropriate,"RULE-16-1, RULE-16-2,RULE-16-3,RULE-16-4,RULE-16-5,RULE-16-6,RULE-16-7",Statements,Medium,
+cpp,MISRA-C++-2023,RULE-9-5-1,Yes,Advisory,Decidable,Single Translation Unit,Legacy for statements should be simple,,Statements,Hard,
+cpp,MISRA-C++-2023,RULE-9-5-2,Yes,Required,Decidable,Single Translation Unit,A for-range-initializer shall contain at most one function call,,Statements,Easy,
 cpp,MISRA-C++-2023,RULE-9-6-1,Yes,Advisory,Decidable,Single Translation Unit,The goto statement should not be used,RULE-15-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-6-2,Yes,Required,Decidable,Single Translation Unit,A goto statement shall reference a label in a surrounding block,RULE-15-3,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-6-3,Yes,Required,Decidable,Single Translation Unit,The goto statement shall jump to a label declared later in the function body,RULE-15-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-6-4,Yes,Required,Undecidable,System,A function declared with the [[noreturn]] attribute shall not return,MSC53-CPP,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-9-6-5,Yes,Required,Decidable,Single Translation Unit,A function with non-void return type shall return a value on all paths,MSC52-CPP,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-10-0-1,Yes,Advisory,Decidable,Single Translation Unit,A declaration should not declare more than one variable or member variable,M8-0-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-10-1-1,Yes,Advisory,Decidable,Single Translation Unit,The target type of a pointer or lvalue reference parameter should be const-qualified appropriately,RULE-8-13,,Hard,
-cpp,MISRA-C++-2023,RULE-10-1-2,Yes,Required,Decidable,Single Translation Unit,The volatile qualifier shall be used appropriately,,,Easy,
+cpp,MISRA-C++-2023,RULE-10-1-1,Yes,Advisory,Decidable,Single Translation Unit,The target type of a pointer or lvalue reference parameter should be const-qualified appropriately,RULE-8-13,Declarations2,Hard,
+cpp,MISRA-C++-2023,RULE-10-1-2,Yes,Required,Decidable,Single Translation Unit,The volatile qualifier shall be used appropriately,,Declarations2,Easy,
 cpp,MISRA-C++-2023,RULE-10-2-1,Yes,Required,Decidable,Single Translation Unit,An enumeration shall be defined with an explicit underlying type,A7-2-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-10-2-2,Yes,Advisory,Decidable,Single Translation Unit,Unscoped enumerations should not be declared,A7-2-3,,Easy,
-cpp,MISRA-C++-2023,RULE-10-2-3,Yes,Required,Decidable,Single Translation Unit,The numeric value of an unscoped enumeration with no fixed underlying type shall not be used,A4-5-1,,Easy,
-cpp,MISRA-C++-2023,RULE-10-3-1,Yes,Advisory,Decidable,Single Translation Unit,There should be no unnamed namespaces in header files,"DCL59-CPP, M7-3-3",,Easy,
+cpp,MISRA-C++-2023,RULE-10-2-2,Yes,Advisory,Decidable,Single Translation Unit,Unscoped enumerations should not be declared,A7-2-3,Banned,Easy,
+cpp,MISRA-C++-2023,RULE-10-2-3,Yes,Required,Decidable,Single Translation Unit,The numeric value of an unscoped enumeration with no fixed underlying type shall not be used,A4-5-1,Banned,Easy,
+cpp,MISRA-C++-2023,RULE-10-3-1,Yes,Advisory,Decidable,Single Translation Unit,There should be no unnamed namespaces in header files,"DCL59-CPP, M7-3-3",Banned,Easy,
 cpp,MISRA-C++-2023,RULE-10-4-1,Yes,Required,Decidable,Single Translation Unit,The asm declaration shall not be used,A7-4-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-11-3-1,Yes,Advisory,Decidable,Single Translation Unit,Variables of array type should not be declared,,,Easy,
+cpp,MISRA-C++-2023,RULE-11-3-1,Yes,Advisory,Decidable,Single Translation Unit,Variables of array type should not be declared,,Declarations2,Easy,
 cpp,MISRA-C++-2023,RULE-11-3-2,Yes,Advisory,Decidable,Single Translation Unit,The declaration of an object should contain no more than two levels of pointer indirection,A5-0-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-11-6-1,Yes,Advisory,Decidable,Single Translation Unit,All variables should be initialized,,,Easy,
-cpp,MISRA-C++-2023,RULE-11-6-2,Yes,Mandatory,Undecidable,System,The value of an object must not be read before it has been set,A8-5-0,,Very Hard,
+cpp,MISRA-C++-2023,RULE-11-6-1,Yes,Advisory,Decidable,Single Translation Unit,All variables should be initialized,,Declarations2,Easy,
+cpp,MISRA-C++-2023,RULE-11-6-2,Yes,Mandatory,Undecidable,System,The value of an object must not be read before it has been set,A8-5-0,Lifetime,Very Hard,
 cpp,MISRA-C++-2023,RULE-11-6-3,Yes,Required,Decidable,Single Translation Unit,"Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique",RULE-8-12,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-12-2-1,Yes,Advisory,Decidable,Single Translation Unit,Bit-fields should not be declared,A9-6-2,,Easy,
+cpp,MISRA-C++-2023,RULE-12-2-1,Yes,Advisory,Decidable,Single Translation Unit,Bit-fields should not be declared,A9-6-2,Banned,Easy,
 cpp,MISRA-C++-2023,RULE-12-2-2,Yes,Required,Decidable,Single Translation Unit,A bit-field shall have an appropriate type,RULE-6-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-12-2-3,Yes,Required,Decidable,Single Translation Unit,A named bit-field with signed integer type shall not have a length of one bit,M9-6-4,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-12-3-1,Yes,Required,Decidable,Single Translation Unit,The union keyword shall not be used,RULE-19-2,,Easy,
-cpp,MISRA-C++-2023,RULE-13-1-1,Yes,Advisory,Decidable,Single Translation Unit,Classes should not be inherited virtually,,,Easy,
+cpp,MISRA-C++-2023,RULE-12-3-1,Yes,Required,Decidable,Single Translation Unit,The union keyword shall not be used,RULE-19-2,Banned,Easy,
+cpp,MISRA-C++-2023,RULE-13-1-1,Yes,Advisory,Decidable,Single Translation Unit,Classes should not be inherited virtually,,Classes2,Easy,
 cpp,MISRA-C++-2023,RULE-13-1-2,Yes,Required,Decidable,Single Translation Unit,An accessible base class shall not be both virtual and non-virtual in the same hierarchy,M10-1-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-13-3-1,Yes,Required,Decidable,Single Translation Unit,"User-declared member functions shall use the virtual, override and final specifiers appropriately",,,Easy,
+cpp,MISRA-C++-2023,RULE-13-3-1,Yes,Required,Decidable,Single Translation Unit,"User-declared member functions shall use the virtual, override and final specifiers appropriately",,Classes2,Easy,
 cpp,MISRA-C++-2023,RULE-13-3-2,Yes,Required,Decidable,Single Translation Unit,Parameters in an overriding virtual function shall not specify different default arguments,M8-3-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-13-3-3,Yes,Required,Decidable,System,The parameters in all declarations or overrides of a function shall either be unnamed or have identical names,RULE-8-3,,Easy,
+cpp,MISRA-C++-2023,RULE-13-3-3,Yes,Required,Decidable,System,The parameters in all declarations or overrides of a function shall either be unnamed or have identical names,RULE-8-3,Declarations2,Easy,
 cpp,MISRA-C++-2023,RULE-13-3-4,Yes,Required,Decidable,Single Translation Unit,A comparison of a potentially virtual pointer to member function shall only be with nullptr,A5-10-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-14-1-1,Yes,Advisory,Decidable,Single Translation Unit,Non-static data members should be either all private or all public,,,Easy,
-cpp,MISRA-C++-2023,RULE-15-0-1,Yes,Required,Decidable,Single Translation Unit,Special member functions shall be provided appropriately,A12-0-1,,Medium,
-cpp,MISRA-C++-2023,RULE-15-0-2,Yes,Advisory,Decidable,Single Translation Unit,User-provided copy and move member functions of a class should have appropriate signatures,,,Easy,
+cpp,MISRA-C++-2023,RULE-14-1-1,Yes,Advisory,Decidable,Single Translation Unit,Non-static data members should be either all private or all public,,Classes2,Easy,
+cpp,MISRA-C++-2023,RULE-15-0-1,Yes,Required,Decidable,Single Translation Unit,Special member functions shall be provided appropriately,A12-0-1,Classes2,Medium,
+cpp,MISRA-C++-2023,RULE-15-0-2,Yes,Advisory,Decidable,Single Translation Unit,User-provided copy and move member functions of a class should have appropriate signatures,,Classes2,Easy,
 cpp,MISRA-C++-2023,RULE-15-1-1,Yes,Required,Undecidable,System,An object’s dynamic type shall not be used from within its constructor or destructor,M12-1-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-15-1-2,Yes,Advisory,Decidable,Single Translation Unit,All constructors of a class should explicitly initialize all of its virtual base classes and immediate base classes,A12-1-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-15-1-3,Yes,Required,Decidable,Single Translation Unit,Conversion operators and constructors that are callable with a single argument shall be explicit,"A12-1-4,A13-5-2",,Easy,
-cpp,MISRA-C++-2023,RULE-15-1-4,Yes,Advisory,Decidable,Single Translation Unit,"All direct, non-static data members of a class should be initialized before the class object is accessible",,,Hard,
+cpp,MISRA-C++-2023,RULE-15-1-3,Yes,Required,Decidable,Single Translation Unit,Conversion operators and constructors that are callable with a single argument shall be explicit,"A12-1-4,A13-5-2",Classes2,Easy,
+cpp,MISRA-C++-2023,RULE-15-1-4,Yes,Advisory,Decidable,Single Translation Unit,"All direct, non-static data members of a class should be initialized before the class object is accessible",,Classes2,Hard,
 cpp,MISRA-C++-2023,RULE-15-1-5,Yes,Required,Decidable,Single Translation Unit,A class shall only define an initializer-list constructor when it is the only constructor,A8-5-4,ImportMisra23,Import,
 cpp,MISRA-C++-2023,DIR-15-8-1,Yes,Required,Decidable,Implementation,User-provided copy assignment operators and move assignment operators shall handle self-assignment,A12-8-5,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-16-5-1,Yes,Required,Decidable,Single Translation Unit,The logical AND and logical OR operators shall not be overloaded,M5-2-11,,Easy,
+cpp,MISRA-C++-2023,RULE-16-5-1,Yes,Required,Decidable,Single Translation Unit,The logical AND and logical OR operators shall not be overloaded,M5-2-11,Classes2,Easy,
 cpp,MISRA-C++-2023,RULE-16-5-2,Yes,Required,Decidable,Single Translation Unit,The address-of operator shall not be overloaded,M5-3-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-16-6-1,Yes,Advisory,Decidable,Single Translation Unit,Symmetrical operators should only be implemented as non-member functions,,,Medium,
+cpp,MISRA-C++-2023,RULE-16-6-1,Yes,Advisory,Decidable,Single Translation Unit,Symmetrical operators should only be implemented as non-member functions,,Classes2,Medium,
 cpp,MISRA-C++-2023,RULE-17-8-1,Yes,Required,Decidable,Single Translation Unit,Function templates shall not be explicitly specialized,A14-8-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-18-1-1,Yes,Required,Decidable,Single Translation Unit,An exception object shall not have pointer type,A15-1-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-18-1-2,Yes,Required,Decidable,Single Translation Unit,An empty throw shall only occur within the compound-statement of a catch handler,M15-1-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-18-3-1,Yes,Advisory,Decidable,Single Translation Unit,There should be at least one exception handler to catch all otherwise unhandled exceptions,A15-3-3,,Easy,
-cpp,MISRA-C++-2023,RULE-18-3-2,Yes,Required,Decidable,Single Translation Unit,An exception of class type shall be caught by const reference or reference,A15-3-5,,Easy,
+cpp,MISRA-C++-2023,RULE-18-3-1,Yes,Advisory,Decidable,Single Translation Unit,There should be at least one exception handler to catch all otherwise unhandled exceptions,A15-3-3,Exceptions3,Easy,
+cpp,MISRA-C++-2023,RULE-18-3-2,Yes,Required,Decidable,Single Translation Unit,An exception of class type shall be caught by const reference or reference,A15-3-5,Exceptions3,Easy,
 cpp,MISRA-C++-2023,RULE-18-3-3,Yes,Required,Decidable,Single Translation Unit,Handlers for a function-try-block of a constructor or destructor shall not refer to non-static members from their class or its bases,M15-3-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-18-4-1,Yes,Required,Decidable,Single Translation Unit,Exception-unfriendly functions shall be noexcept,A15-5-1,,Easy,
+cpp,MISRA-C++-2023,RULE-18-4-1,Yes,Required,Decidable,Single Translation Unit,Exception-unfriendly functions shall be noexcept,A15-5-1,Exceptions3,Easy,
 cpp,MISRA-C++-2023,RULE-18-5-1,Yes,Advisory,Undecidable,System,A noexcept function should not attempt to propagate an exception to the calling function,A15-4-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-18-5-2,Yes,Advisory,Decidable,Single Translation Unit,Program-terminating functions should not be used,,,Easy,
+cpp,MISRA-C++-2023,RULE-18-5-2,Yes,Advisory,Decidable,Single Translation Unit,Program-terminating functions should not be used,,BannedAPIs,Easy,
 cpp,MISRA-C++-2023,RULE-19-0-1,No,Required,Decidable,Single Translation Unit,A line whose first token is # shall be a valid preprocessing directive,,,,
 cpp,MISRA-C++-2023,RULE-19-0-2,Yes,Required,Decidable,Single Translation Unit,Function-like macros shall not be defined,DIR-4-9,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-0-3,Yes,Advisory,Decidable,Single Translation Unit,#include directives should only be preceded by preprocessor directives or comments,RULE-20-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-19-0-4,Yes,Advisory,Decidable,Single Translation Unit,#undef should only be used for macros defined previously in the same file,,,Easy,
-cpp,MISRA-C++-2023,RULE-19-1-1,Yes,Required,Decidable,Single Translation Unit,The defined preprocessor operator shall be used appropriately,M16-1-1,,Easy,
+cpp,MISRA-C++-2023,RULE-19-0-4,Yes,Advisory,Decidable,Single Translation Unit,#undef should only be used for macros defined previously in the same file,,Preprocessor,Easy,
+cpp,MISRA-C++-2023,RULE-19-1-1,Yes,Required,Decidable,Single Translation Unit,The defined preprocessor operator shall be used appropriately,M16-1-1,Preprocessor,Easy,
 cpp,MISRA-C++-2023,RULE-19-1-2,No,Required,Decidable,Single Translation Unit,"All #else, #elif and #endif preprocessor directives shall reside in the same file as the #if, #ifdef or #ifndef directive to which they are related",M16-1-2,,,
 cpp,MISRA-C++-2023,RULE-19-1-3,Yes,Required,Decidable,Single Translation Unit,All identifiers used in the controlling expression of #if or #elif preprocessing directives shall be defined prior to evaluation,M16-0-7,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-19-2-1,Yes,Required,Decidable,Single Translation Unit,Precautions shall be taken in order to prevent the contents of a header file being included more than once,M16-2-3,,Easy,
-cpp,MISRA-C++-2023,RULE-19-2-2,Yes,Required,Decidable,Single Translation Unit,"The #include directive shall be followed by either a <filename> or ""filename"" sequence",,,Easy,
+cpp,MISRA-C++-2023,RULE-19-2-1,Yes,Required,Decidable,Single Translation Unit,Precautions shall be taken in order to prevent the contents of a header file being included more than once,M16-2-3,Preprocessor,Easy,
+cpp,MISRA-C++-2023,RULE-19-2-2,Yes,Required,Decidable,Single Translation Unit,"The #include directive shall be followed by either a <filename> or ""filename"" sequence",,Preprocessor,Easy,
 cpp,MISRA-C++-2023,RULE-19-2-3,Yes,Required,Decidable,Single Translation Unit,"The ' or "" or \ characters and the /* or // character sequences shall not occur in a header file name",A16-2-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-3-1,Yes,Advisory,Decidable,Single Translation Unit,The # and ## preprocessor operators should not be used,M16-3-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-3-2,Yes,Required,Decidable,Single Translation Unit,A macro parameter immediately following a # operator shall not be immediately followed by a ## operator,RULE-20-11,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-19-3-3,Yes,Required,Decidable,Single Translation Unit,The argument to a mixed-use macro parameter shall not be subject to further expansion,RULE-20-12,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-19-3-4,Yes,Required,Decidable,Single Translation Unit,Parentheses shall be used to ensure macro arguments are expanded appropriately,M16-0-6,,Medium,
+cpp,MISRA-C++-2023,RULE-19-3-4,Yes,Required,Decidable,Single Translation Unit,Parentheses shall be used to ensure macro arguments are expanded appropriately,M16-0-6,Preprocessor,Medium,
 cpp,MISRA-C++-2023,RULE-19-3-5,Yes,Required,Decidable,Single Translation Unit,Tokens that look like a preprocessing directive shall not occur within a macro argument,RULE-20-6,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-19-6-1,Yes,Advisory,Decidable,Single Translation Unit,The #pragma directive and the _Pragma operator should not be used,A16-7-1,,Easy,
+cpp,MISRA-C++-2023,RULE-19-6-1,Yes,Advisory,Decidable,Single Translation Unit,The #pragma directive and the _Pragma operator should not be used,A16-7-1,Preprocessor,Easy,
 cpp,MISRA-C++-2023,RULE-21-2-1,Yes,Required,Decidable,Single Translation Unit,"The library functions atof, atoi, atol and atoll from <cstdlib> shall not be used",RULE-21-7,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-21-2-2,Yes,Required,Decidable,Single Translation Unit,"The string handling functions from <cstring>, <cstdlib>, <cwchar> and <cinttypes> shall not be used",M18-0-5,,Easy,
-cpp,MISRA-C++-2023,RULE-21-2-3,Yes,Required,Decidable,Single Translation Unit,The library function system from <cstdlib> shall not be used,M18-0-3,,Easy,
+cpp,MISRA-C++-2023,RULE-21-2-2,Yes,Required,Decidable,Single Translation Unit,"The string handling functions from <cstring>, <cstdlib>, <cwchar> and <cinttypes> shall not be used",M18-0-5,BannedAPIs,Easy,
+cpp,MISRA-C++-2023,RULE-21-2-3,Yes,Required,Decidable,Single Translation Unit,The library function system from <cstdlib> shall not be used,M18-0-3,BannedAPIs,Easy,
 cpp,MISRA-C++-2023,RULE-21-2-4,Yes,Required,Decidable,Single Translation Unit,The macro offsetof shall not be used,M18-2-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-21-6-1,Yes,Advisory,Undecidable,Single Translation Unit,Dynamic memory should not be used,DIR-4-12,,Easy,
-cpp,MISRA-C++-2023,RULE-21-6-2,Yes,Required,Decidable,Single Translation Unit,Dynamic memory shall be managed automatically,,,Easy,
-cpp,MISRA-C++-2023,RULE-21-6-3,Yes,Required,Decidable,Single Translation Unit,Advanced memory management shall not be used,,,Medium,
+cpp,MISRA-C++-2023,RULE-21-6-1,Yes,Advisory,Undecidable,Single Translation Unit,Dynamic memory should not be used,DIR-4-12,Banned,Easy,
+cpp,MISRA-C++-2023,RULE-21-6-2,Yes,Required,Decidable,Single Translation Unit,Dynamic memory shall be managed automatically,,Memory,Easy,
+cpp,MISRA-C++-2023,RULE-21-6-3,Yes,Required,Decidable,Single Translation Unit,Advanced memory management shall not be used,,Memory,Medium,
 cpp,MISRA-C++-2023,RULE-21-6-4,Yes,Required,Decidable,System,"If a project defines either a sized or unsized version of a global operator delete, then both shall be defined",A18-5-4,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-21-6-5,Yes,Required,Decidable,Single Translation Unit,A pointer to an incomplete class type shall not be deleted,A5-3-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-21-10-1,Yes,Required,Decidable,Single Translation Unit,The features of <cstdarg> shall not be used,DCL50-CPP,,Easy,
-cpp,MISRA-C++-2023,RULE-21-10-2,Yes,Required,Decidable,Single Translation Unit,The standard header file <csetjmp> shall not be used,ERR52-CPP,,Easy,
+cpp,MISRA-C++-2023,RULE-21-10-1,Yes,Required,Decidable,Single Translation Unit,The features of <cstdarg> shall not be used,DCL50-CPP,BannedAPIs,Easy,
+cpp,MISRA-C++-2023,RULE-21-10-2,Yes,Required,Decidable,Single Translation Unit,The standard header file <csetjmp> shall not be used,ERR52-CPP,BannedAPIs,Easy,
 cpp,MISRA-C++-2023,RULE-21-10-3,Yes,Required,Decidable,Single Translation Unit,The facilities provided by the standard header file <csignal> shall not be used,M18-7-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-22-3-1,Yes,Required,Decidable,Single Translation Unit,The assert macro shall not be used with a constant-expression,,,Easy,
-cpp,MISRA-C++-2023,RULE-22-4-1,Yes,Required,Decidable,Single Translation Unit,The literal value zero shall be the only value assigned to errno,,,Easy,
-cpp,MISRA-C++-2023,RULE-23-11-1,Yes,Advisory,Decidable,Single Translation Unit,The raw pointer constructors of std::shared_ptr and std::unique_ptr should not be used,,,Easy,
-cpp,MISRA-C++-2023,RULE-24-5-1,Yes,Required,Decidable,Single Translation Unit,The character handling functions from <cctype> and <cwctype> shall not be used,,,Easy,
-cpp,MISRA-C++-2023,RULE-24-5-2,Yes,Required,Decidable,Single Translation Unit,"The C++ Standard Library functions memcpy, memmove and memcmp from <cstring> shall not be used",,,Easy,
-cpp,MISRA-C++-2023,RULE-25-5-1,Yes,Required,Decidable,Single Translation Unit,The setlocale and std::locale::global functions shall not be called,,,Easy,
+cpp,MISRA-C++-2023,RULE-22-3-1,Yes,Required,Decidable,Single Translation Unit,The assert macro shall not be used with a constant-expression,,Preconditions,Easy,
+cpp,MISRA-C++-2023,RULE-22-4-1,Yes,Required,Decidable,Single Translation Unit,The literal value zero shall be the only value assigned to errno,,Preconditions,Easy,
+cpp,MISRA-C++-2023,RULE-23-11-1,Yes,Advisory,Decidable,Single Translation Unit,The raw pointer constructors of std::shared_ptr and std::unique_ptr should not be used,,BannedAPIs,Easy,
+cpp,MISRA-C++-2023,RULE-24-5-1,Yes,Required,Decidable,Single Translation Unit,The character handling functions from <cctype> and <cwctype> shall not be used,,BannedAPIs,Easy,
+cpp,MISRA-C++-2023,RULE-24-5-2,Yes,Required,Decidable,Single Translation Unit,"The C++ Standard Library functions memcpy, memmove and memcmp from <cstring> shall not be used",,BannedAPIs,Easy,
+cpp,MISRA-C++-2023,RULE-25-5-1,Yes,Required,Decidable,Single Translation Unit,The setlocale and std::locale::global functions shall not be called,,BannedAPIs,Easy,
 cpp,MISRA-C++-2023,RULE-25-5-2,Yes,Mandatory,Decidable,Single Translation Unit,"The pointers returned by the C++ Standard Library functions localeconv, getenv, setlocale or strerror must only be used as if they have pointer to const-qualified type",RULE-21-19,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-25-5-3,Yes,Mandatory,Undecidable,System,"The pointer returned by the C++ Standard Library functions asctime, ctime, gmtime, localtime, localeconv, getenv, setlocale or strerror must not be used following a subsequent call to the same function",RULE-21-20,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-26-3-1,Yes,Advisory,Decidable,Single Translation Unit,std::vector should not be specialized with bool,A18-1-2,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-28-3-1,Yes,Required,Undecidable,System,Predicates shall not have persistent side effects,A25-1-1,,Easy,
-cpp,MISRA-C++-2023,RULE-28-6-1,Yes,Required,Decidable,Single Translation Unit,The argument to std::move shall be a non-const lvalue,A18-9-3,,Easy,
+cpp,MISRA-C++-2023,RULE-28-3-1,Yes,Required,Undecidable,System,Predicates shall not have persistent side effects,A25-1-1,SideEffects3,Easy,
+cpp,MISRA-C++-2023,RULE-28-6-1,Yes,Required,Decidable,Single Translation Unit,The argument to std::move shall be a non-const lvalue,A18-9-3,Preconditions,Easy,
 cpp,MISRA-C++-2023,RULE-28-6-2,Yes,Required,Decidable,Single Translation Unit,Forwarding references and std::forward shall be used together,A18-9-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-28-6-3,Yes,Required,Decidable,Single Translation Unit,An object shall not be used while in a potentially moved-from state,A12-8-3,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-28-6-4,Yes,Required,Decidable,Single Translation Unit,"The result of std::remove, std::remove_if, std::unique and empty shall be used",,,Easy,
+cpp,MISRA-C++-2023,RULE-28-6-4,Yes,Required,Decidable,Single Translation Unit,"The result of std::remove, std::remove_if, std::unique and empty shall be used",,DeadCode2,Easy,
 cpp,MISRA-C++-2023,RULE-30-0-1,Yes,Required,Decidable,Single Translation Unit,The C Library input/output functions shall not be used,M27-0-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-30-0-2,Yes,Required,Undecidable,System,Reads and writes on the same file stream shall be separated by a positioning operation,A27-0-3,ImportMisra23,Import,

From d9f248e3333b22ab277e7271226a020562246761 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Mon, 29 Jul 2024 15:43:22 +0100
Subject: [PATCH 077/435] Avoid clash on Package name

Naming was already used
---
 rules.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules.csv b/rules.csv
index 0e08bef58f..f9c195e47a 100644
--- a/rules.csv
+++ b/rules.csv
@@ -792,7 +792,7 @@ cpp,MISRA-C++-2023,RULE-5-0-1,Yes,Advisory,Decidable,Single Translation Unit,Tri
 cpp,MISRA-C++-2023,RULE-5-7-1,Yes,Required,Decidable,Single Translation Unit,The character sequence /* shall not be used within a C-style comment,M2-7-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,DIR-5-7-2,Yes,Advisory,,,Sections of code should not be “commented out”,A2-7-2,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-7-3,Yes,Required,Decidable,Single Translation Unit,Line-splicing shall not be used in // comments,A2-7-1,ImportMisra23,Import,
-cpp,MISRA-C++-2023,RULE-5-10-1,Yes,Required,Decidable,Single Translation Unit,User-defined identifiers shall have an appropriate form,,Naming,Easy,
+cpp,MISRA-C++-2023,RULE-5-10-1,Yes,Required,Decidable,Single Translation Unit,User-defined identifiers shall have an appropriate form,,Naming2,Easy,
 cpp,MISRA-C++-2023,RULE-5-13-1,Yes,Required,Decidable,Single Translation Unit,"In character literals and non-raw string literals, \ shall only be used to form a defined escape sequence or universal character name",A2-13-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-13-2,Yes,Required,Decidable,Single Translation Unit,"Octal escape sequences, hexadecimal escape sequences, and universal character names shall be terminated",RULE-4-1,ImportMisra23,Import,
 cpp,MISRA-C++-2023,RULE-5-13-3,Yes,Required,Decidable,Single Translation Unit,Octal constants shall not be used,M2-13-2,ImportMisra23,Import,

From 490a968c014036ab8fa01b099a618ded0dae1f57 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 30 Jul 2024 14:19:55 +0900
Subject: [PATCH 078/435] Fix for #650

---
 .../MacroOrFunctionArgsContainHashToken.ql    | 37 ++++++++++++++++---
 ...croOrFunctionArgsContainHashToken.expected |  2 -
 c/cert/test/rules/PRE32-C/test.c              |  6 +--
 change_notes/2024-07-30-fix-fp-650-PRE32-C.md |  2 +
 4 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 change_notes/2024-07-30-fix-fp-650-PRE32-C.md

diff --git a/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql b/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
index c323c2d31f..9680bea813 100644
--- a/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
+++ b/c/cert/src/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.ql
@@ -32,11 +32,38 @@ predicate isFunctionSuccessorLocation(ControlFlowNode node, File f, int endline)
 PreprocessorDirective isLocatedInAFunctionInvocation(FunctionCall c) {
   exists(PreprocessorDirective p, File f, int startCall, int endCall |
     isFunctionInvocationLocation(c, f, startCall, endCall) and
-    exists(int startLine, int endLine | isPreprocDirectiveLine(p, f, startLine, endLine) |
-      startCall < startLine and
-      startCall < endLine and
-      endLine <= endCall and
-      endLine <= endCall
+    exists(Expr arg, int preprocStartLine, int preprocEndLine |
+      c.getAnArgument() = arg and
+      isPreprocDirectiveLine(p, f, preprocStartLine, preprocEndLine) and
+      // function call begins before preprocessor directive
+      startCall < preprocStartLine and
+      (
+        // argument's location is after the preprocessor directive
+        arg.getLocation().getStartLine() > preprocStartLine
+        or
+        // arg's location is before an endif token that is part of a
+        // preprocessor directive defined before the argument.
+        // E.g.
+        // memcpy(dest, src,
+        // #ifdef SOMEMACRO
+        // 12
+        // #else
+        // 24 // 'arg' exists here
+        // #endif // endif after 'arg', but part of a preproc. branch before 'arg'
+        // );
+        p instanceof PreprocessorEndif and
+        // exists a preprocessor branch of which this is the endif
+        // and that preprocessor directive exists before
+        // the argument and after the function call begins.
+        exists(PreprocessorBranchDirective another |
+          another.getEndIf() = p and
+          another.getLocation().getFile() = f and
+          startCall < another.getLocation().getStartLine() and
+          arg.getLocation().getStartLine() > another.getLocation().getStartLine()
+        )
+      ) and
+      // function call ends after preprocessor directive
+      endCall > preprocEndLine
     ) and
     result = p
   )
diff --git a/c/cert/test/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.expected b/c/cert/test/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.expected
index f25c7ea0e0..efbf021972 100644
--- a/c/cert/test/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.expected
+++ b/c/cert/test/rules/PRE32-C/MacroOrFunctionArgsContainHashToken.expected
@@ -4,5 +4,3 @@
 | test.c:20:1:20:16 | #ifdef SOMEMACRO | Invocation of function memcpy includes a token "#ifdef SOMEMACRO" that could be confused for an argument preprocessor directive. |
 | test.c:22:1:22:5 | #else | Invocation of function memcpy includes a token "#else" that could be confused for an argument preprocessor directive. |
 | test.c:24:1:24:6 | #endif | Invocation of function memcpy includes a token "#endif" that could be confused for an argument preprocessor directive. |
-| test.c:27:1:27:8 | #if TEST | Invocation of function memcpy includes a token "#if TEST" that could be confused for an argument preprocessor directive. |
-| test.c:28:1:28:6 | #endif | Invocation of function memcpy includes a token "#endif" that could be confused for an argument preprocessor directive. |
diff --git a/c/cert/test/rules/PRE32-C/test.c b/c/cert/test/rules/PRE32-C/test.c
index af3606f24c..bf07beecb5 100644
--- a/c/cert/test/rules/PRE32-C/test.c
+++ b/c/cert/test/rules/PRE32-C/test.c
@@ -24,6 +24,6 @@ void func(const char *src) {
 #endif // NON_COMPLIANT
   );
 
-#if TEST // COMPLIANT[FALSE_POSITIVE]
-#endif   // COMPLIANT[FALSE_POSITIVE]
-}
\ No newline at end of file
+#if TEST // COMPLIANT
+#endif   // COMPLIANT
+}
diff --git a/change_notes/2024-07-30-fix-fp-650-PRE32-C.md b/change_notes/2024-07-30-fix-fp-650-PRE32-C.md
new file mode 100644
index 0000000000..e1ea391499
--- /dev/null
+++ b/change_notes/2024-07-30-fix-fp-650-PRE32-C.md
@@ -0,0 +1,2 @@
+- `PRE32-C` - `MacroOrFunctionArgsContainHashToken.ql`:
+  - Fixes #650. Correctly identifies presence of preprocessor directives in function calls.

From e3e2911fa1280b8eae552a563b8a3e5d3d2d1d36 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 30 Jul 2024 16:20:47 -0400
Subject: [PATCH 079/435] Update handbook

---
 docs/development_handbook.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index 10ad1637a5..6db6b51e73 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -1,4 +1,4 @@
-# Coding Standards: Developer handbook
+# Coding Standards: Developer handbookA
 
 ## Document management
 
@@ -39,7 +39,7 @@
 | 0.29.1 | 2023-10-11 | Remco Vermeulen | Address Markdown linter problems. |
 | 0.30.0 | 2023-11-14 | Remco Vermeulen | Clarify release steps in case of a hotfix release. |
 | 0.31.0 | 2024-02-23 | Remco Vermeulen | Clarify the required use of Python version 3.9 |
-| 0.32.0 | 2024-05-01 | Luke Cartey | Refer to the user manual for the list of supported standards. |
+| 0.32.0 | 2024-05-01 | Luke Cartey | Refer to the user manual for the list of supported standards. | 0.33.0 | 2024-07-30 | Kristen Newbury | Remove out dated references to codeql modules directory usage. |
 
 ## Scope of work
 
@@ -509,8 +509,7 @@ To upgrade the CodeQL external dependencies:
 2. Determine if there is a compatible CodeQL CLI bundle version by looking at the releases specified at [CodeQL Action releases](https://github.com/github/codeql-action/releases). The bundle always includes the standard library at the version specified by the `codeql-cli/v<version-number>` tag in the `github/codeql` repository.
 3. If you find a compatible CodeQL CLI bundle, determine whether that bundle was released in a GitHub Enterprise server release, by inspecting the `defaults.json` file at https://github.com/github/codeql-action/blob/main/lib/defaults.json#L2 for the CodeQL Action submitted with
 4. Populated the `supported_codeql_configs.json` file with the given values, ensuring to delete the optional fields if they are not populated.
-5. Update the `codeql_modules/codeql` submodule pointer to the `codeql_standard_library` tag identified.
-6. Submit a Pull Request to the `github/codeql-coding-standards` repository with the title `Upgrade `github/codeql` dependency to <insert codeql_standard_library value>`. Use this template for the description, filling :
+5. Submit a Pull Request to the `github/codeql-coding-standards` repository with the title `Upgrade `github/codeql` dependency to <insert codeql_standard_library value>`. Use this template for the description, filling :
 
     ```md
     This PR updates the `supported_codeql_configs.json` file to target:
@@ -532,9 +531,9 @@ To upgrade the CodeQL external dependencies:
     - [ ] Validate performance vs pre-upgrade
     ```
 
-7. Follow the dependency upgrade checklist, confirming each step. The `.github/workflows/standard_library_upgrade_tests.yml` will trigger automation for running the `github/codeql` unit tests with the appropriate CLI version.
-8. Once all the automate tests have passed, and the checklist is complete, the PR can be merged.
-9. An internal notification should be shared with the development team.
+6. Follow the dependency upgrade checklist, confirming each step. The `.github/workflows/standard_library_upgrade_tests.yml` will trigger automation for running the `github/codeql` unit tests with the appropriate CLI version.
+7. Once all the automate tests have passed, and the checklist is complete, the PR can be merged.
+8. An internal notification should be shared with the development team.
 
 ### Release process
 

From 7b0f058ae628a6a6fc199014b02aaf03a6443f76 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 30 Jul 2024 16:22:53 -0400
Subject: [PATCH 080/435] Update handbook - prev fix introduced typo

---
 docs/development_handbook.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index 6db6b51e73..b248919271 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -1,4 +1,4 @@
-# Coding Standards: Developer handbookA
+# Coding Standards: Developer handbook
 
 ## Document management
 

From 30e2830fb5c4599b14551126b0d85e6aaa5d30bc Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Wed, 31 Jul 2024 12:04:51 -0400
Subject: [PATCH 081/435] Update docs/development_handbook.md

Co-authored-by: Luke Cartey <5377966+lcartey@users.noreply.github.com>
---
 docs/development_handbook.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index b248919271..b8b883b628 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -39,7 +39,8 @@
 | 0.29.1 | 2023-10-11 | Remco Vermeulen | Address Markdown linter problems. |
 | 0.30.0 | 2023-11-14 | Remco Vermeulen | Clarify release steps in case of a hotfix release. |
 | 0.31.0 | 2024-02-23 | Remco Vermeulen | Clarify the required use of Python version 3.9 |
-| 0.32.0 | 2024-05-01 | Luke Cartey | Refer to the user manual for the list of supported standards. | 0.33.0 | 2024-07-30 | Kristen Newbury | Remove out dated references to codeql modules directory usage. |
+| 0.32.0 | 2024-05-01 | Luke Cartey | Refer to the user manual for the list of supported standards. |
+| 0.33.0 | 2024-07-30 | Kristen Newbury | Remove out dated references to codeql modules directory usage. |
 
 ## Scope of work
 

From 5f17c720cf56692e05f0faadcaf00491fd05827b Mon Sep 17 00:00:00 2001
From: knewbury01 <knewbury01@users.noreply.github.com>
Date: Fri, 2 Aug 2024 17:13:11 +0000
Subject: [PATCH 082/435] Bump version to 2.34.0-dev

---
 c/cert/src/qlpack.yml       |  2 +-
 c/cert/test/qlpack.yml      |  2 +-
 c/common/src/qlpack.yml     |  2 +-
 c/common/test/qlpack.yml    |  2 +-
 c/misra/src/qlpack.yml      |  2 +-
 c/misra/test/qlpack.yml     |  2 +-
 cpp/autosar/src/qlpack.yml  |  2 +-
 cpp/autosar/test/qlpack.yml |  2 +-
 cpp/cert/src/qlpack.yml     |  2 +-
 cpp/cert/test/qlpack.yml    |  2 +-
 cpp/common/src/qlpack.yml   |  2 +-
 cpp/common/test/qlpack.yml  |  2 +-
 cpp/misra/src/qlpack.yml    |  2 +-
 cpp/misra/test/qlpack.yml   |  2 +-
 cpp/report/src/qlpack.yml   |  2 +-
 docs/user_manual.md         | 12 ++++++------
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index fbae0e71e0..1f2e0ebae0 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
index 9b878b7b5c..f6ed827283 100644
--- a/c/cert/test/qlpack.yml
+++ b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.33.0-dev
+version: 2.34.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 474bb3bed7..a37d47ec49 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
index c83d53ae3f..7516f70ba5 100644
--- a/c/common/test/qlpack.yml
+++ b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.33.0-dev
+version: 2.34.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index bfb3a8e8a5..960416a409 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
index efe05e7d75..354b1d81f3 100644
--- a/c/misra/test/qlpack.yml
+++ b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.33.0-dev
+version: 2.34.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 9c0bccbc08..af1422fc68 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
index 6743c3b3ee..101f8f987e 100644
--- a/cpp/autosar/test/qlpack.yml
+++ b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.33.0-dev
+version: 2.34.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 47c2c319c7..cc0e71c7bd 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
index 7b8ed0858d..6cefec112e 100644
--- a/cpp/cert/test/qlpack.yml
+++ b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.33.0-dev
+version: 2.34.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index 764c164fcd..2d205f5921 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.9.3
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
index 3ce9a6da2a..69ecca2036 100644
--- a/cpp/common/test/qlpack.yml
+++ b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.33.0-dev
+version: 2.34.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index d177c9f651..b9d02663fc 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 description: MISRA C++ 2023
 suites: codeql-suites
 license: MIT
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
index 2627cf1b66..7fc85dc12a 100644
--- a/cpp/misra/test/qlpack.yml
+++ b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.33.0-dev
+version: 2.34.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 085b1e8a9e..525379e38e 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.33.0-dev
+version: 2.34.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.9.3
diff --git a/docs/user_manual.md b/docs/user_manual.md
index a32abda8c4..60b695ebd4 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -30,13 +30,13 @@
 
 ## Release information
 
-This user manual documents release `2.33.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
+This user manual documents release `2.34.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
-- `code-scanning-cpp-query-pack-2.33.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `supported_rules_list_2.33.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
-- `supported_rules_list_2.33.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
-- `user_manual_2.33.0-dev.md`: This user manual.
+- `code-scanning-cpp-query-pack-2.34.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `supported_rules_list_2.34.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
+- `supported_rules_list_2.34.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
+- `user_manual_2.34.0-dev.md`: This user manual.
 - `Source Code (zip)`: A zip archive containing the contents of https://github.com/github/codeql-coding-standards
 - `Source Code (tar.gz)`: A GZip compressed tar archive containing the contents of https://github.com/github/codeql-coding-standards
 - `checksums.txt`: A text file containing sha256 checksums for the aforementioned artifacts.
@@ -499,7 +499,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Ouf of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
-|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.33.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
+|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.34.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
 |                              | Incorrect deviation record specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation records with a reason. Ensure that all deviation records are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |

From 46f271b49e0878c10760b7d4cc08be93ec35b397 Mon Sep 17 00:00:00 2001
From: Nicolas Will <nicolaswill@github.com>
Date: Mon, 5 Aug 2024 22:21:05 +0200
Subject: [PATCH 083/435] Update automation ACLs

Removed jsinglet and kraiouchkine
---
 .github/workflows/dispatch-matrix-check.yml      | 16 +++++++---------
 .../dispatch-matrix-test-on-comment.yml          |  5 +----
 .../dispatch-release-performance-check.yml       |  6 ++----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/dispatch-matrix-check.yml b/.github/workflows/dispatch-matrix-check.yml
index 350f2fb73f..77670e4bd0 100644
--- a/.github/workflows/dispatch-matrix-check.yml
+++ b/.github/workflows/dispatch-matrix-check.yml
@@ -1,8 +1,8 @@
-name: 🤖 Run Matrix Check 
+name: 🤖 Run Matrix Check
 
 on:
   pull_request_target:
-    types: [synchronize,opened]
+    types: [synchronize, opened]
     branches:
       - "matrix/**"
   workflow_dispatch:
@@ -11,14 +11,13 @@ jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
-
       - name: Test Variables
         shell: pwsh
         run: |
-          Write-Host "Running as: ${{github.actor}}"    
-    
+          Write-Host "Running as: ${{github.actor}}"
+
       - name: Dispatch Matrix Testing Job
-        if: ${{ contains(fromJSON('["jsinglet", "mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "kraiouchkine"]'), github.actor) }}
+        if: ${{ contains(fromJSON('["mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill"]'), github.actor) }}
         uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
@@ -26,9 +25,8 @@ jobs:
           event-type: matrix-test
           client-payload: '{"pr": "${{ github.event.number  }}"}'
 
-
       - uses: actions/github-script@v6
-        if: ${{ contains(fromJSON('["jsinglet", "mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "kraiouchkine"]'), github.actor) }}
+        if: ${{ contains(fromJSON('["mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill"]'), github.actor) }}
         with:
           script: |
             github.rest.issues.createComment({
@@ -36,4 +34,4 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: '🤖 Beep Boop! Matrix Testing for this PR has been initiated. Please check back later for results. <br><br> :bulb: If you do not hear back from me please check my status! **I will report even if this PR does not contain files eligible for matrix testing.**'
-            })
\ No newline at end of file
+            })
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
index bef0ba7232..ba223380c7 100644
--- a/.github/workflows/dispatch-matrix-test-on-comment.yml
+++ b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -8,12 +8,10 @@ on:
       - "rc/**"
       - next
 
-
 jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
-
       - name: Test Variables
         shell: pwsh
         run: |
@@ -21,13 +19,12 @@ jobs:
 
           $actor = "${{github.actor}}"
 
-          $acl = @("jsinglet","mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "kraiouchkine") 
+          $acl = @("mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill") 
 
           if(-not ($actor -in $acl)){
             throw "Refusing to run workflow for user not in acl."
           }
 
-
       - name: Dispatch Matrix Testing Job
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') }}
         uses: peter-evans/repository-dispatch@v2
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index 0858527721..437f80b322 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -12,7 +12,6 @@ jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
-
       - name: Test Variables
         shell: pwsh
         run: |
@@ -20,7 +19,7 @@ jobs:
 
           $actor = "${{github.actor}}"
 
-          $acl = @("jsinglet","mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "kraiouchkine") 
+          $acl = @("mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill") 
 
           if(-not ($actor -in $acl)){
             throw "Refusing to run workflow for user not in acl."
@@ -35,7 +34,6 @@ jobs:
           event-type: performance-test
           client-payload: '{"pr": "${{ github.event.issue.number  }}"}'
 
-
       - uses: actions/github-script@v6
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') }}
         with:
@@ -45,4 +43,4 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: '🏁 Beep Boop! Performance testing for this PR has been initiated. Please check back later for results. Note that the query package generation step must complete before testing  will start so it might be a minute. <br><br> :bulb: If you do not hear back from me please check my status! **I will report even if I fail!**'
-            })
\ No newline at end of file
+            })

From 10a4dda0979397b22e20d633b68e6e2315e05e4e Mon Sep 17 00:00:00 2001
From: Nicolas Will <nicolaswill@github.com>
Date: Mon, 5 Aug 2024 22:33:07 +0200
Subject: [PATCH 084/435] Remove duplicate whitespace

Co-authored-by: Jeongsoo Lee <jeongsoolee09@github.com>
---
 .github/workflows/dispatch-matrix-check.yml              | 2 +-
 .github/workflows/dispatch-release-performance-check.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dispatch-matrix-check.yml b/.github/workflows/dispatch-matrix-check.yml
index 77670e4bd0..a570777877 100644
--- a/.github/workflows/dispatch-matrix-check.yml
+++ b/.github/workflows/dispatch-matrix-check.yml
@@ -23,7 +23,7 @@ jobs:
           token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
           repository: github/codeql-coding-standards-release-engineering
           event-type: matrix-test
-          client-payload: '{"pr": "${{ github.event.number  }}"}'
+          client-payload: '{"pr": "${{ github.event.number }}"}'
 
       - uses: actions/github-script@v6
         if: ${{ contains(fromJSON('["mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill"]'), github.actor) }}
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index 437f80b322..827c0c4463 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -32,7 +32,7 @@ jobs:
           token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
           repository: github/codeql-coding-standards-release-engineering
           event-type: performance-test
-          client-payload: '{"pr": "${{ github.event.issue.number  }}"}'
+          client-payload: '{"pr": "${{ github.event.issue.number }}"}'
 
       - uses: actions/github-script@v6
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') }}

From eaf9ccb7299ba6d26d54f9c230f98dda59b047fe Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 6 Aug 2024 15:35:20 +0900
Subject: [PATCH 085/435] Fix #658

---
 .../src/rules/M0-1-3/UnusedLocalVariable.ql   | 13 ++++++++---
 .../rules/M0-1-3/UnusedLocalVariable.expected | 11 +++++-----
 cpp/autosar/test/rules/M0-1-3/test.cpp        | 22 +++++++++++++++----
 .../cpp/deadcode/UnusedVariables.qll          |  7 +++++-
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
index f088bb1b74..70e8d13e3c 100644
--- a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
+++ b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
@@ -18,10 +18,10 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.deadcode.UnusedVariables
 
-/** Gets the constant value of a constexpr variable. */
+/** Gets the constant value of a constexpr/const variable. */
 private string getConstExprValue(Variable v) {
   result = v.getInitializer().getExpr().getValue() and
-  v.isConstexpr()
+  (v.isConst() or v.isConstexpr())
 }
 
 // This predicate is similar to getUseCount for M0-1-4 except that it also
@@ -41,7 +41,14 @@ int getUseCountConservatively(Variable v) {
       ) +
       // For static asserts too, check if there is a child which has the same value
       // as the constexpr variable.
-      count(StaticAssert s | s.getCondition().getAChild*().getValue() = getConstExprValue(v))
+      count(StaticAssert s | s.getCondition().getAChild*().getValue() = getConstExprValue(v)) +
+      // In case an array type uses a constant in the same scope as the constexpr variable,
+      // consider it as used.
+      count(ArrayType at, LocalVariable arrayVariable |
+        arrayVariable.getType().resolveTypedefs() = at and
+        v.(PotentiallyUnusedLocalVariable).getFunction() = arrayVariable.getFunction() and
+        at.getArraySize().toString() = getConstExprValue(v)
+      )
 }
 
 from PotentiallyUnusedLocalVariable v
diff --git a/cpp/autosar/test/rules/M0-1-3/UnusedLocalVariable.expected b/cpp/autosar/test/rules/M0-1-3/UnusedLocalVariable.expected
index d6f398369f..19317d1d0d 100644
--- a/cpp/autosar/test/rules/M0-1-3/UnusedLocalVariable.expected
+++ b/cpp/autosar/test/rules/M0-1-3/UnusedLocalVariable.expected
@@ -1,7 +1,6 @@
 | test.cpp:7:7:7:7 | y | Local variable 'y' in 'test_simple' is not used. |
-| test.cpp:14:13:14:13 | y | Local variable 'y' in 'test_const' is not used. |
-| test.cpp:17:7:17:7 | z | Local variable 'z' in 'test_const' is not used. |
-| test.cpp:23:5:23:5 | t | Local variable 't' in 'f1' is not used. |
-| test.cpp:23:5:23:5 | t | Local variable 't' in 'f1' is not used. |
-| test.cpp:44:6:44:6 | a | Local variable 'a' in 'test_side_effect_init' is not used. |
-| test.cpp:91:5:91:5 | t | Local variable 't' in 'template_function' is not used. |
+| test.cpp:15:7:15:7 | z | Local variable 'z' in 'test_const' is not used. |
+| test.cpp:21:5:21:5 | t | Local variable 't' in 'f1' is not used. |
+| test.cpp:21:5:21:5 | t | Local variable 't' in 'f1' is not used. |
+| test.cpp:42:6:42:6 | a | Local variable 'a' in 'test_side_effect_init' is not used. |
+| test.cpp:89:5:89:5 | t | Local variable 't' in 'template_function' is not used. |
diff --git a/cpp/autosar/test/rules/M0-1-3/test.cpp b/cpp/autosar/test/rules/M0-1-3/test.cpp
index a591c7e82b..0a8bdee7dd 100644
--- a/cpp/autosar/test/rules/M0-1-3/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-3/test.cpp
@@ -11,9 +11,7 @@ int test_simple() {
 
 int test_const() {
   const int x = 1; // COMPLIANT - used below
-  const int y = 2; // COMPLIANT[FALSE_POSITIVE] - used in array initialization,
-                   // but the database does not contain sufficient information
-                   // for this case
+  const int y = 2; // COMPLIANT - used in array initialization,
   int z[y];        // NON_COMPLIANT - never used
   return x;
 }
@@ -98,4 +96,20 @@ class ClassT {
   void test() {}
 };
 
-void test_template_function() { template_function<ClassT>(); }
\ No newline at end of file
+void test_template_function() { template_function<ClassT>(); }
+
+int foo() {
+  constexpr int arrayDim = 10; // COMPLIANT - used in array size below
+  static int array[arrayDim]{};
+  return array[4];
+}
+
+template <typename T> static T another_templ_function() { return T(); }
+
+template <typename T, typename First, typename... Rest>
+static T another_templ_function(const First &first, const Rest &... rest) {
+  return first +
+         another_templ_function<T>(rest...); // COMPLIANT - 'rest' is used here
+}
+
+static int templ_fnc2() { return another_templ_function<int>(1, 2, 3, 4, 5); }
diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
index f4607d82cb..578f06ebc6 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
@@ -52,7 +52,12 @@ class PotentiallyUnusedLocalVariable extends LocalVariable {
     // exclude uninstantiated template members
     not this.isFromUninstantiatedTemplate(_) and
     // Do not report compiler generated variables
-    not this.isCompilerGenerated()
+    not this.isCompilerGenerated() and
+    not exists(LocalScopeVariable another |
+      another.getDefinitionLocation() = this.getDefinitionLocation() and
+      another.hasName(this.getName()) and
+      exists(another.getAnAccess())
+    )
   }
 }
 

From a7402b05a047a6a85da2d2b048c964ea2c581bf8 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 6 Aug 2024 15:40:17 +0900
Subject: [PATCH 086/435] Update change_notes

---
 change_notes/2024-08-06-fix-fp-658-M0-1-3.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-08-06-fix-fp-658-M0-1-3.md

diff --git a/change_notes/2024-08-06-fix-fp-658-M0-1-3.md b/change_notes/2024-08-06-fix-fp-658-M0-1-3.md
new file mode 100644
index 0000000000..47a26705ae
--- /dev/null
+++ b/change_notes/2024-08-06-fix-fp-658-M0-1-3.md
@@ -0,0 +1,2 @@
+- `M0-1-3` - `UnusedLocalVariable.ql`:
+  - Fixes #658. Considers usage of const/constexpr variables in array size and function parameters that are used in arguments of template functions.

From cb0e45247d7228c28fdfd3733a539bc250acebdf Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 22 Aug 2024 00:44:48 -0400
Subject: [PATCH 087/435] Update development handbook

---
 docs/development_handbook.md | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index b8b883b628..6c789c4fbd 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -41,6 +41,7 @@
 | 0.31.0 | 2024-02-23 | Remco Vermeulen | Clarify the required use of Python version 3.9 |
 | 0.32.0 | 2024-05-01 | Luke Cartey | Refer to the user manual for the list of supported standards. |
 | 0.33.0 | 2024-07-30 | Kristen Newbury | Remove out dated references to codeql modules directory usage. |
+| 0.34.0 | 2024-08-22 | Kristen Newbury | Remove out dated references to git submodules usage. |
 
 ## Scope of work
 
@@ -737,12 +738,4 @@ codeql test accept \
        cpp/cert/test/rules/EXP52-CPP/DoNotRelyOnSideEffectsInDeclTypeOperand.qlref
 
 
-```
-
-### Troubleshooting: Unrecoverable mismatch between extractor and library dbschemes
-
-The following error could be indicative of the Git submodule *codeql-coding-standards/github_modules* being out-of-date:
-
->Could not upgrade the dataset in /path/to/codeql-coding-standards/cpp/autosar/test/rules/...: Unrecoverable mismatch between extractor and library dbschemes.
-
-To resolve the problem, update the submodule by executing `git submodule update`.
+```
\ No newline at end of file

From 40c546fe9e1635df9ed1aa7dcf3856856d17917a Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 22 Aug 2024 12:18:59 -0400
Subject: [PATCH 088/435] Update development handbook

---
 docs/development_handbook.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index 6c789c4fbd..de283bb946 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -736,6 +736,3 @@ codeql test run --show-extractor-output \
 # The actual output can be accepted via codeql test accept (which moves some files):
 codeql test accept \
        cpp/cert/test/rules/EXP52-CPP/DoNotRelyOnSideEffectsInDeclTypeOperand.qlref
-
-
-```
\ No newline at end of file

From 0f64260895bde831f7f964d24755d6d6353258ff Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 27 Aug 2024 10:05:29 +0900
Subject: [PATCH 089/435] Correct formatting in test

---
 cpp/autosar/test/rules/M0-1-3/test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/test/rules/M0-1-3/test.cpp b/cpp/autosar/test/rules/M0-1-3/test.cpp
index 0a8bdee7dd..5c9c4a3413 100644
--- a/cpp/autosar/test/rules/M0-1-3/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-3/test.cpp
@@ -107,7 +107,7 @@ int foo() {
 template <typename T> static T another_templ_function() { return T(); }
 
 template <typename T, typename First, typename... Rest>
-static T another_templ_function(const First &first, const Rest &... rest) {
+static T another_templ_function(const First &first, const Rest &...rest) {
   return first +
          another_templ_function<T>(rest...); // COMPLIANT - 'rest' is used here
 }

From df7dc88b9cc0fb4ebdf4616119b6e8988e68bb2c Mon Sep 17 00:00:00 2001
From: knewbury01 <knewbury01@users.noreply.github.com>
Date: Tue, 27 Aug 2024 13:32:09 +0000
Subject: [PATCH 090/435] Bump version to 2.35.0-dev

---
 c/cert/src/qlpack.yml       |  2 +-
 c/cert/test/qlpack.yml      |  2 +-
 c/common/src/qlpack.yml     |  2 +-
 c/common/test/qlpack.yml    |  2 +-
 c/misra/src/qlpack.yml      |  2 +-
 c/misra/test/qlpack.yml     |  2 +-
 cpp/autosar/src/qlpack.yml  |  2 +-
 cpp/autosar/test/qlpack.yml |  2 +-
 cpp/cert/src/qlpack.yml     |  2 +-
 cpp/cert/test/qlpack.yml    |  2 +-
 cpp/common/src/qlpack.yml   |  2 +-
 cpp/common/test/qlpack.yml  |  2 +-
 cpp/misra/src/qlpack.yml    |  2 +-
 cpp/misra/test/qlpack.yml   |  2 +-
 cpp/report/src/qlpack.yml   |  2 +-
 docs/user_manual.md         | 12 ++++++------
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index 1f2e0ebae0..1cffeea095 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
index f6ed827283..defb929a0f 100644
--- a/c/cert/test/qlpack.yml
+++ b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.34.0-dev
+version: 2.35.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index a37d47ec49..03e55b4851 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
index 7516f70ba5..97590a4d4e 100644
--- a/c/common/test/qlpack.yml
+++ b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.34.0-dev
+version: 2.35.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 960416a409..0300f548bd 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
index 354b1d81f3..26164b1e29 100644
--- a/c/misra/test/qlpack.yml
+++ b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.34.0-dev
+version: 2.35.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index af1422fc68..9342d641ae 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
index 101f8f987e..7bc49127a1 100644
--- a/cpp/autosar/test/qlpack.yml
+++ b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.34.0-dev
+version: 2.35.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index cc0e71c7bd..d97fa9b2e3 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
index 6cefec112e..8832249332 100644
--- a/cpp/cert/test/qlpack.yml
+++ b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.34.0-dev
+version: 2.35.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index 2d205f5921..849866287f 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.9.3
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
index 69ecca2036..51521c3ada 100644
--- a/cpp/common/test/qlpack.yml
+++ b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.34.0-dev
+version: 2.35.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index b9d02663fc..75d1ef2e2c 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 description: MISRA C++ 2023
 suites: codeql-suites
 license: MIT
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
index 7fc85dc12a..b1e9fc383e 100644
--- a/cpp/misra/test/qlpack.yml
+++ b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.34.0-dev
+version: 2.35.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 525379e38e..09ef198c5a 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.34.0-dev
+version: 2.35.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.9.3
diff --git a/docs/user_manual.md b/docs/user_manual.md
index 60b695ebd4..7315ed322a 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -30,13 +30,13 @@
 
 ## Release information
 
-This user manual documents release `2.34.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
+This user manual documents release `2.35.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
-- `code-scanning-cpp-query-pack-2.34.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `supported_rules_list_2.34.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
-- `supported_rules_list_2.34.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
-- `user_manual_2.34.0-dev.md`: This user manual.
+- `code-scanning-cpp-query-pack-2.35.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `supported_rules_list_2.35.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
+- `supported_rules_list_2.35.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
+- `user_manual_2.35.0-dev.md`: This user manual.
 - `Source Code (zip)`: A zip archive containing the contents of https://github.com/github/codeql-coding-standards
 - `Source Code (tar.gz)`: A GZip compressed tar archive containing the contents of https://github.com/github/codeql-coding-standards
 - `checksums.txt`: A text file containing sha256 checksums for the aforementioned artifacts.
@@ -499,7 +499,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Ouf of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
-|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.34.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
+|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.35.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
 |                              | Incorrect deviation record specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation records with a reason. Ensure that all deviation records are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |

From c3666a15b222ef8701b8078f2dd4a31814b4a266 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Wed, 28 Aug 2024 10:34:58 +0900
Subject: [PATCH 091/435] Fix for M0-1-4's testcase failures

---
 cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql       | 8 ++++++++
 .../src/codingstandards/cpp/deadcode/UnusedVariables.qll  | 7 +------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
index 70e8d13e3c..5956515e5b 100644
--- a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
+++ b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
@@ -56,5 +56,13 @@ where
   not isExcluded(v, DeadCodePackage::unusedLocalVariableQuery()) and
   // Local variable is never accessed
   not exists(v.getAnAccess()) and
+  // Sometimes multiple objects representing the same entities are created in
+  // the AST. Check if those are not accessed as well. Refer issue #658
+  not exists(LocalScopeVariable another |
+    another.getDefinitionLocation() = v.getDefinitionLocation() and
+    another.hasName(v.getName()) and
+    exists(another.getAnAccess()) and
+    another != v
+  ) and
   getUseCountConservatively(v) = 0
 select v, "Local variable '" + v.getName() + "' in '" + v.getFunction().getName() + "' is not used."
diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
index 578f06ebc6..f4607d82cb 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
@@ -52,12 +52,7 @@ class PotentiallyUnusedLocalVariable extends LocalVariable {
     // exclude uninstantiated template members
     not this.isFromUninstantiatedTemplate(_) and
     // Do not report compiler generated variables
-    not this.isCompilerGenerated() and
-    not exists(LocalScopeVariable another |
-      another.getDefinitionLocation() = this.getDefinitionLocation() and
-      another.hasName(this.getName()) and
-      exists(another.getAnAccess())
-    )
+    not this.isCompilerGenerated()
   }
 }
 

From f71f976234f82b4fe03eedac7ed6e53e3dffd6a0 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 29 Aug 2024 12:58:51 -0400
Subject: [PATCH 092/435] Fix package generation workflow

---
 .github/workflows/code-scanning-pack-gen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 1fd57cf755..0f07c1e14b 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -103,7 +103,7 @@ jobs:
           codeql query compile --precompile --threads 0 c
 
           cd ..
-          zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/schemas
+          zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/schemas
 
       - name: Upload GHAS Query Pack
         uses: actions/upload-artifact@v2

From 94d711461dd6c7df5578614a854c8a423dee866b Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 3 Sep 2024 15:54:23 +0200
Subject: [PATCH 093/435] Update expected test results after merge from main

---
 ...sedPointerToRestrictQualifiedParamShared.expected | 12 ------------
 .../A18-5-8/UnnecessaryUseOfDynamicStorage.expected  |  7 ++++---
 .../test/rules/M0-1-2/InfeasiblePath.expected        |  3 ---
 .../ConstLikeReturnValue.expected                    | 10 +++++-----
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected
index 1c8a649094..4d4c20a39c 100644
--- a/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected
+++ b/c/common/test/rules/donotpassaliasedpointertorestrictqualifiedparamshared/DoNotPassAliasedPointerToRestrictQualifiedParamShared.expected
@@ -1,15 +1,3 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:103,36-44)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:118,51-59)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:119,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:121,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:127,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:132,40-48)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:146,41-49)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:147,7-15)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:150,43-51)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:151,9-17)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:158,43-51)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (DoNotPassAliasedPointerToRestrictQualifiedParam.ql:159,9-17)
 | test.c:59:3:59:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:59:13:59:15 | & ... | aliased pointer | test.c:59:8:59:10 | & ... | restrict-qualified parameter | test.c:59:8:59:10 | & ... | addressof1 | test.c:59:13:59:15 | & ... | addressof2 |
 | test.c:65:3:65:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:65:15:65:19 | & ... | aliased pointer | test.c:65:8:65:12 | & ... | restrict-qualified parameter | test.c:65:8:65:12 | & ... | addressof1 | test.c:65:15:65:19 | & ... | addressof2 |
 | test.c:67:3:67:6 | call to copy | Call to 'copy' passes an $@ to a $@ (pointer value derived from a pair of address-of expressions ($@, $@). | test.c:67:15:67:16 | px | aliased pointer | test.c:67:8:67:12 | & ... | restrict-qualified parameter | test.c:67:8:67:12 | & ... | addressof1 | test.c:63:13:63:17 | & ... | addressof2 |
diff --git a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
index 6ab75d989e..68cab835fa 100644
--- a/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
+++ b/cpp/autosar/test/rules/A18-5-8/UnnecessaryUseOfDynamicStorage.expected
@@ -1,7 +1,8 @@
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:55,34-42)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:57,26-34)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:71,5-18)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:76,41-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:58,33-41)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:60,26-34)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:74,5-18)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (UnnecessaryUseOfDynamicStorage.ql:79,41-54)
 | test.cpp:17:17:17:29 | new | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:21:17:21:32 | new[] | StructA[] object of size 800 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
 | test.cpp:35:20:35:44 | call to make_shared | StructA object of size 8 bytes does not appear to outlive the function, but is created on the heap instead of the stack. |
diff --git a/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected b/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected
index 9cb237e8b3..d0a819a794 100644
--- a/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected
+++ b/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected
@@ -2,9 +2,6 @@
 | test.cpp:7:7:7:22 | ... <= ... | The false path is infeasible because a (max value: 4294967295) is always less than or equal to 4294967295 (minimum value: 4294967295). |
 | test.cpp:15:7:15:13 | ... < ... | The false path is infeasible because l1 (max value: 2) is always less than l2 (minimum value: 10). |
 | test.cpp:19:9:19:14 | ... < ... | The false path is infeasible because a (max value: 1) is always less than l2 (minimum value: 10). |
-| test.cpp:33:7:33:7 | 0 | The path is unreachable in a template. |
 | test.cpp:77:9:77:14 | ... < ... | The true path is infeasible because 0 (max value: 0) is always less than or equal to a (minimum value: 0). |
 | test.cpp:80:9:80:15 | ... >= ... | The false path is infeasible because 0 (max value: 0) is always less than or equal to a (minimum value: 0). |
 | test.cpp:86:9:86:14 | ... < ... | The true path is infeasible because 0 (max value: 0) is always less than or equal to a (minimum value: 0). |
-| test.cpp:117:7:117:7 | 0 | The path is unreachable in a template. |
-| test.cpp:123:7:123:8 | ! ... | The path is unreachable in a template. |
diff --git a/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected b/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
index b02aa464bb..2caa0d197c 100644
--- a/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
+++ b/cpp/common/test/rules/constlikereturnvalue/ConstLikeReturnValue.expected
@@ -3,11 +3,11 @@ problems
 | test.cpp:67:5:67:9 | conv4 | test.cpp:64:11:64:20 | call to localeconv | test.cpp:67:5:67:9 | conv4 | The object returned by the function localeconv should not be modified. |
 | test.cpp:76:5:76:8 | conv | test.cpp:72:25:72:34 | call to localeconv | test.cpp:76:5:76:8 | conv | The object returned by the function localeconv should not be modified. |
 edges
-| test.cpp:8:18:8:22 | c_str | test.cpp:11:8:11:12 | c_str |
-| test.cpp:18:16:18:21 | call to getenv | test.cpp:24:9:24:12 | env1 |
-| test.cpp:24:9:24:12 | env1 | test.cpp:8:18:8:22 | c_str |
-| test.cpp:64:11:64:20 | call to localeconv | test.cpp:67:5:67:9 | conv4 |
-| test.cpp:72:25:72:34 | call to localeconv | test.cpp:76:5:76:8 | conv |
+| test.cpp:8:18:8:22 | c_str | test.cpp:11:8:11:12 | c_str | provenance |  |
+| test.cpp:18:16:18:21 | call to getenv | test.cpp:24:9:24:12 | env1 | provenance |  |
+| test.cpp:24:9:24:12 | env1 | test.cpp:8:18:8:22 | c_str | provenance |  |
+| test.cpp:64:11:64:20 | call to localeconv | test.cpp:67:5:67:9 | conv4 | provenance |  |
+| test.cpp:72:25:72:34 | call to localeconv | test.cpp:76:5:76:8 | conv | provenance |  |
 nodes
 | test.cpp:8:18:8:22 | c_str | semmle.label | c_str |
 | test.cpp:11:8:11:12 | c_str | semmle.label | c_str |

From 6702c6449293c742076f5973c870ac31fcb89ca1 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 6 Sep 2024 09:22:40 +0100
Subject: [PATCH 094/435] Update 11.6 to reflect standard

Rule text specifies that the exclusion is on integer constants
with value 0 instead of null pointer constants
---
 .../RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql b/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
index 987d8a32bb..de75e9d37a 100644
--- a/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
+++ b/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
@@ -22,5 +22,5 @@ where
   typeTo = cast.getUnderlyingType() and
   [typeFrom, typeTo] instanceof ArithmeticType and
   [typeFrom, typeTo] instanceof VoidPointerType and
-  not isNullPointerConstant(cast.getExpr())
+  not cast.getExpr() instanceof Zero
 select cast, "Cast performed between a pointer to void type and an arithmetic type."

From 2672d08b7cd7af1a37d3a2897f38b505f75b8ee5 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 6 Sep 2024 09:23:33 +0100
Subject: [PATCH 095/435] Update change note to reflect impact on other queries

---
 change_notes/2023-07-28-rule-11-4-improvements.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/change_notes/2023-07-28-rule-11-4-improvements.md b/change_notes/2023-07-28-rule-11-4-improvements.md
index d97e554a26..7c7411beec 100644
--- a/change_notes/2023-07-28-rule-11-4-improvements.md
+++ b/change_notes/2023-07-28-rule-11-4-improvements.md
@@ -1,4 +1,10 @@
- - `RULE-11-4`
-   - Reduce false positives by considering `0` a null pointer constant.
+ - `RULE-11-1` - `ConversionBetweenFunctionPointerAndOtherType.ql`:
+    - Fixed issue #331 - consider `0` a null pointer constant.
+ - `RULE-11-4` - `ConversionBetweenPointerToObjectAndIntegerType.ql`:
+   - Fixed issue #331 - consider `0` a null pointer constant. 
    - Improve reporting of the order of the cast and the actual types involved.
-   - Improve reporting where the result is expanded from a macro by either reporting the macro itself (if it is not dependent on the context) or by including a link to the macro in the alert message.
\ No newline at end of file
+   - Improve reporting where the result is expanded from a macro by either reporting the macro itself (if it is not dependent on the context) or by including a link to the macro in the alert message.
+ - `RULE-11-5` - `ConversionFromPointerToVoidIntoPointerToObject.ql`:
+    - Fixed issue #331 - consider `0` a null pointer constant.
+ - `RULE-11-6` - `CastBetweenPointerToVoidAndArithmeticType.ql`:
+    - Fixed issue #331 - accept integer constant expressions with value `0` instead of null pointer constants.
\ No newline at end of file

From 0ec5f7204d7cf17cfcf0bd5e8646bdc15beb0c27 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 6 Sep 2024 10:00:24 +0100
Subject: [PATCH 096/435] RULE-11-9: do not accept 0 as a null pointer constant

Rule 11.9 has a different set of requirements for null pointer
constants to the other rules.
---
 ...MacroNullNotUsedAsIntegerNullPointerConstant.ql | 14 ++++++++++++--
 cpp/common/src/codingstandards/cpp/Pointers.qll    |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
index b002ceb4c2..64414b2408 100644
--- a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
+++ b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
@@ -18,8 +18,18 @@ import codingstandards.cpp.Type
 from Zero zero, Expr e, string type
 where
   not isExcluded(zero, Pointers1Package::macroNullNotUsedAsIntegerNullPointerConstantQuery()) and
-  // exclude the base-case (NULL macros and void pointer casts)
-  not isNullPointerConstant(zero) and
+  // Exclude the base-case (NULL macros and void pointer casts)
+  // Note: we cannot use the isNullPointerConstant predicate here because it permits
+  //       the use of `0` without casting, which is prohibited here.
+  not (
+    zero.findRootCause() instanceof NullMacro
+    or
+    // integer constant `0` explicitly cast to void pointer
+    exists(Conversion c | c = zero.getConversion() |
+      not c.isImplicit() and
+      c.getUnderlyingType() instanceof VoidPointerType
+    )
+  ) and
   (
     // ?: operator
     exists(ConditionalExpr parent |
diff --git a/cpp/common/src/codingstandards/cpp/Pointers.qll b/cpp/common/src/codingstandards/cpp/Pointers.qll
index a1126693a5..22dcbd187b 100644
--- a/cpp/common/src/codingstandards/cpp/Pointers.qll
+++ b/cpp/common/src/codingstandards/cpp/Pointers.qll
@@ -62,6 +62,8 @@ class ArrayPointerArithmeticExpr extends PointerArithmeticExpr, ArrayExpr {
 predicate isNullPointerConstant(Expr e) {
   e.findRootCause() instanceof NullMacro
   or
+  // 8.11 Pointer type conversions states:
+  // A null pointer constant, i.e. the value 0, optionally cast to void *.
   e instanceof Zero
   or
   isNullPointerConstant(e.(Conversion).getExpr())

From 71559521957d574f8a4fde473b3addbdc2ed5a02 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 6 Sep 2024 10:05:46 +0100
Subject: [PATCH 097/435] RULE-11-9: Improve ternary test cases

This rule intends to prohibit the use of 0 within branches of
ternaries, where the ternary expression itself produces a pointer
expression because the other branch of the ternary is a pointer.

The previous test case didn't capture this behaviour, instead
looking for assignments within branches.
---
 ...roNullNotUsedAsIntegerNullPointerConstant.expected |  4 ++--
 c/misra/test/rules/RULE-11-9/test.c                   | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected b/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected
index 8cdd34edd1..25ec87d11c 100644
--- a/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected
+++ b/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected
@@ -1,4 +1,4 @@
 | test.c:15:13:15:13 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:15:7:15:13 | ... == ... | Equality operator |
 | test.c:17:8:17:8 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:17:3:17:8 | ... = ... | Assignment to pointer |
-| test.c:25:20:25:20 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:25:3:25:35 | ... ? ... : ... | Ternary operator |
-| test.c:25:20:25:20 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:25:15:25:20 | ... = ... | Assignment to pointer |
+| test.c:23:13:23:13 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:23:3:23:13 | ... ? ... : ... | Ternary operator |
+| test.c:24:8:24:8 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:24:3:24:13 | ... ? ... : ... | Ternary operator |
diff --git a/c/misra/test/rules/RULE-11-9/test.c b/c/misra/test/rules/RULE-11-9/test.c
index 216ea2b280..8342660e2c 100644
--- a/c/misra/test/rules/RULE-11-9/test.c
+++ b/c/misra/test/rules/RULE-11-9/test.c
@@ -19,9 +19,12 @@ void *f1(void *p1, int p2) {
   p1 = NULL;      // COMPLIANT
   if (p2 == 0) {  // COMPLIANT
     return NULL;
-  }                                     // COMPLIANT
-  (p1) ? (p1 = NULL) : (p1 = NULL);     // COMPLIANT
-  (p2 > 0) ? (p1 = NULL) : (p1 = NULL); // COMPLIANT
-  (p2 > 0) ? (p1 = 0) : (p1 = NULL);    // NON_COMPLIANT
+  }
+  p2 ? p1 : 0;     // NON_COMPLIANT
+  p2 ? 0 : p1;     // NON_COMPLIANT
+  p2 ? (void*) 0 : p1;     // COMPLIANT
+  p2 ? p1 : (void*) 0;     // COMPLIANT
+  p2 ? p2 : 0;     // COMPLIANT - p2 is not a pointer type
+  p2 ? 0 : p2;     // COMPLIANT - p2 is not a pointer type
   return 0;                             // COMPLIANT
 }
\ No newline at end of file

From 575be092f990b5f0f5e3a659df5264af008dca7b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 6 Sep 2024 10:15:27 +0100
Subject: [PATCH 098/435] Fix issue with detecting ternary expressions.

---
 .../RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql | 4 ++--
 .../MacroNullNotUsedAsIntegerNullPointerConstant.expected     | 1 +
 c/misra/test/rules/RULE-11-9/test.c                           | 4 ++++
 change_notes/2023-07-28-rule-11-4-improvements.md             | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
index 64414b2408..a5c34fb747 100644
--- a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
+++ b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
@@ -34,9 +34,9 @@ where
     // ?: operator
     exists(ConditionalExpr parent |
       (
-        parent.getThen().getAChild*() = zero and parent.getElse().getType() instanceof PointerType
+        parent.getThen() = zero and parent.getElse().getType() instanceof PointerType
         or
-        parent.getElse().getAChild*() = zero and parent.getThen().getType() instanceof PointerType
+        parent.getElse() = zero and parent.getThen().getType() instanceof PointerType
       ) and
       // exclude a common conditional pattern used in macros such as 'assert'
       not parent.isInMacroExpansion() and
diff --git a/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected b/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected
index 25ec87d11c..d854730296 100644
--- a/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected
+++ b/c/misra/test/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.expected
@@ -2,3 +2,4 @@
 | test.c:17:8:17:8 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:17:3:17:8 | ... = ... | Assignment to pointer |
 | test.c:23:13:23:13 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:23:3:23:13 | ... ? ... : ... | Ternary operator |
 | test.c:24:8:24:8 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:24:3:24:13 | ... ? ... : ... | Ternary operator |
+| test.c:31:14:31:14 | 0 | $@ uses zero-value integer constant expression as null pointer constant. | test.c:31:9:31:14 | ... = ... | Assignment to pointer |
diff --git a/c/misra/test/rules/RULE-11-9/test.c b/c/misra/test/rules/RULE-11-9/test.c
index 8342660e2c..c9cce8687b 100644
--- a/c/misra/test/rules/RULE-11-9/test.c
+++ b/c/misra/test/rules/RULE-11-9/test.c
@@ -26,5 +26,9 @@ void *f1(void *p1, int p2) {
   p2 ? p1 : (void*) 0;     // COMPLIANT
   p2 ? p2 : 0;     // COMPLIANT - p2 is not a pointer type
   p2 ? 0 : p2;     // COMPLIANT - p2 is not a pointer type
+  int x;
+  int *y;
+  p2 ? (p1 = 0) : p1;     // NON_COMPLIANT - p1 is a pointer type
+  p2 ? (p2 = 0) : p1;     // COMPLIANT - p2 is not a pointer type
   return 0;                             // COMPLIANT
 }
\ No newline at end of file
diff --git a/change_notes/2023-07-28-rule-11-4-improvements.md b/change_notes/2023-07-28-rule-11-4-improvements.md
index 7c7411beec..3c385359a8 100644
--- a/change_notes/2023-07-28-rule-11-4-improvements.md
+++ b/change_notes/2023-07-28-rule-11-4-improvements.md
@@ -7,4 +7,6 @@
  - `RULE-11-5` - `ConversionFromPointerToVoidIntoPointerToObject.ql`:
     - Fixed issue #331 - consider `0` a null pointer constant.
  - `RULE-11-6` - `CastBetweenPointerToVoidAndArithmeticType.ql`:
-    - Fixed issue #331 - accept integer constant expressions with value `0` instead of null pointer constants.
\ No newline at end of file
+    - Fixed issue #331 - accept integer constant expressions with value `0` instead of null pointer constants.
+ - `RULE-11-9` - `MacroNullNotUsedAsIntegerNullPointerConstant.ql`:
+    - Remove false positives in branches of ternary expressions, where `0` was used correctly.
\ No newline at end of file

From 7a6b8df1ddce5778cb6b677abb9b82ee11f9cd2b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 23 Jul 2023 18:13:04 +0100
Subject: [PATCH 099/435] RULE-12-2: Support RemAssignExpr

Add %= support to our SimpleRangeAnalysisCustomizations.
---
 .../RightHandOperandOfAShiftRange.expected    |  3 ++
 c/misra/test/rules/RULE-12-2/test.c           | 12 +++++++
 .../cpp/SimpleRangeAnalysisCustomizations.qll | 35 +++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected b/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected
index a4deb83a14..9e2d3e9e6c 100644
--- a/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected
+++ b/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected
@@ -8,3 +8,6 @@
 | test.c:25:10:25:10 | 8 | The right hand operand of the shift operator shall lie in the range 0 to 7. |
 | test.c:26:10:26:11 | 64 | The right hand operand of the shift operator shall lie in the range 0 to 7. |
 | test.c:30:16:30:17 | 64 | The right hand operand of the shift operator shall lie in the range 0 to 63. |
+| test.c:34:8:34:8 | y | The right hand operand of the shift operator shall lie in the range 0 to 31. |
+| test.c:40:8:40:8 | y | The right hand operand of the shift operator shall lie in the range 0 to 31. |
+| test.c:42:8:42:8 | y | The right hand operand of the shift operator shall lie in the range 0 to 31. |
diff --git a/c/misra/test/rules/RULE-12-2/test.c b/c/misra/test/rules/RULE-12-2/test.c
index 449a47b7ae..db7b7b062d 100644
--- a/c/misra/test/rules/RULE-12-2/test.c
+++ b/c/misra/test/rules/RULE-12-2/test.c
@@ -29,3 +29,15 @@ void f1() {
   ULONG_MAX << 8;  // COMPLIANT
   ULONG_MAX << 64; // NON_COMPLIANT
 }
+
+void unsignedRemAssign(unsigned int y, unsigned int x) {
+  x >> y; // NON_COMPLIANT
+  y %= 32;
+  x >> y; // COMPLIANT
+}
+
+void signedRemAssign(signed int y, signed int x) {
+  x >> y; // NON_COMPLIANT
+  y %= 32;
+  x >> y; // NON_COMPLIANT - may be negative
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll b/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll
index 469fe9a738..038d09413e 100644
--- a/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll
+++ b/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll
@@ -151,6 +151,41 @@ private class CastEnumToIntegerSimpleRange extends SimpleRangeAnalysisExpr, Cast
   override predicate dependsOnChild(Expr child) { child = getExpr() }
 }
 
+/**
+ * A range analysis extension that supports `%=`.
+ */
+private class RemAssignSimpleRange extends SimpleRangeAnalysisExpr, AssignRemExpr {
+  override float getLowerBounds() {
+    exists(float maxDivisorNegated, float dividendLowerBounds |
+      // Find the max divisor, negated e.g. `%= 32` would be  `-31`
+      maxDivisorNegated = (getFullyConvertedUpperBounds(getRValue()).abs() - 1) * -1 and
+      // Find the lower bounds of the dividend
+      dividendLowerBounds = getFullyConvertedLowerBounds(getLValue()) and
+      // The lower bound is caluclated in two steps:
+      // 1. Determine the maximum of the dividend lower bound and maxDivisorNegated.
+      //    When the dividend is negative this will result in a negative result
+      // 2. Find the minimum with 0. If the divided is always >0 this will produce 0
+      //    otherwise it will produce the lowest negative number that can be held
+      //    after the modulo.
+      result = 0.minimum(dividendLowerBounds.maximum(maxDivisorNegated))
+    )
+  }
+
+  override float getUpperBounds() {
+    // TODO rem zero?
+    exists(float maxDivisor, float maxDividend |
+      // The maximum divisor value is the absolute value of the divisor minus 1
+      maxDivisor = getFullyConvertedUpperBounds(getRValue()).abs() - 1 and
+      // value if > 0 otherwise 0
+      maxDividend = getFullyConvertedUpperBounds(getLValue()).maximum(0) and
+      // In the case the numerator is definitely less than zero, the result could be negative
+      result = maxDividend.minimum(maxDivisor)
+    )
+  }
+
+  override predicate dependsOnChild(Expr expr) { expr = getAChild() }
+}
+
 /**
  * <stdio.h> functions that read a character from the STDIN,
  * or return EOF if it fails to do so.

From 7b7389648627ef61e17ea8dfd9add3601ff10d23 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 23 Jul 2023 18:41:05 +0100
Subject: [PATCH 100/435] EssentialTypes: Fix integer constant types

Integer constants are only subject to the stlr or utlr if they are type
int, signed int or unsigned int, otherwise they have the standard type.

Fixes issues with RULE 12.2.
---
 .../codingstandards/c/misra/EssentialTypes.qll | 18 +++++++++++-------
 c/misra/test/c/misra/EssentialTypes.expected   |  3 +++
 c/misra/test/c/misra/test.c                    |  6 ++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
index a1b8d6fdb0..7df233d2ab 100644
--- a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
+++ b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
@@ -355,13 +355,17 @@ class EssentialLiteral extends EssentialExpr, Literal {
     else (
       if this.(CharLiteral).getCharacter().length() = 1
       then result instanceof PlainCharType
-      else (
-        getStandardType().(IntegralType).isSigned() and
-        result = stlr(this)
-        or
-        not getStandardType().(IntegralType).isSigned() and
-        result = utlr(this)
-      )
+      else
+        exists(Type underlyingStandardType |
+          underlyingStandardType = getStandardType().getUnderlyingType()
+        |
+          if underlyingStandardType instanceof IntType
+          then
+            if underlyingStandardType.(IntType).isSigned()
+            then result = stlr(this)
+            else result = utlr(this)
+          else result = underlyingStandardType
+        )
     )
   }
 }
diff --git a/c/misra/test/c/misra/EssentialTypes.expected b/c/misra/test/c/misra/EssentialTypes.expected
index 8bf299bd63..d9245311da 100644
--- a/c/misra/test/c/misra/EssentialTypes.expected
+++ b/c/misra/test/c/misra/EssentialTypes.expected
@@ -38,3 +38,6 @@
 | test.c:26:3:26:3 | f | float | float | essentially Floating type |
 | test.c:27:3:27:5 | f32 | float32_t | float32_t | essentially Floating type |
 | test.c:28:3:28:6 | cf32 | float | float | essentially Floating type |
+| test.c:32:3:32:3 | 1 | signed char | signed char | essentially Signed type |
+| test.c:33:3:33:4 | 1 | unsigned char | unsigned char | essentially Unsigned type |
+| test.c:34:3:34:5 | 1 | unsigned long | unsigned long | essentially Unsigned type |
diff --git a/c/misra/test/c/misra/test.c b/c/misra/test/c/misra/test.c
index 8788f7e93a..d7064c4c12 100644
--- a/c/misra/test/c/misra/test.c
+++ b/c/misra/test/c/misra/test.c
@@ -26,4 +26,10 @@ void testCategoriesForComplexTypes() {
   f;    // Should be essentially Floating type
   f32;  // Should be essentially Floating type
   cf32; // Should be essentially Floating type
+}
+
+void testConstants() {
+  1;   // Essentially signed char
+  1U;  // Essentially unsigned char
+  1UL; // Essentially unsigned long
 }
\ No newline at end of file

From 12494a41e9e9b752cf9216a95305eb6490be9b7b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 23 Jul 2023 20:05:02 +0100
Subject: [PATCH 101/435] RULE-12-2: Improve reporting

Update the message to include the right operand range in addition to the
valid shift range, the essential type of the left operand, and, if
relevant, the macro in which the shift is defined.
---
 .../RightHandOperandOfAShiftRange.ql          | 47 +++++++++++++++++--
 .../RightHandOperandOfAShiftRange.expected    | 25 +++++-----
 2 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql b/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql
index 891ca1e82a..bd77bdacd2 100644
--- a/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql
+++ b/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql
@@ -20,14 +20,51 @@ class ShiftExpr extends BinaryBitwiseOperation {
   ShiftExpr() { this instanceof LShiftExpr or this instanceof RShiftExpr }
 }
 
-from ShiftExpr e, Expr right, int max_val
+MacroInvocation getAMacroInvocation(ShiftExpr se) { result.getAnExpandedElement() = se }
+
+Macro getPrimaryMacro(ShiftExpr se) {
+  exists(MacroInvocation mi |
+    mi = getAMacroInvocation(se) and
+    not exists(MacroInvocation otherMi |
+      otherMi = getAMacroInvocation(se) and otherMi.getParentInvocation() = mi
+    ) and
+    result = mi.getMacro()
+  )
+}
+
+from
+  ShiftExpr e, Expr right, int max_val, float lowerBound, float upperBound, Type essentialType,
+  string extraMessage, Locatable optionalPlaceholderLocation, string optionalPlaceholderMessage
 where
   not isExcluded(right, Contracts7Package::rightHandOperandOfAShiftRangeQuery()) and
   right = e.getRightOperand().getFullyConverted() and
-  max_val = (8 * getEssentialType(e.getLeftOperand()).getSize()) - 1 and
+  essentialType = getEssentialType(e.getLeftOperand()) and
+  max_val = (8 * essentialType.getSize()) - 1 and
+  upperBound = upperBound(right) and
+  lowerBound = lowerBound(right) and
+  (
+    lowerBound < 0 or
+    upperBound > max_val
+  ) and
+  // If this shift happens inside a macro, then report the macro as well
+  // for easier validation
   (
-    lowerBound(right) < 0 or
-    upperBound(right) > max_val
+    if exists(getPrimaryMacro(e))
+    then
+      extraMessage = " from expansion of macro $@" and
+      exists(Macro m |
+        m = getPrimaryMacro(e) and
+        optionalPlaceholderLocation = m and
+        optionalPlaceholderMessage = m.getName()
+      )
+    else (
+      extraMessage = "" and
+      optionalPlaceholderLocation = e and
+      optionalPlaceholderMessage = ""
+    )
   )
 select right,
-  "The right hand operand of the shift operator shall lie in the range 0 to " + max_val + "."
+  "The possible range of the right operand of the shift operator (" + lowerBound + ".." + upperBound
+    + ") is outside the the valid shift range (0.." + max_val +
+    ") for the essential type of the left operand (" + essentialType + ")" + extraMessage + ".",
+  optionalPlaceholderLocation, optionalPlaceholderMessage
diff --git a/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected b/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected
index 9e2d3e9e6c..5ac6f8bfd4 100644
--- a/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected
+++ b/c/misra/test/rules/RULE-12-2/RightHandOperandOfAShiftRange.expected
@@ -1,13 +1,12 @@
-| test.c:8:10:8:10 | 8 | The right hand operand of the shift operator shall lie in the range 0 to 7. |
-| test.c:9:10:9:11 | - ... | The right hand operand of the shift operator shall lie in the range 0 to 7. |
-| test.c:10:10:10:14 | ... + ... | The right hand operand of the shift operator shall lie in the range 0 to 7. |
-| test.c:11:10:11:14 | ... + ... | The right hand operand of the shift operator shall lie in the range 0 to 7. |
-| test.c:13:21:13:22 | 16 | The right hand operand of the shift operator shall lie in the range 0 to 15. |
-| test.c:16:9:16:9 | 8 | The right hand operand of the shift operator shall lie in the range 0 to 7. |
-| test.c:21:9:21:10 | 64 | The right hand operand of the shift operator shall lie in the range 0 to 63. |
-| test.c:25:10:25:10 | 8 | The right hand operand of the shift operator shall lie in the range 0 to 7. |
-| test.c:26:10:26:11 | 64 | The right hand operand of the shift operator shall lie in the range 0 to 7. |
-| test.c:30:16:30:17 | 64 | The right hand operand of the shift operator shall lie in the range 0 to 63. |
-| test.c:34:8:34:8 | y | The right hand operand of the shift operator shall lie in the range 0 to 31. |
-| test.c:40:8:40:8 | y | The right hand operand of the shift operator shall lie in the range 0 to 31. |
-| test.c:42:8:42:8 | y | The right hand operand of the shift operator shall lie in the range 0 to 31. |
+| test.c:8:10:8:10 | 8 | The possible range of the right operand of the shift operator (8..8) is outside the the valid shift range (0..7) for the essential type of the left operand (uint8_t). | test.c:8:3:8:10 | ... >> ... |  |
+| test.c:9:10:9:11 | - ... | The possible range of the right operand of the shift operator (-1..-1) is outside the the valid shift range (0..7) for the essential type of the left operand (uint8_t). | test.c:9:3:9:11 | ... >> ... |  |
+| test.c:10:10:10:14 | ... + ... | The possible range of the right operand of the shift operator (8..8) is outside the the valid shift range (0..7) for the essential type of the left operand (uint8_t). | test.c:10:3:10:14 | ... >> ... |  |
+| test.c:11:10:11:14 | ... + ... | The possible range of the right operand of the shift operator (8..8) is outside the the valid shift range (0..7) for the essential type of the left operand (uint8_t). | test.c:11:3:11:14 | ... << ... |  |
+| test.c:13:21:13:22 | 16 | The possible range of the right operand of the shift operator (16..16) is outside the the valid shift range (0..15) for the essential type of the left operand (uint16_t). | test.c:13:3:13:22 | ... << ... |  |
+| test.c:16:9:16:9 | 8 | The possible range of the right operand of the shift operator (8..8) is outside the the valid shift range (0..7) for the essential type of the left operand (unsigned char). | test.c:16:3:16:9 | ... << ... |  |
+| test.c:21:9:21:10 | 64 | The possible range of the right operand of the shift operator (64..64) is outside the the valid shift range (0..63) for the essential type of the left operand (unsigned long). | test.c:21:3:21:10 | ... << ... |  |
+| test.c:26:10:26:11 | 64 | The possible range of the right operand of the shift operator (64..64) is outside the the valid shift range (0..63) for the essential type of the left operand (unsigned long). | test.c:26:3:26:11 | ... << ... |  |
+| test.c:30:16:30:17 | 64 | The possible range of the right operand of the shift operator (64..64) is outside the the valid shift range (0..63) for the essential type of the left operand (unsigned long). | test.c:30:3:30:17 | ... << ... |  |
+| test.c:34:8:34:8 | y | The possible range of the right operand of the shift operator (0..4294967295) is outside the the valid shift range (0..31) for the essential type of the left operand (unsigned int). | test.c:34:3:34:8 | ... >> ... |  |
+| test.c:40:8:40:8 | y | The possible range of the right operand of the shift operator (-2147483648..2147483647) is outside the the valid shift range (0..31) for the essential type of the left operand (signed int). | test.c:40:3:40:8 | ... >> ... |  |
+| test.c:42:8:42:8 | y | The possible range of the right operand of the shift operator (-31..31) is outside the the valid shift range (0..31) for the essential type of the left operand (signed int). | test.c:42:3:42:8 | ... >> ... |  |

From 88bc3dab507b6401d57ddd6242022028bc93671a Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 11 Sep 2024 11:10:08 +0100
Subject: [PATCH 102/435] Remove ACLs for dispatch targets

Remove ACLs and replace with a check against write access to the repository.
---
 .github/actions/check-permissions/action.yml  | 43 +++++++++++++++++++
 .github/workflows/dispatch-matrix-check.yml   | 13 +++---
 .../dispatch-matrix-test-on-comment.yml       | 25 +++--------
 .../dispatch-release-performance-check.yml    | 25 +++--------
 4 files changed, 64 insertions(+), 42 deletions(-)
 create mode 100644 .github/actions/check-permissions/action.yml

diff --git a/.github/actions/check-permissions/action.yml b/.github/actions/check-permissions/action.yml
new file mode 100644
index 0000000000..9a3ea6d7f7
--- /dev/null
+++ b/.github/actions/check-permissions/action.yml
@@ -0,0 +1,43 @@
+name: Check current actor permissions
+description: |
+  Checks whether the current actor has the specified permssions
+inputs:
+  minimum-permission:
+    description: |
+      The minimum required permission. One of: read, write, admin
+    required: true
+outputs:
+  has-permission:
+    description: "Whether the actor had the minimum required permission"
+    value: ${{ steps.check-permission.outputs.has-permission }}
+
+runs:
+  using: composite
+  steps:
+  - uses: actions/github-script@v7
+    id: check-permission
+    with:
+      script: |
+        // Valid permissions are none, read, write, admin (legacy base permissions)
+        const permissionsRanking = ["none", "read", "write", "admin"];
+
+        const minimumPermission = core.getInput('minimum-permission');
+        if (!permissionsRanking.includes(minimumPermission)) {
+          core.setFailed(`Invalid minimum permission: ${minimumPermission}`);
+          return;
+        }
+
+        const { data : { permission : actorPermission } } = await github.rest.repos.getCollaboratorPermissionLevel({
+          owner: context.repo.owner,
+          repo: context.repo.repo,
+          username: tools.context.actor
+        });
+
+        // Confirm whether the actor permission is at least the selected permission
+        const hasPermission = permissionsRanking.indexOf(minimumPermission) <= permissionsRanking.indexOf(actorPermission) ? "1" : "";
+        core.setOutput('has-permission', hasPermission);
+        if (!hasPermission) {
+          core.info(`Current actor (${tools.context.actor}) does not have the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
+        } else {
+          core.info(`Current actor (${tools.context.actor}) has the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
+        }
\ No newline at end of file
diff --git a/.github/workflows/dispatch-matrix-check.yml b/.github/workflows/dispatch-matrix-check.yml
index a570777877..458a7a6a58 100644
--- a/.github/workflows/dispatch-matrix-check.yml
+++ b/.github/workflows/dispatch-matrix-check.yml
@@ -11,13 +11,14 @@ jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
-      - name: Test Variables
-        shell: pwsh
-        run: |
-          Write-Host "Running as: ${{github.actor}}"
+      - name: Check permission
+        id: check-write-permission
+        uses: ./.github/actions/check-permissions
+        with:
+          minimum-permission: "write"
 
       - name: Dispatch Matrix Testing Job
-        if: ${{ contains(fromJSON('["mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill"]'), github.actor) }}
+        if: steps.check-write-permission.outputs.has-permission
         uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
@@ -26,7 +27,7 @@ jobs:
           client-payload: '{"pr": "${{ github.event.number }}"}'
 
       - uses: actions/github-script@v6
-        if: ${{ contains(fromJSON('["mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill"]'), github.actor) }}
+        if: steps.check-write-permission.outputs.has-permission
         with:
           script: |
             github.rest.issues.createComment({
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
index ba223380c7..4dc69a035a 100644
--- a/.github/workflows/dispatch-matrix-test-on-comment.yml
+++ b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -3,30 +3,19 @@ name: 🤖 Run Matrix Check (On Comment)
 on:
   issue_comment:
     types: [created]
-    branches:
-      - main
-      - "rc/**"
-      - next
 
 jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
-      - name: Test Variables
-        shell: pwsh
-        run: |
-          Write-Host "Running as: ${{github.actor}}"    
-
-          $actor = "${{github.actor}}"
-
-          $acl = @("mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill") 
-
-          if(-not ($actor -in $acl)){
-            throw "Refusing to run workflow for user not in acl."
-          }
+      - name: Check permission
+        id: check-write-permission
+        uses: ./.github/actions/check-permissions
+        with:
+          minimum-permission: "write"
 
       - name: Dispatch Matrix Testing Job
-        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') }}
+        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
         uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
@@ -35,7 +24,7 @@ jobs:
           client-payload: '{"pr": "${{ github.event.issue.number }}"}'
 
       - uses: actions/github-script@v6
-        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') }}
+        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |
             github.rest.issues.createComment({
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index 827c0c4463..8933495382 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -3,30 +3,19 @@ name: 🏁 Run Release Performance Check
 on:
   issue_comment:
     types: [created]
-    branches:
-      - main
-      - "rc/**"
-      - next
 
 jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
-      - name: Test Variables
-        shell: pwsh
-        run: |
-          Write-Host "Running as: ${{github.actor}}"    
-
-          $actor = "${{github.actor}}"
-
-          $acl = @("mbaluda", "lcartey", "rvermeulen", "ravikprasad", "jeongsoolee09", "hohn", "knewbury01", "nicolaswill") 
-
-          if(-not ($actor -in $acl)){
-            throw "Refusing to run workflow for user not in acl."
-          }
+      - name: Check permission
+        id: check-write-permission
+        uses: ./.github/actions/check-permissions
+        with:
+          minimum-permission: "write"
 
       - name: Dispatch Performance Testing Job
-        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') }}
+        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}
         uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
@@ -35,7 +24,7 @@ jobs:
           client-payload: '{"pr": "${{ github.event.issue.number }}"}'
 
       - uses: actions/github-script@v6
-        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') }}
+        if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |
             github.rest.issues.createComment({

From 9a992f2d0f1c0f7b74646aeba15e8ba15d7f5975 Mon Sep 17 00:00:00 2001
From: Nicolas Will <nicolaswill@github.com>
Date: Wed, 11 Sep 2024 10:26:22 +0000
Subject: [PATCH 103/435] Bump actions/upload-artifact@v2 to @v3

---
 .github/workflows/code-scanning-pack-gen.yml         | 2 +-
 .github/workflows/generate-html-docs.yml             | 2 +-
 .github/workflows/standard_library_upgrade_tests.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 0f07c1e14b..7b187b2980 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -106,7 +106,7 @@ jobs:
           zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/schemas
 
       - name: Upload GHAS Query Pack
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: code-scanning-cpp-query-pack.zip
           path: code-scanning-cpp-query-pack.zip
diff --git a/.github/workflows/generate-html-docs.yml b/.github/workflows/generate-html-docs.yml
index f8e3d6d30c..71359a8e6f 100644
--- a/.github/workflows/generate-html-docs.yml
+++ b/.github/workflows/generate-html-docs.yml
@@ -35,7 +35,7 @@ jobs:
           python scripts/documentation/generate_iso26262_docs.py coding-standards-html-docs
 
       - name: Upload HTML documentation
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: coding-standards-docs-${{ github.sha }}
           path: coding-standards-html-docs/
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
index aac2fd1e0e..5402dc9105 100644
--- a/.github/workflows/standard_library_upgrade_tests.yml
+++ b/.github/workflows/standard_library_upgrade_tests.yml
@@ -143,7 +143,7 @@ jobs:
               }, test_summary_file)
 
       - name: Upload test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: test-results-${{runner.os}}-${{matrix.codeql_cli}}-${{matrix.codeql_standard_library_ident}}
           path: |

From fec298bec004016ec1236f82b88844ba7e45307d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 11 Sep 2024 12:05:20 +0100
Subject: [PATCH 104/435] Add GitHub Action for applying Coding Standards
 configuration

---
 .../action.yml                                    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/actions/apply-coding-standards-configuration/action.yml

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
new file mode 100644
index 0000000000..f901238061
--- /dev/null
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -0,0 +1,15 @@
+name: Applies Coding Standard configuration files in the repository
+description: |
+  Installs Python and indexes the CodeQL Coding Standard configuration files in the repository
+
+runs:
+  using: composite
+  steps:
+    - name: Install Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: python -m pip install -r ${{ github.action_path }}/scripts/configuration/requirements.txt
+    - name: Process files
+      run: python ${{ github.action_path }}/scripts/configuration/process_coding_standards_config.py
\ No newline at end of file

From 422f17090e7e8aca666aa8ed1983cffb46572c5c Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 11 Sep 2024 14:54:57 +0100
Subject: [PATCH 105/435] Rule 11.1: Exclude null pointer constant

Null pointer constants can be cast to a function pointer.
---
 .../ConversionBetweenFunctionPointerAndOtherType.expected       | 1 -
 c/misra/test/rules/RULE-11-1/test.c                             | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/c/misra/test/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.expected b/c/misra/test/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.expected
index ebe2c74742..0144180616 100644
--- a/c/misra/test/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.expected
+++ b/c/misra/test/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.expected
@@ -1,7 +1,6 @@
 | test.c:11:8:11:16 | (fp1 *)... | Cast performed between a function pointer and another type. |
 | test.c:11:8:11:16 | (fp1)... | Cast performed between a function pointer and another type. |
 | test.c:12:14:12:23 | (void *)... | Cast performed between a function pointer and another type. |
-| test.c:14:8:14:15 | (fp2)... | Cast performed between a function pointer and another type. |
 | test.c:15:8:15:15 | (fp2)... | Cast performed between a function pointer and another type. |
 | test.c:22:12:22:13 | (fp1)... | Cast performed between a function pointer and another type. |
 | test.c:25:8:25:9 | (fp1)... | Cast performed between a function pointer and another type. |
diff --git a/c/misra/test/rules/RULE-11-1/test.c b/c/misra/test/rules/RULE-11-1/test.c
index 858c6e68a9..4fcabb0599 100644
--- a/c/misra/test/rules/RULE-11-1/test.c
+++ b/c/misra/test/rules/RULE-11-1/test.c
@@ -11,7 +11,7 @@ void f1(void) {
   v1 = (fp1 *)v2;        // NON_COMPLIANT
   void *v3 = (void *)v1; // NON_COMPLIANT
 
-  v2 = (fp2 *)0; // NON_COMPLIANT
+  v2 = (fp2 *)0; // COMPLIANT - null pointer constant
   v2 = (fp2 *)1; // NON_COMPLIANT
 
   pfp2 v4;

From 8729c437e87d8aa6661e6819c3baaf351ba416b0 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 11 Sep 2024 14:55:25 +0100
Subject: [PATCH 106/435] Rule 11.9: Format test file

---
 c/misra/test/rules/RULE-11-9/test.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/c/misra/test/rules/RULE-11-9/test.c b/c/misra/test/rules/RULE-11-9/test.c
index c9cce8687b..e87366d831 100644
--- a/c/misra/test/rules/RULE-11-9/test.c
+++ b/c/misra/test/rules/RULE-11-9/test.c
@@ -20,15 +20,15 @@ void *f1(void *p1, int p2) {
   if (p2 == 0) {  // COMPLIANT
     return NULL;
   }
-  p2 ? p1 : 0;     // NON_COMPLIANT
-  p2 ? 0 : p1;     // NON_COMPLIANT
-  p2 ? (void*) 0 : p1;     // COMPLIANT
-  p2 ? p1 : (void*) 0;     // COMPLIANT
-  p2 ? p2 : 0;     // COMPLIANT - p2 is not a pointer type
-  p2 ? 0 : p2;     // COMPLIANT - p2 is not a pointer type
+  p2 ? p1 : 0;         // NON_COMPLIANT
+  p2 ? 0 : p1;         // NON_COMPLIANT
+  p2 ? (void *)0 : p1; // COMPLIANT
+  p2 ? p1 : (void *)0; // COMPLIANT
+  p2 ? p2 : 0;         // COMPLIANT - p2 is not a pointer type
+  p2 ? 0 : p2;         // COMPLIANT - p2 is not a pointer type
   int x;
   int *y;
-  p2 ? (p1 = 0) : p1;     // NON_COMPLIANT - p1 is a pointer type
-  p2 ? (p2 = 0) : p1;     // COMPLIANT - p2 is not a pointer type
-  return 0;                             // COMPLIANT
+  p2 ? (p1 = 0) : p1; // NON_COMPLIANT - p1 is a pointer type
+  p2 ? (p2 = 0) : p1; // COMPLIANT - p2 is not a pointer type
+  return 0;           // COMPLIANT
 }
\ No newline at end of file

From 1accfabeaf01a8074f3cc8fc10cdb6946204bade Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 11 Sep 2024 14:58:17 +0100
Subject: [PATCH 107/435] Checkout repository before calling check-permissions
 action

---
 .github/workflows/dispatch-matrix-check.yml              | 3 +++
 .github/workflows/dispatch-matrix-test-on-comment.yml    | 3 +++
 .github/workflows/dispatch-release-performance-check.yml | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/.github/workflows/dispatch-matrix-check.yml b/.github/workflows/dispatch-matrix-check.yml
index 458a7a6a58..afe78c948c 100644
--- a/.github/workflows/dispatch-matrix-check.yml
+++ b/.github/workflows/dispatch-matrix-check.yml
@@ -11,6 +11,9 @@ jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Check permission
         id: check-write-permission
         uses: ./.github/actions/check-permissions
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
index 4dc69a035a..98e1f9b7ba 100644
--- a/.github/workflows/dispatch-matrix-test-on-comment.yml
+++ b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -8,6 +8,9 @@ jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Check permission
         id: check-write-permission
         uses: ./.github/actions/check-permissions
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index 8933495382..64863b8b05 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -8,6 +8,9 @@ jobs:
   dispatch-matrix-check:
     runs-on: ubuntu-22.04
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Check permission
         id: check-write-permission
         uses: ./.github/actions/check-permissions

From 122a8f7fc2ced656c652355e84e612de176504a8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Wed, 11 Sep 2024 22:49:43 +0100
Subject: [PATCH 108/435] Fix input passing in check-permissions

Composite actions do not get passed the input from the overall action - only the composite action.

Address this by manually setting the appropriate env var to ensure the value is passed through.

See: https://github.com/actions/github-script/issues/56
---
 .github/actions/check-permissions/action.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/actions/check-permissions/action.yml b/.github/actions/check-permissions/action.yml
index 9a3ea6d7f7..4d258d10cf 100644
--- a/.github/actions/check-permissions/action.yml
+++ b/.github/actions/check-permissions/action.yml
@@ -16,11 +16,17 @@ runs:
   steps:
   - uses: actions/github-script@v7
     id: check-permission
+    env:
+      INPUT_MINIMUM-PERMISSION: ${{ inputs.minimum-permission }}
     with:
       script: |
         // Valid permissions are none, read, write, admin (legacy base permissions)
         const permissionsRanking = ["none", "read", "write", "admin"];
 
+        // Note: core.getInput doesn't work by default in a composite action - in this case
+        //       it would try to fetch the input to the github-script instead of the action
+        //       itself. Instead, we set the appropriate magic env var with the actions input.
+        //       See: https://github.com/actions/runner/issues/665
         const minimumPermission = core.getInput('minimum-permission');
         if (!permissionsRanking.includes(minimumPermission)) {
           core.setFailed(`Invalid minimum permission: ${minimumPermission}`);
@@ -40,4 +46,4 @@ runs:
           core.info(`Current actor (${tools.context.actor}) does not have the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
         } else {
           core.info(`Current actor (${tools.context.actor}) has the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
-        }
\ No newline at end of file
+        }

From 3c223ace4e6c91e5302f8e851b10dd24c4bb9509 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 11 Sep 2024 22:57:12 +0100
Subject: [PATCH 109/435] Fix comments

 - Fix typo
 - Do not need to handle rem by zero
---
 .../codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll b/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll
index 038d09413e..5144f63dc2 100644
--- a/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll
+++ b/cpp/common/src/codingstandards/cpp/SimpleRangeAnalysisCustomizations.qll
@@ -161,7 +161,7 @@ private class RemAssignSimpleRange extends SimpleRangeAnalysisExpr, AssignRemExp
       maxDivisorNegated = (getFullyConvertedUpperBounds(getRValue()).abs() - 1) * -1 and
       // Find the lower bounds of the dividend
       dividendLowerBounds = getFullyConvertedLowerBounds(getLValue()) and
-      // The lower bound is caluclated in two steps:
+      // The lower bound is calculated in two steps:
       // 1. Determine the maximum of the dividend lower bound and maxDivisorNegated.
       //    When the dividend is negative this will result in a negative result
       // 2. Find the minimum with 0. If the divided is always >0 this will produce 0
@@ -172,7 +172,6 @@ private class RemAssignSimpleRange extends SimpleRangeAnalysisExpr, AssignRemExp
   }
 
   override float getUpperBounds() {
-    // TODO rem zero?
     exists(float maxDivisor, float maxDividend |
       // The maximum divisor value is the absolute value of the divisor minus 1
       maxDivisor = getFullyConvertedUpperBounds(getRValue()).abs() - 1 and

From c765f93757323ee5218c0670016ec4b76f3387e8 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Thu, 12 Sep 2024 12:22:50 +0900
Subject: [PATCH 110/435] Fix(common/cpp): dead code alert on constexpr with
 array sizes.

---
 .../cpp/rules/deadcode/DeadCode.qll           | 24 ++++++++++++++++++-
 .../test/rules/deadcode/DeadCode.expected     |  2 ++
 cpp/common/test/rules/deadcode/test.cpp       |  5 ++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
index 4a008dc15a..5f3b77e661 100644
--- a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
@@ -16,11 +16,31 @@ import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.deadcode.UselessAssignments
 import codingstandards.cpp.deadcode.UnreachableCode
+import codingstandards.cpp.deadcode.UnusedVariables
 
 abstract class DeadCodeSharedQuery extends Query { }
 
 Query getQuery() { result instanceof DeadCodeSharedQuery }
 
+/**
+ * Returns integer value of a constexpr variable
+ */
+int getConstexprValue(Variable v) {
+  result = v.getInitializer().getExpr().getValue().toInt() and v.isConstexpr()
+}
+
+/**
+ * Holds if `Variable` v is used for a local array size with value `n`
+ */
+bindingset[n]
+predicate isUsedInLocalArraySize(Variable v, int n) {
+  // Cf. https://github.com/github/codeql-coding-standards/pull/660/files.
+  count(ArrayType at, LocalVariable arrayVariable |
+        arrayVariable.getType().resolveTypedefs() = at and
+        v.(PotentiallyUnusedLocalVariable).getFunction() = arrayVariable.getFunction() and
+        at.getArraySize() = n) > 0
+}
+
 /**
  * Holds if the `Stmt` `s` is either dead or unreachable.
  */
@@ -39,6 +59,7 @@ predicate isDeadStmt(Stmt s) {
   // - All the declarations are variable declarations
   // - None of those variables are ever accessed in non-dead code
   // - The initializers for each of the variables are pure
+  // - It isn't constexpr and used to declare an array size
   exists(DeclStmt ds |
     ds = s and
     // Use forex so that we don't flag "fake" generated `DeclStmt`s (e.g. those generated by the
@@ -50,7 +71,8 @@ predicate isDeadStmt(Stmt s) {
         not exists(VariableAccess va |
           va.getTarget() = v and
           not isDeadOrUnreachableStmt(va.getEnclosingStmt())
-        )
+        ) and
+        not isUsedInLocalArraySize(v, getConstexprValue(v))
       )
     )
   )
diff --git a/cpp/common/test/rules/deadcode/DeadCode.expected b/cpp/common/test/rules/deadcode/DeadCode.expected
index 6c111d8a93..d3252e9401 100644
--- a/cpp/common/test/rules/deadcode/DeadCode.expected
+++ b/cpp/common/test/rules/deadcode/DeadCode.expected
@@ -12,3 +12,5 @@
 | test.cpp:72:3:73:3 | try { ... } | This statement is dead code. |
 | test.cpp:73:17:74:3 | { ... } | This statement is dead code. |
 | test.cpp:79:17:80:3 | { ... } | This statement is dead code. |
+| test.cpp:85:3:85:44 | declaration | This statement is dead code. |
+| test.cpp:87:3:87:30 | declaration | This statement is dead code. |
diff --git a/cpp/common/test/rules/deadcode/test.cpp b/cpp/common/test/rules/deadcode/test.cpp
index ba5c59b07c..982c021563 100644
--- a/cpp/common/test/rules/deadcode/test.cpp
+++ b/cpp/common/test/rules/deadcode/test.cpp
@@ -81,5 +81,10 @@ int test_dead_code(int x) {
 
   static_assert(1); // COMPLIANT
 
+  constexpr int constexpr_array_size{6};     // COMPLIANT
+  int unused_array[constexpr_array_size] {}; // NON_COMPLIANT
+
+  constexpr int unused_int{2}; // NON_COMPLIANT
+
   return live5 + live6; // COMPLIANT
 }
\ No newline at end of file

From 2690409a7fde4c3256806eeda19dd4c4b418ceb2 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:55:09 +0100
Subject: [PATCH 111/435] check-permission: Use the current context.actor
 property

---
 .github/actions/check-permissions/action.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/actions/check-permissions/action.yml b/.github/actions/check-permissions/action.yml
index 4d258d10cf..b47466d080 100644
--- a/.github/actions/check-permissions/action.yml
+++ b/.github/actions/check-permissions/action.yml
@@ -36,14 +36,14 @@ runs:
         const { data : { permission : actorPermission } } = await github.rest.repos.getCollaboratorPermissionLevel({
           owner: context.repo.owner,
           repo: context.repo.repo,
-          username: tools.context.actor
+          username: context.actor
         });
 
         // Confirm whether the actor permission is at least the selected permission
         const hasPermission = permissionsRanking.indexOf(minimumPermission) <= permissionsRanking.indexOf(actorPermission) ? "1" : "";
         core.setOutput('has-permission', hasPermission);
         if (!hasPermission) {
-          core.info(`Current actor (${tools.context.actor}) does not have the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
+          core.info(`Current actor (${context.actor}) does not have the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
         } else {
-          core.info(`Current actor (${tools.context.actor}) has the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
+          core.info(`Current actor (${context.actor}) has the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
         }

From 073eaa2bf6cc693b442115e3b7389fb3c84c65bc Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 12 Sep 2024 12:44:39 -0700
Subject: [PATCH 112/435] Fix #1869 Compiler Compatability for clang for
 CERT-C++ rule DCL51-CPP

tzname is char*[2] in the standard libraries of both clang and gcc. This will
allow the test code to compile, and still triggers a non-compliance query
result.
---
 cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected | 2 +-
 cpp/cert/test/rules/DCL51-CPP/test.cpp                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
index 698b0c6067..0d0491b42c 100644
--- a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
@@ -1 +1 @@
-| test.cpp:18:5:18:10 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:18:5:18:10 | tzname | tzname |
+| test.cpp:18:7:18:12 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:18:7:18:12 | tzname | tzname |
diff --git a/cpp/cert/test/rules/DCL51-CPP/test.cpp b/cpp/cert/test/rules/DCL51-CPP/test.cpp
index 5e27dd2390..27c03210e9 100644
--- a/cpp/cert/test/rules/DCL51-CPP/test.cpp
+++ b/cpp/cert/test/rules/DCL51-CPP/test.cpp
@@ -15,7 +15,7 @@ enum {
 
 // int NULL = 0; // NON_COMPLIANT, but not supported by compilers in practice
 
-int tzname = 0; // NON_COMPLIANT
+char* tzname[2]; // NON_COMPLIANT
 
 void min() {} // NON_COMPLIANT
 

From 3187f2c769fcc9bc35a53d712f13d4a857388e41 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Thu, 12 Sep 2024 16:57:52 -0400
Subject: [PATCH 113/435] A2-7-3: update test expected file

---
 .../UndocumentedUserDefinedType.expected      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected b/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
index 90935f9396..d14f6e21f7 100644
--- a/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
+++ b/cpp/autosar/test/rules/A2-7-3/UndocumentedUserDefinedType.expected
@@ -1,10 +1,12 @@
-| test.cpp:70:7:70:12 | definition of ClassD | Declaration entry for user-defined type ClassD is missing documentation. |
-| test.cpp:72:7:72:7 | definition of a | Declaration entry for member variable a is missing documentation. |
-| test.cpp:73:14:73:14 | declaration of b | Declaration entry for member variable b is missing documentation. |
-| test.cpp:74:8:74:8 | declaration of f | Declaration entry for function f is missing documentation. |
-| test.cpp:76:7:76:7 | definition of c | Declaration entry for member variable c is missing documentation. |
-| test.cpp:78:6:78:6 | declaration of d | Declaration entry for function d is missing documentation. |
-| test.cpp:81:6:81:6 | definition of e | Declaration entry for function e is missing documentation. |
-| test.cpp:88:1:88:30 | definition of message_to_string_undocumented | Declaration entry for function message_to_string_undocumented is missing documentation. |
-| test.cpp:160:21:160:24 | definition of kBar | Declaration entry for member variable kBar is missing documentation. |
-| test.cpp:207:14:207:17 | definition of foo3 | Declaration entry for function foo3 is missing documentation. |
+| test.cpp:74:8:74:8 | declaration of j | Declaration entry for function j is missing documentation. |
+| test.cpp:75:8:75:8 | declaration of k | Declaration entry for function k is missing documentation. |
+| test.cpp:90:7:90:12 | definition of ClassD | Declaration entry for user-defined type ClassD is missing documentation. |
+| test.cpp:92:7:92:7 | definition of a | Declaration entry for member variable a is missing documentation. |
+| test.cpp:93:14:93:14 | declaration of b | Declaration entry for member variable b is missing documentation. |
+| test.cpp:94:8:94:8 | declaration of f | Declaration entry for function f is missing documentation. |
+| test.cpp:96:7:96:7 | definition of c | Declaration entry for member variable c is missing documentation. |
+| test.cpp:98:6:98:6 | declaration of d | Declaration entry for function d is missing documentation. |
+| test.cpp:101:6:101:6 | definition of e | Declaration entry for function e is missing documentation. |
+| test.cpp:108:1:108:30 | definition of message_to_string_undocumented | Declaration entry for function message_to_string_undocumented is missing documentation. |
+| test.cpp:180:21:180:24 | definition of kBar | Declaration entry for member variable kBar is missing documentation. |
+| test.cpp:227:14:227:17 | definition of foo3 | Declaration entry for function foo3 is missing documentation. |

From 87346721e85ad3fb2cdf8c1c5e330fd601fb5319 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 12 Sep 2024 16:08:20 -0700
Subject: [PATCH 114/435] Fix clang format.

---
 cpp/cert/test/rules/DCL51-CPP/test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/cert/test/rules/DCL51-CPP/test.cpp b/cpp/cert/test/rules/DCL51-CPP/test.cpp
index 27c03210e9..0cb2496861 100644
--- a/cpp/cert/test/rules/DCL51-CPP/test.cpp
+++ b/cpp/cert/test/rules/DCL51-CPP/test.cpp
@@ -15,7 +15,7 @@ enum {
 
 // int NULL = 0; // NON_COMPLIANT, but not supported by compilers in practice
 
-char* tzname[2]; // NON_COMPLIANT
+char *tzname[2]; // NON_COMPLIANT
 
 void min() {} // NON_COMPLIANT
 

From 19b54e2c667b85ddf5b4b3ce2298a96baef6910d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 16 Sep 2024 11:29:38 +0100
Subject: [PATCH 115/435] Add change note

---
 change_notes/2024-09-11-rule-12-2-improvements.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 change_notes/2024-09-11-rule-12-2-improvements.md

diff --git a/change_notes/2024-09-11-rule-12-2-improvements.md b/change_notes/2024-09-11-rule-12-2-improvements.md
new file mode 100644
index 0000000000..0e713a5088
--- /dev/null
+++ b/change_notes/2024-09-11-rule-12-2-improvements.md
@@ -0,0 +1,6 @@
+- `RULE-12-2` - `RightHandOperandOfAShiftRange.ql`:
+  - Reduce false positives related to ranges determined by `%=`.
+  - Reduce false positives for integer constants with explicit size suffix were incorrectly identified as smaller types.
+  - Improve explanation of results, providing additional information on types and size ranges.
+  - Combine results stemming from the expansion of a macro, where the result is not dependent on the context.
+  
\ No newline at end of file

From 15801d9245b453c599f6445b0f52c54c2261e8dd Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Mon, 16 Sep 2024 20:56:00 +0900
Subject: [PATCH 116/435] Refactor to share a predicate between M0-1-3 and
 M0-1-9 reducing duplication.

---
 .../src/rules/M0-1-3/UnusedLocalVariable.ql   |  6 +-----
 .../cpp/deadcode/UnusedVariables.qll          | 16 ++++++++++++++
 .../cpp/rules/deadcode/DeadCode.qll           | 21 +------------------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
index 5956515e5b..0387208514 100644
--- a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
+++ b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
@@ -44,11 +44,7 @@ int getUseCountConservatively(Variable v) {
       count(StaticAssert s | s.getCondition().getAChild*().getValue() = getConstExprValue(v)) +
       // In case an array type uses a constant in the same scope as the constexpr variable,
       // consider it as used.
-      count(ArrayType at, LocalVariable arrayVariable |
-        arrayVariable.getType().resolveTypedefs() = at and
-        v.(PotentiallyUnusedLocalVariable).getFunction() = arrayVariable.getFunction() and
-        at.getArraySize().toString() = getConstExprValue(v)
-      )
+      countUsesInLocalArraySize(v)
 }
 
 from PotentiallyUnusedLocalVariable v
diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
index f4607d82cb..92fa3b497f 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
@@ -150,3 +150,19 @@ predicate maybeACompileTimeTemplateArgument(Variable v) {
     )
   )
 }
+
+/** Gets the constant value of a constexpr/const variable. */
+private string getConstExprValue(Variable v) {
+  result = v.getInitializer().getExpr().getValue() and
+  (v.isConst() or v.isConstexpr())
+}
+
+/**
+ * Counts uses of `Variable` v in a local array of size `n`
+ */
+int countUsesInLocalArraySize(Variable v) {
+  result = count(ArrayType at, LocalVariable arrayVariable |
+		 arrayVariable.getType().resolveTypedefs() = at and
+		 v.(PotentiallyUnusedLocalVariable).getFunction() = arrayVariable.getFunction() and
+		 at.getArraySize().toString() = getConstExprValue(v))
+}
diff --git a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
index 5f3b77e661..1cf4989680 100644
--- a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
@@ -22,25 +22,6 @@ abstract class DeadCodeSharedQuery extends Query { }
 
 Query getQuery() { result instanceof DeadCodeSharedQuery }
 
-/**
- * Returns integer value of a constexpr variable
- */
-int getConstexprValue(Variable v) {
-  result = v.getInitializer().getExpr().getValue().toInt() and v.isConstexpr()
-}
-
-/**
- * Holds if `Variable` v is used for a local array size with value `n`
- */
-bindingset[n]
-predicate isUsedInLocalArraySize(Variable v, int n) {
-  // Cf. https://github.com/github/codeql-coding-standards/pull/660/files.
-  count(ArrayType at, LocalVariable arrayVariable |
-        arrayVariable.getType().resolveTypedefs() = at and
-        v.(PotentiallyUnusedLocalVariable).getFunction() = arrayVariable.getFunction() and
-        at.getArraySize() = n) > 0
-}
-
 /**
  * Holds if the `Stmt` `s` is either dead or unreachable.
  */
@@ -72,7 +53,7 @@ predicate isDeadStmt(Stmt s) {
           va.getTarget() = v and
           not isDeadOrUnreachableStmt(va.getEnclosingStmt())
         ) and
-        not isUsedInLocalArraySize(v, getConstexprValue(v))
+        not (countUsesInLocalArraySize(v) > 0)
       )
     )
   )

From 468eabd2c684111f03f7b211dee5bf8054a02611 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Mon, 16 Sep 2024 20:59:40 +0900
Subject: [PATCH 117/435] Add cases in dead code test where the arrays are
 constexpr.

Complemeting previous case where the integers used for the sizes of the
arrays were constexpr.
---
 cpp/common/test/rules/deadcode/DeadCode.expected | 1 +
 cpp/common/test/rules/deadcode/test.cpp          | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cpp/common/test/rules/deadcode/DeadCode.expected b/cpp/common/test/rules/deadcode/DeadCode.expected
index d3252e9401..db68f5f8c4 100644
--- a/cpp/common/test/rules/deadcode/DeadCode.expected
+++ b/cpp/common/test/rules/deadcode/DeadCode.expected
@@ -14,3 +14,4 @@
 | test.cpp:79:17:80:3 | { ... } | This statement is dead code. |
 | test.cpp:85:3:85:44 | declaration | This statement is dead code. |
 | test.cpp:87:3:87:30 | declaration | This statement is dead code. |
+| test.cpp:90:3:90:50 | declaration | This statement is dead code. |
diff --git a/cpp/common/test/rules/deadcode/test.cpp b/cpp/common/test/rules/deadcode/test.cpp
index 982c021563..597c06af43 100644
--- a/cpp/common/test/rules/deadcode/test.cpp
+++ b/cpp/common/test/rules/deadcode/test.cpp
@@ -86,5 +86,8 @@ int test_dead_code(int x) {
 
   constexpr int unused_int{2}; // NON_COMPLIANT
 
-  return live5 + live6; // COMPLIANT
-}
\ No newline at end of file
+  constexpr int   constexpr_used_array[]{3, 4, 5}; // COMPLIANT
+  constexpr int constexpr_unused_array[]{0, 1, 2}; // NON_COMPLIANT
+
+  return live5 + live6 + constexpr_used_array[1]; // COMPLIANT
+}

From 8a20d0e9b51bc51fd8196f85bda603d5833b26ca Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 16 Sep 2024 07:43:34 -0700
Subject: [PATCH 118/435] Use namespace, to ensure tzname definition is
 distinct from std time.

---
 .../test/rules/DCL51-CPP/ObjectReusesReservedName.expected    | 2 +-
 cpp/cert/test/rules/DCL51-CPP/test.cpp                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
index 0d0491b42c..f59486e814 100644
--- a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
@@ -1 +1 @@
-| test.cpp:18:7:18:12 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:18:7:18:12 | tzname | tzname |
+| test.cpp:18:20:18:25 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:18:20:18:25 | tzname | tzname |
diff --git a/cpp/cert/test/rules/DCL51-CPP/test.cpp b/cpp/cert/test/rules/DCL51-CPP/test.cpp
index 0cb2496861..e344681fd5 100644
--- a/cpp/cert/test/rules/DCL51-CPP/test.cpp
+++ b/cpp/cert/test/rules/DCL51-CPP/test.cpp
@@ -15,7 +15,7 @@ enum {
 
 // int NULL = 0; // NON_COMPLIANT, but not supported by compilers in practice
 
-char *tzname[2]; // NON_COMPLIANT
+namespace ns { int tzname = 0; } // NON_COMPLIANT
 
 void min() {} // NON_COMPLIANT
 
@@ -48,4 +48,4 @@ void test_lambda(const int y) {
   // Lambda generates a static function called `_FUN` when the lambda is
   // converted to a function pointer
   g([](int x) { return x; }); // COMPLIANT - compiler generated
-}
\ No newline at end of file
+}

From a6f52403db11f9a6a7f463e1f7b3285740bbd519 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 16 Sep 2024 07:59:39 -0700
Subject: [PATCH 119/435] Clang format; adjust all expected results
 accordingly.

---
 .../rules/DCL51-CPP/FunctionReusesReservedName.expected   | 2 +-
 .../rules/DCL51-CPP/ObjectReusesReservedName.expected     | 2 +-
 .../DCL51-CPP/RedefiningOfStandardLibraryName.expected    | 2 +-
 .../UseOfDoubleUnderscoreReservedPrefix.expected          | 4 ++--
 .../UseOfReservedLiteralSuffixIdentifier.expected         | 2 +-
 .../UseOfSingleUnderscoreReservedPrefix.expected          | 8 ++++----
 cpp/cert/test/rules/DCL51-CPP/test.cpp                    | 4 +++-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected b/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected
index e945f93c57..97bbccbbd0 100644
--- a/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected
@@ -1 +1 @@
-| test.cpp:20:6:20:8 | min | The function $@ reuses a reserved standard library name. | test.cpp:20:6:20:8 | min | min |
+| test.cpp:22:6:22:8 | min | The function $@ reuses a reserved standard library name. | test.cpp:22:6:22:8 | min | min |
diff --git a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
index f59486e814..d1c0b8d60e 100644
--- a/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected
@@ -1 +1 @@
-| test.cpp:18:20:18:25 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:18:20:18:25 | tzname | tzname |
+| test.cpp:19:5:19:10 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:19:5:19:10 | tzname | tzname |
diff --git a/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected b/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected
index f5b15966ba..fb01130c4d 100644
--- a/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected
@@ -1,3 +1,3 @@
 | test.cpp:6:1:6:14 | #undef INT_MAX | Redefinition of INT_MAX declared in a standard library header. |
 | test.cpp:7:1:7:20 | #define SIZE_MAX 256 | Redefinition of SIZE_MAX declared in a standard library header. |
-| test.cpp:37:1:38:9 | #define FD_SET(X) int _ ## X | Redefinition of FD_SET declared in a standard library header. |
+| test.cpp:39:1:40:9 | #define FD_SET(X) int _ ## X | Redefinition of FD_SET declared in a standard library header. |
diff --git a/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected b/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected
index 3b0a94429a..0d52226d5f 100644
--- a/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected
@@ -1,2 +1,2 @@
-| test.cpp:25:5:25:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:25:5:25:7 | __x | __x |
-| test.cpp:30:5:30:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:30:5:30:7 | __x | __x |
+| test.cpp:27:5:27:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:27:5:27:7 | __x | __x |
+| test.cpp:32:5:32:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:32:5:32:7 | __x | __x |
diff --git a/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected b/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected
index f8863eab59..96f3b1068e 100644
--- a/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected
@@ -1 +1 @@
-| test.cpp:22:6:22:17 | operator ""x | Literal suffix identifier $@ does not start with an underscore. | test.cpp:22:6:22:17 | operator ""x | operator ""x |
+| test.cpp:24:6:24:17 | operator ""x | Literal suffix identifier $@ does not start with an underscore. | test.cpp:24:6:24:17 | operator ""x | operator ""x |
diff --git a/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected b/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected
index 679ad58deb..544a26c996 100644
--- a/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected
+++ b/cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected
@@ -1,5 +1,5 @@
-| test.cpp:26:5:26:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:26:5:26:6 | _X | _X |
-| test.cpp:27:5:27:6 | _x | Name $@ uses the reserved prefix '_'. | test.cpp:27:5:27:6 | _x | _x |
-| test.cpp:31:5:31:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:31:5:31:6 | _X | _X |
-| test.cpp:35:1:35:3 | _i | Name $@ uses the reserved prefix '_'. | test.cpp:35:1:35:3 | _i | _i |
+| test.cpp:28:5:28:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:28:5:28:6 | _X | _X |
+| test.cpp:29:5:29:6 | _x | Name $@ uses the reserved prefix '_'. | test.cpp:29:5:29:6 | _x | _x |
+| test.cpp:33:5:33:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:33:5:33:6 | _X | _X |
+| test.cpp:37:1:37:3 | _i | Name $@ uses the reserved prefix '_'. | test.cpp:37:1:37:3 | _i | _i |
 | test.h:2:1:2:15 | #define _TEST_H | Name $@ uses the reserved prefix '_'. | test.h:2:1:2:15 | #define _TEST_H | _TEST_H |
diff --git a/cpp/cert/test/rules/DCL51-CPP/test.cpp b/cpp/cert/test/rules/DCL51-CPP/test.cpp
index e344681fd5..9248041b57 100644
--- a/cpp/cert/test/rules/DCL51-CPP/test.cpp
+++ b/cpp/cert/test/rules/DCL51-CPP/test.cpp
@@ -15,7 +15,9 @@ enum {
 
 // int NULL = 0; // NON_COMPLIANT, but not supported by compilers in practice
 
-namespace ns { int tzname = 0; } // NON_COMPLIANT
+namespace ns {
+int tzname = 0; // NON_COMPLIANT
+}
 
 void min() {} // NON_COMPLIANT
 

From 70f9756d04d905ffe45a1cf18ac0ee132a744e88 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 16 Sep 2024 23:16:15 +0100
Subject: [PATCH 120/435] RULE-5-8: Only consider decls conflicting if in same
 link target

---
 ...IdentifiersWithExternalLinkageNotUnique.ql | 20 ++++++++++++++++++-
 .../2024-09-16-rule-5-8-consider-linkage.md   |  2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 change_notes/2024-09-16-rule-5-8-consider-linkage.md

diff --git a/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql b/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql
index 7406f05f14..1b21dd273e 100644
--- a/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql
+++ b/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql
@@ -41,7 +41,25 @@ class NotUniqueExternalIdentifier extends ExternalIdentifiers {
 
   Declaration getAConflictingDeclaration() {
     not result = this and
-    isConflictingDeclaration(result, getName())
+    isConflictingDeclaration(result, getName()) and
+    // We only consider a declaration to be conflicting if it shares a link target with the external
+    // identifier. This avoids reporting false positives where multiple binaries or libraries are
+    // built in the same CodeQL database, but are not intended to be linked together.
+    exists(LinkTarget lt |
+      // External declaration can only be a function or global variable
+      lt = this.(Function).getALinkTarget() or
+      lt = this.(GlobalVariable).getALinkTarget()
+    |
+      lt = result.(Function).getALinkTarget()
+      or
+      lt = result.(GlobalVariable).getALinkTarget()
+      or
+      exists(Class c | c.getAMember() = result and c.getALinkTarget() = lt)
+      or
+      result.(LocalVariable).getFunction().getALinkTarget() = lt
+      or
+      result.(Class).getALinkTarget() = lt
+    )
   }
 }
 
diff --git a/change_notes/2024-09-16-rule-5-8-consider-linkage.md b/change_notes/2024-09-16-rule-5-8-consider-linkage.md
new file mode 100644
index 0000000000..2877d53f50
--- /dev/null
+++ b/change_notes/2024-09-16-rule-5-8-consider-linkage.md
@@ -0,0 +1,2 @@
+ - `RULE-5-8` - `IdentifiersWithExternalLinkageNotUnique.ql`
+   - Remove false positives where conflicting declarations do not appear in the same link target.
\ No newline at end of file

From fb4e41896beb3ad77bb82d1cfd551cf0611eae73 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Tue, 17 Sep 2024 07:19:25 +0900
Subject: [PATCH 121/435] Refactor get constexpr helper to public in unused
 variable qll and remove from ql.

---
 cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql         | 6 ------
 .../src/codingstandards/cpp/deadcode/UnusedVariables.qll    | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
index 0387208514..e89e9ec135 100644
--- a/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
+++ b/cpp/autosar/src/rules/M0-1-3/UnusedLocalVariable.ql
@@ -18,12 +18,6 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.deadcode.UnusedVariables
 
-/** Gets the constant value of a constexpr/const variable. */
-private string getConstExprValue(Variable v) {
-  result = v.getInitializer().getExpr().getValue() and
-  (v.isConst() or v.isConstexpr())
-}
-
 // This predicate is similar to getUseCount for M0-1-4 except that it also
 // considers static_asserts. This was created to cater for M0-1-3 specifically
 // and hence, doesn't attempt to reuse the M0-1-4 specific predicate
diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
index 92fa3b497f..56d1e2b998 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
@@ -152,7 +152,7 @@ predicate maybeACompileTimeTemplateArgument(Variable v) {
 }
 
 /** Gets the constant value of a constexpr/const variable. */
-private string getConstExprValue(Variable v) {
+string getConstExprValue(Variable v) {
   result = v.getInitializer().getExpr().getValue() and
   (v.isConst() or v.isConstexpr())
 }

From 3223bcd7c4a47e8b27f280a23b4835b7e2391ac4 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Tue, 17 Sep 2024 11:36:27 +0900
Subject: [PATCH 122/435] Format ql and test.

---
 .../codingstandards/cpp/deadcode/UnusedVariables.qll   | 10 ++++++----
 cpp/common/test/rules/deadcode/DeadCode.expected       |  2 +-
 cpp/common/test/rules/deadcode/test.cpp                |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
index 56d1e2b998..912d2babcd 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UnusedVariables.qll
@@ -161,8 +161,10 @@ string getConstExprValue(Variable v) {
  * Counts uses of `Variable` v in a local array of size `n`
  */
 int countUsesInLocalArraySize(Variable v) {
-  result = count(ArrayType at, LocalVariable arrayVariable |
-		 arrayVariable.getType().resolveTypedefs() = at and
-		 v.(PotentiallyUnusedLocalVariable).getFunction() = arrayVariable.getFunction() and
-		 at.getArraySize().toString() = getConstExprValue(v))
+  result =
+    count(ArrayType at, LocalVariable arrayVariable |
+      arrayVariable.getType().resolveTypedefs() = at and
+      v.(PotentiallyUnusedLocalVariable).getFunction() = arrayVariable.getFunction() and
+      at.getArraySize().toString() = getConstExprValue(v)
+    )
 }
diff --git a/cpp/common/test/rules/deadcode/DeadCode.expected b/cpp/common/test/rules/deadcode/DeadCode.expected
index db68f5f8c4..aec93e0914 100644
--- a/cpp/common/test/rules/deadcode/DeadCode.expected
+++ b/cpp/common/test/rules/deadcode/DeadCode.expected
@@ -12,6 +12,6 @@
 | test.cpp:72:3:73:3 | try { ... } | This statement is dead code. |
 | test.cpp:73:17:74:3 | { ... } | This statement is dead code. |
 | test.cpp:79:17:80:3 | { ... } | This statement is dead code. |
-| test.cpp:85:3:85:44 | declaration | This statement is dead code. |
+| test.cpp:85:3:85:43 | declaration | This statement is dead code. |
 | test.cpp:87:3:87:30 | declaration | This statement is dead code. |
 | test.cpp:90:3:90:50 | declaration | This statement is dead code. |
diff --git a/cpp/common/test/rules/deadcode/test.cpp b/cpp/common/test/rules/deadcode/test.cpp
index 597c06af43..d9c0cab277 100644
--- a/cpp/common/test/rules/deadcode/test.cpp
+++ b/cpp/common/test/rules/deadcode/test.cpp
@@ -81,12 +81,12 @@ int test_dead_code(int x) {
 
   static_assert(1); // COMPLIANT
 
-  constexpr int constexpr_array_size{6};     // COMPLIANT
-  int unused_array[constexpr_array_size] {}; // NON_COMPLIANT
+  constexpr int constexpr_array_size{6};    // COMPLIANT
+  int unused_array[constexpr_array_size]{}; // NON_COMPLIANT
 
   constexpr int unused_int{2}; // NON_COMPLIANT
 
-  constexpr int   constexpr_used_array[]{3, 4, 5}; // COMPLIANT
+  constexpr int constexpr_used_array[]{3, 4, 5};   // COMPLIANT
   constexpr int constexpr_unused_array[]{0, 1, 2}; // NON_COMPLIANT
 
   return live5 + live6 + constexpr_used_array[1]; // COMPLIANT

From 55cb51debc0f8ee5ed97351892ac6911f532e042 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Tue, 17 Sep 2024 13:21:20 +0900
Subject: [PATCH 123/435] Add change note

---
 change_notes/2024-09-17-fix-fp-678-m0-1-9.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-09-17-fix-fp-678-m0-1-9.md

diff --git a/change_notes/2024-09-17-fix-fp-678-m0-1-9.md b/change_notes/2024-09-17-fix-fp-678-m0-1-9.md
new file mode 100644
index 0000000000..e068825f4c
--- /dev/null
+++ b/change_notes/2024-09-17-fix-fp-678-m0-1-9.md
@@ -0,0 +1,2 @@
+- `M0-1-9` - `DeadCode.qll`:
+  - Fixes #678. Remove dead code false positive when integer constant expression is used to define the size of an array.

From d22328b2baa2bce7ea1499876199153a867dce0b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 17 Sep 2024 11:47:45 +0100
Subject: [PATCH 124/435] EssentialTypes: Add support for unary logical
 operations

These should return essentially boolean type
---
 .../c/misra/EssentialTypes.qll                |  4 +++
 c/misra/test/c/misra/EssentialTypes.expected  | 32 +++++++++++++++++++
 c/misra/test/c/misra/test.c                   | 20 ++++++++++++
 3 files changed, 56 insertions(+)

diff --git a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
index 7df233d2ab..d01bc81038 100644
--- a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
+++ b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
@@ -179,6 +179,10 @@ class EssentialBinaryLogicalOperationExpr extends EssentialExpr, BinaryLogicalOp
   override Type getEssentialType() { result instanceof BoolType }
 }
 
+class EssentialUnaryLogicalOperationExpr extends EssentialExpr, UnaryLogicalOperation {
+  override Type getEssentialType() { result instanceof BoolType }
+}
+
 class EssentialEqualityOperationExpr extends EssentialExpr, EqualityOperation {
   override Type getEssentialType() { result instanceof BoolType }
 }
diff --git a/c/misra/test/c/misra/EssentialTypes.expected b/c/misra/test/c/misra/EssentialTypes.expected
index d9245311da..8b6b45a2f0 100644
--- a/c/misra/test/c/misra/EssentialTypes.expected
+++ b/c/misra/test/c/misra/EssentialTypes.expected
@@ -41,3 +41,35 @@
 | test.c:32:3:32:3 | 1 | signed char | signed char | essentially Signed type |
 | test.c:33:3:33:4 | 1 | unsigned char | unsigned char | essentially Unsigned type |
 | test.c:34:3:34:5 | 1 | unsigned long | unsigned long | essentially Unsigned type |
+| test.c:38:13:38:16 | 1 | bool | bool | essentially Boolean type |
+| test.c:38:13:38:16 | (bool)... | bool | bool | essentially Boolean type |
+| test.c:39:20:39:20 | 1 | signed char | signed char | essentially Signed type |
+| test.c:39:20:39:20 | (unsigned int)... | unsigned int | unsigned int | essentially Unsigned type |
+| test.c:40:23:40:23 | 1 | signed char | signed char | essentially Signed type |
+| test.c:40:23:40:23 | (unsigned short)... | unsigned short | unsigned short | essentially Unsigned type |
+| test.c:41:17:41:18 | 1 | signed char | signed char | essentially Signed type |
+| test.c:42:21:42:21 | 1 | signed char | signed char | essentially Signed type |
+| test.c:42:21:42:21 | (signed short)... | signed short | signed short | essentially Signed type |
+| test.c:44:3:44:4 | ! ... | bool | bool | essentially Boolean type |
+| test.c:44:4:44:4 | b | bool | bool | essentially Boolean type |
+| test.c:45:3:45:4 | ! ... | bool | bool | essentially Boolean type |
+| test.c:45:4:45:4 | u | unsigned int | unsigned int | essentially Unsigned type |
+| test.c:46:3:46:5 | ! ... | bool | bool | essentially Boolean type |
+| test.c:46:4:46:5 | us | unsigned short | unsigned short | essentially Unsigned type |
+| test.c:47:3:47:4 | ! ... | bool | bool | essentially Boolean type |
+| test.c:47:4:47:4 | s | signed int | signed int | essentially Signed type |
+| test.c:48:3:48:5 | ! ... | bool | bool | essentially Boolean type |
+| test.c:48:4:48:5 | ss | signed short | signed short | essentially Signed type |
+| test.c:50:3:50:4 | ~ ... | int | int | essentially Signed type |
+| test.c:50:4:50:4 | (int)... | int | int | essentially Signed type |
+| test.c:50:4:50:4 | b | bool | bool | essentially Boolean type |
+| test.c:51:3:51:4 | ~ ... | unsigned int | unsigned int | essentially Unsigned type |
+| test.c:51:4:51:4 | u | unsigned int | unsigned int | essentially Unsigned type |
+| test.c:52:3:52:5 | ~ ... | unsigned short | unsigned short | essentially Unsigned type |
+| test.c:52:4:52:5 | (int)... | int | int | essentially Signed type |
+| test.c:52:4:52:5 | us | unsigned short | unsigned short | essentially Unsigned type |
+| test.c:53:3:53:4 | ~ ... | signed int | signed int | essentially Signed type |
+| test.c:53:4:53:4 | s | signed int | signed int | essentially Signed type |
+| test.c:54:3:54:5 | ~ ... | int | int | essentially Signed type |
+| test.c:54:4:54:5 | (int)... | int | int | essentially Signed type |
+| test.c:54:4:54:5 | ss | signed short | signed short | essentially Signed type |
diff --git a/c/misra/test/c/misra/test.c b/c/misra/test/c/misra/test.c
index d7064c4c12..6156e9440e 100644
--- a/c/misra/test/c/misra/test.c
+++ b/c/misra/test/c/misra/test.c
@@ -32,4 +32,24 @@ void testConstants() {
   1;   // Essentially signed char
   1U;  // Essentially unsigned char
   1UL; // Essentially unsigned long
+}
+
+void testUnary() {
+  _Bool b = true;
+  unsigned int u = 1;
+  unsigned short us = 1;
+  signed int s = 1;
+  signed short ss = 1;
+
+  !b;  // Should be boolean
+  !u;  // Should be boolean
+  !us; // Should be boolean
+  !s;  // Should be boolean
+  !ss; // Should be boolean
+
+  ~b;  // Should be essentially signed
+  ~u;  // Should be essentially unsigned
+  ~us; // Should be essentially unsigned
+  ~s;  // Should be essentially signed
+  ~ss; // Should be essentially signed
 }
\ No newline at end of file

From 06866d869a628070bf40c7cbc15746c19042cbf8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 17 Sep 2024 11:50:29 +0100
Subject: [PATCH 125/435] Rule 10.1: Handle ~, improve output

 - Add support for the ~ operator.
 - Report the operand, not the operator
 - Fix typo in one message
---
 .../OperandsOfAnInappropriateEssentialType.ql |   7 +-
 ...ndsOfAnInappropriateEssentialType.expected | 378 +++++++++---------
 2 files changed, 195 insertions(+), 190 deletions(-)

diff --git a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
index 6fdde80119..5c39f89003 100644
--- a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
+++ b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
@@ -178,7 +178,8 @@ predicate isInappropriateEssentialType(
     child =
       [
         operator.(BinaryBitwiseOperation).getAnOperand(),
-        operator.(Bitwise::AssignBitwiseOperation).getAnOperand()
+        operator.(Bitwise::AssignBitwiseOperation).getAnOperand(),
+        operator.(ComplementExpr).getAnOperand()
       ] and
     not operator instanceof LShiftExpr and
     not operator instanceof RShiftExpr and
@@ -240,7 +241,7 @@ string getRationaleMessage(int rationaleId, EssentialTypeCategory etc) {
   result = "Bitwise operator applied to operand of " + etc + " and not essentially unsigned."
   or
   rationaleId = 7 and
-  result = "Right hand operatand of shift operator is " + etc + " and not not essentially unsigned."
+  result = "Right hand operand of shift operator is " + etc + " and not not essentially unsigned."
   or
   rationaleId = 8 and
   result =
@@ -251,4 +252,4 @@ from Expr operator, Expr child, int rationaleId, EssentialTypeCategory etc
 where
   not isExcluded(operator, EssentialTypesPackage::operandsOfAnInappropriateEssentialTypeQuery()) and
   isInappropriateEssentialType(operator, child, etc, rationaleId)
-select operator, getRationaleMessage(rationaleId, etc)
+select child, getRationaleMessage(rationaleId, etc)
diff --git a/c/misra/test/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.expected b/c/misra/test/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.expected
index b04a4ee4aa..8d1b1d8d1b 100644
--- a/c/misra/test/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.expected
+++ b/c/misra/test/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.expected
@@ -1,187 +1,191 @@
-| test.c:13:3:13:6 | access to array | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:14:3:14:6 | access to array | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:20:3:20:4 | + ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:21:3:21:4 | + ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:22:3:22:5 | + ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:27:3:27:4 | - ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:28:3:28:4 | - ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:29:3:29:5 | - ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:31:3:31:4 | - ... | Operand of essentially Unsigned type will be converted to a signed type with the signedness dependent on the implemented size of int. |
-| test.c:34:3:34:7 | ... + ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:36:3:36:8 | ... + ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:41:3:41:7 | ... - ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:43:3:43:8 | ... - ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:48:3:48:7 | ... + ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:50:3:50:8 | ... + ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:55:3:55:7 | ... - ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:57:3:57:8 | ... - ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:62:3:62:5 | ... ++ | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:64:3:64:6 | ... ++ | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:69:3:69:5 | ... -- | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:71:3:71:6 | ... -- | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:76:3:76:5 | ++ ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:78:3:78:6 | ++ ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:83:3:83:5 | -- ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:85:3:85:6 | -- ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:90:3:90:7 | ... * ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:91:3:91:7 | ... * ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:92:3:92:8 | ... * ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:97:3:97:7 | ... / ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:98:3:98:7 | ... / ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:99:3:99:8 | ... / ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:104:3:104:7 | ... * ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:105:3:105:7 | ... * ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:106:3:106:8 | ... * ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:111:3:111:7 | ... / ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:112:3:112:7 | ... / ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:113:3:113:8 | ... / ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:118:3:118:7 | ... % ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:119:3:119:7 | ... % ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:120:3:120:8 | ... % ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:125:3:125:7 | ... % ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:126:3:126:7 | ... % ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:127:3:127:8 | ... % ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:132:3:132:7 | ... < ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:139:3:139:7 | ... > ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:146:3:146:8 | ... <= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:153:3:153:8 | ... >= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:160:3:160:7 | ... < ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:167:3:167:7 | ... > ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:174:3:174:8 | ... <= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:181:3:181:8 | ... >= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:217:3:217:4 | ! ... | Operand of essentially Character type type interpreted as a Boolean value. |
-| test.c:218:3:218:5 | ! ... | Operand of essentially Enum Type type interpreted as a Boolean value. |
-| test.c:219:3:219:4 | ! ... | Operand of essentially Signed type type interpreted as a Boolean value. |
-| test.c:220:3:220:4 | ! ... | Operand of essentially Unsigned type type interpreted as a Boolean value. |
-| test.c:221:3:221:4 | ! ... | Operand of essentially Floating type type interpreted as a Boolean value. |
-| test.c:224:3:224:11 | ... && ... | Operand of essentially Character type type interpreted as a Boolean value. |
-| test.c:225:3:225:12 | ... && ... | Operand of essentially Enum Type type interpreted as a Boolean value. |
-| test.c:226:3:226:11 | ... && ... | Operand of essentially Signed type type interpreted as a Boolean value. |
-| test.c:227:3:227:11 | ... && ... | Operand of essentially Unsigned type type interpreted as a Boolean value. |
-| test.c:228:3:228:11 | ... && ... | Operand of essentially Floating type type interpreted as a Boolean value. |
-| test.c:231:3:231:12 | ... \|\| ... | Operand of essentially Character type type interpreted as a Boolean value. |
-| test.c:232:3:232:13 | ... \|\| ... | Operand of essentially Enum Type type interpreted as a Boolean value. |
-| test.c:233:3:233:12 | ... \|\| ... | Operand of essentially Signed type type interpreted as a Boolean value. |
-| test.c:234:3:234:12 | ... \|\| ... | Operand of essentially Unsigned type type interpreted as a Boolean value. |
-| test.c:235:3:235:12 | ... \|\| ... | Operand of essentially Floating type type interpreted as a Boolean value. |
-| test.c:238:3:238:11 | ... && ... | Operand of essentially Character type type interpreted as a Boolean value. |
-| test.c:239:3:239:12 | ... && ... | Operand of essentially Enum Type type interpreted as a Boolean value. |
-| test.c:240:3:240:11 | ... && ... | Operand of essentially Signed type type interpreted as a Boolean value. |
-| test.c:241:3:241:11 | ... && ... | Operand of essentially Unsigned type type interpreted as a Boolean value. |
-| test.c:242:3:242:11 | ... && ... | Operand of essentially Floating type type interpreted as a Boolean value. |
-| test.c:245:3:245:12 | ... \|\| ... | Operand of essentially Character type type interpreted as a Boolean value. |
-| test.c:246:3:246:13 | ... \|\| ... | Operand of essentially Enum Type type interpreted as a Boolean value. |
-| test.c:247:3:247:12 | ... \|\| ... | Operand of essentially Signed type type interpreted as a Boolean value. |
-| test.c:248:3:248:12 | ... \|\| ... | Operand of essentially Unsigned type type interpreted as a Boolean value. |
-| test.c:249:3:249:12 | ... \|\| ... | Operand of essentially Floating type type interpreted as a Boolean value. |
-| test.c:251:3:251:8 | ... << ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:252:3:252:8 | ... << ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:253:3:253:9 | ... << ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:254:3:254:8 | ... << ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:258:3:258:8 | ... >> ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:259:3:259:8 | ... >> ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:260:3:260:9 | ... >> ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:261:3:261:8 | ... >> ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:265:3:265:8 | ... << ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:266:3:266:8 | ... << ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:267:3:267:9 | ... << ... | Right hand operatand of shift operator is essentially Enum Type and not not essentially unsigned. |
-| test.c:268:3:268:8 | ... << ... | Right hand operatand of shift operator is essentially Signed type and not not essentially unsigned. |
-| test.c:272:3:272:8 | ... >> ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:273:3:273:8 | ... >> ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:274:3:274:9 | ... >> ... | Right hand operatand of shift operator is essentially Enum Type and not not essentially unsigned. |
-| test.c:275:3:275:8 | ... >> ... | Right hand operatand of shift operator is essentially Signed type and not not essentially unsigned. |
-| test.c:279:3:279:6 | ... & ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:280:3:280:6 | ... & ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:281:3:281:7 | ... & ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:282:3:282:6 | ... & ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:286:3:286:7 | ... \| ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:287:3:287:7 | ... \| ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:288:3:288:8 | ... \| ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:289:3:289:7 | ... \| ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:293:3:293:7 | ... ^ ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:294:3:294:7 | ... ^ ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:295:3:295:8 | ... ^ ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:296:3:296:7 | ... ^ ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:300:3:300:6 | ... & ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:301:3:301:6 | ... & ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:302:3:302:7 | ... & ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:303:3:303:6 | ... & ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:307:3:307:7 | ... \| ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:308:3:308:7 | ... \| ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:309:3:309:8 | ... \| ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:310:3:310:7 | ... \| ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:314:3:314:7 | ... ^ ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:315:3:315:7 | ... ^ ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:316:3:316:8 | ... ^ ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:317:3:317:7 | ... ^ ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:329:3:329:11 | ... ? ... : ... | Operand of essentially Character type type interpreted as a Boolean value. |
-| test.c:330:3:330:12 | ... ? ... : ... | Operand of essentially Enum Type type interpreted as a Boolean value. |
-| test.c:331:3:331:11 | ... ? ... : ... | Operand of essentially Signed type type interpreted as a Boolean value. |
-| test.c:332:3:332:11 | ... ? ... : ... | Operand of essentially Unsigned type type interpreted as a Boolean value. |
-| test.c:333:3:333:11 | ... ? ... : ... | Operand of essentially Floating type type interpreted as a Boolean value. |
-| test.c:342:3:342:8 | ... += ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:344:3:344:9 | ... += ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:349:3:349:8 | ... -= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:351:3:351:9 | ... -= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:356:3:356:8 | ... += ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:358:3:358:9 | ... += ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:363:3:363:8 | ... -= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:365:3:365:9 | ... -= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:370:3:370:8 | ... *= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:371:3:371:8 | ... *= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:372:3:372:9 | ... *= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:377:3:377:8 | ... /= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:378:3:378:8 | ... /= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:379:3:379:9 | ... /= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:384:3:384:8 | ... *= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:385:3:385:8 | ... *= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:386:3:386:9 | ... *= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:391:3:391:8 | ... /= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:392:3:392:8 | ... /= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:393:3:393:9 | ... /= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:398:3:398:8 | ... %= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:399:3:399:8 | ... %= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:400:3:400:9 | ... %= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:405:3:405:8 | ... %= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:406:3:406:8 | ... %= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:407:3:407:9 | ... %= ... | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
-| test.c:412:3:412:9 | ... <<= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:413:3:413:9 | ... <<= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:414:3:414:10 | ... <<= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:415:3:415:9 | ... <<= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:419:3:419:9 | ... >>= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:420:3:420:9 | ... >>= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:421:3:421:10 | ... >>= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:422:3:422:9 | ... >>= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:426:3:426:9 | ... <<= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:427:3:427:9 | ... <<= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:428:3:428:10 | ... <<= ... | Right hand operatand of shift operator is essentially Enum Type and not not essentially unsigned. |
-| test.c:429:3:429:9 | ... <<= ... | Right hand operatand of shift operator is essentially Signed type and not not essentially unsigned. |
-| test.c:433:3:433:9 | ... >>= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:434:3:434:9 | ... >>= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:435:3:435:10 | ... >>= ... | Right hand operatand of shift operator is essentially Enum Type and not not essentially unsigned. |
-| test.c:436:3:436:9 | ... >>= ... | Right hand operatand of shift operator is essentially Signed type and not not essentially unsigned. |
-| test.c:440:3:440:8 | ... &= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:441:3:441:8 | ... &= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:442:3:442:9 | ... &= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:443:3:443:8 | ... &= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:447:3:447:8 | ... ^= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:448:3:448:8 | ... ^= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:449:3:449:9 | ... ^= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:450:3:450:8 | ... ^= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:454:3:454:8 | ... \|= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:455:3:455:8 | ... \|= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:456:3:456:9 | ... \|= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:457:3:457:8 | ... \|= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:461:3:461:8 | ... &= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:462:3:462:8 | ... &= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:463:3:463:9 | ... &= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:464:3:464:8 | ... &= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:468:3:468:8 | ... ^= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:469:3:469:8 | ... ^= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:470:3:470:9 | ... ^= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:471:3:471:8 | ... ^= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
-| test.c:475:3:475:8 | ... \|= ... | Operand of essentially Boolean type interpreted as a numeric value. |
-| test.c:476:3:476:8 | ... \|= ... | Operand of essentially Charater type interpreted as a numeric value. |
-| test.c:477:3:477:9 | ... \|= ... | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
-| test.c:478:3:478:8 | ... \|= ... | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:13:5:13:5 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:14:5:14:5 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:20:4:20:4 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:21:4:21:4 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:22:4:22:5 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:27:4:27:4 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:28:4:28:4 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:29:4:29:5 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:31:4:31:4 | u | Operand of essentially Unsigned type will be converted to a signed type with the signedness dependent on the implemented size of int. |
+| test.c:34:7:34:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:36:7:36:8 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:41:7:41:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:43:7:43:8 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:48:3:48:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:50:3:50:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:55:3:55:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:57:3:57:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:62:3:62:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:64:3:64:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:69:3:69:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:71:3:71:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:76:5:76:5 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:78:5:78:6 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:83:5:83:5 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:85:5:85:6 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:90:7:90:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:91:7:91:7 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:92:7:92:8 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:97:7:97:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:98:7:98:7 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:99:7:99:8 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:104:3:104:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:105:3:105:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:106:3:106:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:111:3:111:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:112:3:112:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:113:3:113:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:118:3:118:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:119:3:119:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:120:3:120:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:125:7:125:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:126:7:126:7 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:127:7:127:8 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:132:7:132:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:139:7:139:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:146:8:146:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:153:8:153:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:160:3:160:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:167:3:167:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:174:3:174:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:181:3:181:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:217:4:217:4 | c | Operand of essentially Character type type interpreted as a Boolean value. |
+| test.c:218:4:218:5 | e1 | Operand of essentially Enum Type type interpreted as a Boolean value. |
+| test.c:219:4:219:4 | s | Operand of essentially Signed type type interpreted as a Boolean value. |
+| test.c:220:4:220:4 | u | Operand of essentially Unsigned type type interpreted as a Boolean value. |
+| test.c:221:4:221:4 | f | Operand of essentially Floating type type interpreted as a Boolean value. |
+| test.c:224:3:224:3 | c | Operand of essentially Character type type interpreted as a Boolean value. |
+| test.c:225:3:225:4 | e1 | Operand of essentially Enum Type type interpreted as a Boolean value. |
+| test.c:226:3:226:3 | s | Operand of essentially Signed type type interpreted as a Boolean value. |
+| test.c:227:3:227:3 | u | Operand of essentially Unsigned type type interpreted as a Boolean value. |
+| test.c:228:3:228:3 | f | Operand of essentially Floating type type interpreted as a Boolean value. |
+| test.c:231:3:231:3 | c | Operand of essentially Character type type interpreted as a Boolean value. |
+| test.c:232:3:232:4 | e1 | Operand of essentially Enum Type type interpreted as a Boolean value. |
+| test.c:233:3:233:3 | s | Operand of essentially Signed type type interpreted as a Boolean value. |
+| test.c:234:3:234:3 | u | Operand of essentially Unsigned type type interpreted as a Boolean value. |
+| test.c:235:3:235:3 | f | Operand of essentially Floating type type interpreted as a Boolean value. |
+| test.c:238:11:238:11 | c | Operand of essentially Character type type interpreted as a Boolean value. |
+| test.c:239:11:239:12 | e1 | Operand of essentially Enum Type type interpreted as a Boolean value. |
+| test.c:240:11:240:11 | s | Operand of essentially Signed type type interpreted as a Boolean value. |
+| test.c:241:11:241:11 | u | Operand of essentially Unsigned type type interpreted as a Boolean value. |
+| test.c:242:11:242:11 | f | Operand of essentially Floating type type interpreted as a Boolean value. |
+| test.c:245:12:245:12 | c | Operand of essentially Character type type interpreted as a Boolean value. |
+| test.c:246:12:246:13 | e1 | Operand of essentially Enum Type type interpreted as a Boolean value. |
+| test.c:247:12:247:12 | s | Operand of essentially Signed type type interpreted as a Boolean value. |
+| test.c:248:12:248:12 | u | Operand of essentially Unsigned type type interpreted as a Boolean value. |
+| test.c:249:12:249:12 | f | Operand of essentially Floating type type interpreted as a Boolean value. |
+| test.c:251:3:251:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:252:3:252:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:253:3:253:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:254:3:254:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:258:3:258:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:259:3:259:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:260:3:260:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:261:3:261:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:265:8:265:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:266:8:266:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:267:8:267:9 | e1 | Right hand operand of shift operator is essentially Enum Type and not not essentially unsigned. |
+| test.c:268:8:268:8 | s | Right hand operand of shift operator is essentially Signed type and not not essentially unsigned. |
+| test.c:272:8:272:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:273:8:273:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:274:8:274:9 | e1 | Right hand operand of shift operator is essentially Enum Type and not not essentially unsigned. |
+| test.c:275:8:275:8 | s | Right hand operand of shift operator is essentially Signed type and not not essentially unsigned. |
+| test.c:279:3:279:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:280:3:280:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:281:3:281:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:282:3:282:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:286:3:286:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:287:3:287:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:288:3:288:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:289:3:289:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:293:3:293:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:294:3:294:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:295:3:295:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:296:3:296:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:300:6:300:6 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:301:6:301:6 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:302:6:302:7 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:303:6:303:6 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:307:7:307:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:308:7:308:7 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:309:7:309:8 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:310:7:310:7 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:314:7:314:7 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:315:7:315:7 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:316:7:316:8 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:317:7:317:7 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:321:4:321:4 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:322:4:322:4 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:323:4:323:5 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:324:4:324:4 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:329:3:329:3 | c | Operand of essentially Character type type interpreted as a Boolean value. |
+| test.c:330:3:330:4 | e1 | Operand of essentially Enum Type type interpreted as a Boolean value. |
+| test.c:331:3:331:3 | s | Operand of essentially Signed type type interpreted as a Boolean value. |
+| test.c:332:3:332:3 | u | Operand of essentially Unsigned type type interpreted as a Boolean value. |
+| test.c:333:3:333:3 | f | Operand of essentially Floating type type interpreted as a Boolean value. |
+| test.c:342:3:342:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:344:3:344:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:349:3:349:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:351:3:351:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:356:8:356:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:358:8:358:9 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:363:8:363:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:365:8:365:9 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:370:3:370:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:371:3:371:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:372:3:372:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:377:3:377:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:378:3:378:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:379:3:379:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:384:8:384:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:385:8:385:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:386:8:386:9 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:391:8:391:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:392:8:392:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:393:8:393:9 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:398:3:398:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:399:3:399:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:400:3:400:4 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:405:8:405:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:406:8:406:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:407:8:407:9 | e1 | Operand of essentially Enum type used in arithmetic operation, but has an implementation defined integer type. |
+| test.c:412:3:412:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:413:3:413:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:414:3:414:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:415:3:415:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:419:3:419:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:420:3:420:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:421:3:421:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:422:3:422:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:426:9:426:9 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:427:9:427:9 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:428:9:428:10 | e1 | Right hand operand of shift operator is essentially Enum Type and not not essentially unsigned. |
+| test.c:429:9:429:9 | s | Right hand operand of shift operator is essentially Signed type and not not essentially unsigned. |
+| test.c:433:9:433:9 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:434:9:434:9 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:435:9:435:10 | e1 | Right hand operand of shift operator is essentially Enum Type and not not essentially unsigned. |
+| test.c:436:9:436:9 | s | Right hand operand of shift operator is essentially Signed type and not not essentially unsigned. |
+| test.c:440:3:440:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:441:3:441:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:442:3:442:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:443:3:443:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:447:3:447:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:448:3:448:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:449:3:449:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:450:3:450:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:454:3:454:3 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:455:3:455:3 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:456:3:456:4 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:457:3:457:3 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:461:8:461:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:462:8:462:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:463:8:463:9 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:464:8:464:8 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:468:8:468:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:469:8:469:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:470:8:470:9 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:471:8:471:8 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |
+| test.c:475:8:475:8 | b | Operand of essentially Boolean type interpreted as a numeric value. |
+| test.c:476:8:476:8 | c | Operand of essentially Charater type interpreted as a numeric value. |
+| test.c:477:8:477:9 | e1 | Bitwise operator applied to operand of essentially Enum Type and not essentially unsigned. |
+| test.c:478:8:478:8 | s | Bitwise operator applied to operand of essentially Signed type and not essentially unsigned. |

From 1a1acdbd8eb7ea32bfbaa16eaee8cfafa8d383e4 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 17 Sep 2024 11:53:05 +0100
Subject: [PATCH 126/435] Add change note

---
 change_notes/2024-09-17-essential-types-unary.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 change_notes/2024-09-17-essential-types-unary.md

diff --git a/change_notes/2024-09-17-essential-types-unary.md b/change_notes/2024-09-17-essential-types-unary.md
new file mode 100644
index 0000000000..401f59a9a6
--- /dev/null
+++ b/change_notes/2024-09-17-essential-types-unary.md
@@ -0,0 +1,4 @@
+ - `RULE-10-1` - `OperandsOfAnInappropriateEssentialType.ql`
+   - Reduce false negatives by supporting operands to the `~` operator with the incorrect essential type.
+   - Reduce false positives by identifying the essential type of `!<expr>` as essentially boolean type.
+   - Improve clarity reporting by reporting the violating operand, instead of the operator, and addressing message typos.
\ No newline at end of file

From 401568f32d0f34acad08f6f786a3949ecea1daff Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 16 Sep 2024 15:18:40 -0700
Subject: [PATCH 127/435] Fix gcc expected test output for M18-2-1, using macro
 offsetof

---
 .../test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc b/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc
index f09fafd410..87bf6e1b01 100644
--- a/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc
+++ b/cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc
@@ -1 +1 @@
-| test.cpp:9:32:9:51 | offsetof(__typ,__id) | Use of banned macro offsetof. |
+| test.cpp:9:32:9:51 | offsetof(TYPE,MEMBER) | Use of banned macro offsetof. |

From 19834830d68c3d08ea07fe2b5fe1ebc2964be337 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 17 Sep 2024 22:39:28 +0100
Subject: [PATCH 128/435] Rule 8.3: Remove false positives for decls that don't
 share a link target

---
 .../DeclarationsOfAnObjectSameNameAndType.ql         | 12 ++++++++++++
 change_notes/2024-09-17-rule-8-3-linker-aware.md     |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 change_notes/2024-09-17-rule-8-3-linker-aware.md

diff --git a/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql b/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql
index dfd9d622e9..d68382503a 100644
--- a/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql
+++ b/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql
@@ -21,7 +21,19 @@ where
   not isExcluded(decl2, Declarations4Package::declarationsOfAnObjectSameNameAndTypeQuery()) and
   not decl1 = decl2 and
   not decl1.getVariable().getDeclaringType().isAnonymous() and
+  // Declarations are for the same qualified name
+  // Note: decl1.getVariable() = decl2.getVariable() does not work for common cases where an aliased
+  //       type is used.
   decl1.getVariable().getQualifiedName() = decl2.getVariable().getQualifiedName() and
+  // As we use qualified name, require that they share a common link target to ensure they are
+  // for the same object
+  (
+    decl1.getVariable().(GlobalVariable).getALinkTarget() =
+      decl2.getVariable().(GlobalVariable).getALinkTarget()
+    or
+    decl1.getVariable().(Field).getDeclaringType().(Class).getALinkTarget() =
+      decl2.getVariable().(Field).getDeclaringType().(Class).getALinkTarget()
+  ) and
   not typesCompatible(decl1.getType(), decl2.getType())
 select decl1,
   "The object $@ of type " + decl1.getType().toString() +
diff --git a/change_notes/2024-09-17-rule-8-3-linker-aware.md b/change_notes/2024-09-17-rule-8-3-linker-aware.md
new file mode 100644
index 0000000000..3e48bb1228
--- /dev/null
+++ b/change_notes/2024-09-17-rule-8-3-linker-aware.md
@@ -0,0 +1,2 @@
+ - `RULE-8-3` - `DeclarationsOfAnObjectSameNameAndType.ql`
+   - Remove false positives where two conflicting declarations are never linked together.
\ No newline at end of file

From 234bc05d5fdb566f3beda08adc924b97089f48d1 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Wed, 18 Sep 2024 09:29:44 +0900
Subject: [PATCH 129/435] Fix query formatting (remove parentheses around not's
 argument).

---
 cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
index 1cf4989680..2b5be15e80 100644
--- a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
@@ -53,7 +53,7 @@ predicate isDeadStmt(Stmt s) {
           va.getTarget() = v and
           not isDeadOrUnreachableStmt(va.getEnclosingStmt())
         ) and
-        not (countUsesInLocalArraySize(v) > 0)
+        not countUsesInLocalArraySize(v) > 0
       )
     )
   )

From a6409e47d384c44019d780bb6ca683b5fed6ec8f Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 18 Sep 2024 22:52:51 +0100
Subject: [PATCH 130/435] Rule 1.2: Report specific extensions used

Distinguish between the different types of extensions.
---
 c/common/src/codingstandards/c/Extensions.qll |  89 ++++++++++++---
 .../LanguageExtensionsShouldNotBeUsed.ql      |   2 +-
 ...LanguageExtensionsShouldNotBeUsed.expected | 102 +++++++++---------
 3 files changed, 129 insertions(+), 64 deletions(-)

diff --git a/c/common/src/codingstandards/c/Extensions.qll b/c/common/src/codingstandards/c/Extensions.qll
index 018359586e..a30f1ec45b 100644
--- a/c/common/src/codingstandards/c/Extensions.qll
+++ b/c/common/src/codingstandards/c/Extensions.qll
@@ -4,21 +4,28 @@ import codingstandards.cpp.Extensions
 /**
  * Common base class for modeling compiler extensions.
  */
-abstract class CCompilerExtension extends CompilerExtension { }
+abstract class CCompilerExtension extends CompilerExtension {
+  abstract string getMessage();
+}
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html#Other-Builtins
 abstract class CConditionalDefineExtension extends CCompilerExtension, PreprocessorIfdef {
+  string feature;
+
   CConditionalDefineExtension() {
-    exists(toString().indexOf("__has_builtin")) or
-    exists(toString().indexOf("__has_constexpr_builtin")) or
-    exists(toString().indexOf("__has_feature")) or
-    exists(toString().indexOf("__has_extension")) or
-    exists(toString().indexOf("__has_attribute")) or
-    exists(toString().indexOf("__has_declspec_attribute")) or
-    exists(toString().indexOf("__is_identifier")) or
-    exists(toString().indexOf("__has_include")) or
-    exists(toString().indexOf("__has_include_next")) or
-    exists(toString().indexOf("__has_warning"))
+    feature =
+      [
+        "__has_builtin", "__has_constexpr_builtin", "__has_feature", "__has_extension",
+        "__has_attribute", "__has_declspec_attribute", "__is_identifier", "__has_include",
+        "__has_include_next", "__has_warning"
+      ] and
+    exists(toString().indexOf(feature))
+  }
+
+  override string getMessage() {
+    result =
+      "Call to builtin function '" + feature +
+        "' is a compiler extension and is not portable to other compilers."
   }
 }
 
@@ -31,6 +38,12 @@ class CMacroBasedExtension extends CCompilerExtension, Macro {
         "__clang_version__", "__clang_literal_encoding__", "__clang_wide_literal_encoding__"
       ]
   }
+
+  override string getMessage() {
+    result =
+      "Use of builtin macro '" + getBody() +
+        "' is a compiler extension and is not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Variable-Attributes.html#Variable-Attributes
@@ -41,6 +54,12 @@ class CAttributeExtension extends CCompilerExtension, Attribute {
         "fallthrough", "read_only", "alias"
       ]
   }
+
+  override string getMessage() {
+    result =
+      "Use of attribute  '" + getName() +
+        "' is a compiler extension and is not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fsync-Builtins.html#g_t_005f_005fsync-Builtins
@@ -61,21 +80,41 @@ class CFunctionExtension extends CCompilerExtension, FunctionCall {
     // the built-in extensions
     getTarget().getName().indexOf("__builtin_") = 0
   }
+
+  override string getMessage() {
+    result =
+      "Call to builtin function '" + getTarget().getName() +
+        "' is a compiler extension and is not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Alignment.html#Alignment
 class CFunctionLikeExtension extends CCompilerExtension, AlignofExprOperator {
   CFunctionLikeExtension() { exists(getValueText().indexOf("__alignof__")) }
+
+  override string getMessage() {
+    result = "'__alignof__' is a compiler extension and is not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Statement-Exprs.html#Statement-Exprs
-class CStmtExprExtension extends CCompilerExtension, StmtExpr { }
+class CStmtExprExtension extends CCompilerExtension, StmtExpr {
+  override string getMessage() {
+    result =
+      "Statement expressions are a compiler extension and are not portable to other compilers."
+  }
+}
 
 // Use of ternary like the following: `int a = 0 ?: 0;` where the
 // one of the branches is omitted
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Conditionals.html#Conditionals
 class CTerseTernaryExtension extends CCompilerExtension, ConditionalExpr {
   CTerseTernaryExtension() { getCondition() = getElse() or getCondition() = getThen() }
+
+  override string getMessage() {
+    result =
+      "Ternaries with omitted middle operands are a compiler extension and is not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fint128.html#g_t_005f_005fint128
@@ -87,25 +126,46 @@ class CRealTypeExtensionExtension extends CCompilerExtension, DeclarationEntry {
     getType() instanceof Decimal64Type or
     getType() instanceof Float128Type
   }
+
+  override string getMessage() {
+    result = "Decimal floats are a compiler extension and are not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/_005f_005fint128.html#g_t_005f_005fint128
 class CIntegerTypeExtension extends CCompilerExtension, DeclarationEntry {
   CIntegerTypeExtension() { getType() instanceof Int128Type }
+
+  override string getMessage() {
+    result = "128-bit integers are a compiler extension and are not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Long-Long.html#Long-Long
 class CLongLongType extends CCompilerExtension, DeclarationEntry {
   CLongLongType() { getType() instanceof LongLongType }
+
+  override string getMessage() {
+    result =
+      "Double-Word integers are a compiler extension and are not portable to other compilers."
+  }
 }
 
 class CZeroLengthArraysExtension extends CCompilerExtension, DeclarationEntry {
   CZeroLengthArraysExtension() { getType().(ArrayType).getArraySize() = 0 }
+
+  override string getMessage() {
+    result = "Zero length arrays are a compiler extension and are not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Empty-Structures.html#Empty-Structures
 class CEmptyStructExtension extends CCompilerExtension, Struct {
   CEmptyStructExtension() { not exists(getAMember(_)) }
+
+  override string getMessage() {
+    result = "Empty structures are a compiler extension and are not portable to other compilers."
+  }
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Variable-Length.html#Variable-Length
@@ -114,4 +174,9 @@ class CVariableLengthArraysExtension extends CCompilerExtension, DeclarationEntr
     getType() instanceof ArrayType and
     not getType().(ArrayType).hasArraySize()
   }
+
+  override string getMessage() {
+    result =
+      "Variable length arrays are a compiler extension and are not portable to other compilers."
+  }
 }
diff --git a/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql b/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
index f38e41a1b6..00a364a87e 100644
--- a/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
@@ -17,4 +17,4 @@ import codingstandards.c.Extensions
 
 from CCompilerExtension e
 where not isExcluded(e, Language3Package::languageExtensionsShouldNotBeUsedQuery())
-select e, "Is a compiler extension and is not portable to other compilers."
+select e, e.getMessage()
diff --git a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
index f9f034c980..d13141d7ac 100644
--- a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
+++ b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
@@ -1,51 +1,51 @@
-| test.c:34:1:34:23 | #define A __BASE_FILE__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:35:1:35:23 | #define B __FILE_NAME__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:36:1:36:21 | #define C __COUNTER__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:37:1:37:27 | #define D __INCLUDE_LEVEL__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:39:1:39:19 | #define F __clang__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:40:1:40:25 | #define G __clang_major__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:41:1:41:25 | #define H __clang_minor__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:42:1:42:30 | #define I __clang_patchlevel__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:43:1:43:27 | #define J __clang_version__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:44:1:44:36 | #define K __clang_literal_encoding__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:45:1:45:41 | #define L __clang_wide_literal_encoding__ | Is a compiler extension and is not portable to other compilers. |
-| test.c:53:33:53:43 | vector_size | Is a compiler extension and is not portable to other compilers. |
-| test.c:54:33:54:47 | vector_size | Is a compiler extension and is not portable to other compilers. |
-| test.c:55:37:55:51 | ext_vector_type | Is a compiler extension and is not portable to other compilers. |
-| test.c:56:37:56:51 | ext_vector_type | Is a compiler extension and is not portable to other compilers. |
-| test.c:61:3:69:4 | (statement expression) | Is a compiler extension and is not portable to other compilers. |
-| test.c:96:3:96:18 | call to __builtin_setjmp | Is a compiler extension and is not portable to other compilers. |
-| test.c:97:3:97:19 | call to __builtin_longjmp | Is a compiler extension and is not portable to other compilers. |
-| test.c:113:11:113:16 | ... ? ... : ... | Is a compiler extension and is not portable to other compilers. |
-| test.c:124:12:124:12 | definition of a | Is a compiler extension and is not portable to other compilers. |
-| test.c:128:17:128:17 | definition of a | Is a compiler extension and is not portable to other compilers. |
-| test.c:165:8:165:15 | definition of contents | Is a compiler extension and is not portable to other compilers. |
-| test.c:182:8:182:11 | gf19 | Is a compiler extension and is not portable to other compilers. |
-| test.c:214:33:214:35 | declaration of out | Is a compiler extension and is not portable to other compilers. |
-| test.c:215:25:215:26 | declaration of in | Is a compiler extension and is not portable to other compilers. |
-| test.c:268:16:268:21 | access | Is a compiler extension and is not portable to other compilers. |
-| test.c:271:27:271:31 | alias | Is a compiler extension and is not portable to other compilers. |
-| test.c:274:23:274:29 | aligned | Is a compiler extension and is not portable to other compilers. |
-| test.c:285:25:285:34 | deprecated | Is a compiler extension and is not portable to other compilers. |
-| test.c:297:20:297:30 | fallthrough | Is a compiler extension and is not portable to other compilers. |
-| test.c:321:3:321:22 | alignof(<expr>) | Is a compiler extension and is not portable to other compilers. |
-| test.c:340:3:340:31 | call to __builtin_extract_return_addr | Is a compiler extension and is not portable to other compilers. |
-| test.c:341:3:341:28 | call to __builtin_frob_return_addr | Is a compiler extension and is not portable to other compilers. |
-| test.c:342:3:342:25 | call to __builtin_frame_address | Is a compiler extension and is not portable to other compilers. |
-| test.c:363:3:363:22 | call to __sync_fetch_and_add_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:364:3:364:22 | call to __sync_fetch_and_sub_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:365:3:365:21 | call to __sync_fetch_and_or_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:366:3:366:22 | call to __sync_fetch_and_and_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:367:3:367:22 | call to __sync_fetch_and_xor_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:368:3:368:23 | call to __sync_fetch_and_nand_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:369:3:369:22 | call to __sync_add_and_fetch_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:370:3:370:22 | call to __sync_sub_and_fetch_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:371:3:371:21 | call to __sync_or_and_fetch_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:372:3:372:22 | call to __sync_and_and_fetch_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:373:3:373:22 | call to __sync_xor_and_fetch_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:374:3:374:23 | call to __sync_nand_and_fetch_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:376:3:376:30 | call to __sync_bool_compare_and_swap_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:377:3:377:29 | call to __sync_val_compare_and_swap_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:378:3:378:26 | call to __sync_lock_test_and_set_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:379:3:379:21 | call to __sync_lock_release_4 | Is a compiler extension and is not portable to other compilers. |
-| test.c:407:3:407:18 | call to __builtin_alloca | Is a compiler extension and is not portable to other compilers. |
+| test.c:34:1:34:23 | #define A __BASE_FILE__ | Use of builtin macro '__BASE_FILE__' is a compiler extension and is not portable to other compilers. |
+| test.c:35:1:35:23 | #define B __FILE_NAME__ | Use of builtin macro '__FILE_NAME__' is a compiler extension and is not portable to other compilers. |
+| test.c:36:1:36:21 | #define C __COUNTER__ | Use of builtin macro '__COUNTER__' is a compiler extension and is not portable to other compilers. |
+| test.c:37:1:37:27 | #define D __INCLUDE_LEVEL__ | Use of builtin macro '__INCLUDE_LEVEL__' is a compiler extension and is not portable to other compilers. |
+| test.c:39:1:39:19 | #define F __clang__ | Use of builtin macro '__clang__' is a compiler extension and is not portable to other compilers. |
+| test.c:40:1:40:25 | #define G __clang_major__ | Use of builtin macro '__clang_major__' is a compiler extension and is not portable to other compilers. |
+| test.c:41:1:41:25 | #define H __clang_minor__ | Use of builtin macro '__clang_minor__' is a compiler extension and is not portable to other compilers. |
+| test.c:42:1:42:30 | #define I __clang_patchlevel__ | Use of builtin macro '__clang_patchlevel__' is a compiler extension and is not portable to other compilers. |
+| test.c:43:1:43:27 | #define J __clang_version__ | Use of builtin macro '__clang_version__' is a compiler extension and is not portable to other compilers. |
+| test.c:44:1:44:36 | #define K __clang_literal_encoding__ | Use of builtin macro '__clang_literal_encoding__' is a compiler extension and is not portable to other compilers. |
+| test.c:45:1:45:41 | #define L __clang_wide_literal_encoding__ | Use of builtin macro '__clang_wide_literal_encoding__' is a compiler extension and is not portable to other compilers. |
+| test.c:53:33:53:43 | vector_size | Use of attribute  'vector_size' is a compiler extension and is not portable to other compilers. |
+| test.c:54:33:54:47 | vector_size | Use of attribute  'vector_size' is a compiler extension and is not portable to other compilers. |
+| test.c:55:37:55:51 | ext_vector_type | Use of attribute  'ext_vector_type' is a compiler extension and is not portable to other compilers. |
+| test.c:56:37:56:51 | ext_vector_type | Use of attribute  'ext_vector_type' is a compiler extension and is not portable to other compilers. |
+| test.c:61:3:69:4 | (statement expression) | Statement expressions are a compiler extension and are not portable to other compilers. |
+| test.c:96:3:96:18 | call to __builtin_setjmp | Call to builtin function '__builtin_setjmp' is a compiler extension and is not portable to other compilers. |
+| test.c:97:3:97:19 | call to __builtin_longjmp | Call to builtin function '__builtin_longjmp' is a compiler extension and is not portable to other compilers. |
+| test.c:113:11:113:16 | ... ? ... : ... | Ternaries with omitted middle operands are a compiler extension and is not portable to other compilers. |
+| test.c:124:12:124:12 | definition of a | 128-bit integers are a compiler extension and are not portable to other compilers. |
+| test.c:128:17:128:17 | definition of a | Double-Word integers are a compiler extension and are not portable to other compilers. |
+| test.c:165:8:165:15 | definition of contents | Zero length arrays are a compiler extension and are not portable to other compilers. |
+| test.c:182:8:182:11 | gf19 | Empty structures are a compiler extension and are not portable to other compilers. |
+| test.c:214:33:214:35 | declaration of out | Variable length arrays are a compiler extension and are not portable to other compilers. |
+| test.c:215:25:215:26 | declaration of in | Variable length arrays are a compiler extension and are not portable to other compilers. |
+| test.c:268:16:268:21 | access | Use of attribute  'access' is a compiler extension and is not portable to other compilers. |
+| test.c:271:27:271:31 | alias | Use of attribute  'alias' is a compiler extension and is not portable to other compilers. |
+| test.c:274:23:274:29 | aligned | Use of attribute  'aligned' is a compiler extension and is not portable to other compilers. |
+| test.c:285:25:285:34 | deprecated | Use of attribute  'deprecated' is a compiler extension and is not portable to other compilers. |
+| test.c:297:20:297:30 | fallthrough | Use of attribute  'fallthrough' is a compiler extension and is not portable to other compilers. |
+| test.c:321:3:321:22 | alignof(<expr>) | '__alignof__' is a compiler extension and is not portable to other compilers. |
+| test.c:340:3:340:31 | call to __builtin_extract_return_addr | Call to builtin function '__builtin_extract_return_addr' is a compiler extension and is not portable to other compilers. |
+| test.c:341:3:341:28 | call to __builtin_frob_return_addr | Call to builtin function '__builtin_frob_return_addr' is a compiler extension and is not portable to other compilers. |
+| test.c:342:3:342:25 | call to __builtin_frame_address | Call to builtin function '__builtin_frame_address' is a compiler extension and is not portable to other compilers. |
+| test.c:363:3:363:22 | call to __sync_fetch_and_add_4 | Call to builtin function '__sync_fetch_and_add_4' is a compiler extension and is not portable to other compilers. |
+| test.c:364:3:364:22 | call to __sync_fetch_and_sub_4 | Call to builtin function '__sync_fetch_and_sub_4' is a compiler extension and is not portable to other compilers. |
+| test.c:365:3:365:21 | call to __sync_fetch_and_or_4 | Call to builtin function '__sync_fetch_and_or_4' is a compiler extension and is not portable to other compilers. |
+| test.c:366:3:366:22 | call to __sync_fetch_and_and_4 | Call to builtin function '__sync_fetch_and_and_4' is a compiler extension and is not portable to other compilers. |
+| test.c:367:3:367:22 | call to __sync_fetch_and_xor_4 | Call to builtin function '__sync_fetch_and_xor_4' is a compiler extension and is not portable to other compilers. |
+| test.c:368:3:368:23 | call to __sync_fetch_and_nand_4 | Call to builtin function '__sync_fetch_and_nand_4' is a compiler extension and is not portable to other compilers. |
+| test.c:369:3:369:22 | call to __sync_add_and_fetch_4 | Call to builtin function '__sync_add_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:370:3:370:22 | call to __sync_sub_and_fetch_4 | Call to builtin function '__sync_sub_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:371:3:371:21 | call to __sync_or_and_fetch_4 | Call to builtin function '__sync_or_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:372:3:372:22 | call to __sync_and_and_fetch_4 | Call to builtin function '__sync_and_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:373:3:373:22 | call to __sync_xor_and_fetch_4 | Call to builtin function '__sync_xor_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:374:3:374:23 | call to __sync_nand_and_fetch_4 | Call to builtin function '__sync_nand_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:376:3:376:30 | call to __sync_bool_compare_and_swap_4 | Call to builtin function '__sync_bool_compare_and_swap_4' is a compiler extension and is not portable to other compilers. |
+| test.c:377:3:377:29 | call to __sync_val_compare_and_swap_4 | Call to builtin function '__sync_val_compare_and_swap_4' is a compiler extension and is not portable to other compilers. |
+| test.c:378:3:378:26 | call to __sync_lock_test_and_set_4 | Call to builtin function '__sync_lock_test_and_set_4' is a compiler extension and is not portable to other compilers. |
+| test.c:379:3:379:21 | call to __sync_lock_release_4 | Call to builtin function '__sync_lock_release_4' is a compiler extension and is not portable to other compilers. |
+| test.c:407:3:407:18 | call to __builtin_alloca | Call to builtin function '__builtin_alloca' is a compiler extension and is not portable to other compilers. |

From 9605d7954cc7d04a61bbf28d0ecdb35ae0aff0c6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 18 Sep 2024 23:13:39 +0100
Subject: [PATCH 131/435] Rule 1.2: Correct detection of variable length arrays

---
 c/common/src/codingstandards/c/Extensions.qll | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/c/common/src/codingstandards/c/Extensions.qll b/c/common/src/codingstandards/c/Extensions.qll
index a30f1ec45b..4f16a1f09a 100644
--- a/c/common/src/codingstandards/c/Extensions.qll
+++ b/c/common/src/codingstandards/c/Extensions.qll
@@ -169,10 +169,16 @@ class CEmptyStructExtension extends CCompilerExtension, Struct {
 }
 
 // Reference: https://gcc.gnu.org/onlinedocs/gcc/Variable-Length.html#Variable-Length
-class CVariableLengthArraysExtension extends CCompilerExtension, DeclarationEntry {
+class CVariableLengthArraysExtension extends CCompilerExtension, Field {
   CVariableLengthArraysExtension() {
     getType() instanceof ArrayType and
-    not getType().(ArrayType).hasArraySize()
+    not getType().(ArrayType).hasArraySize() and
+    // Not the final member of the struct, which is allowed to be variably sized
+    not exists(int lastIndex, Class declaringStruct |
+      declaringStruct = getDeclaringType() and
+      lastIndex = count(declaringStruct.getACanonicalMember()) - 1 and
+      this = declaringStruct.getCanonicalMember(lastIndex)
+    )
   }
 
   override string getMessage() {

From 110f4023ec899544b8d60c2222b04c4802514cd0 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 18 Sep 2024 16:12:50 -0700
Subject: [PATCH 132/435] Add new MISRA C-2023 rules to csv

---
 rules.csv | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/rules.csv b/rules.csv
index f9c195e47a..4ce53bf3bb 100644
--- a/rules.csv
+++ b/rules.csv
@@ -616,10 +616,15 @@ c,MISRA-C-2012,DIR-4-11,Yes,Required,,,The validity of values passed to library
 c,MISRA-C-2012,DIR-4-12,Yes,Required,,,Dynamic memory allocation shall not be used,,Banned,Medium,
 c,MISRA-C-2012,DIR-4-13,No,Advisory,,,Functions which are designed to provide operations on a resource should be called in an appropriate sequence,,,,"Rule 22.1, 22.2 and 22.6 cover aspects of this rule. In other cases this is a design issue and needs to be checked manually."
 c,MISRA-C-2012,DIR-4-14,Yes,Required,,,The validity of values received from external sources shall be checked,,Contracts,Hard,This is supported by CodeQLs default C security queries.
+c,MISRA-C-2012,DIR-4-15,Yes,Required,,,Evaluation of floating-point expressions shall not lead to the undetected generation of infinities and NaNs,FLP32-C and FLP04-C,FloatingTypes2,Medium,
+c,MISRA-C-2012,DIR-5-1,Yes,Required,,,There shall be no data races between threads,CON43-C and CON32-C,Concurrency6,Very Hard,
+c,MISRA-C-2012,DIR-5-2,Yes,Required,,,There shall be no deadlocks between threads,CON35-C,Concurrency6,Import,
+c,MISRA-C-2012,DIR-5-3,Yes,Required,,,There shall be no dynamic thread creation,,Concurrency6,Easy,
 c,MISRA-C-2012,RULE-1-1,No,Required,,,"The program shall contain no violations of the standard C syntax and constraints, and shall not exceed the implementation's translation limits",,,Easy,"This should be checked via the compiler output, rather than CodeQL, which adds unnecessary steps."
 c,MISRA-C-2012,RULE-1-2,Yes,Advisory,,,Language extensions should not be used,,Language3,Hard,
 c,MISRA-C-2012,RULE-1-3,Yes,Required,,,There shall be no occurrence of undefined or critical unspecified behaviour,,Language3,Hard,
 c,MISRA-C-2012,RULE-1-4,Yes,Required,,,Emergent language features shall not be used,,Language2,Medium,
+c,MISRA-C-2012,RULE-1-5,Yes,Required,,,Obsolencent language features shall not be used,,Language4,Medium,
 c,MISRA-C-2012,RULE-2-1,Yes,Required,,,A project shall not contain unreachable code,M0-1-1,DeadCode,Import,
 c,MISRA-C-2012,RULE-2-2,Yes,Required,,,There shall be no dead code,M0-1-9,DeadCode,Import,
 c,MISRA-C-2012,RULE-2-3,Yes,Advisory,,,A project should not contain unused type declarations,A0-1-6,DeadCode,Import,
@@ -627,6 +632,7 @@ c,MISRA-C-2012,RULE-2-4,Yes,Advisory,,,A project should not contain unused tag d
 c,MISRA-C-2012,RULE-2-5,Yes,Advisory,,,A project should not contain unused macro declarations,,DeadCode,Easy,
 c,MISRA-C-2012,RULE-2-6,Yes,Advisory,,,A function should not contain unused label declarations,,DeadCode,Easy,
 c,MISRA-C-2012,RULE-2-7,Yes,Advisory,,,There should be no unused parameters in functions,A0-1-4 A0-1-5,DeadCode,Easy,
+c,MISRA-C-2012,RULE-2-8,Yes,Advisory,,,A project should not contain unused object definitions,Rules 2.3-2.7,DeadCode2,Medium,
 c,MISRA-C-2012,RULE-3-1,Yes,Required,,,The character sequences /* and // shall not be used within a comment,M2-7-1,Syntax,Easy,
 c,MISRA-C-2012,RULE-3-2,Yes,Required,,,Line-splicing shall not be used in // comments,,Syntax,Easy,
 c,MISRA-C-2012,RULE-4-1,Yes,Required,,,Octal and hexadecimal escape sequences shall be terminated,A2-13-1 M2-13-2,Syntax,Medium,
@@ -642,10 +648,13 @@ c,MISRA-C-2012,RULE-5-8,Yes,Required,,,Identifiers that define objects or functi
 c,MISRA-C-2012,RULE-5-9,Yes,Advisory,,,Identifiers that define objects or functions with internal linkage should be unique,,Declarations6,Easy,
 c,MISRA-C-2012,RULE-6-1,Yes,Required,,,Bit-fields shall only be declared with an appropriate type,M9-6-4,BitfieldTypes,Medium,
 c,MISRA-C-2012,RULE-6-2,Yes,Required,,,Single-bit named bit fields shall not be of a signed type,M9-6-4,BitfieldTypes,Import,
+c,MISRA-C-2012,RULE-6-3,Yes,Required,,,A bit field shall not be declared as a member of a union,DCL39-C,BitfieldTypes2,Easy,
 c,MISRA-C-2012,RULE-7-1,Yes,Required,,,Octal constants shall not be used,M2-13-2,Banned,Import,
 c,MISRA-C-2012,RULE-7-2,Yes,Required,,,A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type,M2-13-3,Syntax,Easy,
 c,MISRA-C-2012,RULE-7-3,Yes,Required,,,The lowercase character 'l' shall not be used in a literal suffix,M2-13-4,Syntax,Easy,
 c,MISRA-C-2012,RULE-7-4,Yes,Required,,,A string literal shall not be assigned to an object unless the object's type is 'pointer to const-qualified char',A2-13-4,Types1,Easy,
+c,MISRA-C-2012,RULE-7-5,Yes,Required,,,The argument of an integer constant macro shall have an appropriate form,,Types2,Medium,
+c,MISRA-C-2012,RULE-7-6,Yes,Required,,,The small integer variants of the minimum-width integer constant macros shall not be used,,Types2,Easy,
 c,MISRA-C-2012,RULE-8-1,Yes,Required,,,Types shall be explicitly specified,,Declarations3,Medium,
 c,MISRA-C-2012,RULE-8-2,Yes,Required,,,Function types shall be in prototype form with named parameters,,Declarations4,Medium,
 c,MISRA-C-2012,RULE-8-3,Yes,Required,,,All declarations of an object or function shall use the same names and type qualifiers,M3-2-1,Declarations4,Medium,
@@ -660,11 +669,16 @@ c,MISRA-C-2012,RULE-8-11,Yes,Advisory,,,"When an array with external linkage is
 c,MISRA-C-2012,RULE-8-12,Yes,Required,,,"Within an enumerator list, the value of an implicitly-specified enumeration constant shall be unique",,Declarations7,Medium,
 c,MISRA-C-2012,RULE-8-13,Yes,Advisory,,,A pointer should point to a const-qualified type whenever possible,,Pointers1,Medium,
 c,MISRA-C-2012,RULE-8-14,Yes,Required,,,The restrict type qualifier shall not be used,,Banned,Easy,
+c,MISRA-C-2012,RULE-8-15,Yes,Required,,,All declarations of an object with an explicit alignment specification shall specify the same alignment,,Alignment,Easy,
+c,MISRA-C-2012,RULE-8-16,Yes,Advisory,,,The alignment specification of zero should not appear in an object declaration,,Alignment,Easy,
+c,MISRA-C-2012,RULE-8-17,Yes,Advisory,,,At most one explicit alignment specifier should appear in an object declaration,,Alignment,Easy,
 c,MISRA-C-2012,RULE-9-1,Yes,Mandatory,,,The value of an object with automatic storage duration shall not be read before it has been set,,InvalidMemory1,Import,
 c,MISRA-C-2012,RULE-9-2,Yes,Required,,,The initializer for an aggregate or union shall be enclosed in braces,,Memory1,Easy,
 c,MISRA-C-2012,RULE-9-3,Yes,Required,,,Arrays shall not be partially initialized,,Memory1,Medium,
 c,MISRA-C-2012,RULE-9-4,Yes,Required,,,An element of an object shall not be initialized more than once,,Memory1,Medium,
 c,MISRA-C-2012,RULE-9-5,No,Required,,,Where designated initializers are used to initialize an array object the size of the array shall be specified explicitly,,,Medium,
+c,MISRA-C-2012,RULE-9-6,Yes,Required,,,An initializer using chained designators shall not contain initializers without designators,,Declarations9,Hard,
+c,MISRA-C-2012,RULE-9-7,Yes,Mandatory,,,Atomic objects shall be appropriately initialized before being accessed,,Concurrency6,Hard,
 c,MISRA-C-2012,RULE-10-1,Yes,Required,,,Operands shall not be of an inappropriate essential type,,EssentialTypes,Hard,
 c,MISRA-C-2012,RULE-10-2,Yes,Required,,,Expressions of essentially character type shall not be used inappropriately in addition and subtraction operations,,EssentialTypes,Medium,
 c,MISRA-C-2012,RULE-10-3,Yes,Required,,,The value of an expression shall not be assigned to an object with a narrower essential type or of a different essential type category,,EssentialTypes,Hard,
@@ -682,11 +696,13 @@ c,MISRA-C-2012,RULE-11-6,Yes,Required,,,A cast shall not be performed between po
 c,MISRA-C-2012,RULE-11-7,Yes,Required,,,A cast shall not be performed between pointer to object and a non- integer arithmetic type,,Pointers1,Easy,
 c,MISRA-C-2012,RULE-11-8,Yes,Required,,,A cast shall not remove any const or volatile qualification from the type pointed to by a pointer,,Pointers1,Easy,
 c,MISRA-C-2012,RULE-11-9,Yes,Required,,,The macro NULL shall be the only permitted form of integer null pointer constant,,Pointers1,Easy,
+c,MISRA-C-2012,RULE-11-10,Yes,Required,,,The _Atomic qualifier shall not be applied to the incomplete type void,,Declarations9,Easy,
 c,MISRA-C-2012,RULE-12-1,Yes,Advisory,,,The precedence of operators within expressions should be made explicit,,SideEffects1,Medium,
 c,MISRA-C-2012,RULE-12-2,Yes,Required,,,The right hand operand of a shift operator shall lie in the range zero to one less than the width in bits of the essential type of the left hand operand,,Contracts7,Medium,
 c,MISRA-C-2012,RULE-12-3,Yes,Advisory,,,The comma operator should not be used,M5-18-1,Banned,Import,
 c,MISRA-C-2012,RULE-12-4,Yes,Advisory,,,Evaluation of constant expressions should not lead to unsigned integer wrap-around,INT30-C,IntegerOverflow,Easy,
 c,MISRA-C-2012,RULE-12-5,Yes,Mandatory,,,The sizeof operator shall not have an operand which is a function parameter declared as 'array of type',,Types1,Medium,
+c,MISRA-C-2012,RULE-12-6,Yes,Required,,,Structure and union members of atomic objects shall not be directly accessed,,Concurrency6,Easy,
 c,MISRA-C-2012,RULE-13-1,Yes,Required,,,Initializer lists shall not contain persistent side effects,,SideEffects1,Medium,
 c,MISRA-C-2012,RULE-13-2,Yes,Required,,,The value of an expression and its persistent side effects shall be the same under all permitted evaluation orders,PRE31-C,SideEffects3,Medium,
 c,MISRA-C-2012,RULE-13-3,Yes,Advisory,,,A full expression containing an increment (++) or decrement (--) operator should have no other potential side effects other than that caused by the increment or decrement operator,,SideEffects2,Medium,
@@ -719,6 +735,11 @@ c,MISRA-C-2012,RULE-17-5,Yes,Advisory,,,The function argument corresponding to a
 c,MISRA-C-2012,RULE-17-6,Yes,Mandatory,,,The declaration of an array parameter shall not contain the static keyword between the [ ],,Static,Easy,
 c,MISRA-C-2012,RULE-17-7,Yes,Required,,,The value returned by a function having non-void return type shall be used,A0-1-2,Contracts6,Easy,
 c,MISRA-C-2012,RULE-17-8,Yes,Advisory,,,A function parameter should not be modified,,SideEffects2,Medium,
+c,MISRA-C-2012,RULE-17-9,Yes,Mandatory,,,Verify that a function declared with _Noreturn does not return,,NoReturn,Easy,
+c,MISRA-C-2012,RULE-17-10,Yes,Required,,,A function declared with _noreturn shall have a return type of void,,NoReturn,Easy,
+c,MISRA-C-2012,RULE-17-11,Yes,Advisory,,,A function without a branch that returns shall be declared with _Noreturn,,NoReturn,Easy,
+c,MISRA-C-2012,RULE-17-12,Yes,Advisory,,,A function identifier should only be called with a parenthesized parameter list or used with a & (address-of),,FunctionTypes,Easy,
+c,MISRA-C-2012,RULE-17-13,Yes,Required,,,A function type shall not include any type qualifiers (const\, volatile\, restrict\, or _Atomic),,FunctionTypes,Easy,
 c,MISRA-C-2012,RULE-18-1,Yes,Required,,,A pointer resulting from arithmetic on a pointer operand shall address an element of the same array as that pointer operand,M5-0-16,Pointers1,Import,
 c,MISRA-C-2012,RULE-18-2,Yes,Required,,,Subtraction between pointers shall only be applied to pointers that address elements of the same array,M5-0-17,Pointers1,Import,
 c,MISRA-C-2012,RULE-18-3,Yes,Required,,,"The relational operators >, >=, < and <= shall not be applied to objects of pointer type except where they point into the same object",M5-0-18,Pointers1,Import,
@@ -727,6 +748,8 @@ c,MISRA-C-2012,RULE-18-5,Yes,Advisory,,,Declarations should contain no more than
 c,MISRA-C-2012,RULE-18-6,Yes,Required,,,The address of an object with automatic storage shall not be copied to another object that persists after the first object has ceased to exist,M7-5-2,Pointers1,Import,
 c,MISRA-C-2012,RULE-18-7,Yes,Required,,,Flexible array members shall not be declared,,Declarations6,Medium,
 c,MISRA-C-2012,RULE-18-8,Yes,Required,,,Variable-length array types shall not be used,,Declarations7,Medium,
+c,MISRA-C-2012,RULE-18-9,Yes,Required,,,An object with temporary lifetime shall not undergo array to pointer conversion,EXP35-C,InvalidMemory3,Hard,
+c,MISRA-C-2012,RULE-18-10,Yes,Mandatory,,,Pointers to variably-modified array types shall not be used,,InvalidMemory3,Import,
 c,MISRA-C-2012,RULE-19-1,Yes,Mandatory,,,An object shall not be assigned or copied to an overlapping object,M0-2-1,Contracts7,Hard,
 c,MISRA-C-2012,RULE-19-2,Yes,Advisory,,,The union keyword should not be used,A9-5-1,Banned,Import,
 c,MISRA-C-2012,RULE-20-1,Yes,Advisory,,,#include directives should only be preceded by preprocessor directives or comments,M16-0-1,Preprocessor1,Import,
@@ -764,6 +787,11 @@ c,MISRA-C-2012,RULE-21-18,Yes,Mandatory,,,The size_t argument passed to any func
 c,MISRA-C-2012,RULE-21-19,Yes,Mandatory,,,"The pointers returned by the Standard Library functions localeconv, getenv, setlocale or, strerror shall only be used as if they have pointer to const-qualified type",ENV30-C,Contracts2,Medium,
 c,MISRA-C-2012,RULE-21-20,Yes,Mandatory,,,"The pointer returned by the Standard Library functions asctime, ctime, gmtime, localtime, localeconv, getenv, setlocale or strerror shall not be used following a subsequent call to the same function",ENV34-C,Contracts2,Import,
 c,MISRA-C-2012,RULE-21-21,Yes,Required,,,The Standard Library function system of <stdlib.h> shall not be used,ENV33-C,Banned,Import,
+c,MISRA-C-2012,RULE-21-22,Yes,Mandatory,,,All operand arguments to any type-generic macros in <tgmath.h> shall have an appropriate essential type,EXP37-C,EssentialTypes2,Hard,
+c,MISRA-C-2012,RULE-21-23,Yes,Required,,,All operand arguments to any multi-argument type-generic macros in <tgmath.h> shall have the same standard type,Rule-21-22,EssentialTypes2,Easy,
+c,MISRA-C-2012,RULE-21-24,Yes,Required,,,The random number generator functions of <stdlib.h> shall not be used,MSC30-C,Banned2,Easy,
+c,MISRA-C-2012,RULE-21-25,Yes,Required,,,All memory synchronization operations shall be executed in sequentially consistent order,,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-21-26,Yes,Required,,,The Standard Library function mtx_timedlock() shall only be invoked on mutex objects of appropriate mutex type,,Concurrency6,Hard,
 c,MISRA-C-2012,RULE-22-1,Yes,Required,,,All resources obtained dynamically by means of Standard Library functions shall be explicitly released,,Memory2,Hard,
 c,MISRA-C-2012,RULE-22-2,Yes,Mandatory,,,A block of memory shall only be freed if it was allocated by means of a Standard Library function,,Memory2,Hard,
 c,MISRA-C-2012,RULE-22-3,Yes,Required,,,The same file shall not be open for read and write access at the same time on different streams,,IO3,Hard,
@@ -774,6 +802,24 @@ c,MISRA-C-2012,RULE-22-7,Yes,Required,,,The macro EOF shall only be compared wit
 c,MISRA-C-2012,RULE-22-8,Yes,Required,,,The value of errno shall be set to zero prior to a call to an errno-setting-function,ERR30-C,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-9,Yes,Required,,,The value of errno shall be tested against zero after calling an errno-setting-function,,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-10,Yes,Required,,,The value of errno shall only be tested when the last function to be called was an errno-setting-function,,Contracts3,Medium,
+c,MISRA-C-2012,RULE-22-11,Yes,Required,,,A thread that was previously either joined or detached shall not be subsequently joined nor detached,CON39-C,Concurrency6,Import,
+c,MISRA-C-2012,RULE-22-12,Yes,Mandatory,,,Thread objects\, thread synchronization objects\, and thread-specific storage pointers shall only be accessed by the appropriate Standard Library functions,,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-22-13,Yes,Required,,,Thread objects\, thread synchronization objects\, and thread specific storage pointers shall have appropriate storage duration,EXP54-CPP and CON34-C,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-22-14,Yes,Mandatory,,,Thread synchronization objects shall be initialized before being accessed,EXP53-CPP,Concurrency6,Hard,
+c,MISRA-C-2012,RULE-22-15,Yes,Required,,,Thread synchronization objects and thread-specific storage pointers shall not be destroyed until after all threads accessing them have terminated,,Concurrency6,Hard,
+c,MISRA-C-2012,RULE-22-16,Yes,Required,,,All mutex objects locked by a thread shall be explicitly unlocked by the same thread,MEM51-CPP,Concurrency6,Hard,
+c,MISRA-C-2012,RULE-22-17,Yes,Required,,,No thread shall unlock a mutex or call cnd_wait() or cnd_timedwait() for a mutex it has not locked before,Rule 22.2,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-22-18,Yes,Required,,,Non-recursive mutexes shall not be recursively locked,CON56-CPP,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-22-19,Yes,Required,,,A condition variable shall be associated with at most one mutex object,,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-22-20,Yes,Mandatory,,,Thread-specific storage pointers shall be created before being accessed,,Concurrency6,Hard,
+c,MISRA-C-2012,RULE-23-1,Yes,Advisory,,,A generic selection should only be expanded from a macro,,Generics,Medium,
+c,MISRA-C-2012,RULE-23-2,Yes,Required,,,A generic selection that is not expanded from a macro shall not contain potential side effects in the controlling expression,,Generics,Hard,
+c,MISRA-C-2012,RULE-23-3,Yes,Advisory,,,A generic selection should contain at least one non-default association,,Generics,Easy,
+c,MISRA-C-2012,RULE-23-4,Yes,Required,,,A generic association shall list an appropriate type,,Generics,Medium,
+c,MISRA-C-2012,RULE-23-5,Yes,Advisory,,,A generic selection should not depend on implicit pointer type conversion,,Generics,Medium,
+c,MISRA-C-2012,RULE-23-6,Yes,Required,,,The controlling expression of a generic selection shall have an essential type that matches its standard type,,Generics,Medium,
+c,MISRA-C-2012,RULE-23-7,Yes,Advisory,,,A generic selection that is expanded from a macro should evaluate its argument only once,,Generics,Medium,
+c,MISRA-C-2012,RULE-23-8,Yes,Required,,,A default association shall appear as either the first or the last association of a generic selection,,Generics,Easy,
 cpp,MISRA-C++-2023,RULE-0-0-1,Yes,Required,Decidable,Single Translation Unit,A function shall not contain unreachable statements,M0-1-1,DeadCode2,Medium,
 cpp,MISRA-C++-2023,RULE-0-0-2,Yes,Advisory,Undecidable,System,Controlling expressions should not be invariant,M0-1-2,DeadCode2,Easy,
 cpp,MISRA-C++-2023,RULE-0-1-1,Yes,Advisory,Undecidable,System,A value should not be unnecessarily written to a local object,A0-1-1,DeadCode2,Medium,

From 0fef17c85539f69a549ff29ab549403baa0fa316 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Thu, 19 Sep 2024 11:10:57 +0900
Subject: [PATCH 133/435] Fix #665

---
 change_notes/2024-09-19-fix-fp-665-M3-4-1.md  |  2 +
 ...saryExposedIdentifierDeclarationShared.qll | 21 ++++-
 .../test.cpp                                  | 94 ++++++++++++++++++-
 3 files changed, 112 insertions(+), 5 deletions(-)
 create mode 100644 change_notes/2024-09-19-fix-fp-665-M3-4-1.md

diff --git a/change_notes/2024-09-19-fix-fp-665-M3-4-1.md b/change_notes/2024-09-19-fix-fp-665-M3-4-1.md
new file mode 100644
index 0000000000..63c5f91b56
--- /dev/null
+++ b/change_notes/2024-09-19-fix-fp-665-M3-4-1.md
@@ -0,0 +1,2 @@
+- `M3-4-1` - `UnnecessaryExposedIdentifierDeclarationShared.qll`:
+  - Fixes #665. Exclude variables that are constexpr and coming from template instantiations.
diff --git a/cpp/common/src/codingstandards/cpp/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.qll b/cpp/common/src/codingstandards/cpp/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.qll
index a18ab593bb..695a8740b6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/unnecessaryexposedidentifierdeclarationshared/UnnecessaryExposedIdentifierDeclarationShared.qll
@@ -120,7 +120,10 @@ private predicate isTypeUse(Type t1, Type t2) {
 }
 
 newtype TDeclarationAccess =
-  ObjectAccess(Variable v, VariableAccess va) { va = v.getAnAccess() } or
+  ObjectAccess(Variable v, VariableAccess va) {
+    va = v.getAnAccess() or
+    v.(TemplateVariable).getAnInstantiation().getAnAccess() = va
+  } or
   /* Type access can be done in a declaration or an expression (e.g., static member function call) */
   TypeAccess(Type t, Element access) {
     isTypeUse(access.(Variable).getUnspecifiedType(), t)
@@ -205,9 +208,13 @@ class DeclarationAccess extends TDeclarationAccess {
 
 class CandidateDeclaration extends Declaration {
   CandidateDeclaration() {
-    this instanceof LocalVariable
+    this instanceof LocalVariable and
+    not this.(LocalVariable).isConstexpr() and
+    not this.isFromTemplateInstantiation(_)
     or
-    this instanceof GlobalOrNamespaceVariable
+    this instanceof GlobalOrNamespaceVariable and
+    not this.isFromTemplateInstantiation(_) and
+    not this.(GlobalOrNamespaceVariable).isConstexpr()
     or
     this instanceof Type and
     not this instanceof ClassTemplateInstantiation and
@@ -229,7 +236,13 @@ Scope possibleScopesForDeclaration(CandidateDeclaration d) {
     result = scope.getStrictParent*()
   ) and
   // Limit the best scope to block statements and namespaces or control structures
-  (result instanceof BlockStmt or result instanceof Namespace)
+  (
+    result instanceof BlockStmt and
+    // Template variables cannot be in block scope
+    not d instanceof TemplateVariable
+    or
+    result instanceof Namespace
+  )
 }
 
 /* Gets the smallest scope that includes all the declaration accesses of declaration `d`. */
diff --git a/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/test.cpp b/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/test.cpp
index ae3bb7b887..c4e01b8224 100644
--- a/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/test.cpp
+++ b/cpp/common/test/rules/unnecessaryexposedidentifierdeclarationshared/test.cpp
@@ -136,4 +136,96 @@ void f17() {
     ptr = &i;
   }
   *ptr = 1;
-}
\ No newline at end of file
+}
+
+namespace a_namespace {
+
+constexpr static unsigned int a_constexpr_var{
+    10U}; // COMPLIANT; used in
+          // a_namespace and
+          // another_namespace_function
+static unsigned int
+    a_namespace_var[a_constexpr_var]{}; // COMPLIANT; used in
+                                        // a_namespace_function and
+                                        // another_namespace_function
+
+constexpr static unsigned int a_namespace_function(void) noexcept {
+  unsigned int a_return_value{0U};
+
+  for (auto loop_var : a_namespace_var) { // usage of a_namespace_var
+    a_return_value += loop_var;
+  }
+  return a_return_value;
+}
+
+constexpr static unsigned int another_namespace_function(void) noexcept {
+  unsigned int a_return_value{0U};
+
+  for (unsigned int i{0U}; i < a_constexpr_var;
+       i++) {                             // usage of a_constexpr_var
+    a_return_value += a_namespace_var[i]; // usage of a_namespace_var
+  }
+  return a_return_value;
+}
+} // namespace a_namespace
+
+namespace parent_namespace {
+namespace child_namespace {
+template <typename From> class a_class_in_child_namespace {
+public:
+  template <typename To> constexpr auto &&operator()(To &&val) const noexcept {
+    return static_cast<To>(val);
+  }
+}; // a_class_in_child_namespace end
+
+template <typename From>
+extern constexpr a_class_in_child_namespace<From>
+    a_class_in_child_namespace_impl{};
+
+} // namespace child_namespace
+
+template <typename From>
+static constexpr auto const &a_parent_namespace_variable =
+    child_namespace::a_class_in_child_namespace_impl<
+        From>; // COMPLIANT; used in child_namespace2::a_class::bar() and
+               // parent_namespace::another_class::foo()
+
+namespace child_namespace2 {
+class a_class {
+public:
+  int func(...) { return 0; }
+  void foo(int x) { x++; }
+  template <typename F> constexpr auto bar(F(*func), int b) {
+    foo(func(a_parent_namespace_variable<F>(
+        b))); // usage of a_parent_namespace_variable
+  }
+}; // a_class
+} // namespace child_namespace2
+
+class another_class {
+  int a;
+  int b;
+  void bar(int param) { param++; }
+
+  bool has_value() { return a == b; }
+
+public:
+  template <typename F> int foo(F(*func), int b) {
+    if (has_value()) {
+      bar(func(a_parent_namespace_variable<F>(
+          b))); // usage of a_parent_namespace_variable
+    }
+    return 0;
+  }
+}; // another_class
+} // namespace parent_namespace
+
+template <typename T> T a_func(T v) { return v++; }
+
+int main() {
+  parent_namespace::child_namespace2::a_class a_class_obj;
+  a_class_obj.bar(a_func<int>, 10);
+  parent_namespace::another_class another_class_obj;
+  another_class_obj.foo(a_func<int>, 10);
+  return 0;
+}

From 3797b83c90a6887a37970ae7b8ac5071368d7cd3 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 18 Sep 2024 21:00:33 -0700
Subject: [PATCH 134/435] Fix CSV escaping

---
 rules.csv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules.csv b/rules.csv
index 4ce53bf3bb..b5e15ba6f6 100644
--- a/rules.csv
+++ b/rules.csv
@@ -739,7 +739,7 @@ c,MISRA-C-2012,RULE-17-9,Yes,Mandatory,,,Verify that a function declared with _N
 c,MISRA-C-2012,RULE-17-10,Yes,Required,,,A function declared with _noreturn shall have a return type of void,,NoReturn,Easy,
 c,MISRA-C-2012,RULE-17-11,Yes,Advisory,,,A function without a branch that returns shall be declared with _Noreturn,,NoReturn,Easy,
 c,MISRA-C-2012,RULE-17-12,Yes,Advisory,,,A function identifier should only be called with a parenthesized parameter list or used with a & (address-of),,FunctionTypes,Easy,
-c,MISRA-C-2012,RULE-17-13,Yes,Required,,,A function type shall not include any type qualifiers (const\, volatile\, restrict\, or _Atomic),,FunctionTypes,Easy,
+c,MISRA-C-2012,RULE-17-13,Yes,Required,,,"A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)",,FunctionTypes,Easy,
 c,MISRA-C-2012,RULE-18-1,Yes,Required,,,A pointer resulting from arithmetic on a pointer operand shall address an element of the same array as that pointer operand,M5-0-16,Pointers1,Import,
 c,MISRA-C-2012,RULE-18-2,Yes,Required,,,Subtraction between pointers shall only be applied to pointers that address elements of the same array,M5-0-17,Pointers1,Import,
 c,MISRA-C-2012,RULE-18-3,Yes,Required,,,"The relational operators >, >=, < and <= shall not be applied to objects of pointer type except where they point into the same object",M5-0-18,Pointers1,Import,
@@ -803,8 +803,8 @@ c,MISRA-C-2012,RULE-22-8,Yes,Required,,,The value of errno shall be set to zero
 c,MISRA-C-2012,RULE-22-9,Yes,Required,,,The value of errno shall be tested against zero after calling an errno-setting-function,,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-10,Yes,Required,,,The value of errno shall only be tested when the last function to be called was an errno-setting-function,,Contracts3,Medium,
 c,MISRA-C-2012,RULE-22-11,Yes,Required,,,A thread that was previously either joined or detached shall not be subsequently joined nor detached,CON39-C,Concurrency6,Import,
-c,MISRA-C-2012,RULE-22-12,Yes,Mandatory,,,Thread objects\, thread synchronization objects\, and thread-specific storage pointers shall only be accessed by the appropriate Standard Library functions,,Concurrency6,Medium,
-c,MISRA-C-2012,RULE-22-13,Yes,Required,,,Thread objects\, thread synchronization objects\, and thread specific storage pointers shall have appropriate storage duration,EXP54-CPP and CON34-C,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-22-12,Yes,Mandatory,,,"Thread objects, thread synchronization objects, and thread-specific storage pointers shall only be accessed by the appropriate Standard Library functions",,Concurrency6,Medium,
+c,MISRA-C-2012,RULE-22-13,Yes,Required,,,"Thread objects, thread synchronization objects, and thread specific storage pointers shall have appropriate storage duration",EXP54-CPP and CON34-C,Concurrency6,Medium,
 c,MISRA-C-2012,RULE-22-14,Yes,Mandatory,,,Thread synchronization objects shall be initialized before being accessed,EXP53-CPP,Concurrency6,Hard,
 c,MISRA-C-2012,RULE-22-15,Yes,Required,,,Thread synchronization objects and thread-specific storage pointers shall not be destroyed until after all threads accessing them have terminated,,Concurrency6,Hard,
 c,MISRA-C-2012,RULE-22-16,Yes,Required,,,All mutex objects locked by a thread shall be explicitly unlocked by the same thread,MEM51-CPP,Concurrency6,Hard,

From 9139b8e21cb741cc56355ae7a19c68e04e572d58 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 19 Sep 2024 10:00:05 +0100
Subject: [PATCH 135/435] Rule 1.2: Fix test for variable length arrays

Only variable length struct fields are a gcc extension.
---
 ...LanguageExtensionsShouldNotBeUsed.expected | 55 +++++++++----------
 c/misra/test/rules/RULE-1-2/test.c            | 14 ++---
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
index d13141d7ac..b82fa2bbc5 100644
--- a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
+++ b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
@@ -21,31 +21,30 @@
 | test.c:128:17:128:17 | definition of a | Double-Word integers are a compiler extension and are not portable to other compilers. |
 | test.c:165:8:165:15 | definition of contents | Zero length arrays are a compiler extension and are not portable to other compilers. |
 | test.c:182:8:182:11 | gf19 | Empty structures are a compiler extension and are not portable to other compilers. |
-| test.c:214:33:214:35 | declaration of out | Variable length arrays are a compiler extension and are not portable to other compilers. |
-| test.c:215:25:215:26 | declaration of in | Variable length arrays are a compiler extension and are not portable to other compilers. |
-| test.c:268:16:268:21 | access | Use of attribute  'access' is a compiler extension and is not portable to other compilers. |
-| test.c:271:27:271:31 | alias | Use of attribute  'alias' is a compiler extension and is not portable to other compilers. |
-| test.c:274:23:274:29 | aligned | Use of attribute  'aligned' is a compiler extension and is not portable to other compilers. |
-| test.c:285:25:285:34 | deprecated | Use of attribute  'deprecated' is a compiler extension and is not portable to other compilers. |
-| test.c:297:20:297:30 | fallthrough | Use of attribute  'fallthrough' is a compiler extension and is not portable to other compilers. |
-| test.c:321:3:321:22 | alignof(<expr>) | '__alignof__' is a compiler extension and is not portable to other compilers. |
-| test.c:340:3:340:31 | call to __builtin_extract_return_addr | Call to builtin function '__builtin_extract_return_addr' is a compiler extension and is not portable to other compilers. |
-| test.c:341:3:341:28 | call to __builtin_frob_return_addr | Call to builtin function '__builtin_frob_return_addr' is a compiler extension and is not portable to other compilers. |
-| test.c:342:3:342:25 | call to __builtin_frame_address | Call to builtin function '__builtin_frame_address' is a compiler extension and is not portable to other compilers. |
-| test.c:363:3:363:22 | call to __sync_fetch_and_add_4 | Call to builtin function '__sync_fetch_and_add_4' is a compiler extension and is not portable to other compilers. |
-| test.c:364:3:364:22 | call to __sync_fetch_and_sub_4 | Call to builtin function '__sync_fetch_and_sub_4' is a compiler extension and is not portable to other compilers. |
-| test.c:365:3:365:21 | call to __sync_fetch_and_or_4 | Call to builtin function '__sync_fetch_and_or_4' is a compiler extension and is not portable to other compilers. |
-| test.c:366:3:366:22 | call to __sync_fetch_and_and_4 | Call to builtin function '__sync_fetch_and_and_4' is a compiler extension and is not portable to other compilers. |
-| test.c:367:3:367:22 | call to __sync_fetch_and_xor_4 | Call to builtin function '__sync_fetch_and_xor_4' is a compiler extension and is not portable to other compilers. |
-| test.c:368:3:368:23 | call to __sync_fetch_and_nand_4 | Call to builtin function '__sync_fetch_and_nand_4' is a compiler extension and is not portable to other compilers. |
-| test.c:369:3:369:22 | call to __sync_add_and_fetch_4 | Call to builtin function '__sync_add_and_fetch_4' is a compiler extension and is not portable to other compilers. |
-| test.c:370:3:370:22 | call to __sync_sub_and_fetch_4 | Call to builtin function '__sync_sub_and_fetch_4' is a compiler extension and is not portable to other compilers. |
-| test.c:371:3:371:21 | call to __sync_or_and_fetch_4 | Call to builtin function '__sync_or_and_fetch_4' is a compiler extension and is not portable to other compilers. |
-| test.c:372:3:372:22 | call to __sync_and_and_fetch_4 | Call to builtin function '__sync_and_and_fetch_4' is a compiler extension and is not portable to other compilers. |
-| test.c:373:3:373:22 | call to __sync_xor_and_fetch_4 | Call to builtin function '__sync_xor_and_fetch_4' is a compiler extension and is not portable to other compilers. |
-| test.c:374:3:374:23 | call to __sync_nand_and_fetch_4 | Call to builtin function '__sync_nand_and_fetch_4' is a compiler extension and is not portable to other compilers. |
-| test.c:376:3:376:30 | call to __sync_bool_compare_and_swap_4 | Call to builtin function '__sync_bool_compare_and_swap_4' is a compiler extension and is not portable to other compilers. |
-| test.c:377:3:377:29 | call to __sync_val_compare_and_swap_4 | Call to builtin function '__sync_val_compare_and_swap_4' is a compiler extension and is not portable to other compilers. |
-| test.c:378:3:378:26 | call to __sync_lock_test_and_set_4 | Call to builtin function '__sync_lock_test_and_set_4' is a compiler extension and is not portable to other compilers. |
-| test.c:379:3:379:21 | call to __sync_lock_release_4 | Call to builtin function '__sync_lock_release_4' is a compiler extension and is not portable to other compilers. |
-| test.c:407:3:407:18 | call to __builtin_alloca | Call to builtin function '__builtin_alloca' is a compiler extension and is not portable to other compilers. |
+| test.c:216:9:216:10 | definition of x1 | Zero length arrays are a compiler extension and are not portable to other compilers. |
+| test.c:266:16:266:21 | access | Use of attribute  'access' is a compiler extension and is not portable to other compilers. |
+| test.c:270:5:270:9 | alias | Use of attribute  'alias' is a compiler extension and is not portable to other compilers. |
+| test.c:272:23:272:29 | aligned | Use of attribute  'aligned' is a compiler extension and is not portable to other compilers. |
+| test.c:283:25:283:34 | deprecated | Use of attribute  'deprecated' is a compiler extension and is not portable to other compilers. |
+| test.c:295:20:295:30 | fallthrough | Use of attribute  'fallthrough' is a compiler extension and is not portable to other compilers. |
+| test.c:319:3:319:22 | alignof(<expr>) | '__alignof__' is a compiler extension and is not portable to other compilers. |
+| test.c:338:3:338:31 | call to __builtin_extract_return_addr | Call to builtin function '__builtin_extract_return_addr' is a compiler extension and is not portable to other compilers. |
+| test.c:339:3:339:28 | call to __builtin_frob_return_addr | Call to builtin function '__builtin_frob_return_addr' is a compiler extension and is not portable to other compilers. |
+| test.c:340:3:340:25 | call to __builtin_frame_address | Call to builtin function '__builtin_frame_address' is a compiler extension and is not portable to other compilers. |
+| test.c:361:3:361:22 | call to __sync_fetch_and_add_4 | Call to builtin function '__sync_fetch_and_add_4' is a compiler extension and is not portable to other compilers. |
+| test.c:362:3:362:22 | call to __sync_fetch_and_sub_4 | Call to builtin function '__sync_fetch_and_sub_4' is a compiler extension and is not portable to other compilers. |
+| test.c:363:3:363:21 | call to __sync_fetch_and_or_4 | Call to builtin function '__sync_fetch_and_or_4' is a compiler extension and is not portable to other compilers. |
+| test.c:364:3:364:22 | call to __sync_fetch_and_and_4 | Call to builtin function '__sync_fetch_and_and_4' is a compiler extension and is not portable to other compilers. |
+| test.c:365:3:365:22 | call to __sync_fetch_and_xor_4 | Call to builtin function '__sync_fetch_and_xor_4' is a compiler extension and is not portable to other compilers. |
+| test.c:366:3:366:23 | call to __sync_fetch_and_nand_4 | Call to builtin function '__sync_fetch_and_nand_4' is a compiler extension and is not portable to other compilers. |
+| test.c:367:3:367:22 | call to __sync_add_and_fetch_4 | Call to builtin function '__sync_add_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:368:3:368:22 | call to __sync_sub_and_fetch_4 | Call to builtin function '__sync_sub_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:369:3:369:21 | call to __sync_or_and_fetch_4 | Call to builtin function '__sync_or_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:370:3:370:22 | call to __sync_and_and_fetch_4 | Call to builtin function '__sync_and_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:371:3:371:22 | call to __sync_xor_and_fetch_4 | Call to builtin function '__sync_xor_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:372:3:372:23 | call to __sync_nand_and_fetch_4 | Call to builtin function '__sync_nand_and_fetch_4' is a compiler extension and is not portable to other compilers. |
+| test.c:374:3:374:30 | call to __sync_bool_compare_and_swap_4 | Call to builtin function '__sync_bool_compare_and_swap_4' is a compiler extension and is not portable to other compilers. |
+| test.c:375:3:375:29 | call to __sync_val_compare_and_swap_4 | Call to builtin function '__sync_val_compare_and_swap_4' is a compiler extension and is not portable to other compilers. |
+| test.c:376:3:376:26 | call to __sync_lock_test_and_set_4 | Call to builtin function '__sync_lock_test_and_set_4' is a compiler extension and is not portable to other compilers. |
+| test.c:377:3:377:21 | call to __sync_lock_release_4 | Call to builtin function '__sync_lock_release_4' is a compiler extension and is not portable to other compilers. |
+| test.c:405:3:405:18 | call to __builtin_alloca | Call to builtin function '__builtin_alloca' is a compiler extension and is not portable to other compilers. |
diff --git a/c/misra/test/rules/RULE-1-2/test.c b/c/misra/test/rules/RULE-1-2/test.c
index 86a3ae2f20..5a0759afba 100644
--- a/c/misra/test/rules/RULE-1-2/test.c
+++ b/c/misra/test/rules/RULE-1-2/test.c
@@ -211,14 +211,12 @@ void gf24(int f, int g) {
 
 // Reference:
 // https://gcc.gnu.org/onlinedocs/gcc/Variable-Length.html#Variable-Length
-void gf25t(int N, int M, double out[M][N], // NON_COMPLIANT
-           const double in[N][M]);         // NON_COMPLIANT
-void gf25() {
-  double x[3][2];
-  double y[2][3];
-  gf25t(3, 2, y,
-        x); // in ISO C the const qualifier is formally attached
-            // to the element type of the array and not the array itself
+void gf25(int n) {
+  struct S1 {
+    int x1[n]; // NON_COMPLIANT
+    int x2[5]; // COMPLIANT
+    int x3[];  // COMPLIANT
+  };
 }
 
 // Reference:

From ecf5e8beeba67957387fc2bdc8a6ff11b5b1d719 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 19 Sep 2024 10:57:50 +0100
Subject: [PATCH 136/435] Rule 1.2: Support aggregation of results at macro
 locations

Add a new module/library for identifying the macro that generated
an element as the primary location, and use it for Rule 1.2 to
avoid overreporting.
---
 .../LanguageExtensionsShouldNotBeUsed.ql      |  3 +-
 ...LanguageExtensionsShouldNotBeUsed.expected |  1 +
 c/misra/test/rules/RULE-1-2/test.c            |  8 +++-
 .../codingstandards/cpp/AlertReporting.qll    | 41 +++++++++++++++++++
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 cpp/common/src/codingstandards/cpp/AlertReporting.qll

diff --git a/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql b/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
index 00a364a87e..8017f58fb5 100644
--- a/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
@@ -13,8 +13,9 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.AlertReporting
 import codingstandards.c.Extensions
 
 from CCompilerExtension e
 where not isExcluded(e, Language3Package::languageExtensionsShouldNotBeUsedQuery())
-select e, e.getMessage()
+select MacroUnwrapper<CCompilerExtension>::unwrapElement(e), e.getMessage()
diff --git a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
index b82fa2bbc5..d0303f9a7f 100644
--- a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
+++ b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
@@ -48,3 +48,4 @@
 | test.c:376:3:376:26 | call to __sync_lock_test_and_set_4 | Call to builtin function '__sync_lock_test_and_set_4' is a compiler extension and is not portable to other compilers. |
 | test.c:377:3:377:21 | call to __sync_lock_release_4 | Call to builtin function '__sync_lock_release_4' is a compiler extension and is not portable to other compilers. |
 | test.c:405:3:405:18 | call to __builtin_alloca | Call to builtin function '__builtin_alloca' is a compiler extension and is not portable to other compilers. |
+| test.c:409:1:411:8 | #define BUILTIN __builtin_alloca( 0) | Call to builtin function '__builtin_alloca' is a compiler extension and is not portable to other compilers. |
diff --git a/c/misra/test/rules/RULE-1-2/test.c b/c/misra/test/rules/RULE-1-2/test.c
index 5a0759afba..439df3733c 100644
--- a/c/misra/test/rules/RULE-1-2/test.c
+++ b/c/misra/test/rules/RULE-1-2/test.c
@@ -404,4 +404,10 @@ void gf47() { // NON_COMPLIANT in versions < C11.
 void gf48() {
   __builtin_alloca(
       0); // NON_COMPLIANT (all __builtin functions are non-compliant.)
-}
\ No newline at end of file
+}
+
+#define BUILTIN                                                                \
+  __builtin_alloca(                                                            \
+      0) // NON_COMPLIANT (all __builtin functions are non-compliant.)
+
+void gf49() { BUILTIN; }
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/AlertReporting.qll b/cpp/common/src/codingstandards/cpp/AlertReporting.qll
new file mode 100644
index 0000000000..4259e1b67d
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/AlertReporting.qll
@@ -0,0 +1,41 @@
+/**
+ * Provides a library for managing how alerts are reported.
+ */
+
+import cpp
+
+signature class ResultType extends Element;
+
+/**
+ * A module for unwrapping results that occur in macro expansions.
+ */
+module MacroUnwrapper<ResultType ResultElement> {
+  /**
+   * Gets a macro invocation that applies to the result element.
+   */
+  private MacroInvocation getAMacroInvocation(ResultElement re) {
+    result.getAnExpandedElement() = re
+  }
+
+  /**
+   * Gets the primary macro that generated the result element.
+   */
+  Macro getPrimaryMacro(ResultElement re) {
+    exists(MacroInvocation mi |
+      mi = getAMacroInvocation(re) and
+      // No other more specific macro that expands to element
+      not exists(MacroInvocation otherMi |
+        otherMi = getAMacroInvocation(re) and otherMi.getParentInvocation() = mi
+      ) and
+      result = mi.getMacro()
+    )
+  }
+
+  /**
+   * If a result element is expanded from a macro invocation, then return the "primary" macro that
+   * generated the element, otherwise return the element itself.
+   */
+  Element unwrapElement(ResultElement re) {
+    if exists(getPrimaryMacro(re)) then result = getPrimaryMacro(re) else result = re
+  }
+}

From 3490238096744abae7265c58c8ae5b23ae72165a Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 19 Sep 2024 11:17:22 +0100
Subject: [PATCH 137/435] Remove duplicate predicate

---
 cpp/autosar/src/rules/M0-1-4/SingleUsePODVariable.qll | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cpp/autosar/src/rules/M0-1-4/SingleUsePODVariable.qll b/cpp/autosar/src/rules/M0-1-4/SingleUsePODVariable.qll
index 45ea8c35ab..c0a32baba9 100644
--- a/cpp/autosar/src/rules/M0-1-4/SingleUsePODVariable.qll
+++ b/cpp/autosar/src/rules/M0-1-4/SingleUsePODVariable.qll
@@ -4,12 +4,6 @@ import cpp
 import codingstandards.cpp.TrivialType
 import codingstandards.cpp.deadcode.UnusedVariables
 
-/** Gets the constant value of a constexpr variable. */
-private string getConstExprValue(Variable v) {
-  result = v.getInitializer().getExpr().getValue() and
-  v.isConstexpr()
-}
-
 /**
  * Gets the number of uses of variable `v` in an opaque assignment, where an opaque assignment is a cast from one type to the other, and `v` is assumed to be a member of the resulting type.
  * e.g.,

From 4318622161d534399d9cb4e2f531ebc9bf17dd0c Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 19 Sep 2024 11:38:15 +0100
Subject: [PATCH 138/435] Rule 1.2: Add change note

---
 change_notes/2024-09-19-c-extensions.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 change_notes/2024-09-19-c-extensions.md

diff --git a/change_notes/2024-09-19-c-extensions.md b/change_notes/2024-09-19-c-extensions.md
new file mode 100644
index 0000000000..2f78574679
--- /dev/null
+++ b/change_notes/2024-09-19-c-extensions.md
@@ -0,0 +1,4 @@
+ - `RULE-1-2` - `LanguageExtensionsShouldNotBeUsed.ql`:
+   - Improve reporting by describing which language extensions are used.
+   - Improve reporting by aggregating results generated from a macro expansion at the generating macro location.
+   - Reduce false positives for the variable length array check by permitting those extensions which are included in the C99 standard.
\ No newline at end of file

From f6c05fe6cd0c276543106b86caf72771fff9b424 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:32:59 +0100
Subject: [PATCH 139/435] Update action.yml

---
 .../actions/apply-coding-standards-configuration/action.yml   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index f901238061..a5b751793f 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -10,6 +10,8 @@ runs:
       with:
         python-version: 3.9
     - name: Install dependencies
+      shell: bash
       run: python -m pip install -r ${{ github.action_path }}/scripts/configuration/requirements.txt
     - name: Process files
-      run: python ${{ github.action_path }}/scripts/configuration/process_coding_standards_config.py
\ No newline at end of file
+      shell: bash
+      run: python ${{ github.action_path }}/scripts/configuration/process_coding_standards_config.py

From 8c22681df43e205a66535b72daf54373c2df8614 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:37:35 +0100
Subject: [PATCH 140/435] Update action.yml

---
 .../actions/apply-coding-standards-configuration/action.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index a5b751793f..e1580e5f23 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -11,7 +11,7 @@ runs:
         python-version: 3.9
     - name: Install dependencies
       shell: bash
-      run: python -m pip install -r ${{ github.action_path }}/scripts/configuration/requirements.txt
+      run: cd ../../../; python -m pip install -r ${{ github.action_path }}/scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
-      run: python ${{ github.action_path }}/scripts/configuration/process_coding_standards_config.py
+      run: cd ../../../; python ${{ github.action_path }}/scripts/configuration/process_coding_standards_config.py

From 2dc4836be1bdc9ddde8a15e5f7a7af272bc93854 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:39:34 +0100
Subject: [PATCH 141/435] Update action.yml

---
 .../actions/apply-coding-standards-configuration/action.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index e1580e5f23..49ecc01176 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -11,7 +11,7 @@ runs:
         python-version: 3.9
     - name: Install dependencies
       shell: bash
-      run: cd ../../../; python -m pip install -r ${{ github.action_path }}/scripts/configuration/requirements.txt
+      run: cd ../../../; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
-      run: cd ../../../; python ${{ github.action_path }}/scripts/configuration/process_coding_standards_config.py
+      run: cd ../../../; python ${{ github.action_path }}/../../../scripts/configuration/process_coding_standards_config.py

From 6d95d66a17cca4933cd8262d0d1f4cbe68270c67 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:53:58 +0100
Subject: [PATCH 142/435] Update action.yml

---
 .../actions/apply-coding-standards-configuration/action.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index 49ecc01176..ae107f80a2 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -11,7 +11,7 @@ runs:
         python-version: 3.9
     - name: Install dependencies
       shell: bash
-      run: cd ../../../; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
+      run: ls ${{ github.action_path }}/../../..; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
-      run: cd ../../../; python ${{ github.action_path }}/../../../scripts/configuration/process_coding_standards_config.py
+      run: python ${{ github.action_path }}/../../../scripts/configuration/process_coding_standards_config.py

From b74b066d202dfec2351a222d5bcaf2bdfc7176fa Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 19 Sep 2024 17:31:10 -0700
Subject: [PATCH 143/435] Add `amendments.csv` with misra-c amdmts 2&3, and
 tc2.

---
 amendments.csv | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 amendments.csv

diff --git a/amendments.csv b/amendments.csv
new file mode 100644
index 0000000000..9fc03ae951
--- /dev/null
+++ b/amendments.csv
@@ -0,0 +1,50 @@
+language,standard,amendment,rule_id,queryable,implementation_category,difficulty
+c,misra-c-2012,Amendment3,DIR-4-6,Yes,Expand,Easy
+c,misra-c-2012,Amendment3,DIR-4-9,Yes,Refine,Easy
+c,misra-c-2012,Amendment3,DIR-4-11,Yes,Refine,Import
+c,misra-c-2012,Amendment3,RULE-1-4,Yes,Replace,Easy
+c,misra-c-2012,Amendment3,RULE-10-1,Yes,Replace,Easy
+c,misra-c-2012,Amendment3,RULE-10-3,Yes,Refine,Easy
+c,misra-c-2012,Amendment3,RULE-10-4,Yes,Refine,Import
+c,misra-c-2012,Amendment3,RULE-10-5,Yes,Expand,Easy
+c,misra-c-2012,Amendment3,RULE-10-7,Yes,Refine,Import
+c,misra-c-2012,Amendment3,RULE-10-8,Yes,Refine,Import
+c,misra-c-2012,Amendment3,RULE-21-11,Yes,Clarification,Import
+c,misra-c-2012,Amendment3,RULE-21-12,Yes,Replace,Easy
+c,misra-c-2012,Amendment4,RULE-11-3,Yes,Expand,Easy
+c,misra-c-2012,Amendment4,RULE-11-8,Yes,Expand,Easy
+c,misra-c-2012,Amendment4,RULE-13-2,Yes,Expand,Very Hard
+c,misra-c-2012,Amendment4,RULE-18-6,Yes,Expand,Medium
+c,misra-c-2012,Amendment4,RULE-18-8,Yes,Split,Easy
+c,misra-c-2012,Corrigendum2,RULE-2-2,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-2-7,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-3-1,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-8-6,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-8-9,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-9-4,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-18-3,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-1-4,Yes,Replace,Easy
+c,misra-c-2012,Corrigendum2,RULE-9-1,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-9-2,Yes,Refine,Import
+c,misra-c-2012,Corrigendum2,DIR-4-10,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-7-4,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-8-2,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-8-3,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-8-7,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-10-2,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-10-3,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-11-3,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-11-6,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-13-2,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-13-6,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-14-3,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-15-7,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-17-4,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-17-5,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-18-1,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-20-14,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-21-19,Yes,Clarification,Import
+c,misra-c-2012,Corrigendum2,RULE-21-20,Yes,Refine,Easy
+c,misra-c-2012,Corrigendum2,RULE-22-9,Yes,Clarification,Import
\ No newline at end of file

From edd9071c275b42238337abf7c024b0116212840f Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 20 Sep 2024 10:52:13 +0100
Subject: [PATCH 144/435] Rule 7.2: Remove false positives in macros and
 implicit conversions

 - Remove false positives where integer constants are generated from macros.
 - Remove false positives where a signed integer is implicitly converted to unsigned, which is permitted by the standard.
---
 .../UOrUSuffixRepresentedInUnsignedType.ql    |  13 +-
 ...rUSuffixRepresentedInUnsignedType.expected |  11 +-
 c/misra/test/rules/RULE-7-2/test.c            | 266 +++++++++++++++---
 change_notes/2024-09-20-fix-7-2-fps.md        |   3 +
 rule_packages/c/Syntax.json                   |   5 +-
 5 files changed, 252 insertions(+), 46 deletions(-)
 create mode 100644 change_notes/2024-09-20-fix-7-2-fps.md

diff --git a/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql b/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql
index b1dca9ac4a..b8f8d59718 100644
--- a/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql
+++ b/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql
@@ -19,6 +19,13 @@ from Literal l
 where
   not isExcluded(l, SyntaxPackage::uOrUSuffixRepresentedInUnsignedTypeQuery()) and
   not l instanceof StringLiteral and
-  l.getImplicitlyConverted().getType().(IntegralType).isUnsigned() and
-  not exists(l.getValueText().toUpperCase().indexOf("U"))
-select l, "Unsigned literal does not explicitly express sign with a 'U' or 'u' suffix."
+  // Determine if the extractor deduced that the literal is unsigned, based on the C rules
+  l.getType().(IntegralType).isUnsigned() and
+  // And report if the literal does not contain a 'U' or 'u' suffix, e.g. explicitly unsigned
+  not exists(l.getValueText().toUpperCase().indexOf("U")) and
+  // Exclude constants generated by macro expansions, because the suffix information is lost in this
+  // case, so can cause false positives.
+  not l.isInMacroExpansion()
+select l,
+  "Unsigned literal " + l.getValueText() +
+    " does not explicitly express sign with a 'U' or 'u' suffix."
diff --git a/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected b/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
index 4a131f4eaa..07cd56b3d9 100644
--- a/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
+++ b/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
@@ -1,5 +1,6 @@
-| test.c:8:20:8:21 | 0 | Unsigned literal does not explicitly express sign with a 'U' or 'u' suffix. |
-| test.c:9:20:9:22 | 0 | Unsigned literal does not explicitly express sign with a 'U' or 'u' suffix. |
-| test.c:33:6:33:6 | 1 | Unsigned literal does not explicitly express sign with a 'U' or 'u' suffix. |
-| test.c:35:6:35:9 | 1 | Unsigned literal does not explicitly express sign with a 'U' or 'u' suffix. |
-| test.c:37:6:37:8 | 1 | Unsigned literal does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:111:3:111:12 | 2147483648 | Unsigned literal 0x80000000 does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:116:3:116:20 | 9223372036854775808 | Unsigned literal 0x8000000000000000 does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:139:3:139:21 | 9223372036854775808 | Unsigned literal 0x8000000000000000l does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:162:3:162:21 | 9223372036854775808 | Unsigned literal 0x8000000000000000L does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:185:3:185:22 | 9223372036854775808 | Unsigned literal 0x8000000000000000ll does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:208:3:208:22 | 9223372036854775808 | Unsigned literal 0x8000000000000000LL does not explicitly express sign with a 'U' or 'u' suffix. |
diff --git a/c/misra/test/rules/RULE-7-2/test.c b/c/misra/test/rules/RULE-7-2/test.c
index da62825755..b95d2b1e02 100644
--- a/c/misra/test/rules/RULE-7-2/test.c
+++ b/c/misra/test/rules/RULE-7-2/test.c
@@ -1,39 +1,231 @@
+// Assumed platform in qltest is linux_x86_64, so
+// int, long, long long sizes are assumed to be 32, 64, 64 bits respectively
 
-long a1 = 0L;  // COMPLIANT
-long a2 = 0LL; // COMPLIANT
-long a3 = 0uL; // COMPLIANT
-long a4 = 0Lu; // COMPLIANT
-long a5 = 0LU; // COMPLIANT
-
-unsigned long b1 = 0L;  // NON_COMPLIANT
-unsigned long b2 = 0LL; // NON_COMPLIANT
-unsigned long b3 = 0uL; // COMPLIANT
-unsigned long b4 = 0Lu; // COMPLIANT
-unsigned long b5 = 0LU; // COMPLIANT
-
-signed long c1 = 0L;  // COMPLIANT
-signed long c2 = 0LL; // COMPLIANT
-signed long c3 = 0uL; // COMPLIANT
-signed long c4 = 0Lu; // COMPLIANT
-signed long c5 = 0LU; // COMPLIANT
-
-void f0(int a) {}
-
-void f1(unsigned int a) {}
-
-void f2() {
-
-  f0(1);     // COMPLIANT
-  f0(1U);    // COMPLIANT
-  f0(0x01);  // COMPLIANT
-  f0(0x01U); // COMPLIANT
-  f0(001);   // COMPLIANT
-  f0(001U);  // COMPLIANT
-
-  f1(1);     // NON_COMPLIANT
-  f1(1U);    // COMPLIANT
-  f1(0x01);  // NON_COMPLIANT
-  f1(0x01U); // COMPLIANT
-  f1(001);   // NON_COMPLIANT
-  f1(001U);  // COMPLIANT
+// The type of an integer constant is determined by "6.4.4.1 Integer constants"
+// in the C11 Standard. The principle is that any decimal integer constant will
+// be signed, unless it has the `U` or `u` suffix. Any hexadecimal integer will
+// depend on whether it is larger than the maximum value of the smallest signed
+// integer value that can hold the value. So the signedness depends on the
+// magnitude of the constant.
+
+void test_decimal_constants() {
+  0;          // COMPLIANT
+  2147483648; // COMPLIANT - larger than int, but decimal constants never use
+              // unsigned without the suffix, so will be `long`
+  4294967296; // COMPLIANT - larger than unsigned int, still `long`
+  9223372036854775807; // COMPLIANT - max long int
+  // 9223372036854775808; Not a valid integer constant, out of signed range
+  0U;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648U;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296U;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807U; // COMPLIANT - max long int
+  9223372036854775808U; // COMPLIANT - explicitly unsigned, so can go large than
+                        // max long int
+  0u;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648u;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296u;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807u; // COMPLIANT - max long int
+  9223372036854775808u; // COMPLIANT - explicitly unsigned, so can go large than
+                        // max long int
+
+  // l suffix
+  0l;                   // COMPLIANT
+  2147483648l;          // COMPLIANT - within the range of long int
+  4294967296l;          // COMPLIANT - within the range of long int
+  9223372036854775807l; // COMPLIANT - max long int
+  // 9223372036854775808l; Not a valid integer constant, out of signed range
+  0lU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648lU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296lU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807lU; // COMPLIANT - max long int
+  9223372036854775808lU; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+  0lu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807lu; // COMPLIANT - max long int
+  9223372036854775808lu; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+
+  // L suffix
+  0L;                   // COMPLIANT
+  2147483648L;          // COMPLIANT - within the range of long int
+  4294967296L;          // COMPLIANT - within the range of long int
+  9223372036854775807L; // COMPLIANT - max long int
+  // 9223372036854775808L; Not a valid integer constant, out of signed range
+  0LU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648LU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296LU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807LU; // COMPLIANT - max long int
+  9223372036854775808LU; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+  0Lu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648Lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296Lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807Lu; // COMPLIANT - max long int
+  9223372036854775808Lu; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+
+  // ll suffix
+  0ll;                   // COMPLIANT
+  2147483648ll;          // COMPLIANT - within the range of long long int
+  4294967296ll;          // COMPLIANT - within the range of long long int
+  9223372036854775807ll; // COMPLIANT - max long long int
+  // 9223372036854775808ll; Not a valid integer constant, out of signed range
+  0llU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648llU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296llU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807llU; // COMPLIANT - max long long int
+  9223372036854775808llU; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
+  0llu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648llu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296llu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807llu; // COMPLIANT - max long long int
+  9223372036854775808llu; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
+
+  // LL suffix
+  0LL;                   // COMPLIANT
+  2147483648LL;          // COMPLIANT - within the range of long long int
+  4294967296LL;          // COMPLIANT - within the range of long long int
+  9223372036854775807LL; // COMPLIANT - max long long int
+  // 9223372036854775808LL; Not a valid integer constant, out of signed range
+  0LLU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648LLU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296LLU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807LLU; // COMPLIANT - max long long int
+  9223372036854775808LLU; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
+  0LLu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648LLu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296LLu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807LLu; // COMPLIANT - max long long int
+  9223372036854775808LLu; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
 }
+
+void test_hexadecimal_constants() {
+  0x0;        // COMPLIANT - uses signed int
+  0x7FFFFFFF; // COMPLIANT - max value held by signed int
+  0x80000000; // NON_COMPLIANT - larger than max signed int, so will be unsigned
+              // int
+  0x100000000; // COMPLIANT - larger than unsigned int, but smaller than long
+               // int
+  0x7FFFFFFFFFFFFFFF;  // COMPLIANT - max long int
+  0x8000000000000000;  // NON_COMPLIANT - larger than long int, so will be
+                       // unsigned long int
+  0x0U;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000U;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000U;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000U; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0u;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000u;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000u;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000u; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `l` suffix
+  0x0l;         // COMPLIANT - uses signed int
+  0x7FFFFFFFl;  // COMPLIANT - max value held by signed int
+  0x80000000l;  // COMPLIANT - larger than max signed int, but smaller than long
+                // int
+  0x100000000l; // COMPLIANT - larger than unsigned int, but smaller than long
+                // int
+  0x7FFFFFFFFFFFFFFFl;  // COMPLIANT - max long int
+  0x8000000000000000l;  // NON_COMPLIANT - larger than long int, so will be
+                        // unsigned long int
+  0x0lU;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFlU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000lU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000lU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFlU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000lU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0lu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFlu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000lu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000lu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFlu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000lu; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `L` suffix
+  0x0L;         // COMPLIANT - uses signed int
+  0x7FFFFFFFL;  // COMPLIANT - max value held by signed int
+  0x80000000L;  // COMPLIANT - larger than max signed int, but smaller than long
+                // int
+  0x100000000L; // COMPLIANT - larger than unsigned int, but smaller than long
+                // int
+  0x7FFFFFFFFFFFFFFFL;  // COMPLIANT - max long int
+  0x8000000000000000L;  // NON_COMPLIANT - larger than long int, so will be
+                        // unsigned long int
+  0x0LU;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000LU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000LU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000LU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0Lu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000Lu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000Lu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000Lu; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `ll` suffix
+  0x0ll;        // COMPLIANT - uses signed int
+  0x7FFFFFFFll; // COMPLIANT - max value held by signed int
+  0x80000000ll; // COMPLIANT - larger than max signed int, but smaller than long
+                // long int
+  0x100000000ll; // COMPLIANT - larger than unsigned int, but smaller than long
+                 // long int
+  0x7FFFFFFFFFFFFFFFll; // COMPLIANT - max long long int
+  0x8000000000000000ll; // NON_COMPLIANT - larger than long long int, so will be
+                        // unsigned long long int
+  0x0llU;               // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFllU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000llU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000llU;       // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFllU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000llU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0llu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFllu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000llu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000llu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFllu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000llu; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `LL` suffix
+  0x0LL;        // COMPLIANT - uses signed int
+  0x7FFFFFFFLL; // COMPLIANT - max value held by signed int
+  0x80000000LL; // COMPLIANT - larger than max signed int, but smaller than long
+                // long int
+  0x100000000LL; // COMPLIANT - larger than unsigned int, but smaller than long
+                 // long int
+  0x7FFFFFFFFFFFFFFFLL; // COMPLIANT - max long long int
+  0x8000000000000000LL; // NON_COMPLIANT - larger than long long int, so will be
+                        // unsigned long long int
+  0x0LLU;               // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLLU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000LLU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000LLU;       // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLLU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000LLU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0LLu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLLu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000LLu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000LLu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLLu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000LLu; // COMPLIANT - unsigned, but uses the suffix correctly
+}
+
+#define COMPLIANT_VAL 0x80000000U
+#define NON_COMPLIANT_VAL 0x80000000
+
+void test_macro() {
+  COMPLIANT_VAL;     // COMPLIANT
+  NON_COMPLIANT_VAL; // NON_COMPLIANT[FALSE_NEGATIVE] - cannot determine suffix
+                     // in macro expansions
+}
\ No newline at end of file
diff --git a/change_notes/2024-09-20-fix-7-2-fps.md b/change_notes/2024-09-20-fix-7-2-fps.md
new file mode 100644
index 0000000000..897aebadb7
--- /dev/null
+++ b/change_notes/2024-09-20-fix-7-2-fps.md
@@ -0,0 +1,3 @@
+ - `RULE-7-2` - `UOrUSuffixRepresentedInUnsignedType.ql`
+   - Remove false positives where integer constants are generated from macros.
+   - Remove false positives where a signed integer is implicitly converted to unsigned, which is permitted by the standard.
\ No newline at end of file
diff --git a/rule_packages/c/Syntax.json b/rule_packages/c/Syntax.json
index b8899ccc97..99bcf8250e 100644
--- a/rule_packages/c/Syntax.json
+++ b/rule_packages/c/Syntax.json
@@ -121,7 +121,10 @@
           "tags": [
             "maintainability",
             "readability"
-          ]
+          ],
+          "implementation_scope": {
+            "description": "This implementation does not consider constants defined in macro bodies."
+          }
         }
       ],
       "title": "A 'U' or 'u' suffix shall be applied to all integer constants that are represented in an unsigned type"

From 7315e190f5035ddee3b23f03b7452a3f15aa173a Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 20 Sep 2024 11:44:46 +0100
Subject: [PATCH 145/435] Update action.yml

---
 .github/actions/apply-coding-standards-configuration/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index ae107f80a2..8edc6e954c 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -11,7 +11,7 @@ runs:
         python-version: 3.9
     - name: Install dependencies
       shell: bash
-      run: ls ${{ github.action_path }}/../../..; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
+      run: cd ../../../; ls; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
       run: python ${{ github.action_path }}/../../../scripts/configuration/process_coding_standards_config.py

From 2d047cfdc826774039fc936c386c3604cd23e649 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 20 Sep 2024 11:47:02 +0100
Subject: [PATCH 146/435] Update action.yml

---
 .github/actions/apply-coding-standards-configuration/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index 8edc6e954c..e0264a5cc8 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -11,7 +11,7 @@ runs:
         python-version: 3.9
     - name: Install dependencies
       shell: bash
-      run: cd ../../../; ls; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
+      run: cd ${{ github.action_path }}; cd ../../../; ls; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
       run: python ${{ github.action_path }}/../../../scripts/configuration/process_coding_standards_config.py

From bac877f5d1c703c36c8874664fef0ad2c94054e5 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 20 Sep 2024 11:53:02 +0100
Subject: [PATCH 147/435] Update action.yml

---
 .../actions/apply-coding-standards-configuration/action.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index e0264a5cc8..c5c58ebc3c 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -11,7 +11,7 @@ runs:
         python-version: 3.9
     - name: Install dependencies
       shell: bash
-      run: cd ${{ github.action_path }}; cd ../../../; ls; python -m pip install -r ${{ github.action_path }}/../../../scripts/configuration/requirements.txt
+      run: python -m pip install -r ${GITHUB_ACTION_PATH}/../../../scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
-      run: python ${{ github.action_path }}/../../../scripts/configuration/process_coding_standards_config.py
+      run: python ${GITHUB_ACTION_PATH}/../../../scripts/configuration/process_coding_standards_config.py

From b78397ac4e8f9f780e7b0d2ceb98ab24be87ffad Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 20 Sep 2024 13:35:41 +0100
Subject: [PATCH 148/435] Update action.yml

---
 .../apply-coding-standards-configuration/action.yml       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index c5c58ebc3c..7a621bb45f 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -5,10 +5,10 @@ description: |
 runs:
   using: composite
   steps:
-    - name: Install Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
+    # - name: Install Python
+    #   uses: actions/setup-python@v5
+    #   with:
+    #     python-version: 3.9
     - name: Install dependencies
       shell: bash
       run: python -m pip install -r ${GITHUB_ACTION_PATH}/../../../scripts/configuration/requirements.txt

From 382d4f34c15170f029027f01e96ae10345f59e9f Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 20 Sep 2024 13:47:10 +0100
Subject: [PATCH 149/435] Update action.yml

---
 .../apply-coding-standards-configuration/action.yml       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/.github/actions/apply-coding-standards-configuration/action.yml
index 7a621bb45f..c5c58ebc3c 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/.github/actions/apply-coding-standards-configuration/action.yml
@@ -5,10 +5,10 @@ description: |
 runs:
   using: composite
   steps:
-    # - name: Install Python
-    #   uses: actions/setup-python@v5
-    #   with:
-    #     python-version: 3.9
+    - name: Install Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
     - name: Install dependencies
       shell: bash
       run: python -m pip install -r ${GITHUB_ACTION_PATH}/../../../scripts/configuration/requirements.txt

From 12370bc599deeb7bc406bd890d6edb7159e1620f Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 11:17:13 -0700
Subject: [PATCH 150/435] Add support for MISRA-C Rule 6.3

---
 .../BitFieldDeclaredAsMemberOfAUnion.ql       | 22 ++++++++++++++++
 .../BitFieldDeclaredAsMemberOfAUnion.expected |  2 ++
 .../BitFieldDeclaredAsMemberOfAUnion.qlref    |  1 +
 c/misra/test/rules/RULE-6-3/test.c            | 21 +++++++++++++++
 .../cpp/exclusions/c/BitfieldTypes2.qll       | 26 +++++++++++++++++++
 .../cpp/exclusions/c/RuleMetadata.qll         |  3 +++
 rule_packages/c/BitfieldTypes2.json           | 21 +++++++++++++++
 7 files changed, 96 insertions(+)
 create mode 100644 c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
 create mode 100644 c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.expected
 create mode 100644 c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.qlref
 create mode 100644 c/misra/test/rules/RULE-6-3/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/BitfieldTypes2.qll
 create mode 100644 rule_packages/c/BitfieldTypes2.json

diff --git a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
new file mode 100644
index 0000000000..c91f25da10
--- /dev/null
+++ b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
@@ -0,0 +1,22 @@
+/**
+ * @id c/misra/bit-field-declared-as-member-of-a-union
+ * @name RULE-6-3: A bit field shall not be declared as a member of a union
+ * @description Type punning on a union with bit fields relies on implementation-specific alignment
+ *              behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-6-3
+ *       correctness
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from BitField field, Union u
+where
+  not isExcluded(field, BitfieldTypes2Package::bitFieldDeclaredAsMemberOfAUnionQuery()) and
+  u.getAField() = field
+select
+  field, "Union member " + field.getName() + " is declared as a bit field which relies on implementation-specific behavior."
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.expected b/c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.expected
new file mode 100644
index 0000000000..7c39484796
--- /dev/null
+++ b/c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.expected
@@ -0,0 +1,2 @@
+| test.c:7:7:7:7 | x | Union member x is declared as a bit field which relies on implementation-specific behavior. |
+| test.c:20:7:20:7 | (unnamed bitfield) | Union member (unnamed bitfield) is declared as a bit field which relies on implementation-specific behavior. |
diff --git a/c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.qlref b/c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.qlref
new file mode 100644
index 0000000000..21c43d4826
--- /dev/null
+++ b/c/misra/test/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.qlref
@@ -0,0 +1 @@
+rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-6-3/test.c b/c/misra/test/rules/RULE-6-3/test.c
new file mode 100644
index 0000000000..74b7cb86ea
--- /dev/null
+++ b/c/misra/test/rules/RULE-6-3/test.c
@@ -0,0 +1,21 @@
+union U1 {
+  int x; // COMPLIANT
+  char y; // COMPLIANT
+};
+
+union U2 {
+  int x: 2; // NON-COMPLIANT
+  char y; // COMPLIANT
+};
+
+union U3 {
+    struct str {
+        int x: 4; // COMPLIANT
+        int y: 2; // COMPLIANT
+    };
+};
+
+union U4 {
+  char x;
+  int :0; // NON-COMPLIANT
+};
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/BitfieldTypes2.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/BitfieldTypes2.qll
new file mode 100644
index 0000000000..ca116bb51c
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/BitfieldTypes2.qll
@@ -0,0 +1,26 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype BitfieldTypes2Query = TBitFieldDeclaredAsMemberOfAUnionQuery()
+
+predicate isBitfieldTypes2QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `bitFieldDeclaredAsMemberOfAUnion` query
+    BitfieldTypes2Package::bitFieldDeclaredAsMemberOfAUnionQuery() and
+  queryId =
+    // `@id` for the `bitFieldDeclaredAsMemberOfAUnion` query
+    "c/misra/bit-field-declared-as-member-of-a-union" and
+  ruleId = "RULE-6-3" and
+  category = "required"
+}
+
+module BitfieldTypes2Package {
+  Query bitFieldDeclaredAsMemberOfAUnionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `bitFieldDeclaredAsMemberOfAUnion` query
+      TQueryC(TBitfieldTypes2PackageQuery(TBitFieldDeclaredAsMemberOfAUnionQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index c2771f4171..2ddc5138b8 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -4,6 +4,7 @@ import codingstandards.cpp.exclusions.RuleMetadata
 //** Import packages for this language **/
 import Banned
 import BitfieldTypes
+import BitfieldTypes2
 import Concurrency1
 import Concurrency2
 import Concurrency3
@@ -75,6 +76,7 @@ import Types1
 newtype TCQuery =
   TBannedPackageQuery(BannedQuery q) or
   TBitfieldTypesPackageQuery(BitfieldTypesQuery q) or
+  TBitfieldTypes2PackageQuery(BitfieldTypes2Query q) or
   TConcurrency1PackageQuery(Concurrency1Query q) or
   TConcurrency2PackageQuery(Concurrency2Query q) or
   TConcurrency3PackageQuery(Concurrency3Query q) or
@@ -146,6 +148,7 @@ newtype TCQuery =
 predicate isQueryMetadata(Query query, string queryId, string ruleId, string category) {
   isBannedQueryMetadata(query, queryId, ruleId, category) or
   isBitfieldTypesQueryMetadata(query, queryId, ruleId, category) or
+  isBitfieldTypes2QueryMetadata(query, queryId, ruleId, category) or
   isConcurrency1QueryMetadata(query, queryId, ruleId, category) or
   isConcurrency2QueryMetadata(query, queryId, ruleId, category) or
   isConcurrency3QueryMetadata(query, queryId, ruleId, category) or
diff --git a/rule_packages/c/BitfieldTypes2.json b/rule_packages/c/BitfieldTypes2.json
new file mode 100644
index 0000000000..d916421b1f
--- /dev/null
+++ b/rule_packages/c/BitfieldTypes2.json
@@ -0,0 +1,21 @@
+{
+  "MISRA-C-2012": {
+    "RULE-6-3": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Type punning on a union with bit fields relies on implementation-specific alignment behavior.",
+          "kind": "problem",
+          "name": "A bit field shall not be declared as a member of a union",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "BitFieldDeclaredAsMemberOfAUnion",
+          "tags": ["correctness"]
+        }
+      ],
+      "title": "A bit field shall not be declared as a member of a union"
+    }
+  }
+}
\ No newline at end of file

From 0ccbf48e1493bb4b8e1fb4c1855fd2b130fed610 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 11:21:50 -0700
Subject: [PATCH 151/435] Add "implemented" column to amendments.csv

---
 amendments.csv | 100 ++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/amendments.csv b/amendments.csv
index 9fc03ae951..ae6c85e7d1 100644
--- a/amendments.csv
+++ b/amendments.csv
@@ -1,50 +1,50 @@
-language,standard,amendment,rule_id,queryable,implementation_category,difficulty
-c,misra-c-2012,Amendment3,DIR-4-6,Yes,Expand,Easy
-c,misra-c-2012,Amendment3,DIR-4-9,Yes,Refine,Easy
-c,misra-c-2012,Amendment3,DIR-4-11,Yes,Refine,Import
-c,misra-c-2012,Amendment3,RULE-1-4,Yes,Replace,Easy
-c,misra-c-2012,Amendment3,RULE-10-1,Yes,Replace,Easy
-c,misra-c-2012,Amendment3,RULE-10-3,Yes,Refine,Easy
-c,misra-c-2012,Amendment3,RULE-10-4,Yes,Refine,Import
-c,misra-c-2012,Amendment3,RULE-10-5,Yes,Expand,Easy
-c,misra-c-2012,Amendment3,RULE-10-7,Yes,Refine,Import
-c,misra-c-2012,Amendment3,RULE-10-8,Yes,Refine,Import
-c,misra-c-2012,Amendment3,RULE-21-11,Yes,Clarification,Import
-c,misra-c-2012,Amendment3,RULE-21-12,Yes,Replace,Easy
-c,misra-c-2012,Amendment4,RULE-11-3,Yes,Expand,Easy
-c,misra-c-2012,Amendment4,RULE-11-8,Yes,Expand,Easy
-c,misra-c-2012,Amendment4,RULE-13-2,Yes,Expand,Very Hard
-c,misra-c-2012,Amendment4,RULE-18-6,Yes,Expand,Medium
-c,misra-c-2012,Amendment4,RULE-18-8,Yes,Split,Easy
-c,misra-c-2012,Corrigendum2,RULE-2-2,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-2-7,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-3-1,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-8-6,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-8-9,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-9-4,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-18-3,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-1-4,Yes,Replace,Easy
-c,misra-c-2012,Corrigendum2,RULE-9-1,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-9-2,Yes,Refine,Import
-c,misra-c-2012,Corrigendum2,DIR-4-10,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-7-4,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-8-2,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-8-3,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-8-7,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-10-2,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-10-3,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-11-3,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-11-6,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-13-2,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-13-6,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-14-3,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-15-7,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-17-4,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-17-5,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-18-1,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-20-14,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-21-19,Yes,Clarification,Import
-c,misra-c-2012,Corrigendum2,RULE-21-20,Yes,Refine,Easy
-c,misra-c-2012,Corrigendum2,RULE-22-9,Yes,Clarification,Import
\ No newline at end of file
+language,standard,amendment,rule_id,queryable,implementation_category,implemented,difficulty
+c,misra-c-2012,Amendment3,DIR-4-6,Yes,Expand,No,Easy
+c,misra-c-2012,Amendment3,DIR-4-9,Yes,Refine,No,Easy
+c,misra-c-2012,Amendment3,DIR-4-11,Yes,Refine,No,Import
+c,misra-c-2012,Amendment3,RULE-1-4,Yes,Replace,No,Easy
+c,misra-c-2012,Amendment3,RULE-10-1,Yes,Replace,No,Easy
+c,misra-c-2012,Amendment3,RULE-10-3,Yes,Refine,No,Easy
+c,misra-c-2012,Amendment3,RULE-10-4,Yes,Refine,No,Import
+c,misra-c-2012,Amendment3,RULE-10-5,Yes,Expand,No,Easy
+c,misra-c-2012,Amendment3,RULE-10-7,Yes,Refine,No,Import
+c,misra-c-2012,Amendment3,RULE-10-8,Yes,Refine,No,Import
+c,misra-c-2012,Amendment3,RULE-21-11,Yes,Clarification,No,Import
+c,misra-c-2012,Amendment3,RULE-21-12,Yes,Replace,No,Easy
+c,misra-c-2012,Amendment4,RULE-11-3,Yes,Expand,No,Easy
+c,misra-c-2012,Amendment4,RULE-11-8,Yes,Expand,No,Easy
+c,misra-c-2012,Amendment4,RULE-13-2,Yes,Expand,No,Very Hard
+c,misra-c-2012,Amendment4,RULE-18-6,Yes,Expand,No,Medium
+c,misra-c-2012,Amendment4,RULE-18-8,Yes,Split,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-2-2,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-2-7,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-3-1,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-8-6,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-8-9,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-9-4,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-18-3,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-1-4,Yes,Replace,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-9-1,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-9-2,Yes,Refine,No,Import
+c,misra-c-2012,Corrigendum2,DIR-4-10,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-7-4,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-8-2,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-8-3,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-8-7,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-10-2,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-10-3,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-11-3,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-11-6,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-13-2,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-13-6,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-14-3,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-15-7,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-17-4,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-17-5,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-18-1,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-20-14,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-21-19,Yes,Clarification,No,Import
+c,misra-c-2012,Corrigendum2,RULE-21-20,Yes,Refine,No,Easy
+c,misra-c-2012,Corrigendum2,RULE-22-9,Yes,Clarification,No,Import
\ No newline at end of file

From 9c0e6baa1ef4a6d890662bf7c18dcdb523fac63a Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 11:28:02 -0700
Subject: [PATCH 152/435] clang format

---
 c/misra/test/rules/RULE-6-3/test.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/c/misra/test/rules/RULE-6-3/test.c b/c/misra/test/rules/RULE-6-3/test.c
index 74b7cb86ea..1de648d294 100644
--- a/c/misra/test/rules/RULE-6-3/test.c
+++ b/c/misra/test/rules/RULE-6-3/test.c
@@ -1,21 +1,21 @@
 union U1 {
-  int x; // COMPLIANT
+  int x;  // COMPLIANT
   char y; // COMPLIANT
 };
 
 union U2 {
-  int x: 2; // NON-COMPLIANT
-  char y; // COMPLIANT
+  int x : 2; // NON-COMPLIANT
+  char y;    // COMPLIANT
 };
 
 union U3 {
-    struct str {
-        int x: 4; // COMPLIANT
-        int y: 2; // COMPLIANT
-    };
+  struct str {
+    int x : 4; // COMPLIANT
+    int y : 2; // COMPLIANT
+  };
 };
 
 union U4 {
   char x;
-  int :0; // NON-COMPLIANT
+  int : 0; // NON-COMPLIANT
 };
\ No newline at end of file

From ba844d1698b99247842f830dfbfa871f46d1fa98 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 11:35:20 -0700
Subject: [PATCH 153/435] Format codeql query

---
 .../src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
index c91f25da10..5fcf938046 100644
--- a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
+++ b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
@@ -18,5 +18,6 @@ from BitField field, Union u
 where
   not isExcluded(field, BitfieldTypes2Package::bitFieldDeclaredAsMemberOfAUnionQuery()) and
   u.getAField() = field
-select
-  field, "Union member " + field.getName() + " is declared as a bit field which relies on implementation-specific behavior."
\ No newline at end of file
+select field,
+  "Union member " + field.getName() +
+    " is declared as a bit field which relies on implementation-specific behavior."

From 58fa16a218df4273db22ed24ba795263833567e6 Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Tue, 17 Sep 2024 00:16:26 +0000
Subject: [PATCH 154/435] Detect compilations with no warnings when '-w' flag
 is present.

Gcc may be compiled to auto include warnings such as -Wformat. However,
passing in `-w` will suppress the enabled format warnings. The previous
query would not raise an issue, as it saw the `-Wformat` flag etc, even
though if `-w` was present, causing gcc to run with no warnings enabled.
---
 .../CompilerWarningLevelNotInCompliance.ql       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
index bd98ad9162..b22ffa9e29 100644
--- a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
+++ b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
@@ -18,15 +18,19 @@
 import cpp
 import codingstandards.cpp.autosar
 
-predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%") }
+class CompilationWithNoWarnings extends Compilation {
+  CompilationWithNoWarnings() {
+    getAnArgument() = "-w"
+    or not getAnArgument().regexpMatch("-W[\\w=-]+")
+  }
+}
 
-predicate hasWarningOption(Compilation c) { c.getAnArgument().regexpMatch("-W[\\w=-]+") }
+predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%") }
 
 from File f
 where
   not isExcluded(f, ToolchainPackage::compilerWarningLevelNotInComplianceQuery()) and
-  exists(Compilation c | f = c.getAFileCompiled() |
-    not hasResponseFileArgument(c) and
-    not hasWarningOption(c)
+  exists(CompilationWithNoWarnings c | f = c.getAFileCompiled() |
+    not hasResponseFileArgument(c)
   )
-select f, "No warning-level options were used in the compilation of '" + f.getBaseName() + "'."
+select f, "No warning-level options were used in the compilation of '" + f.getBaseName() + "'."
\ No newline at end of file

From 89464ce521164ce6bc3b679ddbc7f9b3b561b4f0 Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Tue, 17 Sep 2024 00:42:28 +0000
Subject: [PATCH 155/435] fix formatting

---
 .../rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
index b22ffa9e29..f21a70e776 100644
--- a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
+++ b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
@@ -20,8 +20,8 @@ import codingstandards.cpp.autosar
 
 class CompilationWithNoWarnings extends Compilation {
   CompilationWithNoWarnings() {
-    getAnArgument() = "-w"
-    or not getAnArgument().regexpMatch("-W[\\w=-]+")
+    getAnArgument() = "-w" or
+    not getAnArgument().regexpMatch("-W[\\w=-]+")
   }
 }
 
@@ -30,7 +30,5 @@ predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%
 from File f
 where
   not isExcluded(f, ToolchainPackage::compilerWarningLevelNotInComplianceQuery()) and
-  exists(CompilationWithNoWarnings c | f = c.getAFileCompiled() |
-    not hasResponseFileArgument(c)
-  )
+  exists(CompilationWithNoWarnings c | f = c.getAFileCompiled() | not hasResponseFileArgument(c))
 select f, "No warning-level options were used in the compilation of '" + f.getBaseName() + "'."
\ No newline at end of file

From 88872a42fa12d84337ce712245be550744f30218 Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Tue, 17 Sep 2024 22:32:56 +0000
Subject: [PATCH 156/435] Update test expectations -- codeql run test expects
 noncompliance.

---
 .../CompilerWarningLevelNotInCompliance.expected   |  1 +
 ...pilerWarningLevelNotInCompliance.expected.clang |  0
 ...ompilerWarningLevelNotInCompliance.expected.gcc |  0
 ...ompilerWarningLevelNotInCompliance.expected.qcc |  0
 .../test/rules/A1-1-2.2/Wcast-function-type.cpp    | 14 +++++++++++++-
 .../CompilerWarningLevelNotInCompliance.expected   |  1 +
 ...pilerWarningLevelNotInCompliance.expected.clang |  0
 ...ompilerWarningLevelNotInCompliance.expected.gcc |  0
 ...ompilerWarningLevelNotInCompliance.expected.qcc |  0
 cpp/autosar/test/rules/A1-1-2/Wall.cpp             | 12 +++++++++++-
 10 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.clang
 create mode 100644 cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.gcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.qcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.clang
 create mode 100644 cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.gcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.qcc

diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected
index e69de29bb2..81a5c4327e 100644
--- a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected
+++ b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected
@@ -0,0 +1 @@
+| Wcast-function-type.cpp:0:0:0:0 | Wcast-function-type.cpp | No warning-level options were used in the compilation of 'Wcast-function-type.cpp'. |
diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.clang b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.clang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.gcc b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.gcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.qcc b/cpp/autosar/test/rules/A1-1-2.2/CompilerWarningLevelNotInCompliance.expected.qcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp b/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
index f405349bbb..79e42b4039 100644
--- a/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
+++ b/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
@@ -1,2 +1,14 @@
 // semmle-extractor-options: --clang -std=c++14 -Wcast-function-type
-// COMPLIANT
\ No newline at end of file
+// COMPLIAN
+
+// NOTE: When tested with `codeql test run`, the test extractor provides `-w`
+// which overrides `-Wcast-function-type` and causes this test case to be
+// non-compliant.
+//
+// However, when tested with our compiler matrix tests, this test db is built
+// via `codeql database create --command="..."`, and the `-w` flag will NOT be
+// used. This means the `-Wcast-function-type` flag is active and the test case
+// is compliant.
+//
+// Therefore, the .expected file for this test expects non-compliance, and the
+// .expected.gcc and .expected.clang files expect this test to be compliant.
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
index e69de29bb2..82ff1c0c36 100644
--- a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
+++ b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
@@ -0,0 +1 @@
+| Wall.cpp:0:0:0:0 | Wall.cpp | No warning-level options were used in the compilation of 'Wall.cpp'. |
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.clang b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.clang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.gcc b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.gcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.qcc b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected.qcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2/Wall.cpp b/cpp/autosar/test/rules/A1-1-2/Wall.cpp
index cb21e0601e..b42189a8d1 100644
--- a/cpp/autosar/test/rules/A1-1-2/Wall.cpp
+++ b/cpp/autosar/test/rules/A1-1-2/Wall.cpp
@@ -1,2 +1,12 @@
 // semmle-extractor-options: --clang -std=c++14 -Wall
-// COMPLIANT
\ No newline at end of file
+// COMPLIANT
+
+// NOTE: When tested with `codeql test run`, the test extractor provides `-w`
+// which overrides `-Wall` and causes this test case to be non-compliant.
+//
+// However, when tested with our compiler matrix tests, this test db is built
+// via `codeql database create --command="..."`, and the `-w` flag will NOT be
+// used. This means the `-Wall` flag is active and the test case is compliant.
+//
+// Therefore, the .expected file for this test expects non-compliance, and the
+// .expected.gcc and .expected.clang files expect this test to be compliant.
\ No newline at end of file

From 495b32e340bdb7531abdb93bab1f9a03cbe5f7cd Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Wed, 18 Sep 2024 00:18:59 +0000
Subject: [PATCH 157/435] Add newline to EOF

---
 .../src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
index f21a70e776..60efab251a 100644
--- a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
+++ b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
@@ -31,4 +31,4 @@ from File f
 where
   not isExcluded(f, ToolchainPackage::compilerWarningLevelNotInComplianceQuery()) and
   exists(CompilationWithNoWarnings c | f = c.getAFileCompiled() | not hasResponseFileArgument(c))
-select f, "No warning-level options were used in the compilation of '" + f.getBaseName() + "'."
\ No newline at end of file
+select f, "No warning-level options were used in the compilation of '" + f.getBaseName() + "'."

From 4b821be80dff4af5f0c60762c3615b8d7f6a5ef4 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 14:35:40 -0700
Subject: [PATCH 158/435] Add changelog.

---
 change_notes/2024-9-20-a1-1-2-improvements.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-9-20-a1-1-2-improvements.md

diff --git a/change_notes/2024-9-20-a1-1-2-improvements.md b/change_notes/2024-9-20-a1-1-2-improvements.md
new file mode 100644
index 0000000000..25e393954b
--- /dev/null
+++ b/change_notes/2024-9-20-a1-1-2-improvements.md
@@ -0,0 +1,2 @@
+- `A1-1-2` - `CompilerWarningLevelNotInCompliance.ql`:
+    - Report non-compliance for compilations that use the error-suppressing `-w` flag.

From aa945830dd6dce3300ace0f27c6c09e4b3e76ba9 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 14:39:29 -0700
Subject: [PATCH 159/435] fix typo

---
 cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp b/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
index 79e42b4039..bc48268931 100644
--- a/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
+++ b/cpp/autosar/test/rules/A1-1-2.2/Wcast-function-type.cpp
@@ -1,5 +1,5 @@
 // semmle-extractor-options: --clang -std=c++14 -Wcast-function-type
-// COMPLIAN
+// COMPLIANT
 
 // NOTE: When tested with `codeql test run`, the test extractor provides `-w`
 // which overrides `-Wcast-function-type` and causes this test case to be
@@ -11,4 +11,4 @@
 // is compliant.
 //
 // Therefore, the .expected file for this test expects non-compliance, and the
-// .expected.gcc and .expected.clang files expect this test to be compliant.
\ No newline at end of file
+// .expected.gcc and .expected.clang files expect this test to be compliant.

From 24adddae97cc5b19bc954a8eecf0f7aa0ec6adbc Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 15:39:07 -0700
Subject: [PATCH 160/435] Add script that verifies amendements.csv, add to
 workflow.

---
 .github/workflows/validate-package-files.yml |   8 +-
 amendments.csv                               |  99 +++++++-------
 scripts/validate-amendments-csv.py           | 128 +++++++++++++++++++
 3 files changed, 184 insertions(+), 51 deletions(-)
 create mode 100644 scripts/validate-amendments-csv.py

diff --git a/.github/workflows/validate-package-files.yml b/.github/workflows/validate-package-files.yml
index 0573b00590..28f265c197 100644
--- a/.github/workflows/validate-package-files.yml
+++ b/.github/workflows/validate-package-files.yml
@@ -56,4 +56,10 @@ jobs:
           find rule_packages/$LANGUAGE -name \*.json -exec basename {} .json \; | xargs python scripts/generate_rules/generate_package_files.py $LANGUAGE
           git diff
           git diff --compact-summary
-          git diff --quiet
\ No newline at end of file
+          git diff --quiet
+
+      - name: Validate Amendments
+        env:
+          LANGUAGE: ${{ matrix.language }}
+        run: |
+          python scripts/verify_amendments-csv.py $LANGUAGE
\ No newline at end of file
diff --git a/amendments.csv b/amendments.csv
index ae6c85e7d1..cd0085493e 100644
--- a/amendments.csv
+++ b/amendments.csv
@@ -1,50 +1,49 @@
-language,standard,amendment,rule_id,queryable,implementation_category,implemented,difficulty
-c,misra-c-2012,Amendment3,DIR-4-6,Yes,Expand,No,Easy
-c,misra-c-2012,Amendment3,DIR-4-9,Yes,Refine,No,Easy
-c,misra-c-2012,Amendment3,DIR-4-11,Yes,Refine,No,Import
-c,misra-c-2012,Amendment3,RULE-1-4,Yes,Replace,No,Easy
-c,misra-c-2012,Amendment3,RULE-10-1,Yes,Replace,No,Easy
-c,misra-c-2012,Amendment3,RULE-10-3,Yes,Refine,No,Easy
-c,misra-c-2012,Amendment3,RULE-10-4,Yes,Refine,No,Import
-c,misra-c-2012,Amendment3,RULE-10-5,Yes,Expand,No,Easy
-c,misra-c-2012,Amendment3,RULE-10-7,Yes,Refine,No,Import
-c,misra-c-2012,Amendment3,RULE-10-8,Yes,Refine,No,Import
-c,misra-c-2012,Amendment3,RULE-21-11,Yes,Clarification,No,Import
-c,misra-c-2012,Amendment3,RULE-21-12,Yes,Replace,No,Easy
-c,misra-c-2012,Amendment4,RULE-11-3,Yes,Expand,No,Easy
-c,misra-c-2012,Amendment4,RULE-11-8,Yes,Expand,No,Easy
-c,misra-c-2012,Amendment4,RULE-13-2,Yes,Expand,No,Very Hard
-c,misra-c-2012,Amendment4,RULE-18-6,Yes,Expand,No,Medium
-c,misra-c-2012,Amendment4,RULE-18-8,Yes,Split,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-2-2,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-2-7,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-3-1,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-8-6,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-8-9,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-9-4,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-18-3,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-1-4,Yes,Replace,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-9-1,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-9-2,Yes,Refine,No,Import
-c,misra-c-2012,Corrigendum2,DIR-4-10,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-7-4,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-8-2,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-8-3,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-8-7,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-10-1,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-10-2,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-10-3,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-11-3,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-11-6,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-13-2,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-13-6,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-14-3,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-15-7,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-17-4,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-17-5,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-18-1,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-20-14,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-21-19,Yes,Clarification,No,Import
-c,misra-c-2012,Corrigendum2,RULE-21-20,Yes,Refine,No,Easy
-c,misra-c-2012,Corrigendum2,RULE-22-9,Yes,Clarification,No,Import
\ No newline at end of file
+language,standard,amendment,rule_id,supportable,implementation_category,implemented,difficulty
+c,MISRA-C-2012,Amendment3,DIR-4-6,Yes,Expand,No,Easy
+c,MISRA-C-2012,Amendment3,DIR-4-9,Yes,Refine,No,Easy
+c,MISRA-C-2012,Amendment3,DIR-4-11,Yes,Refine,No,Import
+c,MISRA-C-2012,Amendment3,RULE-1-4,Yes,Replace,No,Easy
+c,MISRA-C-2012,Amendment3,RULE-10-1,Yes,Replace,No,Easy
+c,MISRA-C-2012,Amendment3,RULE-10-3,Yes,Refine,No,Easy
+c,MISRA-C-2012,Amendment3,RULE-10-4,Yes,Refine,No,Import
+c,MISRA-C-2012,Amendment3,RULE-10-5,Yes,Expand,No,Easy
+c,MISRA-C-2012,Amendment3,RULE-10-7,Yes,Refine,No,Import
+c,MISRA-C-2012,Amendment3,RULE-10-8,Yes,Refine,No,Import
+c,MISRA-C-2012,Amendment3,RULE-21-11,Yes,Clarification,No,Import
+c,MISRA-C-2012,Amendment3,RULE-21-12,Yes,Replace,No,Easy
+c,MISRA-C-2012,Amendment4,RULE-11-3,Yes,Expand,No,Easy
+c,MISRA-C-2012,Amendment4,RULE-11-8,Yes,Expand,No,Easy
+c,MISRA-C-2012,Amendment4,RULE-13-2,Yes,Expand,No,Very Hard
+c,MISRA-C-2012,Amendment4,RULE-18-6,Yes,Expand,No,Medium
+c,MISRA-C-2012,Amendment4,RULE-18-8,Yes,Split,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-2-2,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-2-7,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-3-1,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-8-6,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-8-9,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-9-4,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-10-1,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-18-3,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-1-4,Yes,Replace,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-9-1,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-9-2,Yes,Refine,No,Import
+c,MISRA-C-2012,Corrigendum2,DIR-4-10,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-7-4,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-8-2,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-8-3,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-8-7,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-10-2,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-10-3,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-11-3,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-11-6,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-13-2,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-13-6,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-14-3,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-15-7,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-17-4,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-17-5,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-18-1,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-20-14,No,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-21-19,Yes,Clarification,No,Import
+c,MISRA-C-2012,Corrigendum2,RULE-21-20,Yes,Refine,No,Easy
+c,MISRA-C-2012,Corrigendum2,RULE-22-9,Yes,Clarification,No,Import
\ No newline at end of file
diff --git a/scripts/validate-amendments-csv.py b/scripts/validate-amendments-csv.py
new file mode 100644
index 0000000000..9d83b7d0c9
--- /dev/null
+++ b/scripts/validate-amendments-csv.py
@@ -0,0 +1,128 @@
+from collections import defaultdict
+import csv
+import os
+from pathlib import Path
+import sys
+import json
+
+help_statement = """
+Usage: {script_name}
+
+A script which detects invalid entries in amendments.csv.
+"""
+
+if (len(sys.argv) == 2 and sys.argv[1] == "--help"):
+    print(help_statement.format(script_name=sys.argv[0]))
+    sys.exit(0)
+
+if not len(sys.argv) == 2:
+    print("Error: incorrect number of arguments", file=sys.stderr)
+    print("Usage: " + sys.argv[0] + " [--help]", file=sys.stderr)
+    sys.exit(1)
+
+repo_root = Path(__file__).parent.parent
+rules_file_path = repo_root.joinpath('rules.csv')
+amendments_file_path = repo_root.joinpath('amendments.csv')
+language_name = sys.argv[1]
+
+failed = False
+
+rules_from_csv = {}
+try:
+    rules_file = open(rules_file_path, "r")
+except PermissionError:
+    print("Error: No permission to read the rules file located at '" + str(rules_file_path) + "'")
+    sys.exit(1)
+else:
+    with rules_file:
+        rules_reader = csv.reader(rules_file)
+        # Skip header row
+        next(rules_reader, None)
+        for rule in rules_reader:
+            language = rule[0]
+            rule_id = rule[2]
+
+            # only validate rules for the specified language 
+            if not language == language_name:
+                continue 
+
+            rule_dict = {
+                "standard": rule[1],
+                "rule_id": rule_id,
+                "supportable": rule[3]
+            }
+            rules_from_csv[rule_id] = rule_dict
+
+print(f"Found {len(rules_from_csv)} rules.")
+print(f"Verifying amendments")
+
+seen_amendments = set()
+try:
+    amendments_file = open(amendments_file_path, "r")
+except PermissionError:
+    print("Error: No permission to read the amendments file located at '" + str(amendments_file_path) + "'")
+    sys.exit(1)
+else:
+    with amendments_file:
+        amendments_reader = csv.reader(amendments_file)
+        # Skip header row
+        next(amendments_reader, None)
+        for amendment in amendments_reader:
+            language = amendment[0]
+
+            # only validate rules for the specified language 
+            if not language == language_name:
+                continue 
+
+            if len(amendment) != 8:
+                print(f"🔴 Error: amendment {amendment} has wrong number of fields")
+                failed = True
+                continue
+
+            standard = amendment[1]
+            amendment_name = amendment[2]
+            rule_id = amendment[3]
+            supportable = amendment[4]
+            implemented = amendment[6]
+            amendment_id = f"{rule_id}-{amendment_name}"
+
+            if not rule_id in rules_from_csv:
+                print(f"🔴 Error: Amendment {amendment_id} references rule {rule_id}, not found in rules.csv")
+                failed = True
+                continue
+
+            rule = rules_from_csv[rule_id]
+
+            if rule["standard"] != standard:
+                print(f"🟡 Invalid: {amendment_id} has a different standard than the {rule_id} in rules.csv")
+                print(f"   '{standard}' vs '{rule['standard']}'")
+                failed = True
+
+            if supportable not in {"Yes", "No"}:
+                print(f"🟡 Invalid: {amendment_id} 'supportable' field should be 'Yes' or 'No'.")
+                print(f"   got '{supportable}'")
+                failed = True
+
+            if rule["supportable"] != supportable:
+                print(f"🟡 Invalid: {amendment_id} supportable does not match rules.csv supportable.")
+                print(f"   '{supportable}' vs '{rule['supportable']}'")
+                failed = True
+
+            if implemented not in {"Yes", "No"}:
+                print(f"🟡 Invalid: {amendment_id} 'implemented' field should be 'Yes' or 'No'.")
+                print(f"   got '{implemented}'")
+                failed = True
+
+            if amendment_id in seen_amendments:
+                print(f"🔴 Error: {amendment_id} has duplicate entries")
+                failed = True
+
+            seen_amendments.add(amendment_id)
+
+print(f"Checked {len(seen_amendments)} amendments.")
+
+if failed:
+    print("❌ FAILED: Validity issues found in amendments.csv!")
+    sys.exit(1)
+else:
+    print("✅ PASSED: No validity issues found in amendments.csv! 🎉")

From 1c0353e51c3e99e4abcbaee4b3164ad708c3bfd1 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 20 Sep 2024 15:47:50 -0700
Subject: [PATCH 161/435] Fix validation script name in workflow yaml

---
 .github/workflows/validate-package-files.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/validate-package-files.yml b/.github/workflows/validate-package-files.yml
index 28f265c197..0e38e4a1da 100644
--- a/.github/workflows/validate-package-files.yml
+++ b/.github/workflows/validate-package-files.yml
@@ -62,4 +62,4 @@ jobs:
         env:
           LANGUAGE: ${{ matrix.language }}
         run: |
-          python scripts/verify_amendments-csv.py $LANGUAGE
\ No newline at end of file
+          python scripts/validate-amendments-csv.py $LANGUAGE
\ No newline at end of file

From 941e1d6d175abcaca2d959c1613040fba71a506e Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Tue, 24 Sep 2024 16:23:10 +0100
Subject: [PATCH 162/435] Fail "Validate test" workflow if test runs fail

---
 .github/workflows/codeql_unit_tests.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index 62660d973d..e23377af9a 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -39,6 +39,7 @@ jobs:
     needs: prepare-unit-test-matrix
 
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.prepare-unit-test-matrix.outputs.matrix) }}
@@ -163,6 +164,12 @@ jobs:
     needs: run-test-suites
     runs-on: ubuntu-22.04
     steps:
+      - name: Check if a dependent job failed to complete
+        if: ${{ failure() }}
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Test run job failed')
       - name: Collect test results
         uses: actions/download-artifact@v3
 

From 1651c1f30dda8df6f2e8553174b7e89fa1087886 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Tue, 24 Sep 2024 16:24:21 +0100
Subject: [PATCH 163/435] Introduce deliberate compilation error

---
 .../rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql b/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
index 9503024671..06c9274e8c 100644
--- a/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
+++ b/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
@@ -15,7 +15,7 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.usageofassemblernotdocumented.UsageOfAssemblerNotDocumented
 
-class UsageOfAssemblyLanguageShouldBeDocumentedQuery extends UsageOfAssemblerNotDocumentedSharedQuery
+class UsageOfAssemblyLanguageShouldBeDocumentedQuery  UsageOfAssemblerNotDocumentedSharedQuery
 {
   UsageOfAssemblyLanguageShouldBeDocumentedQuery() {
     this = Language2Package::usageOfAssemblyLanguageShouldBeDocumentedQuery()

From 104bdc7535c8c983cbde5832ab55a093e59c6def Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Tue, 24 Sep 2024 13:04:17 -0700
Subject: [PATCH 164/435] Implement Misra-c Noreturn rule package.

Covers rules 17-9 through 17-11, regarding the use of the _Noreturn attribute.
---
 .../NonVoidReturnTypeOfNoreturnFunction.ql    | 23 ++++++
 ...onWithNoReturningBranchShouldBeNoreturn.ql | 24 ++++++
 .../ReturnStatementInNoreturnFunction.ql      | 24 ++++++
 ...nVoidReturnTypeOfNoreturnFunction.expected |  1 +
 .../NonVoidReturnTypeOfNoreturnFunction.qlref |  1 +
 c/misra/test/rules/RULE-17-10/test.c          | 24 ++++++
 ...NoReturningBranchShouldBeNoreturn.expected |  4 +
 ...ithNoReturningBranchShouldBeNoreturn.qlref |  1 +
 c/misra/test/rules/RULE-17-11/test.c          | 80 +++++++++++++++++++
 ...ReturnStatementInNoreturnFunction.expected |  2 +
 .../ReturnStatementInNoreturnFunction.qlref   |  1 +
 c/misra/test/rules/RULE-17-9/test.c           | 45 +++++++++++
 .../cpp/exclusions/c/NoReturn.qll             | 61 ++++++++++++++
 .../cpp/exclusions/c/RuleMetadata.qll         |  3 +
 rule_packages/c/NoReturn.json                 | 55 +++++++++++++
 15 files changed, 349 insertions(+)
 create mode 100644 c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
 create mode 100644 c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
 create mode 100644 c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
 create mode 100644 c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected
 create mode 100644 c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.qlref
 create mode 100644 c/misra/test/rules/RULE-17-10/test.c
 create mode 100644 c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
 create mode 100644 c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.qlref
 create mode 100644 c/misra/test/rules/RULE-17-11/test.c
 create mode 100644 c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
 create mode 100644 c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref
 create mode 100644 c/misra/test/rules/RULE-17-9/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/NoReturn.qll
 create mode 100644 rule_packages/c/NoReturn.json

diff --git a/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
new file mode 100644
index 0000000000..162403f579
--- /dev/null
+++ b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
@@ -0,0 +1,23 @@
+/**
+ * @id c/misra/non-void-return-type-of-noreturn-function
+ * @name RULE-17-10: A function declared with _noreturn shall have a return type of void
+ * @description Function declared with _noreturn will by definition not return a value, and should
+ *              be declared to return void.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-17-10
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from Function f, Type returnType
+where
+  not isExcluded(f, NoReturnPackage::nonVoidReturnTypeOfNoreturnFunctionQuery()) and
+  f.getASpecifier().getName() = "noreturn" and
+  returnType = f.getType() and
+  not returnType instanceof VoidType
+select
+  f, "The function " + f.getName() + " is declared _noreturn but has a return type of " + returnType.toString() + "."
diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
new file mode 100644
index 0000000000..a711658fcc
--- /dev/null
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -0,0 +1,24 @@
+/**
+ * @id c/misra/function-with-no-returning-branch-should-be-noreturn
+ * @name RULE-17-11: A function without a branch that returns shall be declared with _Noreturn
+ * @description Functions which cannot return should be declared with _Noreturn.
+ * @kind problem
+ * @precision high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-17-11
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from Function f
+where
+  not isExcluded(f, NoReturnPackage::returnStatementInNoreturnFunctionQuery()) and
+  not f.getASpecifier().getName() = "noreturn" and
+  not exists(ReturnStmt s |
+    f = s.getEnclosingFunction() and
+    s.getBasicBlock().isReachable()
+  )
+select
+  f, "The function " + f.getName() + " cannot return and should be declared attribute _Noreturn."
diff --git a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
new file mode 100644
index 0000000000..0c291c20af
--- /dev/null
+++ b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
@@ -0,0 +1,24 @@
+/**
+ * @id c/misra/return-statement-in-noreturn-function
+ * @name RULE-17-9: Verify that a function declared with _Noreturn does not return
+ * @description Returning inside a function declared with _Noreturn is undefined behavior.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-17-9
+ *       external/misra/obligation/mandatory
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from Function f
+where
+  not isExcluded(f, NoReturnPackage::returnStatementInNoreturnFunctionQuery()) and
+  f.getASpecifier().getName() = "noreturn" and
+  exists(ReturnStmt s |
+    f = s.getEnclosingFunction() and
+    s.getBasicBlock().isReachable()
+  )
+select
+  f, "The function " + f.getName() + " declared with attribute _Noreturn returns a value."
diff --git a/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected b/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected
new file mode 100644
index 0000000000..2ec1a0ac6c
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.qlref b/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.qlref
new file mode 100644
index 0000000000..6726b6957a
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.qlref
@@ -0,0 +1 @@
+rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-10/test.c b/c/misra/test/rules/RULE-17-10/test.c
new file mode 100644
index 0000000000..5e3aadf165
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-10/test.c
@@ -0,0 +1,24 @@
+#include "stdlib.h"
+
+void f1(); // COMPLIANT
+int f2(); // COMPLIANT
+_Noreturn void f3(); // COMPLIANT
+_Noreturn int f4(); // NON-COMPLIANT
+
+void f5() { // COMPLIANT
+}
+
+int f6() { // COMPLIANT
+  return 0;
+}
+
+_Noreturn void f7() { // COMPLIANT
+  abort();
+}
+
+_Noreturn int f8() { // NON-COMPLIANT
+  abort();
+  return 0;
+}
+
+_Noreturn void* f9(); // NON-COMPLIANT
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
new file mode 100644
index 0000000000..5141f0c9c3
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
@@ -0,0 +1,4 @@
+| test.c:7:6:7:21 | test_noreturn_f2 | The function test_noreturn_f2 cannot return and should be declared attribute _Noreturn. |
+| test.c:19:6:19:21 | test_noreturn_f4 | The function test_noreturn_f4 cannot return and should be declared attribute _Noreturn. |
+| test.c:48:6:48:21 | test_noreturn_f8 | The function test_noreturn_f8 cannot return and should be declared attribute _Noreturn. |
+| test.c:64:6:64:22 | test_noreturn_f10 | The function test_noreturn_f10 cannot return and should be declared attribute _Noreturn. |
diff --git a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.qlref b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.qlref
new file mode 100644
index 0000000000..feb6f40804
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.qlref
@@ -0,0 +1 @@
+rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-11/test.c b/c/misra/test/rules/RULE-17-11/test.c
new file mode 100644
index 0000000000..3d0144d6f0
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-11/test.c
@@ -0,0 +1,80 @@
+#include "stdlib.h"
+
+_Noreturn void test_noreturn_f1(int i) { // COMPLIANT
+  abort();
+}
+
+void test_noreturn_f2(int i) { // NON_COMPLIANT
+  abort();
+}
+
+
+_Noreturn void test_noreturn_f3(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  exit(1);
+}
+
+void test_noreturn_f4(int i) { // NON_COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  exit(1);
+}
+
+void test_noreturn_f5(int i) { // COMPLIANT
+  if (i > 0) {
+    return;
+  }
+  exit(1);
+}
+
+void test_noreturn_f6(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  if (i < 0) {
+    abort();
+  }
+}
+
+void test_noreturn_f7(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+}
+
+void test_noreturn_f8(int i) { // NON_COMPLIANT
+  if (i > 0) {
+    abort();
+  } else {
+    abort();
+  }
+}
+
+_Noreturn void test_noreturn_f9(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  } else {
+    abort();
+  }
+}
+
+void test_noreturn_f10(int i) { // NON_COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  while (1) {
+    i = 5;
+  }
+}
+
+_Noreturn void test_noreturn_f11(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  while (1) {
+    i = 5;
+  }
+}
diff --git a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
new file mode 100644
index 0000000000..1e6a6ab180
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
@@ -0,0 +1,2 @@
+| test.c:7:16:7:31 | test_noreturn_f2 | The function test_noreturn_f2 declared with attribute _Noreturn returns a value. |
+| test.c:32:16:32:31 | test_noreturn_f5 | The function test_noreturn_f5 declared with attribute _Noreturn returns a value. |
diff --git a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref
new file mode 100644
index 0000000000..eaa647d8a4
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref
@@ -0,0 +1 @@
+rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-9/test.c b/c/misra/test/rules/RULE-17-9/test.c
new file mode 100644
index 0000000000..c3ff575672
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-9/test.c
@@ -0,0 +1,45 @@
+#include "stdlib.h"
+
+_Noreturn void test_noreturn_f1(int i) { // COMPLIANT
+  abort();
+}
+
+_Noreturn void test_noreturn_f2(int i) { // NON_COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  if (i < 0) {
+    abort();
+  }
+}
+
+_Noreturn void test_noreturn_f3(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  exit(1);
+}
+
+void test_noreturn_f4(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  if (i < 0) {
+    abort();
+  }
+}
+
+_Noreturn void test_noreturn_f5(int i) { // NON_COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+}
+
+_Noreturn void test_noreturn_f6(int i) { // COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+  while (1) {
+    i = 5;
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/NoReturn.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/NoReturn.qll
new file mode 100644
index 0000000000..07b9360213
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/NoReturn.qll
@@ -0,0 +1,61 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype NoReturnQuery =
+  TNonVoidReturnTypeOfNoreturnFunctionQuery() or
+  TFunctionWithNoReturningBranchShouldBeNoreturnQuery() or
+  TReturnStatementInNoreturnFunctionQuery()
+
+predicate isNoReturnQueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `nonVoidReturnTypeOfNoreturnFunction` query
+    NoReturnPackage::nonVoidReturnTypeOfNoreturnFunctionQuery() and
+  queryId =
+    // `@id` for the `nonVoidReturnTypeOfNoreturnFunction` query
+    "c/misra/non-void-return-type-of-noreturn-function" and
+  ruleId = "RULE-17-10" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `functionWithNoReturningBranchShouldBeNoreturn` query
+    NoReturnPackage::functionWithNoReturningBranchShouldBeNoreturnQuery() and
+  queryId =
+    // `@id` for the `functionWithNoReturningBranchShouldBeNoreturn` query
+    "c/misra/function-with-no-returning-branch-should-be-noreturn" and
+  ruleId = "RULE-17-11" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `returnStatementInNoreturnFunction` query
+    NoReturnPackage::returnStatementInNoreturnFunctionQuery() and
+  queryId =
+    // `@id` for the `returnStatementInNoreturnFunction` query
+    "c/misra/return-statement-in-noreturn-function" and
+  ruleId = "RULE-17-9" and
+  category = "mandatory"
+}
+
+module NoReturnPackage {
+  Query nonVoidReturnTypeOfNoreturnFunctionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `nonVoidReturnTypeOfNoreturnFunction` query
+      TQueryC(TNoReturnPackageQuery(TNonVoidReturnTypeOfNoreturnFunctionQuery()))
+  }
+
+  Query functionWithNoReturningBranchShouldBeNoreturnQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `functionWithNoReturningBranchShouldBeNoreturn` query
+      TQueryC(TNoReturnPackageQuery(TFunctionWithNoReturningBranchShouldBeNoreturnQuery()))
+  }
+
+  Query returnStatementInNoreturnFunctionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `returnStatementInNoreturnFunction` query
+      TQueryC(TNoReturnPackageQuery(TReturnStatementInNoreturnFunctionQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index c2771f4171..b3ed02f204 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -42,6 +42,7 @@ import Memory1
 import Memory2
 import Memory3
 import Misc
+import NoReturn
 import OutOfBounds
 import Pointers1
 import Pointers2
@@ -113,6 +114,7 @@ newtype TCQuery =
   TMemory2PackageQuery(Memory2Query q) or
   TMemory3PackageQuery(Memory3Query q) or
   TMiscPackageQuery(MiscQuery q) or
+  TNoReturnPackageQuery(NoReturnQuery q) or
   TOutOfBoundsPackageQuery(OutOfBoundsQuery q) or
   TPointers1PackageQuery(Pointers1Query q) or
   TPointers2PackageQuery(Pointers2Query q) or
@@ -184,6 +186,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isMemory2QueryMetadata(query, queryId, ruleId, category) or
   isMemory3QueryMetadata(query, queryId, ruleId, category) or
   isMiscQueryMetadata(query, queryId, ruleId, category) or
+  isNoReturnQueryMetadata(query, queryId, ruleId, category) or
   isOutOfBoundsQueryMetadata(query, queryId, ruleId, category) or
   isPointers1QueryMetadata(query, queryId, ruleId, category) or
   isPointers2QueryMetadata(query, queryId, ruleId, category) or
diff --git a/rule_packages/c/NoReturn.json b/rule_packages/c/NoReturn.json
new file mode 100644
index 0000000000..1cb4d02ab4
--- /dev/null
+++ b/rule_packages/c/NoReturn.json
@@ -0,0 +1,55 @@
+{
+  "MISRA-C-2012": {
+    "RULE-17-10": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Function declared with _noreturn will by definition not return a value, and should be declared to return void.",
+          "kind": "problem",
+          "name": "A function declared with _noreturn shall have a return type of void",
+          "precision": "very-high",
+          "severity": "recommendation",
+          "short_name": "NonVoidReturnTypeOfNoreturnFunction",
+          "tags": []
+        }
+      ],
+      "title": "A function declared with _noreturn shall have a return type of void"
+    },
+    "RULE-17-11": {
+      "properties": {
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "Functions which cannot return should be declared with _Noreturn.",
+          "kind": "problem",
+          "name": "A function without a branch that returns shall be declared with _Noreturn",
+          "precision": "high",
+          "severity": "recommendation",
+          "short_name": "FunctionWithNoReturningBranchShouldBeNoreturn",
+          "tags": []
+        }
+      ],
+      "title": "A function without a branch that returns shall be declared with _Noreturn"
+    },
+    "RULE-17-9": {
+      "properties": {
+        "obligation": "mandatory"
+      },
+      "queries": [
+        {
+          "description": "Returning inside a function declared with _Noreturn is undefined behavior.",
+          "kind": "problem",
+          "name": "Verify that a function declared with _Noreturn does not return",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ReturnStatementInNoreturnFunction",
+          "tags": []
+        }
+      ],
+      "title": "Verify that a function declared with _Noreturn does not return"
+    }
+  }
+}
\ No newline at end of file

From 778db73655fbbaebbcec2ec0a18958c1ae566e28 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Tue, 24 Sep 2024 13:43:47 -0700
Subject: [PATCH 165/435] Fix false positives by supporting
 __attribute__((noreturn)), format.

Use shared qll to avoid duplicating logic of detecting noreturn across both
specifiers and attributes, and to detect a possible returning stmt.
---
 c/common/src/codingstandards/c/Noreturn.qll   | 22 +++++++++++++++++++
 .../NonVoidReturnTypeOfNoreturnFunction.ql    |  9 ++++----
 ...onWithNoReturningBranchShouldBeNoreturn.ql | 14 ++++++------
 .../ReturnStatementInNoreturnFunction.ql      | 12 ++++------
 ...nVoidReturnTypeOfNoreturnFunction.expected |  5 ++++-
 c/misra/test/rules/RULE-17-10/test.c          | 10 +++++----
 ...NoReturningBranchShouldBeNoreturn.expected |  6 ++---
 c/misra/test/rules/RULE-17-11/test.c          | 13 ++++++++++-
 ...ReturnStatementInNoreturnFunction.expected |  1 +
 c/misra/test/rules/RULE-17-9/test.c           | 10 +++++++++
 10 files changed, 74 insertions(+), 28 deletions(-)
 create mode 100644 c/common/src/codingstandards/c/Noreturn.qll

diff --git a/c/common/src/codingstandards/c/Noreturn.qll b/c/common/src/codingstandards/c/Noreturn.qll
new file mode 100644
index 0000000000..eabe86b56e
--- /dev/null
+++ b/c/common/src/codingstandards/c/Noreturn.qll
@@ -0,0 +1,22 @@
+import cpp
+
+/**
+ * A function marked with _Noreturn or __attribute((noreturn))
+ */
+class NoreturnFunction extends Function {
+  NoreturnFunction() {
+    this.getASpecifier().getName() = "noreturn" or
+    this.getAnAttribute().getName() = "noreturn"
+  }
+}
+
+/**
+ * A function that may complete normally, and/or contains an explicit reachable
+ * return statement.
+ */
+predicate mayReturn(Function function) {
+  exists(ReturnStmt s |
+    function = s.getEnclosingFunction() and
+    s.getBasicBlock().isReachable()
+  )
+}
diff --git a/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
index 162403f579..3e6f2340fd 100644
--- a/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
@@ -12,12 +12,13 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.c.Noreturn
 
-from Function f, Type returnType
+from NoreturnFunction f, Type returnType
 where
   not isExcluded(f, NoReturnPackage::nonVoidReturnTypeOfNoreturnFunctionQuery()) and
-  f.getASpecifier().getName() = "noreturn" and
   returnType = f.getType() and
   not returnType instanceof VoidType
-select
-  f, "The function " + f.getName() + " is declared _noreturn but has a return type of " + returnType.toString() + "."
+select f,
+  "The function " + f.getName() + " is declared _noreturn but has a return type of " +
+    returnType.toString() + "."
diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index a711658fcc..c5d342c015 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -11,14 +11,14 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.c.Noreturn
 
 from Function f
 where
   not isExcluded(f, NoReturnPackage::returnStatementInNoreturnFunctionQuery()) and
-  not f.getASpecifier().getName() = "noreturn" and
-  not exists(ReturnStmt s |
-    f = s.getEnclosingFunction() and
-    s.getBasicBlock().isReachable()
-  )
-select
-  f, "The function " + f.getName() + " cannot return and should be declared attribute _Noreturn."
+  not f instanceof NoreturnFunction and
+  not mayReturn(f) and
+  f.hasDefinition() and
+  f.getName() != "main" // Allowed exception; _Noreturn main() is undefined behavior.
+select f,
+  "The function " + f.getName() + " cannot return and should be declared attribute _Noreturn."
diff --git a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
index 0c291c20af..7c23cf306f 100644
--- a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
@@ -11,14 +11,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.c.Noreturn
 
-from Function f
+from NoreturnFunction f
 where
   not isExcluded(f, NoReturnPackage::returnStatementInNoreturnFunctionQuery()) and
-  f.getASpecifier().getName() = "noreturn" and
-  exists(ReturnStmt s |
-    f = s.getEnclosingFunction() and
-    s.getBasicBlock().isReachable()
-  )
-select
-  f, "The function " + f.getName() + " declared with attribute _Noreturn returns a value."
+  mayReturn(f)
+select f, "The function " + f.getName() + " declared with attribute _Noreturn returns a value."
diff --git a/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected b/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected
index 2ec1a0ac6c..a94e37baa4 100644
--- a/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected
+++ b/c/misra/test/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.expected
@@ -1 +1,4 @@
-No expected results have yet been specified
\ No newline at end of file
+| test.c:6:15:6:16 | f4 | The function f4 is declared _noreturn but has a return type of int. |
+| test.c:19:15:19:16 | f8 | The function f8 is declared _noreturn but has a return type of int. |
+| test.c:24:17:24:18 | f9 | The function f9 is declared _noreturn but has a return type of void *. |
+| test.c:26:31:26:33 | f10 | The function f10 is declared _noreturn but has a return type of int. |
diff --git a/c/misra/test/rules/RULE-17-10/test.c b/c/misra/test/rules/RULE-17-10/test.c
index 5e3aadf165..b5fc988af2 100644
--- a/c/misra/test/rules/RULE-17-10/test.c
+++ b/c/misra/test/rules/RULE-17-10/test.c
@@ -1,9 +1,9 @@
 #include "stdlib.h"
 
-void f1(); // COMPLIANT
-int f2(); // COMPLIANT
+void f1();           // COMPLIANT
+int f2();            // COMPLIANT
 _Noreturn void f3(); // COMPLIANT
-_Noreturn int f4(); // NON-COMPLIANT
+_Noreturn int f4();  // NON-COMPLIANT
 
 void f5() { // COMPLIANT
 }
@@ -21,4 +21,6 @@ _Noreturn int f8() { // NON-COMPLIANT
   return 0;
 }
 
-_Noreturn void* f9(); // NON-COMPLIANT
\ No newline at end of file
+_Noreturn void *f9(); // NON-COMPLIANT
+
+__attribute__((noreturn)) int f10(); // NON-COMPLIANT
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
index 5141f0c9c3..15389bfcdd 100644
--- a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
+++ b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
@@ -1,4 +1,4 @@
 | test.c:7:6:7:21 | test_noreturn_f2 | The function test_noreturn_f2 cannot return and should be declared attribute _Noreturn. |
-| test.c:19:6:19:21 | test_noreturn_f4 | The function test_noreturn_f4 cannot return and should be declared attribute _Noreturn. |
-| test.c:48:6:48:21 | test_noreturn_f8 | The function test_noreturn_f8 cannot return and should be declared attribute _Noreturn. |
-| test.c:64:6:64:22 | test_noreturn_f10 | The function test_noreturn_f10 cannot return and should be declared attribute _Noreturn. |
+| test.c:18:6:18:21 | test_noreturn_f4 | The function test_noreturn_f4 cannot return and should be declared attribute _Noreturn. |
+| test.c:47:6:47:21 | test_noreturn_f8 | The function test_noreturn_f8 cannot return and should be declared attribute _Noreturn. |
+| test.c:63:6:63:22 | test_noreturn_f10 | The function test_noreturn_f10 cannot return and should be declared attribute _Noreturn. |
diff --git a/c/misra/test/rules/RULE-17-11/test.c b/c/misra/test/rules/RULE-17-11/test.c
index 3d0144d6f0..1ecc2b1c44 100644
--- a/c/misra/test/rules/RULE-17-11/test.c
+++ b/c/misra/test/rules/RULE-17-11/test.c
@@ -8,7 +8,6 @@ void test_noreturn_f2(int i) { // NON_COMPLIANT
   abort();
 }
 
-
 _Noreturn void test_noreturn_f3(int i) { // COMPLIANT
   if (i > 0) {
     abort();
@@ -78,3 +77,15 @@ _Noreturn void test_noreturn_f11(int i) { // COMPLIANT
     i = 5;
   }
 }
+
+void test_noreturn_f12(); // COMPLIANT
+
+__attribute__((noreturn)) void test_noreturn_f13(int i) { // COMPLIANT
+  abort();
+}
+
+// Allowed by exception. It is undefined behavior for main() to be declared with
+// noreturn.
+int main(char **argv, int argc) { // COMPLIANT
+  abort();
+}
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
index 1e6a6ab180..9775f797de 100644
--- a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
+++ b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
@@ -1,2 +1,3 @@
 | test.c:7:16:7:31 | test_noreturn_f2 | The function test_noreturn_f2 declared with attribute _Noreturn returns a value. |
 | test.c:32:16:32:31 | test_noreturn_f5 | The function test_noreturn_f5 declared with attribute _Noreturn returns a value. |
+| test.c:47:32:47:47 | test_noreturn_f7 | The function test_noreturn_f7 declared with attribute _Noreturn returns a value. |
diff --git a/c/misra/test/rules/RULE-17-9/test.c b/c/misra/test/rules/RULE-17-9/test.c
index c3ff575672..05ff410562 100644
--- a/c/misra/test/rules/RULE-17-9/test.c
+++ b/c/misra/test/rules/RULE-17-9/test.c
@@ -43,3 +43,13 @@ _Noreturn void test_noreturn_f6(int i) { // COMPLIANT
     i = 5;
   }
 }
+
+__attribute__((noreturn)) void test_noreturn_f7(int i) { // NON_COMPLIANT
+  if (i > 0) {
+    abort();
+  }
+}
+
+__attribute__((noreturn)) void test_noreturn_f8(int i) { // COMPLIANT
+  abort();
+}
\ No newline at end of file

From b5b300dbefdbbb005ce030f6a111fa42b08d5fe6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 24 Sep 2024 22:12:00 +0100
Subject: [PATCH 166/435] DeadCode: Use HoldsForAllInstances

Eliminate false positives where a line of code is used in some
copies (instances) but not others.
---
 .../cpp/rules/deadcode/DeadCode.qll           | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
index 2b5be15e80..1ccfb91095 100644
--- a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
@@ -12,6 +12,7 @@
  */
 
 import cpp
+import codingstandards.cpp.alertreporting.HoldsForAllInstances
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.deadcode.UselessAssignments
@@ -31,10 +32,6 @@ predicate isDeadOrUnreachableStmt(Stmt s) {
   s.getBasicBlock() = any(UnreachableBasicBlock ubb).getABasicBlock()
 }
 
-/**
- * Holds if the `Stmt` `s` is dead, i.e. could be executed, but its removal would not meaningfully
- * affect the program.
- */
 predicate isDeadStmt(Stmt s) {
   // A `DeclStmt` is dead code if:
   // - All the declarations are variable declarations
@@ -108,17 +105,33 @@ predicate isDeadStmt(Stmt s) {
   exists(TryStmt ts | s = ts and isDeadStmt(ts.getStmt()))
 }
 
-query predicate problems(Stmt s, string message) {
-  not isExcluded(s, getQuery()) and
+/**
+ * Holds if the `Stmt` `s` is dead, i.e. could be executed, but its removal would not meaningfully
+ * affect the program.
+ */
+class DeadStmtInstance extends Stmt {
+  DeadStmtInstance() {
+    isDeadStmt(this) and
+    // Exclude compiler generated statements
+    not this.isCompilerGenerated() and
+    // Exclude code fully generated by macros, because the code may be "live" in other expansions
+    not this.isInMacroExpansion() and
+    // MISRA defines dead code as an "_executed_ statement whose removal would not affect the program
+    // output". We therefore exclude unreachable statements as they are, by definition, not executed.
+    not this.getBasicBlock() = any(UnreachableBasicBlock ubb).getABasicBlock()
+  }
+}
+
+class DeadStmt = HoldsForAllInstances<DeadStmtInstance>::LogicalResultStmt;
+
+query predicate problems(DeadStmt s, string message) {
+  not isExcluded(s.getAStmtInstance(), getQuery()) and
   message = "This statement is dead code." and
-  isDeadStmt(s) and
   // Report only the highest level dead statement, to avoid over reporting
-  not isDeadStmt(s.getParentStmt()) and
-  // MISRA defines dead code as an "_executed_ statement whose removal would not affect the program
-  // output". We therefore exclude unreachable statements as they are, by definition, not executed.
-  not s.getBasicBlock() = any(UnreachableBasicBlock ubb).getABasicBlock() and
-  // Exclude code fully generated by macros, because the code may be "live" in other expansions
-  not s.isInMacroExpansion() and
-  // Exclude compiler generated statements
-  not s.isCompilerGenerated()
+  not exists(DeadStmt parent |
+    // All instances must share a dead statement parent for us to report the parent instead
+    forall(Stmt instance | instance = s.getAStmtInstance() |
+      parent.getAStmtInstance() = instance.getParentStmt()
+    )
+  )
 }

From efa556c0e33d7a24e482b237df09a8d0563e66d2 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 24 Sep 2024 23:25:44 +0100
Subject: [PATCH 167/435] Add library for reporting if all instances hold

Add a utility library for determing whether a condition holds for
all copies of a statement in a program.
---
 .../alertreporting/HoldsForAllInstances.qll   | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll

diff --git a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
new file mode 100644
index 0000000000..fcf307c975
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
@@ -0,0 +1,106 @@
+/**
+ * A module for considering whether a result occurs in all instances (e.g. copies) of the code at a
+ * given location.
+ *
+ * Multiple instances of a statement at the same location can occur for two main reasons:
+ *  1. Instantiations of a template
+ *  2. Re-compilation of a file under a different context
+ * This module helps ensure that a particular condition holds for all copies of a particular logical
+ * statement. For example, this can be used to determine whether a line of code is dead in all copies
+ * of a piece of code.
+ *
+ * This module is parameterized by a set of _candidate_ statements in the program. For each candidate
+ * statement, we determine whether all other statements that occur at the same location in the
+ * program are also part of the same set, ignoring any results generated by macros.
+ *
+ * We do so by reporting a new type of result, `LogicalResultStmt`, which represents a logical result
+ * where all instances of a statement at a given location are considered to be part of the same set.
+ */
+
+import cpp
+
+/**
+ * Holds if the `Stmt` `s` is not within a macro expansion, i.e. generated by a macro, but not the
+ * outermost `Stmt` generated by the macro.
+ */
+predicate isNotWithinMacroExpansion(Stmt s) {
+  not s.isInMacroExpansion()
+  or
+  exists(MacroInvocation mi |
+    mi.getStmt() = s and
+    not exists(mi.getParentInvocation())
+  )
+}
+
+/** A candidate set of types. */
+signature class CandidateStmtSig extends Stmt;
+
+/**
+ * A module for considering whether a result occurs in all instances (e.g. copies) of the code at a
+ * given location.
+ */
+module HoldsForAllInstances<CandidateStmtSig CandidateStmt> {
+  private predicate hasLocation(
+    Stmt s, string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    s.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+
+  final private class MyStmt = Stmt;
+
+  /**
+   * A `Stmt` that appears at the same location as a candidate statement.
+   */
+  private class RelevantStmt extends MyStmt {
+    CandidateStmt s;
+
+    RelevantStmt() {
+      exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
+        hasLocation(this, filepath, startline, startcolumn, endline, endcolumn) and
+        hasLocation(s, filepath, startline, startcolumn, endline, endcolumn)
+      ) and
+      // Not within a macro expansion, as we cannot match up instances by location in that
+      // case
+      isNotWithinMacroExpansion(this) and
+      // Ignore catch handlers, as they occur at the same location as the catch block
+      not this instanceof Handler
+    }
+
+    CandidateStmt getCandidateStmt() { result = s }
+  }
+
+  newtype TResultStmts =
+    TLogicalResultStmt(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
+      exists(CandidateStmt s |
+        // Only consider candidates where we can match up the location
+        isNotWithinMacroExpansion(s) and
+        hasLocation(s, filepath, startline, startcolumn, endline, endcolumn) and
+        // All relevant statements that occur at the same location are candidates
+        forex(RelevantStmt relevantStmt | s = relevantStmt.getCandidateStmt() |
+          relevantStmt instanceof CandidateStmt
+        )
+      )
+    }
+
+  /**
+   * A logical result statement, representing all instances of a statement that occur at the same
+   * location.
+   */
+  class LogicalResultStmt extends TLogicalResultStmt {
+    predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      this = TLogicalResultStmt(filepath, startline, startcolumn, endline, endcolumn)
+    }
+
+    /** Gets an instance of this logical result statement. */
+    CandidateStmt getAStmtInstance() {
+      exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
+        this = TLogicalResultStmt(filepath, startline, startcolumn, endline, endcolumn) and
+        hasLocation(result, filepath, startline, startcolumn, endline, endcolumn)
+      )
+    }
+
+    string toString() { result = getAStmtInstance().toString() }
+  }
+}

From 61cd6ca2c3d79d1ac90d53f25ca863fb6fe0a755 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 25 Sep 2024 09:55:09 +0100
Subject: [PATCH 168/435] Consistently exclude macro generated statements

---
 cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
index 1ccfb91095..667c9020a9 100644
--- a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
@@ -115,7 +115,7 @@ class DeadStmtInstance extends Stmt {
     // Exclude compiler generated statements
     not this.isCompilerGenerated() and
     // Exclude code fully generated by macros, because the code may be "live" in other expansions
-    not this.isInMacroExpansion() and
+    isNotWithinMacroExpansion(this) and
     // MISRA defines dead code as an "_executed_ statement whose removal would not affect the program
     // output". We therefore exclude unreachable statements as they are, by definition, not executed.
     not this.getBasicBlock() = any(UnreachableBasicBlock ubb).getABasicBlock()

From aca6d40da65a1158441363943198d6da6a15bc22 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 25 Sep 2024 10:04:10 +0100
Subject: [PATCH 169/435] Fix #604 - add test of template results

The modifications to the query to handle multiple copies of a
statement across different targets also support reporting of issues
across multiple template instantiations. This commit adds
additional tests to demonstrate that this works effectively.
---
 .../test/rules/deadcode/DeadCode.expected     |  2 ++
 cpp/common/test/rules/deadcode/test.cpp       | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/cpp/common/test/rules/deadcode/DeadCode.expected b/cpp/common/test/rules/deadcode/DeadCode.expected
index aec93e0914..bc0afc7c60 100644
--- a/cpp/common/test/rules/deadcode/DeadCode.expected
+++ b/cpp/common/test/rules/deadcode/DeadCode.expected
@@ -15,3 +15,5 @@
 | test.cpp:85:3:85:43 | declaration | This statement is dead code. |
 | test.cpp:87:3:87:30 | declaration | This statement is dead code. |
 | test.cpp:90:3:90:50 | declaration | This statement is dead code. |
+| test.cpp:108:3:108:21 | ExprStmt | This statement is dead code. |
+| test.cpp:120:3:120:23 | ExprStmt | This statement is dead code. |
diff --git a/cpp/common/test/rules/deadcode/test.cpp b/cpp/common/test/rules/deadcode/test.cpp
index d9c0cab277..7632310e1c 100644
--- a/cpp/common/test/rules/deadcode/test.cpp
+++ b/cpp/common/test/rules/deadcode/test.cpp
@@ -91,3 +91,31 @@ int test_dead_code(int x) {
 
   return live5 + live6 + constexpr_used_array[1]; // COMPLIANT
 }
+
+class Foo {
+public:
+  void bar() { may_have_side_effects(); }
+};
+
+class Baz {
+public:
+  void bar() {} // No side effects
+};
+
+template <typename T> void test_template() {
+  T t;
+  t.bar();            // COMPLIANT
+  no_side_effects(1); // NON_COMPLIANT
+}
+
+template <typename T> void test_unused_template() {
+  T t;
+  t.bar(); // COMPLIANT
+  no_side_effects(
+      1); // NON_COMPLIANT[FALSE_NEGATIVE] - unused templates are not extracted
+}
+
+void test() {
+  test_template<Foo>();
+  test_template<Baz>(); // NON_COMPLIANT - template call has no affect
+}
\ No newline at end of file

From 4d457b8084a885318230dc4cb773eece357e0087 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 25 Sep 2024 10:22:06 +0100
Subject: [PATCH 170/435] DeadCode: Add macro/template tests

Ensure that macro expansions and multiple instances of code work
together.
---
 .../test/rules/deadcode/DeadCode.expected     |  6 +++--
 cpp/common/test/rules/deadcode/test.cpp       | 26 ++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/cpp/common/test/rules/deadcode/DeadCode.expected b/cpp/common/test/rules/deadcode/DeadCode.expected
index bc0afc7c60..1756231343 100644
--- a/cpp/common/test/rules/deadcode/DeadCode.expected
+++ b/cpp/common/test/rules/deadcode/DeadCode.expected
@@ -15,5 +15,7 @@
 | test.cpp:85:3:85:43 | declaration | This statement is dead code. |
 | test.cpp:87:3:87:30 | declaration | This statement is dead code. |
 | test.cpp:90:3:90:50 | declaration | This statement is dead code. |
-| test.cpp:108:3:108:21 | ExprStmt | This statement is dead code. |
-| test.cpp:120:3:120:23 | ExprStmt | This statement is dead code. |
+| test.cpp:116:3:116:21 | ExprStmt | This statement is dead code. |
+| test.cpp:117:3:117:27 | ExprStmt | This statement is dead code. |
+| test.cpp:118:7:118:32 | ExprStmt | This statement is dead code. |
+| test.cpp:139:3:139:35 | ExprStmt | This statement is dead code. |
diff --git a/cpp/common/test/rules/deadcode/test.cpp b/cpp/common/test/rules/deadcode/test.cpp
index 7632310e1c..d40667539d 100644
--- a/cpp/common/test/rules/deadcode/test.cpp
+++ b/cpp/common/test/rules/deadcode/test.cpp
@@ -102,10 +102,27 @@ class Baz {
   void bar() {} // No side effects
 };
 
+#define FULL_STMT_NO_SIDE_EFFECTS no_side_effects(1);
+#define PART_STMT_NO_SIDE_EFFECTS no_side_effects(1)
+#define BLOCK_SOME_SIDE_EFFECTS                                                \
+  {                                                                            \
+    may_have_side_effects();                                                   \
+    no_side_effects(1);                                                        \
+  }
+
 template <typename T> void test_template() {
   T t;
-  t.bar();            // COMPLIANT
-  no_side_effects(1); // NON_COMPLIANT
+  t.bar();                       // COMPLIANT
+  no_side_effects(1);            // NON_COMPLIANT
+  FULL_STMT_NO_SIDE_EFFECTS      // NON_COMPLIANT
+      PART_STMT_NO_SIDE_EFFECTS; // NON_COMPLIANT
+  BLOCK_SOME_SIDE_EFFECTS;       // COMPLIANT - cannot determine loc for
+                                 // no_side_effects(1)
+}
+
+template <typename T> void test_variant_side_effects() {
+  T t;
+  t.bar(); // COMPLIANT - not dead in at least one instance
 }
 
 template <typename T> void test_unused_template() {
@@ -117,5 +134,8 @@ template <typename T> void test_unused_template() {
 
 void test() {
   test_template<Foo>();
-  test_template<Baz>(); // NON_COMPLIANT - template call has no affect
+  test_template<Baz>();
+  test_variant_side_effects<Foo>(); // COMPLIANT
+  test_variant_side_effects<Baz>(); // NON_COMPLIANT - no effect in this
+                                    // instantiation
 }
\ No newline at end of file

From 8d8fd09c2d3188917d8d1d4ec251c8e8f118ae89 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Wed, 25 Sep 2024 17:26:14 +0100
Subject: [PATCH 171/435] Refactor to try to trigger the failure step

---
 .github/workflows/codeql_unit_tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index e23377af9a..a0526551ff 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -39,7 +39,6 @@ jobs:
     needs: prepare-unit-test-matrix
 
     runs-on: ${{ matrix.os }}
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.prepare-unit-test-matrix.outputs.matrix) }}
@@ -161,6 +160,7 @@ jobs:
 
   validate-test-results:
     name: Validate test results
+    if: ${{ always() }}
     needs: run-test-suites
     runs-on: ubuntu-22.04
     steps:

From 783f8d47cdc730db0f05f75568ef808a1967a8c0 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 25 Sep 2024 22:57:25 +0100
Subject: [PATCH 172/435] RULE-2-2: Refactor to detect dead operations

The rule description for this rule in fact talks about dead
operations, not dead statements. Therefore:
 - Unshare the rule from MISRA C++ 2008
 - Implement dead operation, as per the rule
---
 c/misra/src/rules/RULE-2-2/DeadCode.ql        | 60 ++++++++++++++++++-
 c/misra/test/rules/RULE-2-2/DeadCode.expected |  7 +++
 c/misra/test/rules/RULE-2-2/DeadCode.qlref    |  1 +
 c/misra/test/rules/RULE-2-2/DeadCode.testref  |  1 -
 c/misra/test/rules/RULE-2-2/test.c            | 30 ++++++++++
 rule_packages/c/DeadCode.json                 | 16 +----
 6 files changed, 96 insertions(+), 19 deletions(-)
 create mode 100644 c/misra/test/rules/RULE-2-2/DeadCode.expected
 create mode 100644 c/misra/test/rules/RULE-2-2/DeadCode.qlref
 delete mode 100644 c/misra/test/rules/RULE-2-2/DeadCode.testref
 create mode 100644 c/misra/test/rules/RULE-2-2/test.c

diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index c9ecb5e934..79f69e760d 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -14,8 +14,62 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.rules.deadcode.DeadCode
+import codingstandards.cpp.deadcode.UselessAssignments
 
-class MisraCDeadCodeQuery extends DeadCodeSharedQuery {
-  MisraCDeadCodeQuery() { this = DeadCodePackage::deadCodeQuery() }
+/**
+ * Gets an explicit cast from `e` if one exists.
+ */
+Cast getExplicitCast(Expr e) {
+  exists(Conversion c | c = e.getExplicitlyConverted() |
+    result = c
+    or
+    result = c.(ParenthesisExpr).getExpr()
+  )
+}
+
+class ExprStmtExpr extends Expr {
+  ExprStmtExpr() { exists(ExprStmt es | es.getExpr() = this) }
 }
+
+/**
+ * An "operation" as defined by MISRA C Rule 2.2 that is dead, i.e. it's removal has no effect on
+ * the behaviour of the program.
+ */
+class DeadOperation extends Expr {
+  string description;
+
+  DeadOperation() {
+    exists(ExprStmtExpr e |
+      if exists(getExplicitCast(e))
+      then
+        this = getExplicitCast(e) and
+        // void conversions are permitted
+        not getExplicitCast(e) instanceof VoidConversion and
+        description = "Cast operation is unused"
+      else (
+        this = e and
+        (
+          if e instanceof Assignment
+          then
+            exists(SsaDefinition sd, LocalScopeVariable v |
+              e = sd.getDefinition() and
+              sd.getDefiningValue(v).isPure() and
+              // The definition is useless
+              isUselessSsaDefinition(sd, v) and
+              description = "Assignment to " + v.getName() + " is unused and has no side effects"
+            )
+          else (
+            e.isPure() and
+            description = "Result of operation is unused and has no side effects"
+          )
+        )
+      )
+    )
+  }
+
+  string getDescription() { result = description }
+}
+
+from DeadOperation deadOperation
+where not isExcluded(deadOperation, DeadCodePackage::deadCodeQuery())
+select deadOperation, deadOperation.getDescription() + "."
diff --git a/c/misra/test/rules/RULE-2-2/DeadCode.expected b/c/misra/test/rules/RULE-2-2/DeadCode.expected
new file mode 100644
index 0000000000..6cb0fb0c60
--- /dev/null
+++ b/c/misra/test/rules/RULE-2-2/DeadCode.expected
@@ -0,0 +1,7 @@
+| test.c:15:3:15:11 | ... = ... | Assignment to dead1 is unused and has no side effects. |
+| test.c:16:3:16:11 | ... = ... | Assignment to dead2 is unused and has no side effects. |
+| test.c:19:3:19:7 | ... + ... | Result of operation is unused and has no side effects. |
+| test.c:21:3:21:17 | call to no_side_effects | Result of operation is unused and has no side effects. |
+| test.c:23:3:23:30 | (int)... | Cast operation is unused. |
+| test.c:24:3:24:25 | (int)... | Cast operation is unused. |
+| test.c:27:4:27:18 | call to no_side_effects | Result of operation is unused and has no side effects. |
diff --git a/c/misra/test/rules/RULE-2-2/DeadCode.qlref b/c/misra/test/rules/RULE-2-2/DeadCode.qlref
new file mode 100644
index 0000000000..761e04d51b
--- /dev/null
+++ b/c/misra/test/rules/RULE-2-2/DeadCode.qlref
@@ -0,0 +1 @@
+rules/RULE-2-2/DeadCode.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-2-2/DeadCode.testref b/c/misra/test/rules/RULE-2-2/DeadCode.testref
deleted file mode 100644
index f084f30aaa..0000000000
--- a/c/misra/test/rules/RULE-2-2/DeadCode.testref
+++ /dev/null
@@ -1 +0,0 @@
-c/common/test/rules/deadcode/DeadCode.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-2-2/test.c b/c/misra/test/rules/RULE-2-2/test.c
new file mode 100644
index 0000000000..148af8dc9e
--- /dev/null
+++ b/c/misra/test/rules/RULE-2-2/test.c
@@ -0,0 +1,30 @@
+int may_have_side_effects();
+int no_side_effects(int x) { return 1 + 2; }
+int no_side_effects_nondeterministic();
+
+int test_dead_code(int x) {
+  int live1 = may_have_side_effects(),
+      live2 = may_have_side_effects(); // COMPLIANT
+  int live3 = 0,
+      live4 = may_have_side_effects(); // COMPLIANT
+  int live5 = 0, live6 = 0;            // COMPLIANT
+  live5 = 1;                           // COMPLIANT
+  live6 = 2;                           // COMPLIANT
+
+  int dead1 = 0, dead2 = 0; // COMPLIANT - init not considered by this rule
+  dead1 = 1;                // NON_COMPLIANT - useless assignment
+  dead2 = 1;                // NON_COMPLIANT - useless assignment
+
+  may_have_side_effects(); // COMPLIANT
+  1 + 2;                   // NON_COMPLIANT
+
+  no_side_effects(x); // NON_COMPLIANT
+
+  (int)may_have_side_effects(); // NON_COMPLIANT
+  (int)no_side_effects(x);      // NON_COMPLIANT
+  (void)no_side_effects(x);     // COMPLIANT
+  (may_have_side_effects());    // COMPLIANT
+  (no_side_effects(x));         // NON_COMPLIANT
+
+  return live5 + live6; // COMPLIANT
+}
\ No newline at end of file
diff --git a/rule_packages/c/DeadCode.json b/rule_packages/c/DeadCode.json
index 1de7625225..21c8a94ac8 100644
--- a/rule_packages/c/DeadCode.json
+++ b/rule_packages/c/DeadCode.json
@@ -39,21 +39,7 @@
           "tags": [
             "readability",
             "maintainability"
-          ],
-          "implementation_scope": {
-            "description": "This query identifies dead statements in the program of the following kinds:",
-            "items": [
-              "Declarations of a non-static stack variable whose initializing expression is pure (i.e. has no side-effects) and that is never subsequently accessed in live code.",
-              "Blocks that contain only dead statements.",
-              "Do loops whose condition is pure, and whose body contains only dead statements.",
-              "If statements whose condition is pure, and whose then and else clauses (where they exist) only contain dead statements.",
-              "Label statements to which the code never jumps.",
-              "While loops whose condition is pure, and whose body contains only dead statements.",
-              "Expression statements whose expressions are pure.",
-              "Writes to a non-static stack variable that is never subsequently read in live code."
-            ]
-          },
-          "shared_implementation_short_name": "DeadCode"
+          ]
         }
       ],
       "title": "There shall be no dead code"

From 85b161a2d29826cc292cabb57e84487af342375b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 26 Sep 2024 09:13:20 +0100
Subject: [PATCH 173/435] RULE-2-2: Exclude cases nested in macro expansions

---
 c/misra/src/rules/RULE-2-2/DeadCode.ql            |  4 ++++
 c/misra/test/rules/RULE-2-2/DeadCode.expected     |  2 ++
 c/misra/test/rules/RULE-2-2/test.c                | 12 ++++++++++++
 .../cpp/alertreporting/HoldsForAllInstances.qll   | 15 ++++++++++-----
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index 79f69e760d..f90a11eb70 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -14,6 +14,7 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.alertreporting.HoldsForAllInstances
 import codingstandards.cpp.deadcode.UselessAssignments
 
 /**
@@ -39,6 +40,9 @@ class DeadOperation extends Expr {
   string description;
 
   DeadOperation() {
+    // Exclude cases nested within macro expansions, because the code may be "live" in other
+    // expansions
+    isNotWithinMacroExpansion(this) and
     exists(ExprStmtExpr e |
       if exists(getExplicitCast(e))
       then
diff --git a/c/misra/test/rules/RULE-2-2/DeadCode.expected b/c/misra/test/rules/RULE-2-2/DeadCode.expected
index 6cb0fb0c60..1f4ff5f4a8 100644
--- a/c/misra/test/rules/RULE-2-2/DeadCode.expected
+++ b/c/misra/test/rules/RULE-2-2/DeadCode.expected
@@ -5,3 +5,5 @@
 | test.c:23:3:23:30 | (int)... | Cast operation is unused. |
 | test.c:24:3:24:25 | (int)... | Cast operation is unused. |
 | test.c:27:4:27:18 | call to no_side_effects | Result of operation is unused and has no side effects. |
+| test.c:37:3:37:27 | call to no_side_effects | Result of operation is unused and has no side effects. |
+| test.c:38:7:38:31 | call to no_side_effects | Result of operation is unused and has no side effects. |
diff --git a/c/misra/test/rules/RULE-2-2/test.c b/c/misra/test/rules/RULE-2-2/test.c
index 148af8dc9e..f8248c52d2 100644
--- a/c/misra/test/rules/RULE-2-2/test.c
+++ b/c/misra/test/rules/RULE-2-2/test.c
@@ -26,5 +26,17 @@ int test_dead_code(int x) {
   (may_have_side_effects());    // COMPLIANT
   (no_side_effects(x));         // NON_COMPLIANT
 
+#define FULL_STMT_NO_SIDE_EFFECTS no_side_effects(1);
+#define PART_STMT_NO_SIDE_EFFECTS no_side_effects(1)
+#define BLOCK_SOME_SIDE_EFFECTS                                                \
+  {                                                                            \
+    may_have_side_effects();                                                   \
+    no_side_effects(1);                                                        \
+  }
+
+  FULL_STMT_NO_SIDE_EFFECTS      // NON_COMPLIANT
+      PART_STMT_NO_SIDE_EFFECTS; // NON_COMPLIANT
+  BLOCK_SOME_SIDE_EFFECTS;       // COMPLIANT
+
   return live5 + live6; // COMPLIANT
 }
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
index fcf307c975..aa2abd9e88 100644
--- a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
+++ b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
@@ -20,14 +20,19 @@
 import cpp
 
 /**
- * Holds if the `Stmt` `s` is not within a macro expansion, i.e. generated by a macro, but not the
- * outermost `Stmt` generated by the macro.
+ * Holds if the `Element` `e` is not within a macro expansion, i.e. generated by a macro, but not
+ * the outermost `Stmt` or `Expr` generated by the macro.
  */
-predicate isNotWithinMacroExpansion(Stmt s) {
-  not s.isInMacroExpansion()
+predicate isNotWithinMacroExpansion(Element e) {
+  not e.isInMacroExpansion()
   or
   exists(MacroInvocation mi |
-    mi.getStmt() = s and
+    mi.getStmt() = e
+    or
+    mi.getExpr() = e
+    or
+    mi.getStmt().(ExprStmt).getExpr() = e
+  |
     not exists(mi.getParentInvocation())
   )
 }

From 0639b1992c239b17ae292ae7e9c5c943a06c7d2f Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 26 Sep 2024 22:53:39 +0100
Subject: [PATCH 174/435] Rule 2.2: Ignore results which are only dead in some
 compilations

Use the HoldsForAllInstances module to eliminate cases where a
line of code is compiled into multiple targets with different
dead code behaviour.
---
 c/misra/src/rules/RULE-2-2/DeadCode.ql        | 10 +--
 .../alertreporting/HoldsForAllInstances.qll   | 69 ++++++++++---------
 .../cpp/rules/deadcode/DeadCode.qll           |  8 +--
 3 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index f90a11eb70..9c2671e1f4 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -36,10 +36,10 @@ class ExprStmtExpr extends Expr {
  * An "operation" as defined by MISRA C Rule 2.2 that is dead, i.e. it's removal has no effect on
  * the behaviour of the program.
  */
-class DeadOperation extends Expr {
+class DeadOperationInstance extends Expr {
   string description;
 
-  DeadOperation() {
+  DeadOperationInstance() {
     // Exclude cases nested within macro expansions, because the code may be "live" in other
     // expansions
     isNotWithinMacroExpansion(this) and
@@ -74,6 +74,8 @@ class DeadOperation extends Expr {
   string getDescription() { result = description }
 }
 
+class DeadOperation = HoldsForAllInstances<DeadOperationInstance, Expr>::LogicalResultElement;
+
 from DeadOperation deadOperation
-where not isExcluded(deadOperation, DeadCodePackage::deadCodeQuery())
-select deadOperation, deadOperation.getDescription() + "."
+where not isExcluded(deadOperation.getAnElementInstance(), DeadCodePackage::deadCodeQuery())
+select deadOperation, deadOperation.getAnElementInstance().getDescription() + "."
diff --git a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
index aa2abd9e88..1ea8787c22 100644
--- a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
+++ b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
@@ -2,26 +2,26 @@
  * A module for considering whether a result occurs in all instances (e.g. copies) of the code at a
  * given location.
  *
- * Multiple instances of a statement at the same location can occur for two main reasons:
+ * Multiple instances of an element at the same location can occur for two main reasons:
  *  1. Instantiations of a template
  *  2. Re-compilation of a file under a different context
  * This module helps ensure that a particular condition holds for all copies of a particular logical
- * statement. For example, this can be used to determine whether a line of code is dead in all copies
+ * element. For example, this can be used to determine whether a line of code is dead in all copies
  * of a piece of code.
  *
- * This module is parameterized by a set of _candidate_ statements in the program. For each candidate
- * statement, we determine whether all other statements that occur at the same location in the
- * program are also part of the same set, ignoring any results generated by macros.
+ * This module is parameterized by a set of _candidate_ elements in the program. For each candidate
+ * element, we determine whether all other elements in the same element set that occur at the same
+ * location in the program are also part of the same set, ignoring any results generated by macros.
  *
- * We do so by reporting a new type of result, `LogicalResultStmt`, which represents a logical result
- * where all instances of a statement at a given location are considered to be part of the same set.
+ * We do so by reporting a new type of result, `LogicalResultElement`, which represents a logical result
+ * where all instances of a element at a given location are considered to be part of the same set.
  */
 
 import cpp
 
 /**
  * Holds if the `Element` `e` is not within a macro expansion, i.e. generated by a macro, but not
- * the outermost `Stmt` or `Expr` generated by the macro.
+ * the outermost `Element` or `Expr` generated by the macro.
  */
 predicate isNotWithinMacroExpansion(Element e) {
   not e.isInMacroExpansion()
@@ -37,32 +37,35 @@ predicate isNotWithinMacroExpansion(Element e) {
   )
 }
 
-/** A candidate set of types. */
-signature class CandidateStmtSig extends Stmt;
+/** A candidate set of elements. */
+signature class CandidateElementSig extends Element;
+
+/** The super set of relevant elements. */
+signature class ElementSetSig extends Element;
 
 /**
  * A module for considering whether a result occurs in all instances (e.g. copies) of the code at a
  * given location.
  */
-module HoldsForAllInstances<CandidateStmtSig CandidateStmt> {
+module HoldsForAllInstances<CandidateElementSig CandidateElement, ElementSetSig ElementSet> {
   private predicate hasLocation(
-    Stmt s, string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ElementSet s, string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
     s.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 
-  final private class MyStmt = Stmt;
+  final private class MyElement = ElementSet;
 
   /**
-   * A `Stmt` that appears at the same location as a candidate statement.
+   * A `Element` that appears at the same location as a candidate element.
    */
-  private class RelevantStmt extends MyStmt {
-    CandidateStmt s;
+  private class RelevantElement extends MyElement {
+    CandidateElement e;
 
-    RelevantStmt() {
+    RelevantElement() {
       exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
         hasLocation(this, filepath, startline, startcolumn, endline, endcolumn) and
-        hasLocation(s, filepath, startline, startcolumn, endline, endcolumn)
+        hasLocation(e, filepath, startline, startcolumn, endline, endcolumn)
       ) and
       // Not within a macro expansion, as we cannot match up instances by location in that
       // case
@@ -71,41 +74,43 @@ module HoldsForAllInstances<CandidateStmtSig CandidateStmt> {
       not this instanceof Handler
     }
 
-    CandidateStmt getCandidateStmt() { result = s }
+    CandidateElement getCandidateElement() { result = e }
   }
 
-  newtype TResultStmts =
-    TLogicalResultStmt(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
-      exists(CandidateStmt s |
+  newtype TResultElements =
+    TLogicalResultElement(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      exists(CandidateElement s |
         // Only consider candidates where we can match up the location
         isNotWithinMacroExpansion(s) and
         hasLocation(s, filepath, startline, startcolumn, endline, endcolumn) and
-        // All relevant statements that occur at the same location are candidates
-        forex(RelevantStmt relevantStmt | s = relevantStmt.getCandidateStmt() |
-          relevantStmt instanceof CandidateStmt
+        // All relevant elements that occur at the same location are candidates
+        forex(RelevantElement relevantElement | s = relevantElement.getCandidateElement() |
+          relevantElement instanceof CandidateElement
         )
       )
     }
 
   /**
-   * A logical result statement, representing all instances of a statement that occur at the same
+   * A logical result element, representing all instances of a element that occur at the same
    * location.
    */
-  class LogicalResultStmt extends TLogicalResultStmt {
+  class LogicalResultElement extends TLogicalResultElement {
     predicate hasLocationInfo(
       string filepath, int startline, int startcolumn, int endline, int endcolumn
     ) {
-      this = TLogicalResultStmt(filepath, startline, startcolumn, endline, endcolumn)
+      this = TLogicalResultElement(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    /** Gets an instance of this logical result statement. */
-    CandidateStmt getAStmtInstance() {
+    /** Gets an instance of this logical result element. */
+    CandidateElement getAnElementInstance() {
       exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
-        this = TLogicalResultStmt(filepath, startline, startcolumn, endline, endcolumn) and
+        this = TLogicalResultElement(filepath, startline, startcolumn, endline, endcolumn) and
         hasLocation(result, filepath, startline, startcolumn, endline, endcolumn)
       )
     }
 
-    string toString() { result = getAStmtInstance().toString() }
+    string toString() { result = getAnElementInstance().toString() }
   }
 }
diff --git a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
index 667c9020a9..5023b8ae14 100644
--- a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
@@ -122,16 +122,16 @@ class DeadStmtInstance extends Stmt {
   }
 }
 
-class DeadStmt = HoldsForAllInstances<DeadStmtInstance>::LogicalResultStmt;
+class DeadStmt = HoldsForAllInstances<DeadStmtInstance, Stmt>::LogicalResultElement;
 
 query predicate problems(DeadStmt s, string message) {
-  not isExcluded(s.getAStmtInstance(), getQuery()) and
+  not isExcluded(s.getAnElementInstance(), getQuery()) and
   message = "This statement is dead code." and
   // Report only the highest level dead statement, to avoid over reporting
   not exists(DeadStmt parent |
     // All instances must share a dead statement parent for us to report the parent instead
-    forall(Stmt instance | instance = s.getAStmtInstance() |
-      parent.getAStmtInstance() = instance.getParentStmt()
+    forall(Stmt instance | instance = s.getAnElementInstance() |
+      parent.getAnElementInstance() = instance.getParentStmt()
     )
   )
 }

From 35d2f560d55e8737450d1f05a53766b9083dcc45 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 26 Sep 2024 23:08:12 +0100
Subject: [PATCH 175/435] Rule 2.2: Report dead function, if the op is a call

---
 c/misra/src/rules/RULE-2-2/DeadCode.ql        | 21 ++++++++++++++++---
 c/misra/test/rules/RULE-2-2/DeadCode.expected | 18 ++++++++--------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index 9c2671e1f4..8d7ccce273 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -76,6 +76,21 @@ class DeadOperationInstance extends Expr {
 
 class DeadOperation = HoldsForAllInstances<DeadOperationInstance, Expr>::LogicalResultElement;
 
-from DeadOperation deadOperation
-where not isExcluded(deadOperation.getAnElementInstance(), DeadCodePackage::deadCodeQuery())
-select deadOperation, deadOperation.getAnElementInstance().getDescription() + "."
+from
+  DeadOperation deadOperation, DeadOperationInstance instance, string message, Element explainer,
+  string explainerDescription
+where
+  not isExcluded(instance, DeadCodePackage::deadCodeQuery()) and
+  instance = deadOperation.getAnElementInstance() and
+  if instance instanceof FunctionCall
+  then
+    message = instance.getDescription() + " from call to function $@" and
+    explainer = instance.(FunctionCall).getTarget() and
+    explainerDescription = explainer.(Function).getName()
+  else (
+    message = instance.getDescription() and
+    // Ignore the explainer
+    explainer = instance and
+    explainerDescription = ""
+  )
+select deadOperation, message + ".", explainer, explainerDescription
diff --git a/c/misra/test/rules/RULE-2-2/DeadCode.expected b/c/misra/test/rules/RULE-2-2/DeadCode.expected
index 1f4ff5f4a8..e25a5a97ef 100644
--- a/c/misra/test/rules/RULE-2-2/DeadCode.expected
+++ b/c/misra/test/rules/RULE-2-2/DeadCode.expected
@@ -1,9 +1,9 @@
-| test.c:15:3:15:11 | ... = ... | Assignment to dead1 is unused and has no side effects. |
-| test.c:16:3:16:11 | ... = ... | Assignment to dead2 is unused and has no side effects. |
-| test.c:19:3:19:7 | ... + ... | Result of operation is unused and has no side effects. |
-| test.c:21:3:21:17 | call to no_side_effects | Result of operation is unused and has no side effects. |
-| test.c:23:3:23:30 | (int)... | Cast operation is unused. |
-| test.c:24:3:24:25 | (int)... | Cast operation is unused. |
-| test.c:27:4:27:18 | call to no_side_effects | Result of operation is unused and has no side effects. |
-| test.c:37:3:37:27 | call to no_side_effects | Result of operation is unused and has no side effects. |
-| test.c:38:7:38:31 | call to no_side_effects | Result of operation is unused and has no side effects. |
+| test.c:15:3:15:11 | ... = ... | Assignment to dead1 is unused and has no side effects. | test.c:15:3:15:11 | ... = ... |  |
+| test.c:16:3:16:11 | ... = ... | Assignment to dead2 is unused and has no side effects. | test.c:16:3:16:11 | ... = ... |  |
+| test.c:19:3:19:7 | ... + ... | Result of operation is unused and has no side effects. | test.c:19:3:19:7 | ... + ... |  |
+| test.c:21:3:21:17 | call to no_side_effects | Result of operation is unused and has no side effects from call to function $@. | test.c:2:5:2:19 | no_side_effects | no_side_effects |
+| test.c:23:3:23:30 | (int)... | Cast operation is unused. | test.c:23:3:23:30 | (int)... |  |
+| test.c:24:3:24:25 | (int)... | Cast operation is unused. | test.c:24:3:24:25 | (int)... |  |
+| test.c:27:4:27:18 | call to no_side_effects | Result of operation is unused and has no side effects from call to function $@. | test.c:2:5:2:19 | no_side_effects | no_side_effects |
+| test.c:37:3:37:27 | call to no_side_effects | Result of operation is unused and has no side effects from call to function $@. | test.c:2:5:2:19 | no_side_effects | no_side_effects |
+| test.c:38:7:38:31 | call to no_side_effects | Result of operation is unused and has no side effects from call to function $@. | test.c:2:5:2:19 | no_side_effects | no_side_effects |

From 785974b728b02f42b9a344ff1dd04c56652fd966 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 26 Sep 2024 23:12:33 +0100
Subject: [PATCH 176/435] DeadCode: Add change note

---
 change_notes/2024-09-25-dead-code-improvements.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 change_notes/2024-09-25-dead-code-improvements.md

diff --git a/change_notes/2024-09-25-dead-code-improvements.md b/change_notes/2024-09-25-dead-code-improvements.md
new file mode 100644
index 0000000000..9cd8d95ff5
--- /dev/null
+++ b/change_notes/2024-09-25-dead-code-improvements.md
@@ -0,0 +1,5 @@
+ - `M0-1-9` - `DeadCode.ql`
+   - Remove false positives for statements where the enclosing function is compiled multiple times, either as part of different targets or a different template instantiations. Previously we would see false positives where a statement was dead in one instance of the code, but not other instances. We now only consider a statement dead if it is dead in all instances of that code.
+- `RULE-2-2` - `DeadCode.ql`:
+   - Query has been rewritten to report only _operations_ that are considered dead, not statements. This should reduce false positives.
+   - Remove false positives for operations where the enclosing function is compiled multiple times, either as part of different targets or a different template instantiations. Previously we would see false positives where a operation was dead in one instance of the code, but not other instances. We now only consider a operation dead if it is dead in all instances of that code.
\ No newline at end of file

From 37696a908578a78ad32b8b4874deef75f08dbbfd Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Thu, 26 Sep 2024 23:16:44 +0100
Subject: [PATCH 177/435] Updates from editor

---
 .github/workflows/codeql_unit_tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index a0526551ff..41a2990b26 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -164,8 +164,8 @@ jobs:
     needs: run-test-suites
     runs-on: ubuntu-22.04
     steps:
-      - name: Check if a dependent job failed to complete
-        if: ${{ failure() }}
+      - name: Check if run-test-suites job failed to complete, if so fail
+        if: ${{ needs.run-test-suites.result == 'failure }}
         uses: actions/github-script@v3
         with:
           script: |

From 33223fa18bf0fb2a6b57525866c7c6219020e715 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 23:25:12 +0000
Subject: [PATCH 178/435] Bump actions/download-artifact

Bumps the github_actions group with 1 update in the /.github/workflows directory: [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/download-artifact` from 2 to 4
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  dependency-group: github_actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql_unit_tests.yml              | 2 +-
 .github/workflows/standard_library_upgrade_tests.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index 62660d973d..a6488a728c 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -164,7 +164,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Collect test results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Validate test results
         run: |
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
index 5402dc9105..35717b7b4e 100644
--- a/.github/workflows/standard_library_upgrade_tests.yml
+++ b/.github/workflows/standard_library_upgrade_tests.yml
@@ -162,7 +162,7 @@ jobs:
           python-version: "3.9"
 
       - name: Collect test results
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
 
       - name: Validate test results
         shell: python

From 37c198ff0cc897a1b546b8694ffe8ee86b1230ac Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 27 Sep 2024 08:53:26 +0100
Subject: [PATCH 179/435] Updates from editor

---
 .github/workflows/codeql_unit_tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index 41a2990b26..5c2bc10733 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -165,7 +165,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check if run-test-suites job failed to complete, if so fail
-        if: ${{ needs.run-test-suites.result == 'failure }}
+        if: ${{ needs.run-test-suites.result == 'failure' }}
         uses: actions/github-script@v3
         with:
           script: |

From e9cfc8ebe2284c47ed9858697f6c66dc09cb21fe Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:43:01 +0100
Subject: [PATCH 180/435] Revert introduction of CodeQL error

---
 .../rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql b/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
index 06c9274e8c..9503024671 100644
--- a/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
+++ b/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
@@ -15,7 +15,7 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.usageofassemblernotdocumented.UsageOfAssemblerNotDocumented
 
-class UsageOfAssemblyLanguageShouldBeDocumentedQuery  UsageOfAssemblerNotDocumentedSharedQuery
+class UsageOfAssemblyLanguageShouldBeDocumentedQuery extends UsageOfAssemblerNotDocumentedSharedQuery
 {
   UsageOfAssemblyLanguageShouldBeDocumentedQuery() {
     this = Language2Package::usageOfAssemblyLanguageShouldBeDocumentedQuery()

From c8e50910bb1c292dbb395078aec2aef2f7f078b3 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 27 Sep 2024 13:29:11 -0700
Subject: [PATCH 181/435] Address feedback

---
 ...unctionNoReturnAttributeCondition.expected |  3 ++
 .../FunctionNoReturnAttributeCondition.ql     |  4 +++
 .../test.c                                    | 28 +++++++++++++++++++
 .../NonVoidReturnTypeOfNoreturnFunction.ql    |  6 ++--
 ...onWithNoReturningBranchShouldBeNoreturn.ql |  6 ++--
 .../ReturnStatementInNoreturnFunction.ql      | 13 +++++----
 ...NoReturningBranchShouldBeNoreturn.expected |  2 ++
 c/misra/test/rules/RULE-17-11/test.c          | 13 +++++++++
 ...ReturnStatementInNoreturnFunction.expected |  3 --
 .../ReturnStatementInNoreturnFunction.testref |  1 +
 .../src/codingstandards/cpp}/Noreturn.qll     |  0
 .../FunctionNoReturnAttributeCondition.qll    | 23 ++++++++++-----
 rule_packages/c/NoReturn.json                 |  7 +++--
 13 files changed, 86 insertions(+), 23 deletions(-)
 create mode 100644 c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.expected
 create mode 100644 c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql
 rename c/{misra/test/rules/RULE-17-9 => common/test/rules/functionnoreturnattributecondition}/test.c (61%)
 delete mode 100644 c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
 create mode 100644 c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.testref
 rename {c/common/src/codingstandards/c => cpp/common/src/codingstandards/cpp}/Noreturn.qll (100%)

diff --git a/c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.expected b/c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.expected
new file mode 100644
index 0000000000..5aede0a5ba
--- /dev/null
+++ b/c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.expected
@@ -0,0 +1,3 @@
+| test.c:9:16:9:31 | test_noreturn_f2 | The function test_noreturn_f2 declared with attribute _Noreturn returns a value. |
+| test.c:34:16:34:31 | test_noreturn_f5 | The function test_noreturn_f5 declared with attribute _Noreturn returns a value. |
+| test.c:49:32:49:47 | test_noreturn_f7 | The function test_noreturn_f7 declared with attribute _Noreturn returns a value. |
diff --git a/c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql b/c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql
new file mode 100644
index 0000000000..4af4aeceaf
--- /dev/null
+++ b/c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functionnoreturnattributecondition.FunctionNoReturnAttributeCondition
+
+class TestFileQuery extends FunctionNoReturnAttributeConditionSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-17-9/test.c b/c/common/test/rules/functionnoreturnattributecondition/test.c
similarity index 61%
rename from c/misra/test/rules/RULE-17-9/test.c
rename to c/common/test/rules/functionnoreturnattributecondition/test.c
index 05ff410562..8299c0cc89 100644
--- a/c/misra/test/rules/RULE-17-9/test.c
+++ b/c/common/test/rules/functionnoreturnattributecondition/test.c
@@ -1,4 +1,6 @@
 #include "stdlib.h"
+#include "threads.h"
+#include "setjmp.h"
 
 _Noreturn void test_noreturn_f1(int i) { // COMPLIANT
   abort();
@@ -52,4 +54,30 @@ __attribute__((noreturn)) void test_noreturn_f7(int i) { // NON_COMPLIANT
 
 __attribute__((noreturn)) void test_noreturn_f8(int i) { // COMPLIANT
   abort();
+}
+
+_Noreturn void test_noreturn_f9(int i) { // COMPLIANT
+  test_noreturn_f1(i);
+}
+
+_Noreturn void test_noreturn_f10(int i) { // COMPLIANT
+  switch(i) {
+    case 0:
+      abort(); break;
+    case 1:
+      exit(0); break;
+    case 2:
+      _Exit(0); break;
+    case 3:
+      quick_exit(0); break;
+    case 4:
+      thrd_exit(0); break;
+    default:
+      jmp_buf jb;
+      longjmp(jb, 0);
+  }
+}
+
+_Noreturn void test_noreturn_f11(int i) { // COMPLIANT
+  return test_noreturn_f11(i);
 }
\ No newline at end of file
diff --git a/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
index 3e6f2340fd..68c5faeb1b 100644
--- a/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
@@ -7,18 +7,20 @@
  * @precision very-high
  * @problem.severity recommendation
  * @tags external/misra/id/rule-17-10
+ *       correctness
  *       external/misra/obligation/required
  */
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Noreturn
+import codingstandards.cpp.Noreturn
 
 from NoreturnFunction f, Type returnType
 where
   not isExcluded(f, NoReturnPackage::nonVoidReturnTypeOfNoreturnFunctionQuery()) and
   returnType = f.getType() and
-  not returnType instanceof VoidType
+  not returnType instanceof VoidType and
+  not f.isCompilerGenerated()
 select f,
   "The function " + f.getName() + " is declared _noreturn but has a return type of " +
     returnType.toString() + "."
diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index c5d342c015..5563822f9c 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -6,12 +6,13 @@
  * @precision high
  * @problem.severity recommendation
  * @tags external/misra/id/rule-17-11
+ *       correctness
  *       external/misra/obligation/advisory
  */
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Noreturn
+import codingstandards.cpp.Noreturn
 
 from Function f
 where
@@ -19,6 +20,7 @@ where
   not f instanceof NoreturnFunction and
   not mayReturn(f) and
   f.hasDefinition() and
-  f.getName() != "main" // Allowed exception; _Noreturn main() is undefined behavior.
+  not f.getName() = "main" and // Allowed exception; _Noreturn main() is undefined behavior.
+  not f.isCompilerGenerated()
 select f,
   "The function " + f.getName() + " cannot return and should be declared attribute _Noreturn."
diff --git a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
index 7c23cf306f..360be01b7c 100644
--- a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
@@ -6,15 +6,16 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-17-9
+ *       correctness
  *       external/misra/obligation/mandatory
  */
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.c.Noreturn
+import codingstandards.cpp.rules.functionnoreturnattributecondition.FunctionNoReturnAttributeCondition
 
-from NoreturnFunction f
-where
-  not isExcluded(f, NoReturnPackage::returnStatementInNoreturnFunctionQuery()) and
-  mayReturn(f)
-select f, "The function " + f.getName() + " declared with attribute _Noreturn returns a value."
+class ReturnStatementInNoreturnFunctionQuery extends FunctionNoReturnAttributeConditionSharedQuery {
+  ReturnStatementInNoreturnFunctionQuery() {
+    this = NoReturnPackage::returnStatementInNoreturnFunctionQuery()
+  }
+}
diff --git a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
index 15389bfcdd..fe275e9497 100644
--- a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
+++ b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
@@ -2,3 +2,5 @@
 | test.c:18:6:18:21 | test_noreturn_f4 | The function test_noreturn_f4 cannot return and should be declared attribute _Noreturn. |
 | test.c:47:6:47:21 | test_noreturn_f8 | The function test_noreturn_f8 cannot return and should be declared attribute _Noreturn. |
 | test.c:63:6:63:22 | test_noreturn_f10 | The function test_noreturn_f10 cannot return and should be declared attribute _Noreturn. |
+| test.c:97:6:97:22 | test_noreturn_f15 | The function test_noreturn_f15 cannot return and should be declared attribute _Noreturn. |
+| test.c:101:6:101:22 | test_noreturn_f16 | The function test_noreturn_f16 cannot return and should be declared attribute _Noreturn. |
diff --git a/c/misra/test/rules/RULE-17-11/test.c b/c/misra/test/rules/RULE-17-11/test.c
index 1ecc2b1c44..7baaea5821 100644
--- a/c/misra/test/rules/RULE-17-11/test.c
+++ b/c/misra/test/rules/RULE-17-11/test.c
@@ -88,4 +88,17 @@ __attribute__((noreturn)) void test_noreturn_f13(int i) { // COMPLIANT
 // noreturn.
 int main(char **argv, int argc) { // COMPLIANT
   abort();
+}
+
+_Noreturn void test_noreturn_f14(int i) { // COMPLIANT
+  test_noreturn_f1(i);
+}
+
+void test_noreturn_f15(int i) { // NON_COMPLIANT
+  test_noreturn_f1(i);
+}
+
+void test_noreturn_f16(int i) { // NON_COMPLIANT
+  // Infinite tail recursion
+  test_noreturn_f16(i);
 }
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
deleted file mode 100644
index 9775f797de..0000000000
--- a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| test.c:7:16:7:31 | test_noreturn_f2 | The function test_noreturn_f2 declared with attribute _Noreturn returns a value. |
-| test.c:32:16:32:31 | test_noreturn_f5 | The function test_noreturn_f5 declared with attribute _Noreturn returns a value. |
-| test.c:47:32:47:47 | test_noreturn_f7 | The function test_noreturn_f7 declared with attribute _Noreturn returns a value. |
diff --git a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.testref b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.testref
new file mode 100644
index 0000000000..09a6d90538
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.testref
@@ -0,0 +1 @@
+c/common/test/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.ql
\ No newline at end of file
diff --git a/c/common/src/codingstandards/c/Noreturn.qll b/cpp/common/src/codingstandards/cpp/Noreturn.qll
similarity index 100%
rename from c/common/src/codingstandards/c/Noreturn.qll
rename to cpp/common/src/codingstandards/cpp/Noreturn.qll
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll b/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
index 2b910612cb..e2c210282b 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
@@ -5,20 +5,29 @@
 import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Noreturn
 
 abstract class FunctionNoReturnAttributeConditionSharedQuery extends Query { }
 
 Query getQuery() { result instanceof FunctionNoReturnAttributeConditionSharedQuery }
 
+/**
+ * `noreturn` functions are declared differently in c/c++. Attempt to match
+ * the description to the file; low risk if it chooses incorrectly.
+ */
+string describeNoreturn(Function f) {
+  if f.getFile().getExtension() = ["c", "C", "h", "H"]
+  then result = "_Noreturn"
+  else result = "[[noreturn]]"
+}
+
 /**
  * This checks that the return statement is reachable from the function entry point
  */
-query predicate problems(Function f, string message) {
+query predicate problems(NoreturnFunction f, string message) {
   not isExcluded(f, getQuery()) and
-  f.getAnAttribute().getName() = "noreturn" and
-  exists(ReturnStmt s |
-    f = s.getEnclosingFunction() and
-    s.getBasicBlock().isReachable()
-  ) and
-  message = "The function " + f.getName() + " declared with attribute [[noreturn]] returns a value."
+  mayReturn(f) and
+  not f.isCompilerGenerated() and
+  message =
+    "The function " + f.getName() + " declared with attribute " + describeNoreturn(f) + " returns a value."
 }
diff --git a/rule_packages/c/NoReturn.json b/rule_packages/c/NoReturn.json
index 1cb4d02ab4..d06068f376 100644
--- a/rule_packages/c/NoReturn.json
+++ b/rule_packages/c/NoReturn.json
@@ -12,7 +12,7 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "NonVoidReturnTypeOfNoreturnFunction",
-          "tags": []
+          "tags": ["correctness"]
         }
       ],
       "title": "A function declared with _noreturn shall have a return type of void"
@@ -29,7 +29,7 @@
           "precision": "high",
           "severity": "recommendation",
           "short_name": "FunctionWithNoReturningBranchShouldBeNoreturn",
-          "tags": []
+          "tags": ["correctness"]
         }
       ],
       "title": "A function without a branch that returns shall be declared with _Noreturn"
@@ -46,7 +46,8 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ReturnStatementInNoreturnFunction",
-          "tags": []
+          "tags": ["correctness"],
+          "shared_implementation_short_name": "FunctionNoReturnAttributeCondition"
         }
       ],
       "title": "Verify that a function declared with _Noreturn does not return"

From 8991e5f98183d015d02e64b8d47f1748d70b7250 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 27 Sep 2024 13:35:39 -0700
Subject: [PATCH 182/435] Fix format

---
 .../functionnoreturnattributecondition/test.c | 35 +++++++++++--------
 .../FunctionNoReturnAttributeCondition.qll    |  3 +-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/c/common/test/rules/functionnoreturnattributecondition/test.c b/c/common/test/rules/functionnoreturnattributecondition/test.c
index 8299c0cc89..1b0ba759e1 100644
--- a/c/common/test/rules/functionnoreturnattributecondition/test.c
+++ b/c/common/test/rules/functionnoreturnattributecondition/test.c
@@ -1,6 +1,6 @@
+#include "setjmp.h"
 #include "stdlib.h"
 #include "threads.h"
-#include "setjmp.h"
 
 _Noreturn void test_noreturn_f1(int i) { // COMPLIANT
   abort();
@@ -61,20 +61,25 @@ _Noreturn void test_noreturn_f9(int i) { // COMPLIANT
 }
 
 _Noreturn void test_noreturn_f10(int i) { // COMPLIANT
-  switch(i) {
-    case 0:
-      abort(); break;
-    case 1:
-      exit(0); break;
-    case 2:
-      _Exit(0); break;
-    case 3:
-      quick_exit(0); break;
-    case 4:
-      thrd_exit(0); break;
-    default:
-      jmp_buf jb;
-      longjmp(jb, 0);
+  switch (i) {
+  case 0:
+    abort();
+    break;
+  case 1:
+    exit(0);
+    break;
+  case 2:
+    _Exit(0);
+    break;
+  case 3:
+    quick_exit(0);
+    break;
+  case 4:
+    thrd_exit(0);
+    break;
+  default:
+    jmp_buf jb;
+    longjmp(jb, 0);
   }
 }
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll b/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
index e2c210282b..bb54a31df6 100644
--- a/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/functionnoreturnattributecondition/FunctionNoReturnAttributeCondition.qll
@@ -29,5 +29,6 @@ query predicate problems(NoreturnFunction f, string message) {
   mayReturn(f) and
   not f.isCompilerGenerated() and
   message =
-    "The function " + f.getName() + " declared with attribute " + describeNoreturn(f) + " returns a value."
+    "The function " + f.getName() + " declared with attribute " + describeNoreturn(f) +
+      " returns a value."
 }

From b297513482e44fc24126b2c87250ace8fdc49338 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 27 Sep 2024 14:31:29 -0700
Subject: [PATCH 183/435] Fix tests

---
 .../test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref

diff --git a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref b/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref
deleted file mode 100644
index eaa647d8a4..0000000000
--- a/c/misra/test/rules/RULE-17-9/ReturnStatementInNoreturnFunction.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
\ No newline at end of file

From 6f860fcd49ccb88756ecc39c9c81d62093458aeb Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 30 Sep 2024 07:51:17 -0700
Subject: [PATCH 184/435] Add changelog; tweaks based on MRVA results.

---
 .../FunctionWithNoReturningBranchShouldBeNoreturn.ql       | 7 +++++--
 change_notes/2024-09-28-improved-noreturn-rules.md         | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 change_notes/2024-09-28-improved-noreturn-rules.md

diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index 5563822f9c..7383746d05 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -16,11 +16,14 @@ import codingstandards.cpp.Noreturn
 
 from Function f
 where
-  not isExcluded(f, NoReturnPackage::returnStatementInNoreturnFunctionQuery()) and
+  not isExcluded(f, NoReturnPackage::functionWithNoReturningBranchShouldBeNoreturnQuery()) and
   not f instanceof NoreturnFunction and
   not mayReturn(f) and
   f.hasDefinition() and
   not f.getName() = "main" and // Allowed exception; _Noreturn main() is undefined behavior.
+  // Harden against c++ cases.
+  not f.isFromUninstantiatedTemplate(_) and
+  not f.isDeleted() and
   not f.isCompilerGenerated()
 select f,
-  "The function " + f.getName() + " cannot return and should be declared attribute _Noreturn."
+  "The function " + f.getName() + " cannot return and should be declared as _Noreturn."
diff --git a/change_notes/2024-09-28-improved-noreturn-rules.md b/change_notes/2024-09-28-improved-noreturn-rules.md
new file mode 100644
index 0000000000..99fb4a0f46
--- /dev/null
+++ b/change_notes/2024-09-28-improved-noreturn-rules.md
@@ -0,0 +1,3 @@
+ - `A7-6-1`, `MSC53-CPP`, `RULE-9-6-4` - `FunctionNoReturnAttbrituteCondition.qll`
+   - Analysis expanded from functions with "noreturn" attribute, now includes the "noreturn" specifier as well to handle new c rules. No difference in C++ results expected.
+   - Exclude compiler generated functions from being reported.
\ No newline at end of file

From 3356b5e0163cd51f1bf71cf8a235170c8d1563bf Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 30 Sep 2024 07:56:50 -0700
Subject: [PATCH 185/435] Fix format

---
 .../FunctionWithNoReturningBranchShouldBeNoreturn.ql           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index 7383746d05..9769acdb7f 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -25,5 +25,4 @@ where
   not f.isFromUninstantiatedTemplate(_) and
   not f.isDeleted() and
   not f.isCompilerGenerated()
-select f,
-  "The function " + f.getName() + " cannot return and should be declared as _Noreturn."
+select f, "The function " + f.getName() + " cannot return and should be declared as _Noreturn."

From 805a1935643ddaf55ea0b78739cca9c7ece087cf Mon Sep 17 00:00:00 2001
From: knewbury01 <knewbury01@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:30:10 +0000
Subject: [PATCH 186/435] Bump version to 2.36.0-dev

---
 c/cert/src/qlpack.yml       |  2 +-
 c/cert/test/qlpack.yml      |  2 +-
 c/common/src/qlpack.yml     |  2 +-
 c/common/test/qlpack.yml    |  2 +-
 c/misra/src/qlpack.yml      |  2 +-
 c/misra/test/qlpack.yml     |  2 +-
 cpp/autosar/src/qlpack.yml  |  2 +-
 cpp/autosar/test/qlpack.yml |  2 +-
 cpp/cert/src/qlpack.yml     |  2 +-
 cpp/cert/test/qlpack.yml    |  2 +-
 cpp/common/src/qlpack.yml   |  2 +-
 cpp/common/test/qlpack.yml  |  2 +-
 cpp/misra/src/qlpack.yml    |  2 +-
 cpp/misra/test/qlpack.yml   |  2 +-
 cpp/report/src/qlpack.yml   |  2 +-
 docs/user_manual.md         | 12 ++++++------
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index 1cffeea095..a0adb282a4 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
index defb929a0f..7a700897b0 100644
--- a/c/cert/test/qlpack.yml
+++ b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.35.0-dev
+version: 2.36.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 03e55b4851..b1571ec4ec 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
index 97590a4d4e..47b71ea34a 100644
--- a/c/common/test/qlpack.yml
+++ b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.35.0-dev
+version: 2.36.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 0300f548bd..fe7a2a0567 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
index 26164b1e29..bc2f2e7546 100644
--- a/c/misra/test/qlpack.yml
+++ b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.35.0-dev
+version: 2.36.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 9342d641ae..947013155f 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
index 7bc49127a1..41a02a6afb 100644
--- a/cpp/autosar/test/qlpack.yml
+++ b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.35.0-dev
+version: 2.36.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index d97fa9b2e3..3a435b5e8e 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
index 8832249332..2464828aac 100644
--- a/cpp/cert/test/qlpack.yml
+++ b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.35.0-dev
+version: 2.36.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index 849866287f..a2448fd608 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.9.3
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
index 51521c3ada..249c64696e 100644
--- a/cpp/common/test/qlpack.yml
+++ b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.35.0-dev
+version: 2.36.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index 75d1ef2e2c..5e50eb563a 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 description: MISRA C++ 2023
 suites: codeql-suites
 license: MIT
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
index b1e9fc383e..0267a9ec70 100644
--- a/cpp/misra/test/qlpack.yml
+++ b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.35.0-dev
+version: 2.36.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 09ef198c5a..81f95392c9 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.35.0-dev
+version: 2.36.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.9.3
diff --git a/docs/user_manual.md b/docs/user_manual.md
index 7315ed322a..0d42e698fb 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -30,13 +30,13 @@
 
 ## Release information
 
-This user manual documents release `2.35.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
+This user manual documents release `2.36.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
-- `code-scanning-cpp-query-pack-2.35.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `supported_rules_list_2.35.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
-- `supported_rules_list_2.35.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
-- `user_manual_2.35.0-dev.md`: This user manual.
+- `code-scanning-cpp-query-pack-2.36.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `supported_rules_list_2.36.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
+- `supported_rules_list_2.36.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
+- `user_manual_2.36.0-dev.md`: This user manual.
 - `Source Code (zip)`: A zip archive containing the contents of https://github.com/github/codeql-coding-standards
 - `Source Code (tar.gz)`: A GZip compressed tar archive containing the contents of https://github.com/github/codeql-coding-standards
 - `checksums.txt`: A text file containing sha256 checksums for the aforementioned artifacts.
@@ -499,7 +499,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Ouf of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
-|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.35.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
+|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.36.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
 |                              | Incorrect deviation record specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation records with a reason. Ensure that all deviation records are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |

From 8ffbb1e41add56e47394e45abbaaefb65140aeea Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 30 Sep 2024 08:44:22 -0700
Subject: [PATCH 187/435] Update test expected message

---
 ...ionWithNoReturningBranchShouldBeNoreturn.expected | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
index fe275e9497..ecb77a477c 100644
--- a/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
+++ b/c/misra/test/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.expected
@@ -1,6 +1,6 @@
-| test.c:7:6:7:21 | test_noreturn_f2 | The function test_noreturn_f2 cannot return and should be declared attribute _Noreturn. |
-| test.c:18:6:18:21 | test_noreturn_f4 | The function test_noreturn_f4 cannot return and should be declared attribute _Noreturn. |
-| test.c:47:6:47:21 | test_noreturn_f8 | The function test_noreturn_f8 cannot return and should be declared attribute _Noreturn. |
-| test.c:63:6:63:22 | test_noreturn_f10 | The function test_noreturn_f10 cannot return and should be declared attribute _Noreturn. |
-| test.c:97:6:97:22 | test_noreturn_f15 | The function test_noreturn_f15 cannot return and should be declared attribute _Noreturn. |
-| test.c:101:6:101:22 | test_noreturn_f16 | The function test_noreturn_f16 cannot return and should be declared attribute _Noreturn. |
+| test.c:7:6:7:21 | test_noreturn_f2 | The function test_noreturn_f2 cannot return and should be declared as _Noreturn. |
+| test.c:18:6:18:21 | test_noreturn_f4 | The function test_noreturn_f4 cannot return and should be declared as _Noreturn. |
+| test.c:47:6:47:21 | test_noreturn_f8 | The function test_noreturn_f8 cannot return and should be declared as _Noreturn. |
+| test.c:63:6:63:22 | test_noreturn_f10 | The function test_noreturn_f10 cannot return and should be declared as _Noreturn. |
+| test.c:97:6:97:22 | test_noreturn_f15 | The function test_noreturn_f15 cannot return and should be declared as _Noreturn. |
+| test.c:101:6:101:22 | test_noreturn_f16 | The function test_noreturn_f16 cannot return and should be declared as _Noreturn. |

From a4985236a038b2163f4d189d1d240176281fbb32 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 30 Sep 2024 19:04:06 +0100
Subject: [PATCH 188/435] Rule 10.7: Avoid performance issues

The essential type categories were joined prematurely, causing a
cross product of all results against all types of the same
essential type category. Fixed by ensuring the essential type
category join occurs late.
---
 .../RULE-10-7/ImplicitConversionOfCompositeExpression.ql  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql b/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql
index 1cf20378fa..3aa324b668 100644
--- a/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql
+++ b/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql
@@ -18,6 +18,12 @@ import codingstandards.c.misra
 import codingstandards.c.misra.EssentialTypes
 import codingstandards.c.misra.MisraExpressions
 
+bindingset[essentialTypeLeft, essentialTypeRight]
+pragma[inline_late]
+predicate isSameEssentialTypeCategory(Type essentialTypeLeft, Type essentialTypeRight) {
+  getEssentialTypeCategory(essentialTypeLeft) = getEssentialTypeCategory(essentialTypeRight)
+}
+
 from
   OperationWithUsualArithmeticConversions arith, CompositeExpression compositeOp, Expr otherOp,
   Type compositeEssentialType, Type otherOpEssentialType
@@ -32,7 +38,7 @@ where
   // Operands of a different type category in an operation with the usual arithmetic conversions is
   // prohibited by Rule 10.4, so we only report cases here where the essential type categories are
   // the same
-  getEssentialTypeCategory(compositeEssentialType) = getEssentialTypeCategory(otherOpEssentialType)
+  isSameEssentialTypeCategory(compositeEssentialType, otherOpEssentialType)
 select arith,
   "Implicit conversion of $@ from " + compositeEssentialType + " to " + otherOpEssentialType,
   compositeOp, "composite op"

From 10bf70e865918939b679a64ec5ad647528ad140b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 30 Sep 2024 19:34:38 +0100
Subject: [PATCH 189/435] SIG31-C: Improve performance

Remove unintential cross product on target.
---
 ...oNotAccessSharedObjectsInSignalHandlers.ql | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/c/cert/src/rules/SIG31-C/DoNotAccessSharedObjectsInSignalHandlers.ql b/c/cert/src/rules/SIG31-C/DoNotAccessSharedObjectsInSignalHandlers.ql
index 8f9e907019..2a7a6a77f2 100644
--- a/c/cert/src/rules/SIG31-C/DoNotAccessSharedObjectsInSignalHandlers.ql
+++ b/c/cert/src/rules/SIG31-C/DoNotAccessSharedObjectsInSignalHandlers.ql
@@ -21,18 +21,19 @@ import codingstandards.c.Signal
  */
 class UnsafeSharedVariableAccess extends VariableAccess {
   UnsafeSharedVariableAccess() {
-    // static or thread local storage duration
-    (
-      this.getTarget() instanceof StaticStorageDurationVariable or
-      this.getTarget().isThreadLocal()
-    ) and
     // excluding `volatile sig_atomic_t` type
     not this.getType().(SigAtomicType).isVolatile() and
-    // excluding lock-free atomic objects
-    not exists(MacroInvocation mi, VariableAccess va |
-      mi.getMacroName() = "atomic_is_lock_free" and
-      mi.getExpr().getChild(0) = va.getEnclosingElement*() and
-      va.getTarget() = this.getTarget()
+    exists(Variable target | target = this.getTarget() |
+      // static or thread local storage duration
+      (
+        target instanceof StaticStorageDurationVariable or
+        target.isThreadLocal()
+      ) and
+      // excluding lock-free atomic objects
+      not exists(MacroInvocation mi, VariableAccess va | va.getTarget() = target |
+        mi.getMacroName() = "atomic_is_lock_free" and
+        mi.getExpr().getChild(0) = va.getEnclosingElement*()
+      )
     )
   }
 }

From 52a02f38ffa642ba4b7c0d03d69880ffc94cf326 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Wed, 2 Oct 2024 16:13:21 +0900
Subject: [PATCH 190/435] Fix #711

---
 change_notes/2024-10-02-fix-fp-711-M0-1-10.md |  2 +
 .../src/rules/M0-1-10/UnusedFunction.ql       |  3 +-
 .../rules/M0-1-10/UnusedSplMemberFunction.ql  | 32 ++++++++++++
 .../rules/M0-1-10/UnusedFunction.expected     |  3 +-
 .../M0-1-10/UnusedSplMemberFunction.expected  |  2 +
 .../M0-1-10/UnusedSplMemberFunction.qlref     |  1 +
 cpp/autosar/test/rules/M0-1-10/test.cpp       | 51 ++++++++++++++++++-
 cpp/autosar/test/rules/M0-1-10/test.hpp       |  4 ++
 .../cpp/EncapsulatingFunctions.qll            | 33 ++++++++++++
 .../cpp/deadcode/UnusedFunctions.qll          | 40 ++++++++++++++-
 10 files changed, 166 insertions(+), 5 deletions(-)
 create mode 100644 change_notes/2024-10-02-fix-fp-711-M0-1-10.md
 create mode 100644 cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
 create mode 100644 cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
 create mode 100644 cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref
 create mode 100644 cpp/autosar/test/rules/M0-1-10/test.hpp

diff --git a/change_notes/2024-10-02-fix-fp-711-M0-1-10.md b/change_notes/2024-10-02-fix-fp-711-M0-1-10.md
new file mode 100644
index 0000000000..cff5d5ab43
--- /dev/null
+++ b/change_notes/2024-10-02-fix-fp-711-M0-1-10.md
@@ -0,0 +1,2 @@
+- `M0-1-10` - `UnusedFunction.ql`:
+  - Fixes #711. Excludes constexpr functions, considers functions from GoogleTest as an EntryPoint and does not consider special member functions. Another query called UnusedSplMemberFunction.ql is created that reports unused special member functions. This is done so as to enable deviations to be applied to this case.
diff --git a/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql b/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql
index b8593e75c0..27306a9fc1 100644
--- a/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql
+++ b/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql
@@ -26,5 +26,6 @@ where
     then name = unusedFunction.getQualifiedName()
     else name = unusedFunction.getName()
   ) and
-  not unusedFunction.isDeleted()
+  not unusedFunction.isDeleted() and
+  not UnusedFunctions::isASpecialMemberFunction(unusedFunction)
 select unusedFunction, "Function " + name + " is " + unusedFunction.getDeadCodeType()
diff --git a/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
new file mode 100644
index 0000000000..bf073dcced
--- /dev/null
+++ b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
@@ -0,0 +1,32 @@
+/**
+ * @id cpp/autosar/unused-spl-member-function
+ * @name M0-1-10: Every defined function should be called at least once
+ * @description Uncalled functions complicate the program and can indicate a possible mistake on the
+ *              part of the programmer. This query specifically looks for unused Special Member
+ *              Functions.
+ * @kind problem
+ * @precision medium
+ * @problem.severity warning
+ * @tags external/autosar/id/m0-1-10
+ *       readability
+ *       maintainability
+ *       external/autosar/allocated-target/implementation
+ *       external/autosar/enforcement/automated
+ *       external/autosar/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.autosar
+import codingstandards.cpp.deadcode.UnusedFunctions
+
+from UnusedFunctions::UnusedSplMemberFunction unusedSplMemFunction, string name
+where
+  not isExcluded(unusedSplMemFunction, DeadCodePackage::unusedFunctionQuery()) and
+  (
+    if exists(unusedSplMemFunction.getQualifiedName())
+    then name = unusedSplMemFunction.getQualifiedName()
+    else name = unusedSplMemFunction.getName()
+  ) and
+  not unusedSplMemFunction.isDeleted()
+select unusedSplMemFunction,
+  "Special member function " + name + " is " + unusedSplMemFunction.getDeadCodeType()
diff --git a/cpp/autosar/test/rules/M0-1-10/UnusedFunction.expected b/cpp/autosar/test/rules/M0-1-10/UnusedFunction.expected
index d9ab0d38ac..912e2104e8 100644
--- a/cpp/autosar/test/rules/M0-1-10/UnusedFunction.expected
+++ b/cpp/autosar/test/rules/M0-1-10/UnusedFunction.expected
@@ -10,4 +10,5 @@
 | test.cpp:50:5:50:6 | i3 | Function C<T>::i3 is never called. |
 | test.cpp:51:8:51:9 | i4 | Function C<T>::i4 is never called. |
 | test.cpp:52:15:52:16 | i5 | Function C<T>::i5 is never called. |
-| test.cpp:69:17:69:18 | g4 | Function g4 is never called. |
+| test.cpp:79:6:79:21 | anUnusedFunction | Function anUnusedFunction is never called. |
+| test.cpp:113:17:113:18 | g4 | Function g4 is never called. |
diff --git a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
new file mode 100644
index 0000000000..e2bf0acc79
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
@@ -0,0 +1,2 @@
+| test.cpp:71:5:71:16 | ANestedClass | Special member function ANestedClass is never called. |
+| test.cpp:82:5:82:22 | AnotherNestedClass | Special member function AnotherNestedClass is never called from a main function or entry point. |
diff --git a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref
new file mode 100644
index 0000000000..b04687a48b
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref
@@ -0,0 +1 @@
+rules/M0-1-10/UnusedSplMemberFunction.ql
diff --git a/cpp/autosar/test/rules/M0-1-10/test.cpp b/cpp/autosar/test/rules/M0-1-10/test.cpp
index 748d2196ef..6e1220be5d 100644
--- a/cpp/autosar/test/rules/M0-1-10/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-10/test.cpp
@@ -52,6 +52,50 @@ template <class T> class C {
   inline void i5() {}     // NON_COMPLIANT - never used in any instantiation
 };
 
+#include "test.hpp"
+#include <type_traits>
+
+template <typename T1, typename T2>
+constexpr bool aConstExprFunc() noexcept { // COMPLIANT
+  static_assert(std::is_trivially_copy_constructible<T1>() &&
+                    std::is_trivially_copy_constructible<T2>(),
+                "assert");
+  return true;
+}
+
+template <typename T, int val> class AClass { T anArr[val]; };
+
+void aCalledFunc1() // COMPLIANT
+{
+  struct ANestedClass {
+    ANestedClass() noexcept(false) { // COMPLIANT: False Positive!
+      static_cast<void>(0);
+    }
+  };
+  static_assert(std::is_trivially_copy_constructible<AClass<ANestedClass, 5>>(),
+                "Must be trivially copy constructible");
+}
+
+void anUnusedFunction() // NON_COMPLIANT
+{
+  struct AnotherNestedClass {
+    AnotherNestedClass() noexcept(false) { // NON_COMPLAINT
+      static_cast<void>(0);
+    }
+  };
+  AnotherNestedClass d;
+}
+
+void aCalledFunc2() // COMPLIANT
+{
+  struct YetAnotherNestedClass {
+    YetAnotherNestedClass() noexcept(false) {
+      static_cast<void>(0);
+    } // COMPLIANT
+  };
+  YetAnotherNestedClass d;
+};
+
 int main() { // COMPLIANT - this is a main like function which acts as an entry
              // point
   f3();
@@ -88,8 +132,13 @@ int main() { // COMPLIANT - this is a main like function which acts as an entry
   c1.getAT();
   S s;
   c2.i1(s);
+
+  int aVar;
+  aConstExprFunc<decltype(aCalledFuncInHeader(aVar)), int>();
+  aCalledFunc1();
+  aCalledFunc2();
 }
 class M {
 public:
   M(const M &) = delete; // COMPLIANT - ignore if deleted
-};
\ No newline at end of file
+};
diff --git a/cpp/autosar/test/rules/M0-1-10/test.hpp b/cpp/autosar/test/rules/M0-1-10/test.hpp
new file mode 100644
index 0000000000..a2da990951
--- /dev/null
+++ b/cpp/autosar/test/rules/M0-1-10/test.hpp
@@ -0,0 +1,4 @@
+template <class T>
+constexpr T aCalledFuncInHeader(T value) noexcept { // COMPLIANT
+  return static_cast<T>(value);
+}
diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
index d8d9739033..f619429d0d 100644
--- a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
@@ -18,6 +18,39 @@ class MainFunction extends MainLikeFunction {
   }
 }
 
+/**
+ * A test function from the GoogleTest infrastructure.
+ *
+ * Such functions can be treated as valid EntryPoint functions during analysis
+ * of "called" or "unused" functions. It is not straightforward to identify
+ * such functions, however, they have certain features that can be used for
+ * identification. This can be refined based on experiments/real-world use.
+ */
+class GTestFunction extends MainLikeFunction {
+  GTestFunction() {
+    // A GoogleTest function is named "TestBody" and
+    this.hasName("TestBody") and
+    // is enclosed by a class that inherits from a base class
+    this.getEnclosingAccessHolder() instanceof Class and
+    exists(Class base |
+      base = this.getEnclosingAccessHolder().(Class).getABaseClass() and
+      (
+        // called "Test" or
+        exists(Class c | base.getABaseClass() = c and c.hasName("Test"))
+        or
+        // defined under a namespace called "testing" or
+        exists(Namespace n | n = base.getNamespace() | n.hasName("testing"))
+        or
+        // is templatized by a parameter called "gtest_TypeParam_"
+        exists(TemplateParameter tp |
+          tp = base.getATemplateArgument() and
+          tp.hasName("gtest_TypeParam_")
+        )
+      )
+    )
+  }
+}
+
 /**
  * A "task main" function.
  */
diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll b/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll
index b01b80208e..2dc24025ce 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll
@@ -75,7 +75,9 @@ module UnusedFunctions {
    */
 
   private class MainLikeFunctionEntryPoint extends EntryPoint, MainLikeFunction {
-    MainLikeFunctionEntryPoint() { this instanceof MainLikeFunction }
+    MainLikeFunctionEntryPoint() {
+      this instanceof MainLikeFunction or this instanceof GTestFunction
+    }
 
     override Function getAReachableFunction() { reachable*(this, result) }
   }
@@ -111,6 +113,26 @@ module UnusedFunctions {
     }
   }
 
+  /**
+   * A `MemberFunction` which is either a Default constructor, Destructor
+   * CopyConstructor, CopyAssingmentOperator, MoveConstructor or a
+   * MoveAssignmentOperator
+   */
+  predicate isASpecialMemberFunction(MemberFunction f) {
+    // Default constructor
+    f instanceof NoArgConstructor
+    or
+    f instanceof Destructor
+    or
+    f instanceof CopyConstructor
+    or
+    f instanceof CopyAssignmentOperator
+    or
+    f instanceof MoveConstructor
+    or
+    f instanceof MoveAssignmentOperator
+  }
+
   /**
    * A `Function` which is not used from an `EntryPoint`.
    *
@@ -119,7 +141,12 @@ module UnusedFunctions {
   class UnusedFunction extends UsableFunction {
     UnusedFunction() {
       // This function, or an equivalent function, is not reachable from any entry point
-      not exists(EntryPoint ep | getAnEquivalentFunction(this) = ep.getAReachableFunction())
+      not exists(EntryPoint ep | getAnEquivalentFunction(this) = ep.getAReachableFunction()) and
+      // and it is not a constexpr. Refer issue #646.
+      // The usages of constexpr is not well tracked and hence
+      // to avoid false positives, this is added. In case there is an improvement in
+      // handling constexpr in CodeQL, we can consider removing it.
+      not this.isConstexpr()
     }
 
     string getDeadCodeType() {
@@ -128,4 +155,13 @@ module UnusedFunctions {
       else result = "never called."
     }
   }
+
+  /**
+   * A Special `MemberFunction` which is an `UnusedFunction`.
+   *
+   * Refer isASpecialMemberFunction predicate.
+   */
+  class UnusedSplMemberFunction extends UnusedFunction {
+    UnusedSplMemberFunction() { isASpecialMemberFunction(this) }
+  }
 }

From 53a0834e3c4231c0f0e6c5583c154e079ba96250 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 2 Oct 2024 10:08:14 +0100
Subject: [PATCH 191/435] Add change note.

---
 change_notes/2024-10-02-c-perf-issues.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 change_notes/2024-10-02-c-perf-issues.md

diff --git a/change_notes/2024-10-02-c-perf-issues.md b/change_notes/2024-10-02-c-perf-issues.md
new file mode 100644
index 0000000000..e139267e39
--- /dev/null
+++ b/change_notes/2024-10-02-c-perf-issues.md
@@ -0,0 +1,4 @@
+ - `RULE-10-7` - `.ql`:
+   - Improved performance on larger codebases.
+ - `SIG31-C` - `DoNotAccessSharedObjectsInSignalHandlers.ql`:
+   - Improved performance on larger codebases.
\ No newline at end of file

From 67cc2cdd299c1d84eef1167e38671d6c7263c7f7 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 2 Oct 2024 11:16:23 +0100
Subject: [PATCH 192/435] Replace PAT with GitHub App

---
 .github/workflows/dispatch-matrix-check.yml           | 11 ++++++++++-
 .github/workflows/dispatch-matrix-test-on-comment.yml | 11 ++++++++++-
 .../workflows/dispatch-release-performance-check.yml  | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dispatch-matrix-check.yml b/.github/workflows/dispatch-matrix-check.yml
index afe78c948c..f9b0260594 100644
--- a/.github/workflows/dispatch-matrix-check.yml
+++ b/.github/workflows/dispatch-matrix-check.yml
@@ -20,11 +20,20 @@ jobs:
         with:
           minimum-permission: "write"
 
+      - name: Generate token
+        id: generate-token
+        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        with:
+          app-id: ${{ vars.AUTOMATION_APP_ID }}
+          private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "codeql-coding-standards-release-engineering"
+
       - name: Dispatch Matrix Testing Job
         if: steps.check-write-permission.outputs.has-permission
         uses: peter-evans/repository-dispatch@v2
         with:
-          token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
+          token: ${{ steps.generate-token.outputs.token }}
           repository: github/codeql-coding-standards-release-engineering
           event-type: matrix-test
           client-payload: '{"pr": "${{ github.event.number }}"}'
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
index 98e1f9b7ba..6500e3f6bc 100644
--- a/.github/workflows/dispatch-matrix-test-on-comment.yml
+++ b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -17,11 +17,20 @@ jobs:
         with:
           minimum-permission: "write"
 
+      - name: Generate token
+        id: generate-token
+        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        with:
+          app-id: ${{ vars.AUTOMATION_APP_ID }}
+          private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "codeql-coding-standards-release-engineering"
+
       - name: Dispatch Matrix Testing Job
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
         uses: peter-evans/repository-dispatch@v2
         with:
-          token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
+          token: ${{ steps.generate-token.outputs.token }}
           repository: github/codeql-coding-standards-release-engineering
           event-type: matrix-test
           client-payload: '{"pr": "${{ github.event.issue.number }}"}'
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index 64863b8b05..d6311babb3 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -17,11 +17,20 @@ jobs:
         with:
           minimum-permission: "write"
 
+      - name: Generate token
+        id: generate-token
+        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        with:
+          app-id: ${{ vars.AUTOMATION_APP_ID }}
+          private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "codeql-coding-standards-release-engineering"
+
       - name: Dispatch Performance Testing Job
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}
         uses: peter-evans/repository-dispatch@v2
         with:
-          token: ${{ secrets.RELEASE_ENGINEERING_TOKEN }}
+          token: ${{ steps.generate-token.outputs.token }}
           repository: github/codeql-coding-standards-release-engineering
           event-type: performance-test
           client-payload: '{"pr": "${{ github.event.issue.number }}"}'

From 2fbb70f5c0be55164213c1b54dca2ccc705a08c6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:28:12 +0100
Subject: [PATCH 193/435] Use v4 for upload-artifact

---
 .github/workflows/codeql_unit_tests.yml              | 2 +-
 .github/workflows/standard_library_upgrade_tests.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index a6488a728c..251e972a91 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -151,7 +151,7 @@ jobs:
               file.close()
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.language }}-test-results-${{ runner.os }}-${{ matrix.codeql_cli }}-${{ matrix.codeql_standard_library_ident }}
           path: |
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
index 35717b7b4e..b6c3d38d87 100644
--- a/.github/workflows/standard_library_upgrade_tests.yml
+++ b/.github/workflows/standard_library_upgrade_tests.yml
@@ -143,7 +143,7 @@ jobs:
               }, test_summary_file)
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{runner.os}}-${{matrix.codeql_cli}}-${{matrix.codeql_standard_library_ident}}
           path: |

From ce94e95aa35a9a1549cae96bc47300d25ac9aa93 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:35:56 +0100
Subject: [PATCH 194/435] Update change_notes/2024-10-02-c-perf-issues.md

Co-authored-by: Kristen Newbury <knewbury01@github.com>
---
 change_notes/2024-10-02-c-perf-issues.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/change_notes/2024-10-02-c-perf-issues.md b/change_notes/2024-10-02-c-perf-issues.md
index e139267e39..c9fcac1a05 100644
--- a/change_notes/2024-10-02-c-perf-issues.md
+++ b/change_notes/2024-10-02-c-perf-issues.md
@@ -1,4 +1,4 @@
- - `RULE-10-7` - `.ql`:
+ - `RULE-10-7` - `ImplicitConversionOfCompositeExpression.ql`:
    - Improved performance on larger codebases.
  - `SIG31-C` - `DoNotAccessSharedObjectsInSignalHandlers.ql`:
    - Improved performance on larger codebases.
\ No newline at end of file

From 81fb797339d5a9ea216fe41731956e07d7847df4 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 13:46:24 -0700
Subject: [PATCH 195/435] Set FunctionWithNoReturningBranch... to very-high
 precision

---
 .../RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index 9769acdb7f..90cb1af7c2 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -3,7 +3,7 @@
  * @name RULE-17-11: A function without a branch that returns shall be declared with _Noreturn
  * @description Functions which cannot return should be declared with _Noreturn.
  * @kind problem
- * @precision high
+ * @precision very-high
  * @problem.severity recommendation
  * @tags external/misra/id/rule-17-11
  *       correctness

From 71b4c250ffd667c447e0cb2247c932229e867d56 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 13:54:25 -0700
Subject: [PATCH 196/435] Fix NoReturn.json package description precision 17-11

---
 rule_packages/c/NoReturn.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rule_packages/c/NoReturn.json b/rule_packages/c/NoReturn.json
index d06068f376..49cdb4c255 100644
--- a/rule_packages/c/NoReturn.json
+++ b/rule_packages/c/NoReturn.json
@@ -26,7 +26,7 @@
           "description": "Functions which cannot return should be declared with _Noreturn.",
           "kind": "problem",
           "name": "A function without a branch that returns shall be declared with _Noreturn",
-          "precision": "high",
+          "precision": "very-high",
           "severity": "recommendation",
           "short_name": "FunctionWithNoReturningBranchShouldBeNoreturn",
           "tags": ["correctness"]

From ce6709d26cd590513bf90256bd4cddc0f9e32903 Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Wed, 18 Sep 2024 19:58:23 +0000
Subject: [PATCH 197/435] Fix #689, false negatives for A1-1-2 thinking
 -Wno-foo is compliant.

The presence of -Wno-foo should not mark the compilation compliant with
A1-1-2, nor should the presence of -Wfoo=0.

Easily check for all -Wfoo=bar flags, that foo is not no-baz, and bar is
not 0. Also check there is no -Wno-foo flag overruling it. Otherwise the
query functionality remains the same.

Add test cases for non-compliant scenarios -Wfoo=0 and -Wno-foo, and for
the compliant scenario -Wall -Wno-foo.

This will have some compatibility issues with PR #688, after one is
merged the other will need some small updates before this can be merged.
---
 ...2024-09-18-handle-warning-suppresion-flags |  2 +
 .../CompilerWarningLevelNotInCompliance.ql    | 51 ++++++++++++++++++-
 ...mpilerWarningLevelNotInCompliance.expected |  1 +
 .../CompilerWarningLevelNotInCompliance.qlref |  1 +
 .../Wformat=0-Wno-format-security.cpp         |  2 +
 cpp/autosar/test/rules/A1-1-2.4/options.clang |  1 +
 cpp/autosar/test/rules/A1-1-2.4/options.gcc   |  1 +
 cpp/autosar/test/rules/A1-1-2.4/options.qcc   |  1 +
 ...mpilerWarningLevelNotInCompliance.expected |  1 +
 ...WarningLevelNotInCompliance.expected.clang |  0
 ...erWarningLevelNotInCompliance.expected.gcc |  0
 ...erWarningLevelNotInCompliance.expected.qcc |  1 +
 .../CompilerWarningLevelNotInCompliance.qlref |  1 +
 .../test/rules/A1-1-2.5/Wall-Wno-format.cpp   | 14 +++++
 cpp/autosar/test/rules/A1-1-2.5/options.clang |  1 +
 cpp/autosar/test/rules/A1-1-2.5/options.gcc   |  1 +
 cpp/autosar/test/rules/A1-1-2.5/options.qcc   |  1 +
 ...mpilerWarningLevelNotInCompliance.expected |  2 +-
 18 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 change_notes/2024-09-18-handle-warning-suppresion-flags
 create mode 100644 cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.expected
 create mode 100644 cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.qlref
 create mode 100644 cpp/autosar/test/rules/A1-1-2.4/Wformat=0-Wno-format-security.cpp
 create mode 100644 cpp/autosar/test/rules/A1-1-2.4/options.clang
 create mode 100644 cpp/autosar/test/rules/A1-1-2.4/options.gcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2.4/options.qcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.clang
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.gcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.qcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.qlref
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/Wall-Wno-format.cpp
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/options.clang
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/options.gcc
 create mode 100644 cpp/autosar/test/rules/A1-1-2.5/options.qcc

diff --git a/change_notes/2024-09-18-handle-warning-suppresion-flags b/change_notes/2024-09-18-handle-warning-suppresion-flags
new file mode 100644
index 0000000000..12bf30e937
--- /dev/null
+++ b/change_notes/2024-09-18-handle-warning-suppresion-flags
@@ -0,0 +1,2 @@
+- `A1-1-2` - `CompilerWarningLevelNotInCompliance.ql`:
+  - Fixes #689 false negatives where '-Wno-foo' was treated as enabling, rather than disabling warnings.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
index 60efab251a..55f67a9301 100644
--- a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
+++ b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
@@ -18,14 +18,61 @@
 import cpp
 import codingstandards.cpp.autosar
 
+predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%") }
+
 class CompilationWithNoWarnings extends Compilation {
   CompilationWithNoWarnings() {
     getAnArgument() = "-w" or
-    not getAnArgument().regexpMatch("-W[\\w=-]+")
+    not exists(EnableWarningFlag enableFlag | 
+      this.getAnArgument() = enableFlag and
+      not exists(DisableWarningFlag disableFlag |
+        this.getAnArgument() = disableFlag and
+        enableFlag.getWarningType() = disableFlag.getWarningType()
+      )
+    )
   }
 }
 
-predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%") }
+class CompilationArgument extends string {
+  Compilation compilation;
+
+  CompilationArgument() {
+    this = compilation.getAnArgument()
+  }
+}
+
+/**
+ * Compiler flags of type -Wfoo or -Wfoo=bar, which enables the `foo` warning.
+ */
+class EnableWarningFlag extends CompilationArgument {
+  string warningType;
+
+  EnableWarningFlag() {
+    warningType = regexpCapture("^-W([\\w-]+)(=.*)?$", 1)
+    and not this instanceof DisableWarningFlag
+  }
+
+  string getWarningType() {
+    result = warningType
+  }
+}
+
+/**
+ * Compiler flags of type -Wno-foo or -Wfoo=0, which disables the `foo` warning
+ * and overrules -Wfoo.
+ */
+class DisableWarningFlag extends CompilationArgument {
+  string warningType;
+
+  DisableWarningFlag() {
+    warningType = regexpCapture("^-Wno-([\\w-]+)", 1) or
+    warningType = regexpCapture("^-W([\\w-]+)=0", 1)
+  }
+
+  string getWarningType() {
+    result = warningType
+  }
+}
 
 from File f
 where
diff --git a/cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.expected b/cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.expected
new file mode 100644
index 0000000000..dd7f320be2
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.expected
@@ -0,0 +1 @@
+| Wformat=0-Wno-format-security.cpp:0:0:0:0 | Wformat=0-Wno-format-security.cpp | No warning-level options were used in the compilation of 'Wformat=0-Wno-format-security.cpp'. |
diff --git a/cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.qlref b/cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.qlref
new file mode 100644
index 0000000000..30fb98b639
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.4/CompilerWarningLevelNotInCompliance.qlref
@@ -0,0 +1 @@
+rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.4/Wformat=0-Wno-format-security.cpp b/cpp/autosar/test/rules/A1-1-2.4/Wformat=0-Wno-format-security.cpp
new file mode 100644
index 0000000000..29523ad24e
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.4/Wformat=0-Wno-format-security.cpp
@@ -0,0 +1,2 @@
+// semmle-extractor-options: --clang -std=c++14 -Wformat=0 -Wno-format-security
+// NON_COMPLIANT
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.4/options.clang b/cpp/autosar/test/rules/A1-1-2.4/options.clang
new file mode 100644
index 0000000000..4544f91ecb
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.4/options.clang
@@ -0,0 +1 @@
+-Wformat=0 -Wno-format-security
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.4/options.gcc b/cpp/autosar/test/rules/A1-1-2.4/options.gcc
new file mode 100644
index 0000000000..4544f91ecb
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.4/options.gcc
@@ -0,0 +1 @@
+-Wformat=0 -Wno-format-security
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.4/options.qcc b/cpp/autosar/test/rules/A1-1-2.4/options.qcc
new file mode 100644
index 0000000000..e28a2c3ac5
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.4/options.qcc
@@ -0,0 +1 @@
+-Wno-format -Wno-format-security
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected
new file mode 100644
index 0000000000..df69d21d5a
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected
@@ -0,0 +1 @@
+| Wall-Wno-format.cpp:0:0:0:0 | Wall-Wno-format.cpp | No warning-level options were used in the compilation of 'Wall-Wno-format.cpp'. |
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.clang b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.clang
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.gcc b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.gcc
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.qcc b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.qcc
new file mode 100644
index 0000000000..c6354c2475
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.expected.qcc
@@ -0,0 +1 @@
+| Wall-Wno-format.cpp:0:0:0:0 | Wall-Wno-format.cpp | No warning-level options were used in the compilation of 'Wall-Wno-format.cpp'. |
diff --git a/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.qlref b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.qlref
new file mode 100644
index 0000000000..30fb98b639
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.5/CompilerWarningLevelNotInCompliance.qlref
@@ -0,0 +1 @@
+rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.5/Wall-Wno-format.cpp b/cpp/autosar/test/rules/A1-1-2.5/Wall-Wno-format.cpp
new file mode 100644
index 0000000000..93c4b98248
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.5/Wall-Wno-format.cpp
@@ -0,0 +1,14 @@
+// semmle-extractor-options: --clang -std=c++14 -Wall -Wno-format
+// COMPLIANT
+
+// NOTE: When tested with `codeql test run`, the test extractor provides `-w`
+// which overrides `-Wcast-function-type` and causes this test case to be
+// non-compliant.
+//
+// However, when tested with our compiler matrix tests, this test db is built
+// via `codeql database create --command="..."`, and the `-w` flag will NOT be
+// used. This means the `-Wcast-function-type` flag is active and the test case
+// is compliant.
+//
+// Therefore, the .expected file for this test expects non-compliance, and the
+// .expected.gcc and .expected.clang files expect this test to be compliant.
diff --git a/cpp/autosar/test/rules/A1-1-2.5/options.clang b/cpp/autosar/test/rules/A1-1-2.5/options.clang
new file mode 100644
index 0000000000..735817b680
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.5/options.clang
@@ -0,0 +1 @@
+-Wall -Wno-format
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.5/options.gcc b/cpp/autosar/test/rules/A1-1-2.5/options.gcc
new file mode 100644
index 0000000000..735817b680
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.5/options.gcc
@@ -0,0 +1 @@
+-Wall -Wno-format
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2.5/options.qcc b/cpp/autosar/test/rules/A1-1-2.5/options.qcc
new file mode 100644
index 0000000000..735817b680
--- /dev/null
+++ b/cpp/autosar/test/rules/A1-1-2.5/options.qcc
@@ -0,0 +1 @@
+-Wall -Wno-format
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
index 82ff1c0c36..ddc4e03f62 100644
--- a/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
+++ b/cpp/autosar/test/rules/A1-1-2/CompilerWarningLevelNotInCompliance.expected
@@ -1 +1 @@
-| Wall.cpp:0:0:0:0 | Wall.cpp | No warning-level options were used in the compilation of 'Wall.cpp'. |
\ No newline at end of file
+| Wall.cpp:0:0:0:0 | Wall.cpp | No warning-level options were used in the compilation of 'Wall.cpp'. |

From 20f790ac186614cd5054dfc5097c31f10b3719b7 Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Wed, 18 Sep 2024 20:07:48 +0000
Subject: [PATCH 198/435] Query format

---
 .../CompilerWarningLevelNotInCompliance.ql       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
index 55f67a9301..dd51e31ed7 100644
--- a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
+++ b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
@@ -36,9 +36,7 @@ class CompilationWithNoWarnings extends Compilation {
 class CompilationArgument extends string {
   Compilation compilation;
 
-  CompilationArgument() {
-    this = compilation.getAnArgument()
-  }
+  CompilationArgument() { this = compilation.getAnArgument() }
 }
 
 /**
@@ -48,13 +46,11 @@ class EnableWarningFlag extends CompilationArgument {
   string warningType;
 
   EnableWarningFlag() {
-    warningType = regexpCapture("^-W([\\w-]+)(=.*)?$", 1)
-    and not this instanceof DisableWarningFlag
+    warningType = regexpCapture("^-W([\\w-]+)(=.*)?$", 1) and
+    not this instanceof DisableWarningFlag
   }
 
-  string getWarningType() {
-    result = warningType
-  }
+  string getWarningType() { result = warningType }
 }
 
 /**
@@ -69,9 +65,7 @@ class DisableWarningFlag extends CompilationArgument {
     warningType = regexpCapture("^-W([\\w-]+)=0", 1)
   }
 
-  string getWarningType() {
-    result = warningType
-  }
+  string getWarningType() { result = warningType }
 }
 
 from File f

From 35c517beb317ea0ff94ee451af4c9a8b7c6b5a9d Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Wed, 2 Oct 2024 21:33:44 +0000
Subject: [PATCH 199/435] query format again

---
 .../src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
index dd51e31ed7..1499191236 100644
--- a/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
+++ b/cpp/autosar/src/rules/A1-1-2/CompilerWarningLevelNotInCompliance.ql
@@ -22,8 +22,9 @@ predicate hasResponseFileArgument(Compilation c) { c.getAnArgument().matches("@%
 
 class CompilationWithNoWarnings extends Compilation {
   CompilationWithNoWarnings() {
-    getAnArgument() = "-w" or
-    not exists(EnableWarningFlag enableFlag | 
+    getAnArgument() = "-w"
+    or
+    not exists(EnableWarningFlag enableFlag |
       this.getAnArgument() = enableFlag and
       not exists(DisableWarningFlag disableFlag |
         this.getAnArgument() = disableFlag and

From 0e9758e04c0d2fe3256dbcb5ef7c7ec6d9f2a6f9 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 2 Oct 2024 22:38:20 +0100
Subject: [PATCH 200/435] Add tags to represent which MISRA C version the rule
 was introduced in

---
 .../PrecautionIncludeGuardsNotProvided.ql     |   1 +
 .../StdLibDynamicMemoryAllocationUsed.ql      |   1 +
 ...ageOfAssemblyLanguageShouldBeDocumented.ql |   1 +
 .../LanguageNotEncapsulatedAndIsolated.ql     |   1 +
 .../SectionsOfCodeShallNotBeCommentedOut.ql   |   1 +
 ...dentifiersInTheSameNameSpaceUnambiguous.ql |   1 +
 ...ainNumericalTypeUsedOverExplicitTypedef.ql |   1 +
 ...tWithNoPointerDereferenceShouldBeOpaque.ql |   1 +
 .../DIR-4-9/FunctionOverFunctionLikeMacro.ql  |   1 +
 .../LanguageExtensionsShouldNotBeUsed.ql      |   1 +
 .../RULE-1-3/OccurrenceOfUndefinedBehavior.ql |   1 +
 .../RULE-1-4/EmergentLanguageFeaturesUsed.ql  |   1 +
 .../OperandsOfAnInappropriateEssentialType.ql |   1 +
 .../RULE-10-1/PointerTypeOnLogicalOperator.ql |   1 +
 ...dditionSubtractionOnEssentiallyCharType.ql |   1 +
 .../AssignmentOfIncompatibleEssentialType.ql  |   1 +
 ...andsWithMismatchedEssentialTypeCategory.ql |   1 +
 .../InappropriateEssentialTypeCast.ql         |   1 +
 .../AssignmentToWiderEssentialType.ql         |   1 +
 ...ImplicitConversionOfCompositeExpression.ql |   1 +
 .../InappropriateCastOfCompositeExpression.ql |   1 +
 ...rsionBetweenFunctionPointerAndOtherType.ql |   1 +
 ...etweenIncompleteTypePointerAndOtherType.ql |   1 +
 ...weenObjectPointerAndDifferentObjectType.ql |   1 +
 ...ionBetweenPointerToObjectAndIntegerType.ql |   1 +
 ...ionFromPointerToVoidIntoPointerToObject.ql |   1 +
 ...stBetweenPointerToVoidAndArithmeticType.ql |   1 +
 ...nPointerToObjectAndNonIntArithmeticType.ql |   1 +
 ...CastRemovesConstOrVolatileQualification.ql |   1 +
 ...NullNotUsedAsIntegerNullPointerConstant.ql |   1 +
 ...plicitPrecedenceOfOperatorsInExpression.ql |   1 +
 .../RULE-12-1/UnenclosedSizeofOperand.ql      |   1 +
 .../RightHandOperandOfAShiftRange.ql          |   1 +
 .../RULE-12-3/CommaOperatorShouldNotBeUsed.ql |   1 +
 ...antUnsignedIntegerExpressionsWrapAround.ql |   1 +
 .../SizeofOperatorUsedOnArrayTypeParam.ql     |   1 +
 ...alizerListsContainPersistentSideEffects.ql |   1 +
 .../rules/RULE-13-2/UnsequencedSideEffects.ql |   1 +
 .../SideEffectAndCrementInFullExpression.ql   |   1 +
 ...ltOfAnAssignmentOperatorShouldNotBeUsed.ql |   1 +
 ...pressedSideEffectInLogicOperatorOperand.ql |   1 +
 .../RULE-13-6/SizeofOperandWithSideEffect.ql  |   1 +
 .../RULE-14-1/LoopOverEssentiallyFloatType.ql |   1 +
 .../rules/RULE-14-2/ForLoopNotWellFormed.ql   |   1 +
 .../RULE-14-3/ControllingExprInvariant.ql     |   1 +
 .../rules/RULE-14-4/NonBooleanIfCondition.ql  |   1 +
 .../RULE-14-4/NonBooleanIterationCondition.ql |   1 +
 .../src/rules/RULE-15-1/GotoStatementUsed.ql  |   1 +
 .../RULE-15-2/GotoLabelLocationCondition.ql   |   1 +
 .../RULE-15-3/GotoLabelBlockCondition.ql      |   1 +
 .../rules/RULE-15-4/LoopIterationCondition.ql |   1 +
 .../RULE-15-5/FunctionReturnCondition.ql      |   1 +
 .../rules/RULE-15-6/LoopCompoundCondition.ql  |   1 +
 .../RULE-15-6/SelectionCompoundCondition.ql   |   1 +
 .../RULE-15-6/SwitchCompoundCondition.ql      |   1 +
 .../src/rules/RULE-15-7/IfElseEndCondition.ql |   1 +
 .../RULE-16-1/SwitchCaseStartCondition.ql     |   1 +
 .../RULE-16-1/SwitchStmtNotWellFormed.ql      |   1 +
 .../NestSwitchLabelInSwitchStatement.ql       |   1 +
 .../BreakShallTerminateSwitchClause.ql        |   1 +
 .../EverySwitchShallHaveDefaultLabel.ql       |   1 +
 .../DefaultNotFirstOrLastOfSwitch.ql          |   1 +
 .../RULE-16-6/SwitchClauseNumberCondition.ql  |   1 +
 .../SwitchExpressionBoolCondition.ql          |   1 +
 .../rules/RULE-17-1/FeaturesOfStdarghUsed.ql  |   1 +
 .../RULE-17-2/RecursiveFunctionCondition.ql   |   1 +
 .../RULE-17-3/FunctionDeclaredImplicitly.ql   |   1 +
 .../NonVoidFunctionReturnCondition.ql         |   1 +
 .../ArrayFunctionArgumentNumberOfElements.ql  |   1 +
 .../src/rules/RULE-17-6/UseOfArrayStatic.ql   |   1 +
 .../ValueReturnedByAFunctionNotUsed.ql        |   1 +
 .../ModificationOfFunctionParameter.ql        |   1 +
 ...erAndDerivedPointerMustAddressSameArray.ql |   1 +
 ...tionBetweenPointersMustAddressSameArray.ql |   1 +
 ...OperatorComparesPointerToDifferentArray.ql |   1 +
 ...dditionOrSubtractionOperatorsOnPointers.ql |   1 +
 ...TwoLevelsOfPointerNestingInDeclarations.ql |   1 +
 ...StorageObjectAddressCopiedToOtherObject.ql |   1 +
 .../RULE-18-7/FlexibleArrayMembersDeclared.ql |   1 +
 .../RULE-18-8/VariableLengthArrayTypesUsed.ql |   1 +
 .../ObjectAssignedToAnOverlappingObject.ql    |   1 +
 .../ObjectCopiedToAnOverlappingObject.ql      |   1 +
 .../RULE-19-2/UnionKeywordShouldNotBeUsed.ql  |   1 +
 c/misra/src/rules/RULE-2-1/UnreachableCode.ql |   1 +
 c/misra/src/rules/RULE-2-2/DeadCode.ql        |   1 +
 .../rules/RULE-2-3/UnusedTypeDeclarations.ql  |   1 +
 .../rules/RULE-2-4/UnusedTagDeclaration.ql    |   1 +
 .../rules/RULE-2-5/UnusedMacroDeclaration.ql  |   1 +
 .../rules/RULE-2-6/UnusedLabelDeclaration.ql  |   1 +
 c/misra/src/rules/RULE-2-7/UnusedParameter.ql |   1 +
 ...irectivesPrecededByDirectivesOrComments.ql |   1 +
 ...reprocessorHashOperatorsShouldNotBeUsed.ql |   1 +
 ...oreThanOneHashOperatorInMacroDefinition.ql |   1 +
 .../MacroParameterUsedAsHashOperand.ql        |   1 +
 .../ForbiddenCharactersInHeaderFileName.ql    |   1 +
 .../MacroDefinedWithTheSameNameAsKeyword.ql   |   1 +
 .../rules/RULE-20-5/UndefShouldNotBeUsed.ql   |   1 +
 ...tionLikeMacroArgsContainHashTokenCQuery.ql |   1 +
 ...ParameterNotEnclosedInParenthesesCQuery.ql |   1 +
 .../ControllingExpressionIfDirective.ql       |   1 +
 ...IdentifiersUsedInPreprocessorExpression.ql |   1 +
 ...ndefUsedOnReservedIdentifierOrMacroName.ql |   1 +
 ...StandardLibraryTimeAndDateFunctionsUsed.ql |   1 +
 .../StandardHeaderFileTgmathhUsed.ql          |   1 +
 .../ExceptionHandlingFeaturesOfFenvhUsed.ql   |   1 +
 .../CtypeFunctionArgNotUnsignedCharOrEof.ql   |   1 +
 ...emcmpUsedToCompareNullTerminatedStrings.ql |   1 +
 ...veMemcmpArgNotPointersToCompatibleTypes.ql |   1 +
 .../MemcmpOnInappropriateEssentialTypeArgs.ql |   1 +
 ...tringFunctionPointerArgumentOutOfBounds.ql |   1 +
 .../StringLibrarySizeArgumentOutOfBounds.ql   |   1 +
 ...ReturnedByLocaleSettingUsedAsPtrToConst.ql |   1 +
 .../DoNotDeclareAReservedIdentifier.ql        |   1 +
 .../CallToSetlocaleInvalidatesOldPointers.ql  |   1 +
 ...llToSetlocaleInvalidatesOldPointersWarn.ql |   1 +
 .../rules/RULE-21-21/SystemOfStdlibhUsed.ql   |   1 +
 ...emoryAllocDeallocFunctionsOfStdlibhUsed.ql |   1 +
 .../StandardHeaderFileUsedSetjmph.ql          |   1 +
 .../StandardHeaderFileUsedSignalh.ql          |   1 +
 ...StandardLibraryInputoutputFunctionsUsed.ql |   1 +
 .../AtofAtoiAtolAndAtollOfStdlibhUsed.ql      |   1 +
 .../TerminationFunctionsOfStdlibhUsed.ql      |   1 +
 .../TerminationMacrosOfStdlibhUsed.ql         |   1 +
 .../RULE-21-9/BsearchAndQsortOfStdlibhUsed.ql |   1 +
 .../CloseFileHandleWhenNoLongerNeededMisra.ql |   1 +
 .../FreeMemoryWhenNoLongerNeededMisra.ql      |   1 +
 ...TestErrnoRightAfterErrnoSettingFunction.ql |   1 +
 ...OnlyFreeMemoryAllocatedDynamicallyMisra.ql |   1 +
 ...leOpenForReadAndWriteOnDifferentStreams.ql |   1 +
 .../AttemptToWriteToAReadOnlyStream.ql        |   1 +
 .../PointerToAFileObjectDereferenced.ql       |   1 +
 .../rules/RULE-22-6/FileUsedAfterClosed.ql    |   1 +
 ...allBeComparedWithUnmodifiedReturnValues.ql |   1 +
 .../RULE-22-8/ErrnoSetToZeroPriorToCall.ql    |   1 +
 .../RULE-22-9/ErrnoSetToZeroAfterCall.ql      |   1 +
 ...CharacterSequencesAndUsedWithinAComment.ql |   1 +
 .../RULE-3-2/LineSplicingUsedInComments.ql    |   1 +
 ...HexadecimalEscapeSequencesNotTerminated.ql |   1 +
 .../ExternalIdentifiersNotDistinct.ql         |   1 +
 ...ifiersDeclaredInTheSameScopeNotDistinct.ql |   1 +
 .../src/rules/RULE-5-3/IdentifierHidingC.ql   |   1 +
 ...MacroIdentifierNotDistinctFromParameter.ql |   1 +
 .../RULE-5-4/MacroIdentifiersNotDistinct.ql   |   1 +
 .../IdentifiersNotDistinctFromMacroNames.ql   |   1 +
 .../rules/RULE-5-6/TypedefNameNotUnique.ql    |   1 +
 .../src/rules/RULE-5-7/TagNameNotUnique.ql    |   1 +
 ...IdentifiersWithExternalLinkageNotUnique.ql |   1 +
 ...IdentifiersWithInternalLinkageNotUnique.ql |   1 +
 ...hallOnlyBeDeclaredWithAnAppropriateType.ql |   1 +
 .../SingleBitNamedBitFieldsOfASignedType.ql   |   1 +
 .../BitFieldDeclaredAsMemberOfAUnion.ql       |   1 +
 .../src/rules/RULE-7-1/OctalConstantsUsed.ql  |   1 +
 .../UOrUSuffixRepresentedInUnsignedType.ql    |   1 +
 .../LowercaseCharacterLUsedInLiteralSuffix.ql |   1 +
 .../StringLiteralAssignedToNonConstChar.ql    |   1 +
 .../rules/RULE-8-1/ExplicitlyDeclareTypes.ql  |   1 +
 .../InlineFunctionNotDeclaredStaticStorage.ql |   1 +
 ...yExternalLinkageSizeExplicitlySpecified.ql |   1 +
 ...lueImplicitEnumerationConstantNotUnique.ql |   1 +
 ...interShouldPointToConstTypeWhenPossible.ql |   1 +
 .../RULE-8-14/RestrictTypeQualifierUsed.ql    |   1 +
 .../FunctionTypesNotInPrototypeForm.ql        |   1 +
 .../DeclarationsOfAFunctionSameNameAndType.ql |   1 +
 .../DeclarationsOfAnObjectSameNameAndType.ql  |   1 +
 .../CompatibleDeclarationFunctionDefined.ql   |   1 +
 .../CompatibleDeclarationObjectDefined.ql     |   1 +
 ...nalObjectOrFunctionNotDeclaredInOneFile.ql |   1 +
 ...ntifierWithExternalLinkageOneDefinition.ql |   1 +
 .../ShouldNotBeDefinedWithExternalLinkage.ql  |   1 +
 ...ngStaticSpecifierFunctionRedeclarationC.ql |   1 +
 ...singStaticSpecifierObjectRedeclarationC.ql |   1 +
 ...nnecessaryExposedIdentifierDeclarationC.ql |   1 +
 ...ctWithAutoStorageDurationReadBeforeInit.ql |   1 +
 ...rForAggregateOrUnionNotEnclosedInBraces.ql |   1 +
 ...nitializedArrayWithExplicitInitializers.ql |   1 +
 ...dInitializationOfAggregateObjectElement.ql |   1 +
 rule_packages/c/Banned.json                   |  54 ++++--
 rule_packages/c/BitfieldTypes.json            |   8 +-
 rule_packages/c/BitfieldTypes2.json           |   5 +-
 rule_packages/c/Concurrency4.json             |   5 +-
 rule_packages/c/Contracts1.json               |  54 +++---
 rule_packages/c/Contracts2.json               |   9 +-
 rule_packages/c/Contracts3.json               |  71 +++++---
 rule_packages/c/Contracts4.json               |  22 ++-
 rule_packages/c/Contracts5.json               |  52 +++---
 rule_packages/c/Contracts6.json               |  14 +-
 rule_packages/c/Contracts7.json               |   9 +-
 rule_packages/c/DeadCode.json                 |  21 ++-
 rule_packages/c/Declarations1.json            | 172 +++++++++---------
 rule_packages/c/Declarations2.json            | 162 ++++++++---------
 rule_packages/c/Declarations3.json            |  15 +-
 rule_packages/c/Declarations4.json            |  18 +-
 rule_packages/c/Declarations5.json            |  15 +-
 rule_packages/c/Declarations6.json            |  21 ++-
 rule_packages/c/Declarations7.json            |   6 +-
 rule_packages/c/EssentialTypes.json           |  36 ++--
 rule_packages/c/IO1.json                      |   3 +-
 rule_packages/c/IO3.json                      |  12 +-
 rule_packages/c/IO4.json                      |   2 +-
 rule_packages/c/IntegerOverflow.json          |   3 +-
 rule_packages/c/InvalidMemory1.json           |   3 +-
 rule_packages/c/Language1.json                |   3 +-
 rule_packages/c/Language2.json                |   6 +-
 rule_packages/c/Language3.json                |   6 +-
 rule_packages/c/Memory1.json                  |  11 +-
 rule_packages/c/Memory2.json                  |   9 +-
 rule_packages/c/Misc.json                     |   2 +-
 rule_packages/c/OutOfBounds.json              |   6 +-
 rule_packages/c/Pointers1.json                |  51 ++++--
 rule_packages/c/Pointers2.json                |   2 +-
 rule_packages/c/Preprocessor1.json            |  15 +-
 rule_packages/c/Preprocessor2.json            |  12 +-
 rule_packages/c/Preprocessor3.json            |  39 ++--
 rule_packages/c/Preprocessor4.json            |   9 +-
 rule_packages/c/Preprocessor5.json            |   3 +-
 rule_packages/c/Preprocessor6.json            |   3 +-
 rule_packages/c/SideEffects1.json             |  18 +-
 rule_packages/c/SideEffects2.json             |   6 +-
 rule_packages/c/SideEffects3.json             |   3 +-
 .../c/StandardLibraryFunctionTypes.json       |   8 +-
 rule_packages/c/Statements1.json              |  13 +-
 rule_packages/c/Statements2.json              |  15 +-
 rule_packages/c/Statements3.json              |  21 ++-
 rule_packages/c/Statements4.json              |   9 +-
 rule_packages/c/Statements5.json              |  11 +-
 rule_packages/c/Statements6.json              |   3 +-
 rule_packages/c/Static.json                   |   3 +-
 rule_packages/c/Syntax.json                   |  21 ++-
 rule_packages/c/Types1.json                   |  14 +-
 229 files changed, 845 insertions(+), 445 deletions(-)

diff --git a/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql b/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
index 58ec5c80a9..338437b5b2 100644
--- a/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
+++ b/c/misra/src/rules/DIR-4-10/PrecautionIncludeGuardsNotProvided.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/DIR-4-12/StdLibDynamicMemoryAllocationUsed.ql b/c/misra/src/rules/DIR-4-12/StdLibDynamicMemoryAllocationUsed.ql
index dc1e21c97a..5c70bec761 100644
--- a/c/misra/src/rules/DIR-4-12/StdLibDynamicMemoryAllocationUsed.ql
+++ b/c/misra/src/rules/DIR-4-12/StdLibDynamicMemoryAllocationUsed.ql
@@ -11,6 +11,7 @@
  *       security
  *       correctness
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql b/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
index 9503024671..1afd57913e 100644
--- a/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
+++ b/c/misra/src/rules/DIR-4-2/UsageOfAssemblyLanguageShouldBeDocumented.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/dir-4-2
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/DIR-4-3/LanguageNotEncapsulatedAndIsolated.ql b/c/misra/src/rules/DIR-4-3/LanguageNotEncapsulatedAndIsolated.ql
index fb9f00e9c4..698cbabf01 100644
--- a/c/misra/src/rules/DIR-4-3/LanguageNotEncapsulatedAndIsolated.ql
+++ b/c/misra/src/rules/DIR-4-3/LanguageNotEncapsulatedAndIsolated.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/dir-4-3
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql b/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
index d0af758699..272a411f0e 100644
--- a/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
+++ b/c/misra/src/rules/DIR-4-4/SectionsOfCodeShallNotBeCommentedOut.ql
@@ -9,6 +9,7 @@
  *       maintainability
  *       readability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql b/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
index ced5bce28f..5dd78fc340 100644
--- a/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
+++ b/c/misra/src/rules/DIR-4-5/IdentifiersInTheSameNameSpaceUnambiguous.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/dir-4-5
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/DIR-4-6/PlainNumericalTypeUsedOverExplicitTypedef.ql b/c/misra/src/rules/DIR-4-6/PlainNumericalTypeUsedOverExplicitTypedef.ql
index c3ea6dfdbd..3891d8c99f 100644
--- a/c/misra/src/rules/DIR-4-6/PlainNumericalTypeUsedOverExplicitTypedef.ql
+++ b/c/misra/src/rules/DIR-4-6/PlainNumericalTypeUsedOverExplicitTypedef.ql
@@ -7,6 +7,7 @@
  * @precision high
  * @problem.severity error
  * @tags external/misra/id/dir-4-6
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/DIR-4-8/ObjectWithNoPointerDereferenceShouldBeOpaque.ql b/c/misra/src/rules/DIR-4-8/ObjectWithNoPointerDereferenceShouldBeOpaque.ql
index 56f2dd785d..b32a0a4aee 100644
--- a/c/misra/src/rules/DIR-4-8/ObjectWithNoPointerDereferenceShouldBeOpaque.ql
+++ b/c/misra/src/rules/DIR-4-8/ObjectWithNoPointerDereferenceShouldBeOpaque.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/dir-4-8
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
index 3d8a51f219..582715e34f 100644
--- a/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
+++ b/c/misra/src/rules/DIR-4-9/FunctionOverFunctionLikeMacro.ql
@@ -10,6 +10,7 @@
  *       external/misra/audit
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql b/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
index f38e41a1b6..9d1f27597f 100644
--- a/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-1-2
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql b/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql
index f6b295bd32..53f72e6bee 100644
--- a/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql
+++ b/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-1-3
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-1-4/EmergentLanguageFeaturesUsed.ql b/c/misra/src/rules/RULE-1-4/EmergentLanguageFeaturesUsed.ql
index 56ab349a11..a413b1c29a 100644
--- a/c/misra/src/rules/RULE-1-4/EmergentLanguageFeaturesUsed.ql
+++ b/c/misra/src/rules/RULE-1-4/EmergentLanguageFeaturesUsed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-1-4
  *       maintainability
  *       readability
+ *       external/misra/c/2012/amendment2
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
index 5c39f89003..10612f3378 100644
--- a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
+++ b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-10-1
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-1/PointerTypeOnLogicalOperator.ql b/c/misra/src/rules/RULE-10-1/PointerTypeOnLogicalOperator.ql
index 21bfdcb2be..b17f3710d5 100644
--- a/c/misra/src/rules/RULE-10-1/PointerTypeOnLogicalOperator.ql
+++ b/c/misra/src/rules/RULE-10-1/PointerTypeOnLogicalOperator.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-10-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-2/AdditionSubtractionOnEssentiallyCharType.ql b/c/misra/src/rules/RULE-10-2/AdditionSubtractionOnEssentiallyCharType.ql
index ad0c630e23..750e589a1c 100644
--- a/c/misra/src/rules/RULE-10-2/AdditionSubtractionOnEssentiallyCharType.ql
+++ b/c/misra/src/rules/RULE-10-2/AdditionSubtractionOnEssentiallyCharType.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-10-2
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-3/AssignmentOfIncompatibleEssentialType.ql b/c/misra/src/rules/RULE-10-3/AssignmentOfIncompatibleEssentialType.ql
index 353f6a9c8d..af120fb13d 100644
--- a/c/misra/src/rules/RULE-10-3/AssignmentOfIncompatibleEssentialType.ql
+++ b/c/misra/src/rules/RULE-10-3/AssignmentOfIncompatibleEssentialType.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-10-3
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql b/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql
index d5ef8b6d26..cc4c860d7d 100644
--- a/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql
+++ b/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-10-4
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-5/InappropriateEssentialTypeCast.ql b/c/misra/src/rules/RULE-10-5/InappropriateEssentialTypeCast.ql
index 1ff8374e97..f782a16597 100644
--- a/c/misra/src/rules/RULE-10-5/InappropriateEssentialTypeCast.ql
+++ b/c/misra/src/rules/RULE-10-5/InappropriateEssentialTypeCast.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-10-5
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-10-6/AssignmentToWiderEssentialType.ql b/c/misra/src/rules/RULE-10-6/AssignmentToWiderEssentialType.ql
index 09e731ba71..8927e8570a 100644
--- a/c/misra/src/rules/RULE-10-6/AssignmentToWiderEssentialType.ql
+++ b/c/misra/src/rules/RULE-10-6/AssignmentToWiderEssentialType.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-10-6
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql b/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql
index 1cf20378fa..b330bca00a 100644
--- a/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql
+++ b/c/misra/src/rules/RULE-10-7/ImplicitConversionOfCompositeExpression.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-10-7
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-10-8/InappropriateCastOfCompositeExpression.ql b/c/misra/src/rules/RULE-10-8/InappropriateCastOfCompositeExpression.ql
index 8e58ded416..162ba4439c 100644
--- a/c/misra/src/rules/RULE-10-8/InappropriateCastOfCompositeExpression.ql
+++ b/c/misra/src/rules/RULE-10-8/InappropriateCastOfCompositeExpression.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-10-8
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql b/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql
index acb5480e4f..36157e130e 100644
--- a/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql
+++ b/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
index 43ee303415..6c552b0f39 100644
--- a/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
+++ b/c/misra/src/rules/RULE-11-2/ConversionBetweenIncompleteTypePointerAndOtherType.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-2
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql b/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql
index 59674e11ac..8292bd3b6f 100644
--- a/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql
+++ b/c/misra/src/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.ql
@@ -9,6 +9,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-3
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
index aaa64fc3c0..8877d04323 100644
--- a/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
+++ b/c/misra/src/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-4
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql b/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
index 69419e13cd..bdaebcbf54 100644
--- a/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
+++ b/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-5
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql b/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
index de75e9d37a..cc0adf0517 100644
--- a/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
+++ b/c/misra/src/rules/RULE-11-6/CastBetweenPointerToVoidAndArithmeticType.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-6
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
index f898998d32..e499ea6485 100644
--- a/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
+++ b/c/misra/src/rules/RULE-11-7/CastBetweenPointerToObjectAndNonIntArithmeticType.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-7
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-11-8/CastRemovesConstOrVolatileQualification.ql b/c/misra/src/rules/RULE-11-8/CastRemovesConstOrVolatileQualification.ql
index 17b0df1a0e..17b12aaf99 100644
--- a/c/misra/src/rules/RULE-11-8/CastRemovesConstOrVolatileQualification.ql
+++ b/c/misra/src/rules/RULE-11-8/CastRemovesConstOrVolatileQualification.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-8
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
index a5c34fb747..cb18ed0d1d 100644
--- a/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
+++ b/c/misra/src/rules/RULE-11-9/MacroNullNotUsedAsIntegerNullPointerConstant.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-11-9
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql b/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
index 005fffa32d..134068463c 100644
--- a/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
+++ b/c/misra/src/rules/RULE-12-1/ImplicitPrecedenceOfOperatorsInExpression.ql
@@ -9,6 +9,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-12-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-12-1/UnenclosedSizeofOperand.ql b/c/misra/src/rules/RULE-12-1/UnenclosedSizeofOperand.ql
index 8975e7dff7..0081de320c 100644
--- a/c/misra/src/rules/RULE-12-1/UnenclosedSizeofOperand.ql
+++ b/c/misra/src/rules/RULE-12-1/UnenclosedSizeofOperand.ql
@@ -9,6 +9,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-12-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql b/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql
index bd77bdacd2..da7a0f181e 100644
--- a/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql
+++ b/c/misra/src/rules/RULE-12-2/RightHandOperandOfAShiftRange.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-12-2
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
index ec782d84f5..bccb382804 100644
--- a/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-12-3/CommaOperatorShouldNotBeUsed.ql
@@ -7,6 +7,7 @@
  * @problem.severity recommendation
  * @tags external/misra/id/rule-12-3
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql b/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
index 5009ef292d..1ebbf184bb 100644
--- a/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
+++ b/c/misra/src/rules/RULE-12-4/ConstantUnsignedIntegerExpressionsWrapAround.ql
@@ -14,6 +14,7 @@
  * @tags external/misra/id/rule-12-4
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql b/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
index 3eed267198..2e080419e1 100644
--- a/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
+++ b/c/misra/src/rules/RULE-12-5/SizeofOperatorUsedOnArrayTypeParam.ql
@@ -7,6 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-12-5
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql b/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
index 3cce2bb825..69ecbede58 100644
--- a/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-1/InitializerListsContainPersistentSideEffects.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-13-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
index 2497e5d4a3..90b0315e88 100644
--- a/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
+++ b/c/misra/src/rules/RULE-13-2/UnsequencedSideEffects.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-13-2
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
index 3dd03120c8..173827e04e 100644
--- a/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
+++ b/c/misra/src/rules/RULE-13-3/SideEffectAndCrementInFullExpression.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-13-3
  *       readability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
index 69a5d57f25..c840947b1f 100644
--- a/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-13-4/ResultOfAnAssignmentOperatorShouldNotBeUsed.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-13-4
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-13-5/PossibleSuppressedSideEffectInLogicOperatorOperand.ql b/c/misra/src/rules/RULE-13-5/PossibleSuppressedSideEffectInLogicOperatorOperand.ql
index 90faf9ec23..9a5b7b2b7b 100644
--- a/c/misra/src/rules/RULE-13-5/PossibleSuppressedSideEffectInLogicOperatorOperand.ql
+++ b/c/misra/src/rules/RULE-13-5/PossibleSuppressedSideEffectInLogicOperatorOperand.ql
@@ -9,6 +9,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-13-5
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql b/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
index 10317b1169..ec1551c2a6 100644
--- a/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
+++ b/c/misra/src/rules/RULE-13-6/SizeofOperandWithSideEffect.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-13-6
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql b/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
index 6a0f772f61..83d91dac63 100644
--- a/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
+++ b/c/misra/src/rules/RULE-14-1/LoopOverEssentiallyFloatType.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-14-1
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-14-2/ForLoopNotWellFormed.ql b/c/misra/src/rules/RULE-14-2/ForLoopNotWellFormed.ql
index 106bd9b5c6..7b3dc3c8dc 100644
--- a/c/misra/src/rules/RULE-14-2/ForLoopNotWellFormed.ql
+++ b/c/misra/src/rules/RULE-14-2/ForLoopNotWellFormed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-14-2
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql b/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
index eb8e9ede82..1bd2708750 100644
--- a/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
+++ b/c/misra/src/rules/RULE-14-3/ControllingExprInvariant.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-14-4/NonBooleanIfCondition.ql b/c/misra/src/rules/RULE-14-4/NonBooleanIfCondition.ql
index 87d9d31512..f9a24d9492 100644
--- a/c/misra/src/rules/RULE-14-4/NonBooleanIfCondition.ql
+++ b/c/misra/src/rules/RULE-14-4/NonBooleanIfCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-14-4
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-14-4/NonBooleanIterationCondition.ql b/c/misra/src/rules/RULE-14-4/NonBooleanIterationCondition.ql
index b2644a7a92..8418993db2 100644
--- a/c/misra/src/rules/RULE-14-4/NonBooleanIterationCondition.ql
+++ b/c/misra/src/rules/RULE-14-4/NonBooleanIterationCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-14-4
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
index d1c9aadadd..84c7dbd408 100644
--- a/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
+++ b/c/misra/src/rules/RULE-15-1/GotoStatementUsed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-15-1
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql b/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
index d12521dd7e..623fb9baed 100644
--- a/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
+++ b/c/misra/src/rules/RULE-15-2/GotoLabelLocationCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-15-2
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
index 1f9f066f53..a88f3170de 100644
--- a/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
+++ b/c/misra/src/rules/RULE-15-3/GotoLabelBlockCondition.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-15-3
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-15-4/LoopIterationCondition.ql b/c/misra/src/rules/RULE-15-4/LoopIterationCondition.ql
index ed541a68d0..b172a2c1ea 100644
--- a/c/misra/src/rules/RULE-15-4/LoopIterationCondition.ql
+++ b/c/misra/src/rules/RULE-15-4/LoopIterationCondition.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-15-4
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-15-5/FunctionReturnCondition.ql b/c/misra/src/rules/RULE-15-5/FunctionReturnCondition.ql
index 2fb5ad9d65..8e777d7332 100644
--- a/c/misra/src/rules/RULE-15-5/FunctionReturnCondition.ql
+++ b/c/misra/src/rules/RULE-15-5/FunctionReturnCondition.ql
@@ -9,6 +9,7 @@
  *       maintainability
  *       readability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
index a3e30ec345..9cc5bf9dda 100644
--- a/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/LoopCompoundCondition.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-15-6
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
index d181ca2d1c..f84c142414 100644
--- a/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SelectionCompoundCondition.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-15-6
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql b/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
index 837bfb12c1..1d446f323f 100644
--- a/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
+++ b/c/misra/src/rules/RULE-15-6/SwitchCompoundCondition.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-15-6
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-15-7/IfElseEndCondition.ql b/c/misra/src/rules/RULE-15-7/IfElseEndCondition.ql
index f3992d26f5..ee06f484fe 100644
--- a/c/misra/src/rules/RULE-15-7/IfElseEndCondition.ql
+++ b/c/misra/src/rules/RULE-15-7/IfElseEndCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-15-7
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql b/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
index e30ac1bd7b..4ceca23d8f 100644
--- a/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
+++ b/c/misra/src/rules/RULE-16-1/SwitchCaseStartCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-16-1
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql b/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
index 9da9242a78..644994562a 100644
--- a/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
+++ b/c/misra/src/rules/RULE-16-1/SwitchStmtNotWellFormed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-16-1
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql b/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
index df4b6fc93a..45ad0519bb 100644
--- a/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
+++ b/c/misra/src/rules/RULE-16-2/NestSwitchLabelInSwitchStatement.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-16-2
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-3/BreakShallTerminateSwitchClause.ql b/c/misra/src/rules/RULE-16-3/BreakShallTerminateSwitchClause.ql
index e62fe8c8d4..5ff30b53e0 100644
--- a/c/misra/src/rules/RULE-16-3/BreakShallTerminateSwitchClause.ql
+++ b/c/misra/src/rules/RULE-16-3/BreakShallTerminateSwitchClause.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-16-3
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-4/EverySwitchShallHaveDefaultLabel.ql b/c/misra/src/rules/RULE-16-4/EverySwitchShallHaveDefaultLabel.ql
index a5d7c3cf2c..441e30b7e7 100644
--- a/c/misra/src/rules/RULE-16-4/EverySwitchShallHaveDefaultLabel.ql
+++ b/c/misra/src/rules/RULE-16-4/EverySwitchShallHaveDefaultLabel.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-16-4
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql b/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
index f86e242ee3..5a93477b9a 100644
--- a/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
+++ b/c/misra/src/rules/RULE-16-5/DefaultNotFirstOrLastOfSwitch.ql
@@ -6,6 +6,7 @@
  * @precision very-high
  * @problem.severity recommendation
  * @tags external/misra/id/rule-16-5
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql b/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
index 8ddb2e49b2..0259f8023d 100644
--- a/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
+++ b/c/misra/src/rules/RULE-16-6/SwitchClauseNumberCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-16-6
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-16-7/SwitchExpressionBoolCondition.ql b/c/misra/src/rules/RULE-16-7/SwitchExpressionBoolCondition.ql
index 9aeb50d26e..06be288e2c 100644
--- a/c/misra/src/rules/RULE-16-7/SwitchExpressionBoolCondition.ql
+++ b/c/misra/src/rules/RULE-16-7/SwitchExpressionBoolCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-16-7
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-17-1/FeaturesOfStdarghUsed.ql b/c/misra/src/rules/RULE-17-1/FeaturesOfStdarghUsed.ql
index 1cde8b98f2..ddccb58ad1 100644
--- a/c/misra/src/rules/RULE-17-1/FeaturesOfStdarghUsed.ql
+++ b/c/misra/src/rules/RULE-17-1/FeaturesOfStdarghUsed.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-17-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-17-2/RecursiveFunctionCondition.ql b/c/misra/src/rules/RULE-17-2/RecursiveFunctionCondition.ql
index b6f13c4d1f..c7cb818119 100644
--- a/c/misra/src/rules/RULE-17-2/RecursiveFunctionCondition.ql
+++ b/c/misra/src/rules/RULE-17-2/RecursiveFunctionCondition.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-17-2
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql b/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
index 304d0a9bf6..af6c9bccad 100644
--- a/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
+++ b/c/misra/src/rules/RULE-17-3/FunctionDeclaredImplicitly.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-17-3
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql b/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
index 24329e5ab5..1529a403c9 100644
--- a/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
+++ b/c/misra/src/rules/RULE-17-4/NonVoidFunctionReturnCondition.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
index 208e8153d6..bb29be50ac 100644
--- a/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
+++ b/c/misra/src/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-17-5
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql b/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
index 876321c455..0a1232b6ad 100644
--- a/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
+++ b/c/misra/src/rules/RULE-17-6/UseOfArrayStatic.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-17-6
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql b/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql
index 02d0a54ec1..42b0d7a2e2 100644
--- a/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql
+++ b/c/misra/src/rules/RULE-17-7/ValueReturnedByAFunctionNotUsed.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-17-7
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-17-8/ModificationOfFunctionParameter.ql b/c/misra/src/rules/RULE-17-8/ModificationOfFunctionParameter.ql
index 6867455a45..95cddb57d3 100644
--- a/c/misra/src/rules/RULE-17-8/ModificationOfFunctionParameter.ql
+++ b/c/misra/src/rules/RULE-17-8/ModificationOfFunctionParameter.ql
@@ -9,6 +9,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-17-8
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-18-1/PointerAndDerivedPointerMustAddressSameArray.ql b/c/misra/src/rules/RULE-18-1/PointerAndDerivedPointerMustAddressSameArray.ql
index f17d596ead..c8944bd30d 100644
--- a/c/misra/src/rules/RULE-18-1/PointerAndDerivedPointerMustAddressSameArray.ql
+++ b/c/misra/src/rules/RULE-18-1/PointerAndDerivedPointerMustAddressSameArray.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-18-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-18-2/SubtractionBetweenPointersMustAddressSameArray.ql b/c/misra/src/rules/RULE-18-2/SubtractionBetweenPointersMustAddressSameArray.ql
index b6fbb31f1c..ec3a30d5ba 100644
--- a/c/misra/src/rules/RULE-18-2/SubtractionBetweenPointersMustAddressSameArray.ql
+++ b/c/misra/src/rules/RULE-18-2/SubtractionBetweenPointersMustAddressSameArray.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-18-2
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-18-3/RelationalOperatorComparesPointerToDifferentArray.ql b/c/misra/src/rules/RULE-18-3/RelationalOperatorComparesPointerToDifferentArray.ql
index d7785a2d0e..4624cea616 100644
--- a/c/misra/src/rules/RULE-18-3/RelationalOperatorComparesPointerToDifferentArray.ql
+++ b/c/misra/src/rules/RULE-18-3/RelationalOperatorComparesPointerToDifferentArray.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-18-3
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-18-4/DoNotUseAdditionOrSubtractionOperatorsOnPointers.ql b/c/misra/src/rules/RULE-18-4/DoNotUseAdditionOrSubtractionOperatorsOnPointers.ql
index a5f8a85ff1..a1a1ad367b 100644
--- a/c/misra/src/rules/RULE-18-4/DoNotUseAdditionOrSubtractionOperatorsOnPointers.ql
+++ b/c/misra/src/rules/RULE-18-4/DoNotUseAdditionOrSubtractionOperatorsOnPointers.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-18-4
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql b/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
index 7a847acbfa..f467c41804 100644
--- a/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
+++ b/c/misra/src/rules/RULE-18-5/NoMoreThanTwoLevelsOfPointerNestingInDeclarations.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-18-5
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql b/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
index 6d947efb16..efbc8d1334 100644
--- a/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
+++ b/c/misra/src/rules/RULE-18-6/AutomaticStorageObjectAddressCopiedToOtherObject.ql
@@ -9,6 +9,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-18-6
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql b/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
index 5ae2c9b9c6..73f0732ba5 100644
--- a/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
+++ b/c/misra/src/rules/RULE-18-7/FlexibleArrayMembersDeclared.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-18-7
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
index 00d02cdc02..a7c25ed35e 100644
--- a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-18-8
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql b/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
index b39ce4fba4..31c24dcdd8 100644
--- a/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
+++ b/c/misra/src/rules/RULE-19-1/ObjectAssignedToAnOverlappingObject.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-19-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
index bee9b41e2c..e3e85faf34 100644
--- a/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
+++ b/c/misra/src/rules/RULE-19-1/ObjectCopiedToAnOverlappingObject.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-19-1
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-19-2/UnionKeywordShouldNotBeUsed.ql b/c/misra/src/rules/RULE-19-2/UnionKeywordShouldNotBeUsed.ql
index b3028d9add..14d01c47e3 100644
--- a/c/misra/src/rules/RULE-19-2/UnionKeywordShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-19-2/UnionKeywordShouldNotBeUsed.ql
@@ -7,6 +7,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-19-2
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-2-1/UnreachableCode.ql b/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
index 5de46fd9ea..020338913a 100644
--- a/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
+++ b/c/misra/src/rules/RULE-2-1/UnreachableCode.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-2-1
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index c9ecb5e934..19ac69c2c1 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-2-2
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql b/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
index 3192ee960f..b4c6bbf42c 100644
--- a/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
+++ b/c/misra/src/rules/RULE-2-3/UnusedTypeDeclarations.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-2-3
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql b/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql
index c10985f28c..08fe2568e9 100644
--- a/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-4/UnusedTagDeclaration.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-2-4
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
index ed2b1f6065..b7ea9f64de 100644
--- a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-2-5
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql b/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
index 4ab96707e4..7838c5fc1f 100644
--- a/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-6/UnusedLabelDeclaration.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-2-6
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-2-7/UnusedParameter.ql b/c/misra/src/rules/RULE-2-7/UnusedParameter.ql
index b9c2f32f60..e27caee50b 100644
--- a/c/misra/src/rules/RULE-2-7/UnusedParameter.ql
+++ b/c/misra/src/rules/RULE-2-7/UnusedParameter.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-2-7
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql b/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
index aa0d733eb2..ba78abcb5e 100644
--- a/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
+++ b/c/misra/src/rules/RULE-20-1/IncludeDirectivesPrecededByDirectivesOrComments.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-20-1
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-20-10/PreprocessorHashOperatorsShouldNotBeUsed.ql b/c/misra/src/rules/RULE-20-10/PreprocessorHashOperatorsShouldNotBeUsed.ql
index f0d82928fb..016589af94 100644
--- a/c/misra/src/rules/RULE-20-10/PreprocessorHashOperatorsShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-20-10/PreprocessorHashOperatorsShouldNotBeUsed.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-20-10
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
index 42ea398e14..fc87186d3e 100644
--- a/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
+++ b/c/misra/src/rules/RULE-20-11/MoreThanOneHashOperatorInMacroDefinition.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-20-11
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
index 8b9d6ca763..da66f66fb2 100644
--- a/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
+++ b/c/misra/src/rules/RULE-20-12/MacroParameterUsedAsHashOperand.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-20-12
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql b/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
index a9b27e8669..d9942c3e56 100644
--- a/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
+++ b/c/misra/src/rules/RULE-20-2/ForbiddenCharactersInHeaderFileName.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-20-2
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql b/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
index 6b9ae71120..210e081bb1 100644
--- a/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
+++ b/c/misra/src/rules/RULE-20-4/MacroDefinedWithTheSameNameAsKeyword.ql
@@ -11,6 +11,7 @@
  *       correctness
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql b/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
index c253c795e8..15bec51bf8 100644
--- a/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
+++ b/c/misra/src/rules/RULE-20-5/UndefShouldNotBeUsed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-20-5
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql b/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
index 3e212dc972..e0fc8e4510 100644
--- a/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
+++ b/c/misra/src/rules/RULE-20-6/FunctionLikeMacroArgsContainHashTokenCQuery.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-20-6
  *       readability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-20-7/MacroParameterNotEnclosedInParenthesesCQuery.ql b/c/misra/src/rules/RULE-20-7/MacroParameterNotEnclosedInParenthesesCQuery.ql
index ad4882d07c..e557f99a18 100644
--- a/c/misra/src/rules/RULE-20-7/MacroParameterNotEnclosedInParenthesesCQuery.ql
+++ b/c/misra/src/rules/RULE-20-7/MacroParameterNotEnclosedInParenthesesCQuery.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-20-7
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-20-8/ControllingExpressionIfDirective.ql b/c/misra/src/rules/RULE-20-8/ControllingExpressionIfDirective.ql
index cd55e03ee0..5e2c1fbc27 100644
--- a/c/misra/src/rules/RULE-20-8/ControllingExpressionIfDirective.ql
+++ b/c/misra/src/rules/RULE-20-8/ControllingExpressionIfDirective.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-20-8
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql b/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
index 15ca323038..be6f3c00f3 100644
--- a/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
+++ b/c/misra/src/rules/RULE-20-9/IdentifiersUsedInPreprocessorExpression.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-20-9
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-1/DefineAndUndefUsedOnReservedIdentifierOrMacroName.ql b/c/misra/src/rules/RULE-21-1/DefineAndUndefUsedOnReservedIdentifierOrMacroName.ql
index b37b5cb92e..86d8426df8 100644
--- a/c/misra/src/rules/RULE-21-1/DefineAndUndefUsedOnReservedIdentifierOrMacroName.ql
+++ b/c/misra/src/rules/RULE-21-1/DefineAndUndefUsedOnReservedIdentifierOrMacroName.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-10/StandardLibraryTimeAndDateFunctionsUsed.ql b/c/misra/src/rules/RULE-21-10/StandardLibraryTimeAndDateFunctionsUsed.ql
index c519ebe701..0ad9c350f2 100644
--- a/c/misra/src/rules/RULE-21-10/StandardLibraryTimeAndDateFunctionsUsed.ql
+++ b/c/misra/src/rules/RULE-21-10/StandardLibraryTimeAndDateFunctionsUsed.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-10
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-11/StandardHeaderFileTgmathhUsed.ql b/c/misra/src/rules/RULE-21-11/StandardHeaderFileTgmathhUsed.ql
index 5a33f94fb6..1c6b1bcd3d 100644
--- a/c/misra/src/rules/RULE-21-11/StandardHeaderFileTgmathhUsed.ql
+++ b/c/misra/src/rules/RULE-21-11/StandardHeaderFileTgmathhUsed.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-11
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-12/ExceptionHandlingFeaturesOfFenvhUsed.ql b/c/misra/src/rules/RULE-21-12/ExceptionHandlingFeaturesOfFenvhUsed.ql
index 727cb190e9..33da2f5d03 100644
--- a/c/misra/src/rules/RULE-21-12/ExceptionHandlingFeaturesOfFenvhUsed.ql
+++ b/c/misra/src/rules/RULE-21-12/ExceptionHandlingFeaturesOfFenvhUsed.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-21-12
  *       correctness
+ *       external/misra/c/2012/amendment2
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql b/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
index 70ec91e3c1..b7ccf534fa 100644
--- a/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
+++ b/c/misra/src/rules/RULE-21-13/CtypeFunctionArgNotUnsignedCharOrEof.ql
@@ -7,6 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-21-13
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
index 44e21d14db..c51ff10744 100644
--- a/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
+++ b/c/misra/src/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-14
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
index 956fc5383e..f5d8057b3a 100644
--- a/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
+++ b/c/misra/src/rules/RULE-21-15/MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes.ql
@@ -7,6 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-21-15
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-16/MemcmpOnInappropriateEssentialTypeArgs.ql b/c/misra/src/rules/RULE-21-16/MemcmpOnInappropriateEssentialTypeArgs.ql
index 1a939e920c..cb70567660 100644
--- a/c/misra/src/rules/RULE-21-16/MemcmpOnInappropriateEssentialTypeArgs.ql
+++ b/c/misra/src/rules/RULE-21-16/MemcmpOnInappropriateEssentialTypeArgs.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-21-16
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql b/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
index a4850781f6..31d3434c58 100644
--- a/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
+++ b/c/misra/src/rules/RULE-21-17/StringFunctionPointerArgumentOutOfBounds.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-17
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql b/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
index 3554b2791e..22ccc14b69 100644
--- a/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
+++ b/c/misra/src/rules/RULE-21-18/StringLibrarySizeArgumentOutOfBounds.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-21-18
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql b/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
index 0e02cc1d84..6fa3ad92be 100644
--- a/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
+++ b/c/misra/src/rules/RULE-21-19/ValuesReturnedByLocaleSettingUsedAsPtrToConst.ql
@@ -9,6 +9,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-19
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-21-2/DoNotDeclareAReservedIdentifier.ql b/c/misra/src/rules/RULE-21-2/DoNotDeclareAReservedIdentifier.ql
index 89140222da..80ad8386bc 100644
--- a/c/misra/src/rules/RULE-21-2/DoNotDeclareAReservedIdentifier.ql
+++ b/c/misra/src/rules/RULE-21-2/DoNotDeclareAReservedIdentifier.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
index c193e899db..6441add7fc 100644
--- a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
+++ b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointers.ql
@@ -9,6 +9,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-20
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
index 0bbcb045d9..e7e97e2639 100644
--- a/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
+++ b/c/misra/src/rules/RULE-21-20/CallToSetlocaleInvalidatesOldPointersWarn.ql
@@ -9,6 +9,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-21-20
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-21-21/SystemOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-21/SystemOfStdlibhUsed.ql
index b38f159c14..81dd6ba1a3 100644
--- a/c/misra/src/rules/RULE-21-21/SystemOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-21/SystemOfStdlibhUsed.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-21
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.ql
index ed3317b696..ab3ba3e328 100644
--- a/c/misra/src/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-3
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql b/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
index 6de73499c0..88ad0aa6db 100644
--- a/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
+++ b/c/misra/src/rules/RULE-21-4/StandardHeaderFileUsedSetjmph.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-4
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-5/StandardHeaderFileUsedSignalh.ql b/c/misra/src/rules/RULE-21-5/StandardHeaderFileUsedSignalh.ql
index 004060b5a5..d22ee55742 100644
--- a/c/misra/src/rules/RULE-21-5/StandardHeaderFileUsedSignalh.ql
+++ b/c/misra/src/rules/RULE-21-5/StandardHeaderFileUsedSignalh.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-5
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.ql b/c/misra/src/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.ql
index 6ef8c84cfe..6395ddc5ac 100644
--- a/c/misra/src/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.ql
+++ b/c/misra/src/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-6
  *       security
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
index 7263e91d53..ce781403b1 100644
--- a/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-7/AtofAtoiAtolAndAtollOfStdlibhUsed.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-21-7
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-8/TerminationFunctionsOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-8/TerminationFunctionsOfStdlibhUsed.ql
index 3414e82ab2..cbc7dd5a92 100644
--- a/c/misra/src/rules/RULE-21-8/TerminationFunctionsOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-8/TerminationFunctionsOfStdlibhUsed.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-8
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-8/TerminationMacrosOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-8/TerminationMacrosOfStdlibhUsed.ql
index 2f83ec6b70..7a911c1525 100644
--- a/c/misra/src/rules/RULE-21-8/TerminationMacrosOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-8/TerminationMacrosOfStdlibhUsed.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-8
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-21-9/BsearchAndQsortOfStdlibhUsed.ql b/c/misra/src/rules/RULE-21-9/BsearchAndQsortOfStdlibhUsed.ql
index b446b7f3f6..6759fa93d1 100644
--- a/c/misra/src/rules/RULE-21-9/BsearchAndQsortOfStdlibhUsed.ql
+++ b/c/misra/src/rules/RULE-21-9/BsearchAndQsortOfStdlibhUsed.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-21-9
  *       security
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql b/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
index c756bc2526..d888d87b6c 100644
--- a/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
+++ b/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-22-1
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql b/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
index 1650590559..ca5853dac9 100644
--- a/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
+++ b/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-22-1
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql b/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
index eab5a0c089..50e5350936 100644
--- a/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
+++ b/c/misra/src/rules/RULE-22-10/OnlyTestErrnoRightAfterErrnoSettingFunction.ql
@@ -9,6 +9,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-22-10
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql b/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
index a149103c9a..cdbe8e2c16 100644
--- a/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
+++ b/c/misra/src/rules/RULE-22-2/OnlyFreeMemoryAllocatedDynamicallyMisra.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-22-2
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
index c01afea39f..ee103ca6dc 100644
--- a/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
+++ b/c/misra/src/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-22-3
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
index 6dc3b3ee71..19bad99baa 100644
--- a/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
+++ b/c/misra/src/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-22-4
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql b/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
index 86e0b76e21..05cc4e3433 100644
--- a/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
+++ b/c/misra/src/rules/RULE-22-5/PointerToAFileObjectDereferenced.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-22-5
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql b/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
index 78c5063ddd..64318dbedd 100644
--- a/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
+++ b/c/misra/src/rules/RULE-22-6/FileUsedAfterClosed.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-22-6
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql b/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
index 307357a93a..a29ee7c898 100644
--- a/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
+++ b/c/misra/src/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-22-7
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql b/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
index de9a083545..6a39070ef0 100644
--- a/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
+++ b/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
@@ -9,6 +9,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-22-8
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql b/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
index da4504b75b..274bf5b2ae 100644
--- a/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
+++ b/c/misra/src/rules/RULE-22-9/ErrnoSetToZeroAfterCall.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-22-9
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-3-1/CharacterSequencesAndUsedWithinAComment.ql b/c/misra/src/rules/RULE-3-1/CharacterSequencesAndUsedWithinAComment.ql
index f59606a0ac..6eb605dbd9 100644
--- a/c/misra/src/rules/RULE-3-1/CharacterSequencesAndUsedWithinAComment.ql
+++ b/c/misra/src/rules/RULE-3-1/CharacterSequencesAndUsedWithinAComment.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-3-1
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql b/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
index cf6a2bb547..f1fd85b129 100644
--- a/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
+++ b/c/misra/src/rules/RULE-3-2/LineSplicingUsedInComments.ql
@@ -10,6 +10,7 @@
  *       maintainability
  *       readability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
index fd77f1a688..0f04a7362b 100644
--- a/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
+++ b/c/misra/src/rules/RULE-4-1/OctalAndHexadecimalEscapeSequencesNotTerminated.ql
@@ -10,6 +10,7 @@
  *       maintainability
  *       readability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql b/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
index fa7190c39b..2c2c302bc0 100644
--- a/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql b/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
index 682d7538c5..eb24d1c094 100644
--- a/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-2/IdentifiersDeclaredInTheSameScopeNotDistinct.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-3/IdentifierHidingC.ql b/c/misra/src/rules/RULE-5-3/IdentifierHidingC.ql
index 3463d08e1c..1c54b70147 100644
--- a/c/misra/src/rules/RULE-5-3/IdentifierHidingC.ql
+++ b/c/misra/src/rules/RULE-5-3/IdentifierHidingC.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-5-3
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql b/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
index 886e05f0ea..d8a78cb680 100644
--- a/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
+++ b/c/misra/src/rules/RULE-5-4/MacroIdentifierNotDistinctFromParameter.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-5-4
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
index 5b3683bdc4..abd22068dd 100644
--- a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-5/IdentifiersNotDistinctFromMacroNames.ql b/c/misra/src/rules/RULE-5-5/IdentifiersNotDistinctFromMacroNames.ql
index a63d9656b8..da6b725ab5 100644
--- a/c/misra/src/rules/RULE-5-5/IdentifiersNotDistinctFromMacroNames.ql
+++ b/c/misra/src/rules/RULE-5-5/IdentifiersNotDistinctFromMacroNames.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-5-5
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-6/TypedefNameNotUnique.ql b/c/misra/src/rules/RULE-5-6/TypedefNameNotUnique.ql
index 2e9126d3af..1398df6a4d 100644
--- a/c/misra/src/rules/RULE-5-6/TypedefNameNotUnique.ql
+++ b/c/misra/src/rules/RULE-5-6/TypedefNameNotUnique.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-5-6
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-7/TagNameNotUnique.ql b/c/misra/src/rules/RULE-5-7/TagNameNotUnique.ql
index 1c8a7a6b34..fa6560ab49 100644
--- a/c/misra/src/rules/RULE-5-7/TagNameNotUnique.ql
+++ b/c/misra/src/rules/RULE-5-7/TagNameNotUnique.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-5-7
  *       readability
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql b/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql
index 1b21dd273e..fa1b2b1fad 100644
--- a/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql
+++ b/c/misra/src/rules/RULE-5-8/IdentifiersWithExternalLinkageNotUnique.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-5-8
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-5-9/IdentifiersWithInternalLinkageNotUnique.ql b/c/misra/src/rules/RULE-5-9/IdentifiersWithInternalLinkageNotUnique.ql
index 45f63a3207..fcba48f2fd 100644
--- a/c/misra/src/rules/RULE-5-9/IdentifiersWithInternalLinkageNotUnique.ql
+++ b/c/misra/src/rules/RULE-5-9/IdentifiersWithInternalLinkageNotUnique.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-5-9
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
index f5bc589a4d..078c2c48b7 100644
--- a/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
+++ b/c/misra/src/rules/RULE-6-1/BitFieldsShallOnlyBeDeclaredWithAnAppropriateType.ql
@@ -7,6 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-6-1
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
index d699c1c9b7..142a0b542d 100644
--- a/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
+++ b/c/misra/src/rules/RULE-6-2/SingleBitNamedBitFieldsOfASignedType.ql
@@ -7,6 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-6-2
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
index 5fcf938046..4befbb9dd6 100644
--- a/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
+++ b/c/misra/src/rules/RULE-6-3/BitFieldDeclaredAsMemberOfAUnion.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-6-3
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-1/OctalConstantsUsed.ql b/c/misra/src/rules/RULE-7-1/OctalConstantsUsed.ql
index d4a6c332a7..9934e80487 100644
--- a/c/misra/src/rules/RULE-7-1/OctalConstantsUsed.ql
+++ b/c/misra/src/rules/RULE-7-1/OctalConstantsUsed.ql
@@ -10,6 +10,7 @@
  *       readability
  *       correctness
  *       maintainability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql b/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql
index b8f8d59718..c02e0e2aca 100644
--- a/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql
+++ b/c/misra/src/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-7-2
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql b/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
index 85c14ff419..0b38b26eea 100644
--- a/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
+++ b/c/misra/src/rules/RULE-7-3/LowercaseCharacterLUsedInLiteralSuffix.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-7-3
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-4/StringLiteralAssignedToNonConstChar.ql b/c/misra/src/rules/RULE-7-4/StringLiteralAssignedToNonConstChar.ql
index c93740139b..bc2fa5f5bf 100644
--- a/c/misra/src/rules/RULE-7-4/StringLiteralAssignedToNonConstChar.ql
+++ b/c/misra/src/rules/RULE-7-4/StringLiteralAssignedToNonConstChar.ql
@@ -7,6 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-7-4
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql b/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
index bfcbac4435..6484372f5b 100644
--- a/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
+++ b/c/misra/src/rules/RULE-8-1/ExplicitlyDeclareTypes.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-8-1
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql b/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
index 47e80912af..250c00ca2e 100644
--- a/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
+++ b/c/misra/src/rules/RULE-8-10/InlineFunctionNotDeclaredStaticStorage.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-8-10
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-11/ArrayExternalLinkageSizeExplicitlySpecified.ql b/c/misra/src/rules/RULE-8-11/ArrayExternalLinkageSizeExplicitlySpecified.ql
index ada18c805d..d14e236755 100644
--- a/c/misra/src/rules/RULE-8-11/ArrayExternalLinkageSizeExplicitlySpecified.ql
+++ b/c/misra/src/rules/RULE-8-11/ArrayExternalLinkageSizeExplicitlySpecified.ql
@@ -10,6 +10,7 @@
  * @tags external/misra/id/rule-8-11
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
index a4fcb0e4f3..6ebabc3810 100644
--- a/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
+++ b/c/misra/src/rules/RULE-8-12/ValueImplicitEnumerationConstantNotUnique.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-8-12
  *       correctness
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index 48bd9967b2..8b405d138c 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql b/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
index 1969947753..cff7d0df5c 100644
--- a/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
+++ b/c/misra/src/rules/RULE-8-14/RestrictTypeQualifierUsed.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-8-14
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
index e46085750d..73294d776b 100644
--- a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
+++ b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-8-2
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-3/DeclarationsOfAFunctionSameNameAndType.ql b/c/misra/src/rules/RULE-8-3/DeclarationsOfAFunctionSameNameAndType.ql
index 6803af9380..8c80c64a40 100644
--- a/c/misra/src/rules/RULE-8-3/DeclarationsOfAFunctionSameNameAndType.ql
+++ b/c/misra/src/rules/RULE-8-3/DeclarationsOfAFunctionSameNameAndType.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-8-3
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql b/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql
index d68382503a..421998c582 100644
--- a/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql
+++ b/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-8-3
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql
index c87e5b556c..63f70d3541 100644
--- a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql
+++ b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationFunctionDefined.ql
@@ -10,6 +10,7 @@
  *       readability
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql
index 433597cf4a..7e5baacd9a 100644
--- a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql
+++ b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql
@@ -10,6 +10,7 @@
  *       readability
  *       maintainability
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-5/ExternalObjectOrFunctionNotDeclaredInOneFile.ql b/c/misra/src/rules/RULE-8-5/ExternalObjectOrFunctionNotDeclaredInOneFile.ql
index 56e1d742a6..9a3f1c7900 100644
--- a/c/misra/src/rules/RULE-8-5/ExternalObjectOrFunctionNotDeclaredInOneFile.ql
+++ b/c/misra/src/rules/RULE-8-5/ExternalObjectOrFunctionNotDeclaredInOneFile.ql
@@ -7,6 +7,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-8-5
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.ql b/c/misra/src/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.ql
index 1a85775236..0781eef539 100644
--- a/c/misra/src/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.ql
+++ b/c/misra/src/rules/RULE-8-6/IdentifierWithExternalLinkageOneDefinition.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-8-6
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
index 824a4cf1cf..faa915fdd5 100644
--- a/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
+++ b/c/misra/src/rules/RULE-8-7/ShouldNotBeDefinedWithExternalLinkage.ql
@@ -12,6 +12,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
index c210273cd1..c3a5ce897f 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierFunctionRedeclarationC.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-8-8
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
index 2cb65c4fda..65c878e883 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-8-8
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-8-9/UnnecessaryExposedIdentifierDeclarationC.ql b/c/misra/src/rules/RULE-8-9/UnnecessaryExposedIdentifierDeclarationC.ql
index 88cf72fdcd..5dc697e425 100644
--- a/c/misra/src/rules/RULE-8-9/UnnecessaryExposedIdentifierDeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-9/UnnecessaryExposedIdentifierDeclarationC.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-8-9
  *       correctness
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql b/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
index b9960fc886..f3204ef2e3 100644
--- a/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
+++ b/c/misra/src/rules/RULE-9-1/ObjectWithAutoStorageDurationReadBeforeInit.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-9-1
  *       correctness
  *       security
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/mandatory
  */
 
diff --git a/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql b/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
index 02ee294036..c5a9ae4814 100644
--- a/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
+++ b/c/misra/src/rules/RULE-9-2/InitializerForAggregateOrUnionNotEnclosedInBraces.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-9-2
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql b/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
index 231520ce50..d10c8315e1 100644
--- a/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
+++ b/c/misra/src/rules/RULE-9-3/PartiallyInitializedArrayWithExplicitInitializers.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-9-3
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
index 3566835ae3..4f72d6720b 100644
--- a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
+++ b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       maintainability
  *       readability
+ *       external/misra/c/2012/third-edition-first-revision
  *       external/misra/obligation/required
  */
 
diff --git a/rule_packages/c/Banned.json b/rule_packages/c/Banned.json
index cab9ffc8c7..d3825f8f30 100644
--- a/rule_packages/c/Banned.json
+++ b/rule_packages/c/Banned.json
@@ -35,7 +35,8 @@
           "short_name": "CommaOperatorShouldNotBeUsed",
           "shared_implementation_short_name": "CommaOperatorUsed",
           "tags": [
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -54,7 +55,8 @@
           "severity": "error",
           "short_name": "FeaturesOfStdarghUsed",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -73,7 +75,8 @@
           "severity": "warning",
           "short_name": "UnionKeywordShouldNotBeUsed",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -92,7 +95,8 @@
           "severity": "error",
           "short_name": "StandardLibraryTimeAndDateFunctionsUsed",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -111,7 +115,8 @@
           "severity": "error",
           "short_name": "StandardHeaderFileTgmathhUsed",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -130,7 +135,8 @@
           "severity": "warning",
           "short_name": "ExceptionHandlingFeaturesOfFenvhUsed",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/amendment2"
           ]
         }
       ],
@@ -149,7 +155,8 @@
           "severity": "error",
           "short_name": "SystemOfStdlibhUsed",
           "tags": [
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -169,7 +176,8 @@
           "short_name": "MemoryAllocDeallocFunctionsOfStdlibhUsed",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -188,7 +196,8 @@
           "severity": "error",
           "short_name": "StandardHeaderFileUsedSetjmph",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -207,7 +216,8 @@
           "severity": "error",
           "short_name": "StandardHeaderFileUsedSignalh",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -227,7 +237,8 @@
           "short_name": "StandardLibraryInputoutputFunctionsUsed",
           "tags": [
             "security",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -247,7 +258,8 @@
           "short_name": "AtofAtoiAtolAndAtollOfStdlibhUsed",
           "shared_implementation_short_name": "AtofAtoiAtolAndAtollUsed",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -267,7 +279,8 @@
           "short_name": "TerminationFunctionsOfStdlibhUsed",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -279,7 +292,8 @@
           "short_name": "TerminationMacrosOfStdlibhUsed",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -299,7 +313,8 @@
           "short_name": "BsearchAndQsortOfStdlibhUsed",
           "tags": [
             "security",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -320,7 +335,8 @@
           "tags": [
             "security",
             "correctness",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -342,7 +358,8 @@
           "tags": [
             "readability",
             "correctness",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -362,7 +379,8 @@
           "short_name": "RestrictTypeQualifierUsed",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/BitfieldTypes.json b/rule_packages/c/BitfieldTypes.json
index 76490d73d1..43ed42f174 100644
--- a/rule_packages/c/BitfieldTypes.json
+++ b/rule_packages/c/BitfieldTypes.json
@@ -13,7 +13,9 @@
           "severity": "error",
           "short_name": "BitFieldsShallOnlyBeDeclaredWithAnAppropriateType",
           "shared_implementation_short_name": "BitFieldShallHaveAnAppropriateType",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "Bit-fields shall only be declared with an appropriate type"
@@ -31,7 +33,9 @@
           "severity": "error",
           "short_name": "SingleBitNamedBitFieldsOfASignedType",
           "shared_implementation_short_name": "NamedBitFieldsWithSignedIntegerType",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "Single-bit named bit fields shall not be of a signed type"
diff --git a/rule_packages/c/BitfieldTypes2.json b/rule_packages/c/BitfieldTypes2.json
index d916421b1f..957e9bb729 100644
--- a/rule_packages/c/BitfieldTypes2.json
+++ b/rule_packages/c/BitfieldTypes2.json
@@ -12,7 +12,10 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "BitFieldDeclaredAsMemberOfAUnion",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/amendment3"
+          ]
         }
       ],
       "title": "A bit field shall not be declared as a member of a union"
diff --git a/rule_packages/c/Concurrency4.json b/rule_packages/c/Concurrency4.json
index 65a17ed2d7..d537ee713e 100644
--- a/rule_packages/c/Concurrency4.json
+++ b/rule_packages/c/Concurrency4.json
@@ -19,14 +19,13 @@
           "implementation_scope": {
             "description": "This query does not attempt to ensure that the deallocation function in fact deallocates memory and instead assumes the contract is valid. Additionally, this query requires that all `tss_create` calls are bookended by calls to `tss_delete`, even if a thread is not created."
           }
-   
         }
       ],
       "title": "Clean up thread-specific storage"
     },
     "CON34-C": {
       "properties": {
-        "obligation": "rule" 
+        "obligation": "rule"
       },
       "queries": [
         {
@@ -54,7 +53,7 @@
           "tags": [
             "external/cert/audit",
             "correctness",
-            "concurrency"            
+            "concurrency"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts1.json b/rule_packages/c/Contracts1.json
index 2882bb617f..21641922af 100644
--- a/rule_packages/c/Contracts1.json
+++ b/rule_packages/c/Contracts1.json
@@ -4,38 +4,42 @@
       "properties": {
         "obligation": "rule"
       },
-      "queries": [{
-        "description": "Modification of return values of getenv and similar functions results in undefined behaviour.",
-        "kind": "path-problem",
-        "name": "Do not modify the return value of certain functions",
-        "precision": "very-high",
-        "severity": "warning",
-        "short_name": "DoNotModifyTheReturnValueOfCertainFunctions",
-        "shared_implementation_short_name": "ConstLikeReturnValue",
-        "tags": [
-          "correctness"
-        ]
-      }],
+      "queries": [
+        {
+          "description": "Modification of return values of getenv and similar functions results in undefined behaviour.",
+          "kind": "path-problem",
+          "name": "Do not modify the return value of certain functions",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "DoNotModifyTheReturnValueOfCertainFunctions",
+          "shared_implementation_short_name": "ConstLikeReturnValue",
+          "tags": [
+            "correctness"
+          ]
+        }
+      ],
       "title": "Do not modify the object referenced by the return value of certain functions"
     },
     "ENV31-C": {
       "properties": {
         "obligation": "rule"
       },
-      "queries": [{
-        "description": "Using the envp pointer after environment modifications can result in undefined behavior.",
-        "kind": "problem",
-        "name": "Do not rely on an env pointer following an operation that may invalidate it",
-        "precision": "high",
-        "severity": "error",
-        "short_name": "EnvPointerIsInvalidAfterCertainOperations",
-        "tags": [
-          "correctness"
-        ],
-        "implementation_scope": {
-          "description": "The rule is enforced in the context of a single function."
+      "queries": [
+        {
+          "description": "Using the envp pointer after environment modifications can result in undefined behavior.",
+          "kind": "problem",
+          "name": "Do not rely on an env pointer following an operation that may invalidate it",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "EnvPointerIsInvalidAfterCertainOperations",
+          "tags": [
+            "correctness"
+          ],
+          "implementation_scope": {
+            "description": "The rule is enforced in the context of a single function."
+          }
         }
-      }],
+      ],
       "title": "Do not rely on an environment pointer following an operation that may invalidate it"
     }
   }
diff --git a/rule_packages/c/Contracts2.json b/rule_packages/c/Contracts2.json
index b4845fc2be..b07f8f0503 100644
--- a/rule_packages/c/Contracts2.json
+++ b/rule_packages/c/Contracts2.json
@@ -67,7 +67,8 @@
           "short_name": "ValuesReturnedByLocaleSettingUsedAsPtrToConst",
           "shared_implementation_short_name": "ConstLikeReturnValue",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -87,7 +88,8 @@
           "short_name": "CallToSetlocaleInvalidatesOldPointers",
           "shared_implementation_short_name": "InvalidatedEnvStringPointers",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -99,7 +101,8 @@
           "short_name": "CallToSetlocaleInvalidatesOldPointersWarn",
           "shared_implementation_short_name": "InvalidatedEnvStringPointersWarn",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Contracts3.json b/rule_packages/c/Contracts3.json
index 8cb997c3b2..0122b858b5 100644
--- a/rule_packages/c/Contracts3.json
+++ b/rule_packages/c/Contracts3.json
@@ -4,46 +4,61 @@
       "properties": {
         "obligation": "required"
       },
-      "queries": [{
-        "description": "The value of errno shall only be tested when the last function to be called was an errno-setting-function. Testing the value in these conditions does not guarantee the absence of an errors.",
-        "kind": "problem",
-        "name": "The value of errno shall only be tested when the last called function is errno-setting",
-        "precision": "high",
-        "severity": "warning",
-        "short_name": "OnlyTestErrnoRightAfterErrnoSettingFunction",
-        "tags": ["correctness"]
-      }],
+      "queries": [
+        {
+          "description": "The value of errno shall only be tested when the last function to be called was an errno-setting-function. Testing the value in these conditions does not guarantee the absence of an errors.",
+          "kind": "problem",
+          "name": "The value of errno shall only be tested when the last called function is errno-setting",
+          "precision": "high",
+          "severity": "warning",
+          "short_name": "OnlyTestErrnoRightAfterErrnoSettingFunction",
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
+        }
+      ],
       "title": "The value of errno shall only be tested when the last function to be called was an errno-setting-function"
     },
     "RULE-22-8": {
       "properties": {
         "obligation": "required"
       },
-      "queries": [{
-        "description": "The value of errno shall be set to zero prior to a call to an errno-setting-function. Not setting the value leads to incorrectly identifying errors.",
-        "kind": "problem",
-        "name": "The value of errno shall be set to zero prior to a call to an errno-setting-function",
-        "precision": "very-high",
-        "severity": "error",
-        "short_name": "ErrnoSetToZeroPriorToCall",
-        "tags": ["correctness"]
-      }],
+      "queries": [
+        {
+          "description": "The value of errno shall be set to zero prior to a call to an errno-setting-function. Not setting the value leads to incorrectly identifying errors.",
+          "kind": "problem",
+          "name": "The value of errno shall be set to zero prior to a call to an errno-setting-function",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ErrnoSetToZeroPriorToCall",
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
+        }
+      ],
       "title": "The value of errno shall be set to zero prior to a call to an errno-setting-function"
     },
     "RULE-22-9": {
       "properties": {
         "obligation": "required"
       },
-      "queries": [{
-        "description": "The value of errno shall be tested against zero after calling an errno-setting-function. Not testing the value leads to unidentified errors.",
-        "kind": "problem",
-        "name": "The value of errno shall be tested against zero after calling an errno-setting-function",
-        "precision": "very-high",
-        "severity": "error",
-        "short_name": "ErrnoSetToZeroAfterCall",
-        "tags": ["correctness"]
-      }],
+      "queries": [
+        {
+          "description": "The value of errno shall be tested against zero after calling an errno-setting-function. Not testing the value leads to unidentified errors.",
+          "kind": "problem",
+          "name": "The value of errno shall be tested against zero after calling an errno-setting-function",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "ErrnoSetToZeroAfterCall",
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
+        }
+      ],
       "title": "The value of errno shall be tested against zero after calling an errno-setting-function"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/rule_packages/c/Contracts4.json b/rule_packages/c/Contracts4.json
index 90568bec98..8ba25ab32b 100644
--- a/rule_packages/c/Contracts4.json
+++ b/rule_packages/c/Contracts4.json
@@ -4,22 +4,28 @@
       "properties": {
         "obligation": "rule"
       },
-      "queries": [{
+      "queries": [
+        {
           "description": "Do not rely solely on errno to determine if en error occurred in setlocale.",
           "kind": "problem",
           "name": "Do not rely solely on errno to determine if en error occurred in setlocale",
           "precision": "high",
           "severity": "error",
           "short_name": "SetlocaleMightSetErrno",
-          "tags": ["correctness"]
-        }, {
+          "tags": [
+            "correctness"
+          ]
+        },
+        {
           "description": "Do not check errno before the function return value. Failing to do so might invalidate the error detection.",
           "kind": "problem",
           "name": "Do not check errno before the function return value",
           "precision": "high",
           "severity": "error",
           "short_name": "ErrnoReadBeforeReturn",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness"
+          ]
         },
         {
           "description": "After calling an errno-setting function, check errno before calling any other function. Failing to do so might end in errno being overwritten.",
@@ -28,7 +34,9 @@
           "precision": "high",
           "severity": "error",
           "short_name": "FunctionCallBeforeErrnoCheck",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness"
+          ]
         },
         {
           "description": "Set errno to zero prior to each call to an errno-setting function. Failing to do so might end in spurious errno values.",
@@ -37,7 +45,9 @@
           "precision": "high",
           "severity": "error",
           "short_name": "ErrnoNotSetToZero",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness"
+          ]
         }
       ],
       "title": "Take care when reading errno"
diff --git a/rule_packages/c/Contracts5.json b/rule_packages/c/Contracts5.json
index 1032e0546e..9f62ce9255 100644
--- a/rule_packages/c/Contracts5.json
+++ b/rule_packages/c/Contracts5.json
@@ -4,36 +4,44 @@
       "properties": {
         "obligation": "rule"
       },
-      "queries": [{
-        "description": "Do not rely on indeterminate values of errno. This may result in undefined behavior.",
-        "kind": "problem",
-        "name": "Do not rely on indeterminate values of errno",
-        "precision": "high",
-        "severity": "error",
-        "short_name": "DoNotRelyOnIndeterminateValuesOfErrno",
-        "tags": ["correctness"],
-        "implementation_scope": {
-          "description": "The rule is enforced in the context of a single function."
+      "queries": [
+        {
+          "description": "Do not rely on indeterminate values of errno. This may result in undefined behavior.",
+          "kind": "problem",
+          "name": "Do not rely on indeterminate values of errno",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "DoNotRelyOnIndeterminateValuesOfErrno",
+          "tags": [
+            "correctness"
+          ],
+          "implementation_scope": {
+            "description": "The rule is enforced in the context of a single function."
+          }
         }
-      }],
+      ],
       "title": "Do not rely on indeterminate values of errno"
     },
     "ERR33-C": {
       "properties": {
         "obligation": "rule"
       },
-      "queries": [{
-        "description": "Detect and handle standard library errors. Undetected failures can lead to unexpected or undefined behavior.",
-        "kind": "problem",
-        "name": "Detect and handle standard library errors",
-        "precision": "high",
-        "severity": "error",
-        "short_name": "DetectAndHandleStandardLibraryErrors",
-        "tags": ["correctness"],
-        "implementation_scope": {
-          "description": "The rule is enforced in the context of a single function."
+      "queries": [
+        {
+          "description": "Detect and handle standard library errors. Undetected failures can lead to unexpected or undefined behavior.",
+          "kind": "problem",
+          "name": "Detect and handle standard library errors",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "DetectAndHandleStandardLibraryErrors",
+          "tags": [
+            "correctness"
+          ],
+          "implementation_scope": {
+            "description": "The rule is enforced in the context of a single function."
+          }
         }
-      }],
+      ],
       "title": "Detect and handle standard library errors"
     }
   }
diff --git a/rule_packages/c/Contracts6.json b/rule_packages/c/Contracts6.json
index bc707f19f4..4dbae7e121 100644
--- a/rule_packages/c/Contracts6.json
+++ b/rule_packages/c/Contracts6.json
@@ -12,7 +12,9 @@
           "precision": "high",
           "severity": "error",
           "short_name": "DoNotModifyConstantObjects",
-          "tags": ["correctness"],
+          "tags": [
+            "correctness"
+          ],
           "implementation_scope": {
             "description": "The implementation does not consider pointer aliasing via multiple indirection."
           }
@@ -34,7 +36,10 @@
           "precision": "high",
           "severity": "error",
           "short_name": "ArrayFunctionArgumentNumberOfElements",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "The function argument corresponding to an array parameter shall have an appropriate number of elements"
@@ -51,7 +56,10 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ValueReturnedByAFunctionNotUsed",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "The value returned by a function having non-void return type shall be used or cast to void"
diff --git a/rule_packages/c/Contracts7.json b/rule_packages/c/Contracts7.json
index 38a038621e..f76b737db1 100644
--- a/rule_packages/c/Contracts7.json
+++ b/rule_packages/c/Contracts7.json
@@ -54,7 +54,8 @@
           "severity": "error",
           "short_name": "RightHandOperandOfAShiftRange",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -73,7 +74,8 @@
           "severity": "error",
           "short_name": "ObjectAssignedToAnOverlappingObject",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -84,7 +86,8 @@
           "severity": "error",
           "short_name": "ObjectCopiedToAnOverlappingObject",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/DeadCode.json b/rule_packages/c/DeadCode.json
index 1de7625225..ea5ddad703 100644
--- a/rule_packages/c/DeadCode.json
+++ b/rule_packages/c/DeadCode.json
@@ -14,7 +14,8 @@
           "short_name": "UnreachableCode",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query reports basic blocks in the program which are unreachable. For basic blocks within templates, the block is only consider unreachable if it is unreachable in all templates. Code generated by macros is ignored for this query, because it may be the case that basic blocks are reachable only in some expansions."
@@ -38,7 +39,8 @@
           "short_name": "DeadCode",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query identifies dead statements in the program of the following kinds:",
@@ -72,7 +74,8 @@
           "short_name": "UnusedTypeDeclarations",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "shared_implementation_short_name": "UnusedTypeDeclarations"
         }
@@ -93,7 +96,8 @@
           "short_name": "UnusedTagDeclaration",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -113,7 +117,8 @@
           "short_name": "UnusedMacroDeclaration",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -133,7 +138,8 @@
           "short_name": "UnusedLabelDeclaration",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -153,7 +159,8 @@
           "short_name": "UnusedParameter",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "shared_implementation_short_name": "UnusedParameter"
         }
diff --git a/rule_packages/c/Declarations1.json b/rule_packages/c/Declarations1.json
index 217e1e077c..90202a5b52 100644
--- a/rule_packages/c/Declarations1.json
+++ b/rule_packages/c/Declarations1.json
@@ -1,56 +1,56 @@
 {
   "CERT-C": {
     "DCL31-C": {
-        "properties": {
-          "obligation": "rule"
-        },
-        "queries": [
-          {
-            "description": "Omission of type specifiers may not be supported by some compilers.",
-            "kind": "problem",
-            "name": "Declare identifiers before using them",
-            "precision": "very-high",
-            "severity": "error",
-            "short_name": "DeclareIdentifiersBeforeUsingThem",
-            "shared_implementation_short_name": "TypeOmitted",
-            "tags": [
-              "correctness",
-              "readability" 
-            ],
-            "implementation_scope": {
-              "description": "This query does not check for implicitly typed parameters, typedefs or member declarations as this is partially compiler checked.",
-              "items": []
-            }
+      "properties": {
+        "obligation": "rule"
+      },
+      "queries": [
+        {
+          "description": "Omission of type specifiers may not be supported by some compilers.",
+          "kind": "problem",
+          "name": "Declare identifiers before using them",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "DeclareIdentifiersBeforeUsingThem",
+          "shared_implementation_short_name": "TypeOmitted",
+          "tags": [
+            "correctness",
+            "readability"
+          ],
+          "implementation_scope": {
+            "description": "This query does not check for implicitly typed parameters, typedefs or member declarations as this is partially compiler checked.",
+            "items": []
           }
-        ],
-        "title": "Declare identifiers before using them"
+        }
+      ],
+      "title": "Declare identifiers before using them"
+    },
+    "DCL37-C": {
+      "properties": {
+        "obligation": "rule"
       },
-      "DCL37-C": {
-        "properties": {
-          "obligation": "rule"
-        },
-        "queries": [
-          {
-            "description": "Declaring a reserved identifier can lead to undefined behaviour.",
-            "kind": "problem",
-            "name": "Do not declare or define a reserved identifier",
-            "precision": "very-high",
-            "severity": "warning",
-            "short_name": "DoNotDeclareOrDefineAReservedIdentifier",
-            "shared_implementation_short_name": "DeclaredAReservedIdentifier",
-            "tags": [
-              "correctness",
-              "maintainability",
-              "readability"
-            ],
-            "implementation_scope": {
-              "description": "This query does not consider identifiers described in the future library directions section of the standard. This query also checks for any reserved identifier as declared regardless of whether its header file is included or not.",
-              "items": []
-            }
+      "queries": [
+        {
+          "description": "Declaring a reserved identifier can lead to undefined behaviour.",
+          "kind": "problem",
+          "name": "Do not declare or define a reserved identifier",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "DoNotDeclareOrDefineAReservedIdentifier",
+          "shared_implementation_short_name": "DeclaredAReservedIdentifier",
+          "tags": [
+            "correctness",
+            "maintainability",
+            "readability"
+          ],
+          "implementation_scope": {
+            "description": "This query does not consider identifiers described in the future library directions section of the standard. This query also checks for any reserved identifier as declared regardless of whether its header file is included or not.",
+            "items": []
           }
-        ],
-        "title": "Do not declare or define a reserved identifier"
-      }
+        }
+      ],
+      "title": "Do not declare or define a reserved identifier"
+    }
   },
   "MISRA-C-2012": {
     "RULE-21-2": {
@@ -69,7 +69,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -91,7 +92,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query considers the first 31 characters of identifiers as significant, as per C99 and reports the case when names are longer than 31 characters and differ in those characters past the 31 first only. This query does not consider universal or extended source characters.",
@@ -102,41 +104,43 @@
       "title": "External identifiers shall be distinct"
     },
     "RULE-5-4": {
-        "properties": {
-          "obligation": "required"
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Declaring multiple macros with the same name leads to undefined behaviour.",
+          "kind": "problem",
+          "name": "Macro identifiers shall be distinct",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "MacroIdentifiersNotDistinct",
+          "tags": [
+            "correctness",
+            "maintainability",
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
+          ],
+          "implementation_scope": {
+            "description": "This query checks the first 63 characters of macro identifiers as significant, as per C99. Distinctness of parameters within the same function like macro are checked by compiler and therefore not checked by this rule.",
+            "items": []
+          }
         },
-        "queries": [
-          {
-            "description": "Declaring multiple macros with the same name leads to undefined behaviour.",
-            "kind": "problem",
-            "name": "Macro identifiers shall be distinct",
-            "precision": "very-high",
-            "severity": "warning",
-            "short_name": "MacroIdentifiersNotDistinct",
-            "tags": [
-              "correctness",
-              "maintainability",
-              "readability"
-            ],
-              "implementation_scope": {
-                "description": "This query checks the first 63 characters of macro identifiers as significant, as per C99. Distinctness of parameters within the same function like macro are checked by compiler and therefore not checked by this rule.",
-                "items": []
-              }
-          },
-          {
-              "description": "Macros with the same name as their parameters are less readable.",
-              "kind": "problem",
-              "name": "Macro identifiers shall be distinct from paramters",
-              "precision": "very-high",
-              "severity": "warning",
-              "short_name": "MacroIdentifierNotDistinctFromParameter",
-              "tags": [
-                "maintainability",
-                "readability"
-              ]
-            }
-        ],
-        "title": "Macro identifiers shall be distinct"
-      }
+        {
+          "description": "Macros with the same name as their parameters are less readable.",
+          "kind": "problem",
+          "name": "Macro identifiers shall be distinct from paramters",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "MacroIdentifierNotDistinctFromParameter",
+          "tags": [
+            "maintainability",
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
+        }
+      ],
+      "title": "Macro identifiers shall be distinct"
+    }
   }
 }
\ No newline at end of file
diff --git a/rule_packages/c/Declarations2.json b/rule_packages/c/Declarations2.json
index 303965b6b6..9acb117d1e 100644
--- a/rule_packages/c/Declarations2.json
+++ b/rule_packages/c/Declarations2.json
@@ -1,98 +1,98 @@
 {
   "CERT-C": {
     "DCL38-C": {
-        "properties": {
-          "obligation": "rule"
-        },
-        "queries": [
-          {
-            "description": "Structures with flexible array members can be declared in ways that will lead to undefined behaviour.",
-            "kind": "problem",
-            "name": "Use the correct syntax when declaring a flexible array member",
-            "precision": "very-high",
-            "severity": "error",
-            "short_name": "DeclaringAFlexibleArrayMember",
-            "tags": [
-              "correctness",
-              "maintainability",
-              "readability"
-            ]
-          }
-        ],
-        "title": "Use the correct syntax when declaring a flexible array member"
+      "properties": {
+        "obligation": "rule"
       },
+      "queries": [
+        {
+          "description": "Structures with flexible array members can be declared in ways that will lead to undefined behaviour.",
+          "kind": "problem",
+          "name": "Use the correct syntax when declaring a flexible array member",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "DeclaringAFlexibleArrayMember",
+          "tags": [
+            "correctness",
+            "maintainability",
+            "readability"
+          ]
+        }
+      ],
+      "title": "Use the correct syntax when declaring a flexible array member"
+    },
     "DCL40-C": {
       "properties": {
         "obligation": "rule"
       },
       "queries": [
         {
-            "description": "Using nondistinct external identifiers results in undefined behaviour.",
-            "kind": "problem",
-            "name": "External identifiers shall be distinct",
-            "precision": "very-high",
-            "severity": "warning",
-            "short_name": "ExcessLengthNamesIdentifiersNotDistinct",
-            "shared_implementation_short_name": "NotDistinctIdentifier",
-            "tags": [
-              "correctness",
-              "maintainability",
-              "readability"
-            ],
-            "implementation_scope": {
-              "description": "This query considers the first 31 characters of identifiers as significant, as per C99 and reports the case when names are longer than 31 characters and differ in those characters past the 31 first only. This query does not consider universal or extended source characters.",
-              "items": []
-            }
-          },
-        {
-            "description": "Declaring incompatible objects, in other words same named objects of different types, then accessing those objects can lead to undefined behaviour.",
-            "kind": "problem",
-            "name": "Do not create incompatible declarations of the same function or object",
-            "precision": "high",
-            "severity": "error",
-            "short_name": "IncompatibleObjectDeclarations",
-            "tags": [
-              "correctness",
-              "maintainability",
-              "readability"
-            ]
-          },
-          {
-            "description": "Declaring incompatible functions, in other words same named function of different return types or with different numbers of parameters or parameter types, then accessing those functions can lead to undefined behaviour.",
-            "kind": "problem",
-            "name": "Do not create incompatible declarations of the same function or object",
-            "precision": "high",
-            "severity": "error",
-            "short_name": "IncompatibleFunctionDeclarations",
-            "tags": [
-              "correctness",
-              "maintainability",
-              "readability"
-            ]
+          "description": "Using nondistinct external identifiers results in undefined behaviour.",
+          "kind": "problem",
+          "name": "External identifiers shall be distinct",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "ExcessLengthNamesIdentifiersNotDistinct",
+          "shared_implementation_short_name": "NotDistinctIdentifier",
+          "tags": [
+            "correctness",
+            "maintainability",
+            "readability"
+          ],
+          "implementation_scope": {
+            "description": "This query considers the first 31 characters of identifiers as significant, as per C99 and reports the case when names are longer than 31 characters and differ in those characters past the 31 first only. This query does not consider universal or extended source characters.",
+            "items": []
           }
+        },
+        {
+          "description": "Declaring incompatible objects, in other words same named objects of different types, then accessing those objects can lead to undefined behaviour.",
+          "kind": "problem",
+          "name": "Do not create incompatible declarations of the same function or object",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "IncompatibleObjectDeclarations",
+          "tags": [
+            "correctness",
+            "maintainability",
+            "readability"
+          ]
+        },
+        {
+          "description": "Declaring incompatible functions, in other words same named function of different return types or with different numbers of parameters or parameter types, then accessing those functions can lead to undefined behaviour.",
+          "kind": "problem",
+          "name": "Do not create incompatible declarations of the same function or object",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "IncompatibleFunctionDeclarations",
+          "tags": [
+            "correctness",
+            "maintainability",
+            "readability"
+          ]
+        }
       ],
       "title": "Do not create incompatible declarations of the same function or object"
     },
     "DCL41-C": {
-        "properties": {
-          "obligation": "rule"
-        },
-        "queries": [
-          {
-            "description": "Declaring a variable in a switch statement before the first case label can result in reading uninitialized memory which is undefined behaviour.",
-            "kind": "problem",
-            "name": "Do not declare variables inside a switch statement before the first case label",
-            "precision": "very-high",
-            "severity": "error",
-            "short_name": "VariablesInsideSwitchStatement",
-            "tags": [
-              "correctness",
-              "maintainability",
-              "readability"
-            ]
-          }
-        ],
-        "title": "Do not declare variables inside a switch statement before the first case label"
-      }
+      "properties": {
+        "obligation": "rule"
+      },
+      "queries": [
+        {
+          "description": "Declaring a variable in a switch statement before the first case label can result in reading uninitialized memory which is undefined behaviour.",
+          "kind": "problem",
+          "name": "Do not declare variables inside a switch statement before the first case label",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "VariablesInsideSwitchStatement",
+          "tags": [
+            "correctness",
+            "maintainability",
+            "readability"
+          ]
+        }
+      ],
+      "title": "Do not declare variables inside a switch statement before the first case label"
+    }
   }
 }
\ No newline at end of file
diff --git a/rule_packages/c/Declarations3.json b/rule_packages/c/Declarations3.json
index a22567b237..8c2e0879ff 100644
--- a/rule_packages/c/Declarations3.json
+++ b/rule_packages/c/Declarations3.json
@@ -14,7 +14,8 @@
           "shared_implementation_short_name": "IdentifierHidden",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query does not consider C90 or C99 definitions of significant name and instead uses full name matches only.",
@@ -38,7 +39,8 @@
           "short_name": "IdentifiersNotDistinctFromMacroNames",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -58,7 +60,8 @@
           "short_name": "TypedefNameNotUnique",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -78,7 +81,8 @@
           "short_name": "TagNameNotUnique",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -99,7 +103,8 @@
           "shared_implementation_short_name": "TypeOmitted",
           "tags": [
             "correctness",
-            "readability" 
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query does not check for implicitly typed parameters, typedefs or member declarations as this is partially compiler checked.",
diff --git a/rule_packages/c/Declarations4.json b/rule_packages/c/Declarations4.json
index bfd0b18328..06475706f4 100644
--- a/rule_packages/c/Declarations4.json
+++ b/rule_packages/c/Declarations4.json
@@ -13,7 +13,8 @@
           "severity": "error",
           "short_name": "FunctionTypesNotInPrototypeForm",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query does not check for implicitly typed parameters and checks function declarations and definitions but not function pointer types. This query cannot determine when the keyword void is used in place of no parameter.",
@@ -36,7 +37,8 @@
           "severity": "error",
           "short_name": "DeclarationsOfAnObjectSameNameAndType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -47,7 +49,8 @@
           "severity": "error",
           "short_name": "DeclarationsOfAFunctionSameNameAndType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -68,7 +71,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query does not check for the recommendation of declarations in headers.",
@@ -85,7 +89,8 @@
           "tags": [
             "readability",
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query does not check for the recommendation of declarations in headers.",
@@ -109,7 +114,8 @@
           "short_name": "IdentifierWithExternalLinkageOneDefinition",
           "shared_implementation_short_name": "IdentifierWithExternalLinkageOneDefinitionShared",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations5.json b/rule_packages/c/Declarations5.json
index 705f72791c..1106a1d705 100644
--- a/rule_packages/c/Declarations5.json
+++ b/rule_packages/c/Declarations5.json
@@ -15,7 +15,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query considers the first 63 characters of identifiers as significant, as per C99 for nonexternal identifiers and reports the case when names are longer than 63 characters and differ in those characters past the 63 first only. This query does not consider universal or extended source characters.",
@@ -38,7 +39,8 @@
           "severity": "warning",
           "short_name": "ExternalObjectOrFunctionNotDeclaredInOneFile",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -58,7 +60,8 @@
           "short_name": "MissingStaticSpecifierFunctionRedeclarationC",
           "shared_implementation_short_name": "MissingStaticSpecifierFunctionRedeclarationShared",
           "tags": [
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -69,7 +72,8 @@
           "severity": "warning",
           "short_name": "MissingStaticSpecifierObjectRedeclarationC",
           "tags": [
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -89,7 +93,8 @@
           "short_name": "UnnecessaryExposedIdentifierDeclarationC",
           "shared_implementation_short_name": "UnnecessaryExposedIdentifierDeclarationShared",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations6.json b/rule_packages/c/Declarations6.json
index 166d0c568b..198b4e8351 100644
--- a/rule_packages/c/Declarations6.json
+++ b/rule_packages/c/Declarations6.json
@@ -14,7 +14,8 @@
           "short_name": "FunctionDeclaredImplicitly",
           "tags": [
             "correctness",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -33,7 +34,8 @@
           "severity": "error",
           "short_name": "FlexibleArrayMembersDeclared",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -53,7 +55,8 @@
           "short_name": "IdentifiersWithExternalLinkageNotUnique",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -73,7 +76,8 @@
           "short_name": "IdentifiersWithInternalLinkageNotUnique",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This rule does not explicitly check for the exception of inline functions in header files across multiple translation units as the CodeQL database already represents these as the same entity."
@@ -95,7 +99,8 @@
           "severity": "error",
           "short_name": "InlineFunctionNotDeclaredStaticStorage",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -115,7 +120,8 @@
           "short_name": "ArrayExternalLinkageSizeExplicitlySpecified",
           "tags": [
             "correctness",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -136,7 +142,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Declarations7.json b/rule_packages/c/Declarations7.json
index b1be4f9d55..cdb74123b1 100644
--- a/rule_packages/c/Declarations7.json
+++ b/rule_packages/c/Declarations7.json
@@ -39,7 +39,8 @@
           "short_name": "VariableLengthArrayTypesUsed",
           "tags": [
             "correctness",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -60,7 +61,8 @@
           "shared_implementation_short_name": "NonUniqueEnumerationConstant",
           "tags": [
             "correctness",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/EssentialTypes.json b/rule_packages/c/EssentialTypes.json
index 57c7ace1ba..a8ae26e8c6 100644
--- a/rule_packages/c/EssentialTypes.json
+++ b/rule_packages/c/EssentialTypes.json
@@ -13,7 +13,8 @@
           "severity": "warning",
           "short_name": "OperandsOfAnInappropriateEssentialType",
           "tags": [
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -24,7 +25,8 @@
           "severity": "warning",
           "short_name": "PointerTypeOnLogicalOperator",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -44,7 +46,8 @@
           "short_name": "AdditionSubtractionOnEssentiallyCharType",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -64,7 +67,8 @@
           "short_name": "AssignmentOfIncompatibleEssentialType",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -84,7 +88,8 @@
           "short_name": "OperandsWithMismatchedEssentialTypeCategory",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -104,7 +109,8 @@
           "short_name": "InappropriateEssentialTypeCast",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -124,7 +130,8 @@
           "short_name": "AssignmentToWiderEssentialType",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -144,7 +151,8 @@
           "short_name": "ImplicitConversionOfCompositeExpression",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -164,7 +172,8 @@
           "short_name": "InappropriateCastOfCompositeExpression",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -184,7 +193,8 @@
           "short_name": "LoopOverEssentiallyFloatType",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -204,7 +214,8 @@
           "short_name": "MemcmpUsedToCompareNullTerminatedStrings",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -224,7 +235,8 @@
           "short_name": "MemcmpOnInappropriateEssentialTypeArgs",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/IO1.json b/rule_packages/c/IO1.json
index 1d90c6f28f..f5b9ec8b0e 100644
--- a/rule_packages/c/IO1.json
+++ b/rule_packages/c/IO1.json
@@ -145,7 +145,8 @@
           "short_name": "FileUsedAfterClosed",
           "shared_implementation_short_name": "DoNotAccessAClosedFile",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
diff --git a/rule_packages/c/IO3.json b/rule_packages/c/IO3.json
index 8d1c250eda..52276eb05c 100644
--- a/rule_packages/c/IO3.json
+++ b/rule_packages/c/IO3.json
@@ -60,7 +60,8 @@
           "severity": "error",
           "short_name": "FileOpenForReadAndWriteOnDifferentStreams",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -82,7 +83,8 @@
           "severity": "error",
           "short_name": "AttemptToWriteToAReadOnlyStream",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -101,7 +103,8 @@
           "severity": "error",
           "short_name": "PointerToAFileObjectDereferenced",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -120,7 +123,8 @@
           "severity": "error",
           "short_name": "EofShallBeComparedWithUnmodifiedReturnValues",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/IO4.json b/rule_packages/c/IO4.json
index 0873d2707b..1303f9b50f 100644
--- a/rule_packages/c/IO4.json
+++ b/rule_packages/c/IO4.json
@@ -68,4 +68,4 @@
       "title": "Use valid format strings"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/rule_packages/c/IntegerOverflow.json b/rule_packages/c/IntegerOverflow.json
index 0fb1c5a4e7..a7897fad9e 100644
--- a/rule_packages/c/IntegerOverflow.json
+++ b/rule_packages/c/IntegerOverflow.json
@@ -115,7 +115,8 @@
           "shared_implementation_short_name": "ConstantUnsignedIntegerExpressionsWrapAround",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/InvalidMemory1.json b/rule_packages/c/InvalidMemory1.json
index 0d84c1c87e..227ec37558 100644
--- a/rule_packages/c/InvalidMemory1.json
+++ b/rule_packages/c/InvalidMemory1.json
@@ -78,7 +78,8 @@
           "short_name": "ObjectWithAutoStorageDurationReadBeforeInit",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Language1.json b/rule_packages/c/Language1.json
index 50aed45c55..6b20822196 100644
--- a/rule_packages/c/Language1.json
+++ b/rule_packages/c/Language1.json
@@ -14,7 +14,8 @@
           "short_name": "LanguageNotEncapsulatedAndIsolated",
           "tags": [
             "maintainability",
-            "readability" 
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Language2.json b/rule_packages/c/Language2.json
index 66f219a025..43dbb4ecef 100644
--- a/rule_packages/c/Language2.json
+++ b/rule_packages/c/Language2.json
@@ -15,7 +15,8 @@
           "shared_implementation_short_name": "UsageOfAssemblerNotDocumented",
           "tags": [
             "maintainability",
-            "readability" 
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -35,7 +36,8 @@
           "short_name": "EmergentLanguageFeaturesUsed",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/amendment2"
           ]
         }
       ],
diff --git a/rule_packages/c/Language3.json b/rule_packages/c/Language3.json
index d48444a4ab..c19881e05c 100644
--- a/rule_packages/c/Language3.json
+++ b/rule_packages/c/Language3.json
@@ -14,7 +14,8 @@
           "short_name": "LanguageExtensionsShouldNotBeUsed",
           "tags": [
             "maintainability",
-            "readability" 
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This implementation attempts to cover a broad section of the compiler specific extensions documented in: https://clang.llvm.org/docs/LanguageExtensions.html and https://gcc.gnu.org/onlinedocs/gcc/C-Extensions.html but is not comprehensive. The following topics are addressed in this query: Builtin macros, Variable Attributes, Function Attributes, Statement Expressions, Non-Local Gotos, Conditionals, Extended Integer / Numeric Types, Zero Length Structures, Zero Length Arrays, Variable Length Arrays, Case Attributes, Alignment, __sync and __fetch builtins. Other topics listed in the extension references are not covered by this query."
@@ -37,7 +38,8 @@
           "short_name": "OccurrenceOfUndefinedBehavior",
           "tags": [
             "maintainability",
-            "readability" 
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This implementation only considers alternate forms of `main` and the undefined behavior that results. Note that the current version of CodeQL is not able to detect this issue if a function is named `main` since it will assume the return type and formal parameters. Additional cases from Appendix J of the C99 standard are not currently considered."
diff --git a/rule_packages/c/Memory1.json b/rule_packages/c/Memory1.json
index 7232b18751..8515fe15e1 100644
--- a/rule_packages/c/Memory1.json
+++ b/rule_packages/c/Memory1.json
@@ -14,8 +14,9 @@
           "short_name": "InitializerForAggregateOrUnionNotEnclosedInBraces",
           "shared_implementation_short_name": "UseInitializerBracesToMatchAggregateTypeStructure",
           "tags": [
-            "maintainability", 
-            "readability"
+            "maintainability",
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -35,7 +36,8 @@
           "short_name": "PartiallyInitializedArrayWithExplicitInitializers",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -56,7 +58,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Memory2.json b/rule_packages/c/Memory2.json
index 677711938a..358d482194 100644
--- a/rule_packages/c/Memory2.json
+++ b/rule_packages/c/Memory2.json
@@ -164,7 +164,8 @@
           "shared_implementation_short_name": "FreeMemoryWhenNoLongerNeededShared",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -180,7 +181,8 @@
           "shared_implementation_short_name": "CloseFileHandleWhenNoLongerNeededShared",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "The rule is enforced in the context of a single function."
@@ -204,7 +206,8 @@
           "shared_implementation_short_name": "OnlyFreeMemoryAllocatedDynamicallyShared",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Misc.json b/rule_packages/c/Misc.json
index 323ec17350..bba96db85c 100644
--- a/rule_packages/c/Misc.json
+++ b/rule_packages/c/Misc.json
@@ -12,7 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "RandUsedForGeneratingPseudorandomNumbers",
-          "shared_implementation_short_name" : "DoNotUseRandForGeneratingPseudorandomNumbers",
+          "shared_implementation_short_name": "DoNotUseRandForGeneratingPseudorandomNumbers",
           "tags": [
             "security"
           ]
diff --git a/rule_packages/c/OutOfBounds.json b/rule_packages/c/OutOfBounds.json
index 31d0349a63..759b68e294 100644
--- a/rule_packages/c/OutOfBounds.json
+++ b/rule_packages/c/OutOfBounds.json
@@ -56,7 +56,8 @@
           "short_name": "StringFunctionPointerArgumentOutOfBounds",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -76,7 +77,8 @@
           "short_name": "StringLibrarySizeArgumentOutOfBounds",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Pointers1.json b/rule_packages/c/Pointers1.json
index 6b2df1595c..29b658d823 100644
--- a/rule_packages/c/Pointers1.json
+++ b/rule_packages/c/Pointers1.json
@@ -13,7 +13,8 @@
           "severity": "error",
           "short_name": "ConversionBetweenFunctionPointerAndOtherType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -32,7 +33,8 @@
           "severity": "error",
           "short_name": "ConversionBetweenIncompleteTypePointerAndOtherType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -51,7 +53,8 @@
           "severity": "error",
           "short_name": "CastBetweenObjectPointerAndDifferentObjectType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -70,7 +73,8 @@
           "severity": "error",
           "short_name": "ConversionBetweenPointerToObjectAndIntegerType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -89,7 +93,8 @@
           "severity": "error",
           "short_name": "ConversionFromPointerToVoidIntoPointerToObject",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -108,7 +113,8 @@
           "severity": "error",
           "short_name": "CastBetweenPointerToVoidAndArithmeticType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -127,7 +133,8 @@
           "severity": "error",
           "short_name": "CastBetweenPointerToObjectAndNonIntArithmeticType",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -146,7 +153,8 @@
           "severity": "error",
           "short_name": "CastRemovesConstOrVolatileQualification",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -165,7 +173,8 @@
           "severity": "error",
           "short_name": "MacroNullNotUsedAsIntegerNullPointerConstant",
           "tags": [
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This rule allows two forms of null-pointer constants: a Zero literal created by the NULL macro or a Zero literal cast to a void pointer."
@@ -188,7 +197,8 @@
           "short_name": "PointerAndDerivedPointerMustAddressSameArray",
           "shared_implementation_short_name": "DoNotUsePointerArithmeticToAddressDifferentArrays",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -208,7 +218,8 @@
           "short_name": "SubtractionBetweenPointersMustAddressSameArray",
           "shared_implementation_short_name": "DoNotSubtractPointersAddressingDifferentArrays",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -228,7 +239,8 @@
           "short_name": "RelationalOperatorComparesPointerToDifferentArray",
           "shared_implementation_short_name": "DoNotUseRelationalOperatorsWithDifferingArrays",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -248,7 +260,8 @@
           "short_name": "DoNotUseAdditionOrSubtractionOperatorsOnPointers",
           "shared_implementation_short_name": "UseOnlyArrayIndexingForPointerArithmetic",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -268,7 +281,8 @@
           "short_name": "NoMoreThanTwoLevelsOfPointerNestingInDeclarations",
           "shared_implementation_short_name": "DoNotUseMoreThanTwoLevelsOfPointerIndirection",
           "tags": [
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -288,7 +302,8 @@
           "short_name": "AutomaticStorageObjectAddressCopiedToOtherObject",
           "shared_implementation_short_name": "DoNotCopyAddressOfAutoStorageObjectToOtherObject",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -308,7 +323,8 @@
           "short_name": "ObjectWithNoPointerDereferenceShouldBeOpaque",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This rule considers all cases where a structure or union is referenced as a pointer but has no FieldAccess within a translation unit. Further excluded from this rule are translation units in which the structure or union is declared as a non-pointer variable."
@@ -332,7 +348,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "To exclude compliant exceptions, this rule only excludes direct assignments of pointers to non-const-qualified types in the context of a single function and does not cover memory-copying functions. This rule also excludes pointers passed to other functions without conversion."
diff --git a/rule_packages/c/Pointers2.json b/rule_packages/c/Pointers2.json
index da275001c4..9abf4c98ce 100644
--- a/rule_packages/c/Pointers2.json
+++ b/rule_packages/c/Pointers2.json
@@ -12,7 +12,7 @@
           "precision": "high",
           "severity": "error",
           "short_name": "DoNotAddOrSubtractAScaledIntegerToAPointer",
-          "tags":[
+          "tags": [
             "correctness"
           ]
         }
diff --git a/rule_packages/c/Preprocessor1.json b/rule_packages/c/Preprocessor1.json
index b93bc72731..cf4f023023 100644
--- a/rule_packages/c/Preprocessor1.json
+++ b/rule_packages/c/Preprocessor1.json
@@ -14,7 +14,8 @@
           "short_name": "IncludeDirectivesPrecededByDirectivesOrComments",
           "shared_implementation_short_name": "PreprocessorIncludesPreceded",
           "tags": [
-              "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -34,10 +35,10 @@
           "short_name": "PreprocessorHashOperatorsShouldNotBeUsed",
           "shared_implementation_short_name": "HashOperatorsUsed",
           "tags": [
-              "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
-        
       ],
       "title": "The # and ## preprocessor operators should not be used"
     },
@@ -55,7 +56,8 @@
           "short_name": "ForbiddenCharactersInHeaderFileName",
           "shared_implementation_short_name": "PreprocessorIncludesForbiddenHeaderNames",
           "tags": [
-              "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query identifies the use of the ', \\, /*, // characters in header file names. The query is not able to detect the use of the \" character in header file names.",
@@ -79,8 +81,9 @@
           "short_name": "IdentifiersUsedInPreprocessorExpression",
           "shared_implementation_short_name": "UndefinedMacroIdentifiers",
           "tags": [
-              "correctness",
-              "readability"
+            "correctness",
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query does not detect the case where an undefined character is used but not actually evaluated, for example, as a result of the inclusion of a logical AND operator in the #if expression.",
diff --git a/rule_packages/c/Preprocessor2.json b/rule_packages/c/Preprocessor2.json
index 546f426135..62bb0b770a 100644
--- a/rule_packages/c/Preprocessor2.json
+++ b/rule_packages/c/Preprocessor2.json
@@ -14,7 +14,8 @@
           "short_name": "MoreThanOneHashOperatorInMacroDefinition",
           "shared_implementation_short_name": "MacroParameterFollowingHash",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query applies to function like macros and not object like macros. This rule strictly disallows the use of # operator followed by a ## and other combinations are permitted.",
@@ -39,7 +40,8 @@
           "shared_implementation_short_name": "AMixedUseMacroArgumentSubjectToExpansion",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -59,7 +61,8 @@
           "short_name": "UndefShouldNotBeUsed",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -81,7 +84,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query defines header file as any file that is included regardless of file extension. This query does not consider the use of `#pragma once` as a permitted header guard.",
diff --git a/rule_packages/c/Preprocessor3.json b/rule_packages/c/Preprocessor3.json
index 0b0c735a04..79e2aec59c 100644
--- a/rule_packages/c/Preprocessor3.json
+++ b/rule_packages/c/Preprocessor3.json
@@ -1,24 +1,25 @@
 {
   "MISRA-C-2012": {
     "RULE-20-8": {
-        "properties": {
-          "obligation": "required"
-        },
-        "queries": [
-          {
-            "description": "A controlling expression of a #if or #elif preprocessing directive that does not evaluate to 0 or 1 makes code more difficult to understand.",
-            "kind": "problem",
-            "name": "The controlling expression of a #if or #elif preprocessing directive shall evaluate to 0 or 1",
-            "precision": "high",
-            "severity": "warning",
-            "short_name": "ControllingExpressionIfDirective",
-            "tags": [
-                "maintainability",
-                "readability"
-            ]
-          }
-        ],
-        "title": "The controlling expression of a #if or #elif preprocessing directive shall evaluate to 0 or 1"
-      }
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "A controlling expression of a #if or #elif preprocessing directive that does not evaluate to 0 or 1 makes code more difficult to understand.",
+          "kind": "problem",
+          "name": "The controlling expression of a #if or #elif preprocessing directive shall evaluate to 0 or 1",
+          "precision": "high",
+          "severity": "warning",
+          "short_name": "ControllingExpressionIfDirective",
+          "tags": [
+            "maintainability",
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
+        }
+      ],
+      "title": "The controlling expression of a #if or #elif preprocessing directive shall evaluate to 0 or 1"
+    }
   }
 }
\ No newline at end of file
diff --git a/rule_packages/c/Preprocessor4.json b/rule_packages/c/Preprocessor4.json
index 404909c479..608a23d974 100644
--- a/rule_packages/c/Preprocessor4.json
+++ b/rule_packages/c/Preprocessor4.json
@@ -15,7 +15,8 @@
           "tags": [
             "correctness",
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -36,7 +37,8 @@
           "shared_implementation_short_name": "PreprocessingDirectiveWithinMacroArgument",
           "tags": [
             "readability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -57,7 +59,8 @@
           "tags": [
             "correctness",
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Preprocessor5.json b/rule_packages/c/Preprocessor5.json
index 29c0156410..ef17b83c00 100644
--- a/rule_packages/c/Preprocessor5.json
+++ b/rule_packages/c/Preprocessor5.json
@@ -65,7 +65,8 @@
           "shared_implementation_short_name": "MacroParameterNotEnclosedInParentheses",
           "tags": [
             "correctness",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This query checks for every instance of a parameter to be enclosed in parentheses regardless of whether the expansion of that parameter forms an expression or not.",
diff --git a/rule_packages/c/Preprocessor6.json b/rule_packages/c/Preprocessor6.json
index 0bb7f34f90..6d71b8697b 100644
--- a/rule_packages/c/Preprocessor6.json
+++ b/rule_packages/c/Preprocessor6.json
@@ -16,7 +16,8 @@
           "tags": [
             "external/misra/audit",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/SideEffects1.json b/rule_packages/c/SideEffects1.json
index 821fb24d3c..9ecb79447d 100644
--- a/rule_packages/c/SideEffects1.json
+++ b/rule_packages/c/SideEffects1.json
@@ -83,7 +83,8 @@
           "severity": "warning",
           "short_name": "UnenclosedSizeofOperand",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -94,7 +95,8 @@
           "severity": "warning",
           "short_name": "ImplicitPrecedenceOfOperatorsInExpression",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -113,7 +115,8 @@
           "severity": "error",
           "short_name": "InitializerListsContainPersistentSideEffects",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -134,7 +137,8 @@
           "shared_implementation_short_name": "ResultOfAnAssignmentOperatorShouldNotBeUsed",
           "tags": [
             "correctness",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -153,7 +157,8 @@
           "severity": "error",
           "short_name": "PossibleSuppressedSideEffectInLogicOperatorOperand",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -172,7 +177,8 @@
           "severity": "error",
           "short_name": "SizeofOperandWithSideEffect",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/SideEffects2.json b/rule_packages/c/SideEffects2.json
index 42467c2852..b7e1baa901 100644
--- a/rule_packages/c/SideEffects2.json
+++ b/rule_packages/c/SideEffects2.json
@@ -14,7 +14,8 @@
           "short_name": "SideEffectAndCrementInFullExpression",
           "tags": [
             "readability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -33,7 +34,8 @@
           "severity": "warning",
           "short_name": "ModificationOfFunctionParameter",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/SideEffects3.json b/rule_packages/c/SideEffects3.json
index 2d67df6e2e..2bf91d77b9 100644
--- a/rule_packages/c/SideEffects3.json
+++ b/rule_packages/c/SideEffects3.json
@@ -13,7 +13,8 @@
           "severity": "error",
           "short_name": "UnsequencedSideEffects",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/StandardLibraryFunctionTypes.json b/rule_packages/c/StandardLibraryFunctionTypes.json
index 274eadbced..ee0d7f5af1 100644
--- a/rule_packages/c/StandardLibraryFunctionTypes.json
+++ b/rule_packages/c/StandardLibraryFunctionTypes.json
@@ -12,7 +12,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CtypeFunctionArgNotUnsignedCharOrEof",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "Any value passed to a function in <ctype.h> shall be representable as an unsigned char or be the value EOF"
@@ -29,7 +31,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "MemcpyMemmoveMemcmpArgNotPointersToCompatibleTypes",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "The pointer arguments to the Standard Library functions memcpy, memmove and memcmp shall be pointers to qualified or unqualified versions of compatible types"
diff --git a/rule_packages/c/Statements1.json b/rule_packages/c/Statements1.json
index a8dc1b55ea..c932a8642d 100644
--- a/rule_packages/c/Statements1.json
+++ b/rule_packages/c/Statements1.json
@@ -15,7 +15,8 @@
           "shared_implementation_short_name": "NestedLabelInSwitch",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -35,7 +36,8 @@
           "short_name": "BreakShallTerminateSwitchClause",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -55,7 +57,8 @@
           "short_name": "EverySwitchShallHaveDefaultLabel",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -73,7 +76,9 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "DefaultNotFirstOrLastOfSwitch",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "A default label shall appear as either the first or the last switch label of a switch statement"
diff --git a/rule_packages/c/Statements2.json b/rule_packages/c/Statements2.json
index cb616429be..9cd71b69c9 100644
--- a/rule_packages/c/Statements2.json
+++ b/rule_packages/c/Statements2.json
@@ -15,7 +15,8 @@
           "shared_implementation_short_name": "GotoStatementCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -36,7 +37,8 @@
           "shared_implementation_short_name": "GotoReferenceALabelInSurroundingBlock",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -56,7 +58,8 @@
           "short_name": "LoopIterationCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -76,7 +79,8 @@
           "short_name": "SwitchClauseNumberCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -96,7 +100,8 @@
           "short_name": "SwitchExpressionBoolCondition",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements3.json b/rule_packages/c/Statements3.json
index 5471749a49..94206d485f 100644
--- a/rule_packages/c/Statements3.json
+++ b/rule_packages/c/Statements3.json
@@ -14,7 +14,8 @@
           "short_name": "SwitchCompoundCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -26,7 +27,8 @@
           "short_name": "LoopCompoundCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -38,7 +40,8 @@
           "short_name": "SelectionCompoundCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -59,7 +62,8 @@
           "short_name": "IfElseEndCondition",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -80,7 +84,8 @@
           "short_name": "SwitchCaseStartCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -93,7 +98,8 @@
           "short_name": "SwitchStmtNotWellFormed",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -113,7 +119,8 @@
           "short_name": "RecursiveFunctionCondition",
           "tags": [
             "maintainability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements4.json b/rule_packages/c/Statements4.json
index 56e13c9de6..5b0cc9be26 100644
--- a/rule_packages/c/Statements4.json
+++ b/rule_packages/c/Statements4.json
@@ -37,7 +37,8 @@
           "short_name": "ForLoopNotWellFormed",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -57,7 +58,8 @@
           "short_name": "NonBooleanIfCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         },
         {
@@ -69,7 +71,8 @@
           "short_name": "NonBooleanIterationCondition",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Statements5.json b/rule_packages/c/Statements5.json
index 93a533939b..329819b61f 100644
--- a/rule_packages/c/Statements5.json
+++ b/rule_packages/c/Statements5.json
@@ -15,7 +15,8 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -36,7 +37,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -58,11 +60,12 @@
           "tags": [
             "correctness",
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
       "title": "All exit paths from a function with non-void return type shall have an explicit return statement with an expression"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/rule_packages/c/Statements6.json b/rule_packages/c/Statements6.json
index 8d71f11cfd..c8ab3efe38 100644
--- a/rule_packages/c/Statements6.json
+++ b/rule_packages/c/Statements6.json
@@ -15,7 +15,8 @@
           "shared_implementation_short_name": "GotoStatementShouldNotBeUsed",
           "tags": [
             "correctness",
-            "security"
+            "security",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Static.json b/rule_packages/c/Static.json
index 7edf903703..2af2af402a 100644
--- a/rule_packages/c/Static.json
+++ b/rule_packages/c/Static.json
@@ -13,7 +13,8 @@
           "severity": "error",
           "short_name": "UseOfArrayStatic",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "The static keyword is associated with particular array types in our model. This means we can get false positives when two parameter use the same array type and size, but only one of which uses the `static` keyword."
diff --git a/rule_packages/c/Syntax.json b/rule_packages/c/Syntax.json
index 99bcf8250e..e588c366c0 100644
--- a/rule_packages/c/Syntax.json
+++ b/rule_packages/c/Syntax.json
@@ -14,7 +14,8 @@
           "short_name": "CharacterSequencesAndUsedWithinAComment",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -35,7 +36,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -57,7 +59,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -79,7 +82,8 @@
           "tags": [
             "maintainability",
             "readability",
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -100,7 +104,8 @@
           "shared_implementation_short_name": "DifferentIdentifiersNotTypographicallyUnambiguous",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
@@ -120,7 +125,8 @@
           "short_name": "UOrUSuffixRepresentedInUnsignedType",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ],
           "implementation_scope": {
             "description": "This implementation does not consider constants defined in macro bodies."
@@ -144,7 +150,8 @@
           "shared_implementation_short_name": "LowercaseLStartsInLiteralSuffix",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/third-edition-first-revision"
           ]
         }
       ],
diff --git a/rule_packages/c/Types1.json b/rule_packages/c/Types1.json
index fae0339d3c..cbf7f0b632 100644
--- a/rule_packages/c/Types1.json
+++ b/rule_packages/c/Types1.json
@@ -48,7 +48,9 @@
           "precision": "high",
           "severity": "error",
           "short_name": "PlainNumericalTypeUsedOverExplicitTypedef",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "typedefs that indicate size and signedness should be used in place of the basic numerical types"
@@ -65,7 +67,9 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "SizeofOperatorUsedOnArrayTypeParam",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "The sizeof operator shall not have an operand which is a function parameter declared as 'array of type'"
@@ -82,10 +86,12 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "StringLiteralAssignedToNonConstChar",
-          "tags": []
+          "tags": [
+            "external/misra/c/2012/third-edition-first-revision"
+          ]
         }
       ],
       "title": "A string literal shall not be assigned to an object unless the object's type is 'pointer to const-qualified char'"
     }
   }
-}
+}
\ No newline at end of file

From 4c9e0489befb910a7a7fbf24791286d771f90c0d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 2 Oct 2024 22:40:10 +0100
Subject: [PATCH 201/435] MISRA C: Update query suites

 * Provide a query suite for MISRA C 2012, 3rd Edition with Amendment 2
 * Provide query suites for required/advisory
---
 .../misra-c-2012-third-edition-with-amendment-2.qls | 13 +++++++++++++
 c/misra/src/codeql-suites/misra-c-advisory.qls      | 12 ++++++++++++
 .../{misra-default.qls => misra-c-default.qls}      |  0
 c/misra/src/codeql-suites/misra-c-required.qls      | 12 ++++++++++++
 c/misra/src/qlpack.yml                              |  1 +
 5 files changed, 38 insertions(+)
 create mode 100644 c/misra/src/codeql-suites/misra-c-2012-third-edition-with-amendment-2.qls
 create mode 100644 c/misra/src/codeql-suites/misra-c-advisory.qls
 rename c/misra/src/codeql-suites/{misra-default.qls => misra-c-default.qls} (100%)
 create mode 100644 c/misra/src/codeql-suites/misra-c-required.qls

diff --git a/c/misra/src/codeql-suites/misra-c-2012-third-edition-with-amendment-2.qls b/c/misra/src/codeql-suites/misra-c-2012-third-edition-with-amendment-2.qls
new file mode 100644
index 0000000000..8d06e7c2c8
--- /dev/null
+++ b/c/misra/src/codeql-suites/misra-c-2012-third-edition-with-amendment-2.qls
@@ -0,0 +1,13 @@
+- description: MISRA C 2012 - Third Edition, First Revision including Amendment 2
+- qlpack: codeql/misra-c-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - external/misra/c/2012/third-edition-first-revision
+    - external/misra/c/2012/amendment2
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/c/misra/src/codeql-suites/misra-c-advisory.qls b/c/misra/src/codeql-suites/misra-c-advisory.qls
new file mode 100644
index 0000000000..517f449b13
--- /dev/null
+++ b/c/misra/src/codeql-suites/misra-c-advisory.qls
@@ -0,0 +1,12 @@
+- description: MISRA C 2012 (Advisory)
+- qlpack: codeql/misra-c-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - external/misra/obligation/advisory
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/c/misra/src/codeql-suites/misra-default.qls b/c/misra/src/codeql-suites/misra-c-default.qls
similarity index 100%
rename from c/misra/src/codeql-suites/misra-default.qls
rename to c/misra/src/codeql-suites/misra-c-default.qls
diff --git a/c/misra/src/codeql-suites/misra-c-required.qls b/c/misra/src/codeql-suites/misra-c-required.qls
new file mode 100644
index 0000000000..ca32b9ca97
--- /dev/null
+++ b/c/misra/src/codeql-suites/misra-c-required.qls
@@ -0,0 +1,12 @@
+- description: MISRA C 2012 (Required)
+- qlpack: codeql/misra-c-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - external/misra/obligation/required
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index fe7a2a0567..5de8472821 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -3,6 +3,7 @@ version: 2.36.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
+default-suite-file: codeql-suites/misra-c-default.qls
 dependencies:
   codeql/common-c-coding-standards: '*'
   codeql/cpp-all: 0.9.3

From 7bf12c4902c6acd803b90856b8af6b3c2fff317c Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Thu, 3 Oct 2024 10:07:05 +0900
Subject: [PATCH 202/435] Fix new query addition

---
 .../rules/M0-1-10/UnusedSplMemberFunction.ql    |  5 ++---
 .../rules/M0-1-10/UnusedSplMemberFunction.qlref |  2 +-
 .../cpp/exclusions/cpp/DeadCode.qll             | 17 +++++++++++++++++
 rule_packages/cpp/DeadCode.json                 | 15 +++++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
index bf073dcced..9efa4bdfd1 100644
--- a/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
+++ b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
@@ -2,8 +2,7 @@
  * @id cpp/autosar/unused-spl-member-function
  * @name M0-1-10: Every defined function should be called at least once
  * @description Uncalled functions complicate the program and can indicate a possible mistake on the
- *              part of the programmer. This query specifically looks for unused Special Member
- *              Functions.
+ *              part of the programmer.
  * @kind problem
  * @precision medium
  * @problem.severity warning
@@ -21,7 +20,7 @@ import codingstandards.cpp.deadcode.UnusedFunctions
 
 from UnusedFunctions::UnusedSplMemberFunction unusedSplMemFunction, string name
 where
-  not isExcluded(unusedSplMemFunction, DeadCodePackage::unusedFunctionQuery()) and
+  not isExcluded(unusedSplMemberFunctionQuery, DeadCodePackage::unusedFunctionQuery()) and
   (
     if exists(unusedSplMemFunction.getQualifiedName())
     then name = unusedSplMemFunction.getQualifiedName()
diff --git a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref
index b04687a48b..899f00fda1 100644
--- a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref
+++ b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.qlref
@@ -1 +1 @@
-rules/M0-1-10/UnusedSplMemberFunction.ql
+rules/M0-1-10/UnusedSplMemberFunction.ql
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode.qll
index 40b8795e5e..f11741fde5 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode.qll
@@ -12,6 +12,7 @@ newtype DeadCodeQuery =
   TUnusedTypeDeclarationsQuery() or
   TUnreachableCodeQuery() or
   TUnusedFunctionQuery() or
+  TUnusedSplMemberFunctionQuery() or
   TInfeasiblePathQuery() or
   TUnusedLocalVariableQuery() or
   TUnusedGlobalOrNamespaceVariableQuery() or
@@ -94,6 +95,15 @@ predicate isDeadCodeQueryMetadata(Query query, string queryId, string ruleId, st
   ruleId = "M0-1-10" and
   category = "advisory"
   or
+  query =
+    // `Query` instance for the `unusedSplMemberFunction` query
+    DeadCodePackage::unusedSplMemberFunctionQuery() and
+  queryId =
+    // `@id` for the `unusedSplMemberFunction` query
+    "cpp/autosar/unused-spl-member-function" and
+  ruleId = "M0-1-10" and
+  category = "advisory"
+  or
   query =
     // `Query` instance for the `infeasiblePath` query
     DeadCodePackage::infeasiblePathQuery() and
@@ -224,6 +234,13 @@ module DeadCodePackage {
       TQueryCPP(TDeadCodePackageQuery(TUnusedFunctionQuery()))
   }
 
+  Query unusedSplMemberFunctionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `unusedSplMemberFunction` query
+      TQueryCPP(TDeadCodePackageQuery(TUnusedSplMemberFunctionQuery()))
+  }
+
   Query infeasiblePathQuery() {
     //autogenerate `Query` type
     result =
diff --git a/rule_packages/cpp/DeadCode.json b/rule_packages/cpp/DeadCode.json
index 7eb5c9f6f9..4746f86dee 100644
--- a/rule_packages/cpp/DeadCode.json
+++ b/rule_packages/cpp/DeadCode.json
@@ -194,6 +194,21 @@
             "readability",
             "maintainability"
           ]
+        },
+        {
+          "description": "Uncalled functions complicate the program and can indicate a possible mistake on the part of the programmer.",
+          "kind": "problem",
+          "name": "Every defined function should be called at least once",
+          "precision": "medium",
+          "severity": "warning",
+          "short_name": "UnusedSplMemberFunction",
+          "tags": [
+            "readability",
+            "maintainability"
+          ],
+          "implementation_scope": {
+            "description": "In limited cases, this query can raise false-positives for special member function calls invoked from the C++ Metaprogramming library."
+          }
         }
       ],
       "title": "Every defined function should be called at least once."

From a48c7cc6af11ed445cee5a43d1e823db6b2c3833 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Thu, 3 Oct 2024 17:12:41 +0900
Subject: [PATCH 203/435] Simplify GoogleTestFunction

---
 .../cpp/EncapsulatingFunctions.qll            | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
index 4f7e423254..ad11bea21c 100644
--- a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
@@ -26,27 +26,21 @@ class MainFunction extends MainLikeFunction {
  * such functions, however, they have certain features that can be used for
  * identification. This can be refined based on experiments/real-world use.
  */
-class GTestFunction extends MainLikeFunction {
-  GTestFunction() {
+class GoogleTestFunction extends MainLikeFunction {
+  GoogleTestFunction() {
     // A GoogleTest function is named "TestBody" and
     this.hasName("TestBody") and
-    // is enclosed by a class that inherits from a base class
-    this.getEnclosingAccessHolder() instanceof Class and
+    // it's parent class inherits a base class
     exists(Class base |
-      base = this.getEnclosingAccessHolder().(Class).getABaseClass() and
+      base = this.getEnclosingAccessHolder().(Class).getABaseClass+() and
+      // with a name "Test" inside a namespace called "testing"
       (
-        // called "Test" or
-        exists(Class c | base.getABaseClass() = c and c.hasName("Test"))
-        or
-        // defined under a namespace called "testing" or
-        exists(Namespace n | n = base.getNamespace() | n.hasName("testing"))
-        or
-        // is templatized by a parameter called "gtest_TypeParam_"
-        exists(TemplateParameter tp |
-          tp = base.getATemplateArgument() and
-          tp.hasName("gtest_TypeParam_")
-        )
+        base.hasName("Test") and
+        base.getNamespace().hasName("testing")
       )
+      or
+      // or at a location in a file called "gtest.h".
+      base.getDefinitionLocation().getFile().getBaseName() = "gtest.h"
     )
   }
 }

From b2e35a77ce69059fbd89f69d7b4e52d30f954c83 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 09:17:00 +0100
Subject: [PATCH 204/435] Add change note for MISRA C query suite

---
 change_notes/2024-10-03-misra-c-query-suites.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 change_notes/2024-10-03-misra-c-query-suites.md

diff --git a/change_notes/2024-10-03-misra-c-query-suites.md b/change_notes/2024-10-03-misra-c-query-suites.md
new file mode 100644
index 0000000000..3eb3521ec9
--- /dev/null
+++ b/change_notes/2024-10-03-misra-c-query-suites.md
@@ -0,0 +1,6 @@
+ - The following query suites have been added or modified for MISRA C:
+   - A new query suite has been created `misra-c-default.qls` to avoid confusion with the MISRA C++ query suites. The `misra-default.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-c-default.qls` suite.
+     - The `misra-c-default.qls` suite has been specified as the default for the pack, and will include our most up-to-date coverage for MISRA C.
+   - A new query suite `misra-c-2012-third-edition-with-amendment-2.qls` has been created to represent our previous MISRA C coverage. Note: this query suite will run the rules that were present in MISRA C 2012, Third Edition, First Revision and Amendment 2. The interpretation of those
+   rules may be updated to reflect changes in more recent MISRA standards.
+   - A pair of new query suites, `misra-c-required.qls` and `misra-c-advisory.qls`, have been added to enable running only the required or advisory queries.
\ No newline at end of file

From eb6e77c9192ced49a4acbd101526c9a88c4cd0fd Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 09:18:36 +0100
Subject: [PATCH 205/435] Re-add MISRA default suite for C

To avoid compatibility problems
---
 c/misra/src/codeql-suites/misra-default.qls | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 c/misra/src/codeql-suites/misra-default.qls

diff --git a/c/misra/src/codeql-suites/misra-default.qls b/c/misra/src/codeql-suites/misra-default.qls
new file mode 100644
index 0000000000..343379a2b3
--- /dev/null
+++ b/c/misra/src/codeql-suites/misra-default.qls
@@ -0,0 +1,10 @@
+- description: MISRA C 2012 (Default)
+- qlpack: codeql/misra-c-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled

From d86432913437ffd75b040899b742c113c027fb49 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 2 Oct 2024 22:42:36 +0100
Subject: [PATCH 206/435] Update under development section

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d1de9b6372..cc148fbde3 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,10 @@ The following coding standards are supported:
 
 ## :construction: Standards under development :construction:
 
-- [MISRA C++ 2023](https://misra.org.uk/product/misra-cpp2023/) - under development _scheduled for release 2024 Q4_.
+The following standards are under active development:
+
+- [MISRA C++ 2023](https://misra.org.uk/product/misra-cpp2023/) - under development - _scheduled for release 2025 Q1_
+- [MISRA C 2023](https://misra.org.uk/product/misra-c2023/) - under development - _scheduled for release 2025 Q1_
 
 ## How do I use the CodeQL Coding Standards Queries?
 

From aed2b139770c2c7fa46eb5f0c96231394b375ec9 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 09:14:53 +0100
Subject: [PATCH 207/435] Update user manual and README for MISRA C 2023.

---
 README.md           | 1 +
 docs/user_manual.md | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cc148fbde3..0f24587afe 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ The following standards are under active development:
 
 - [MISRA C++ 2023](https://misra.org.uk/product/misra-cpp2023/) - under development - _scheduled for release 2025 Q1_
 - [MISRA C 2023](https://misra.org.uk/product/misra-c2023/) - under development - _scheduled for release 2025 Q1_
+  - This includes the development of [MISRA C 2012 Amendment 3](https://misra.org.uk/app/uploads/2021/06/MISRA-C-2012-AMD3.pdf) and [MISRA C 2012 Amendment 4](https://misra.org.uk/app/uploads/2021/06/MISRA-C-2012-AMD4.pdf), which are incorporated into MISRA C 2023.
 
 ## How do I use the CodeQL Coding Standards Queries?
 
diff --git a/docs/user_manual.md b/docs/user_manual.md
index 0d42e698fb..5799d73e6f 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -27,6 +27,7 @@
 | 0.19.0  | 2024-02-23 | Remco Vermeulen | Clarify the required use of Python version 3.9.                                                                         |
 | 0.20.0  | 2024-02-23 | Remco Vermeulen | Add table describing the permitted guideline re-categorizations.                                                        |
 | 0.21.0  | 2024-05-01 | Luke Cartey | Add MISRA C++ 2023 as under development, and clarify MISRA C 2012 coverage.                                                        |
+| 0.22.0  | 2024-10-02 | Luke Cartey | Add MISRA C 2023 as under development, and clarify MISRA C 2012 coverage.
 
 ## Release information
 
@@ -58,8 +59,11 @@ The _CodeQL Coding Standards_ product is a set of CodeQL queries for identifying
 | AUTOSAR C++ | [^1] [R22-11](https://www.autosar.org/fileadmin/standards/R22-11/AP/AUTOSAR_RS_CPP14Guidelines.pdf), R21-11, R20-11, R19-11, R19-03 | 397         | 372                     | 370[^2] | Implemented       |
 | CERT-C++   | [2016](https://resources.sei.cmu.edu/downloads/secure-coding/assets/sei-cert-cpp-coding-standard-2016-v01.pdf)    | 83          | 82                      | 82 | Implemented       |
 | CERT C       | [2016](https://resources.sei.cmu.edu/downloads/secure-coding/assets/sei-cert-c-coding-standard-2016-v01.pdf)    | 99          | 97                      | 97 | Implemented |
-| MISRA C                                | [2012 Third Edition, First Revision](](https://www.misra.org.uk/product/misra-c2012-third-edition-first-revision/)), and [Amendment 2](https://misra.org.uk/app/uploads/2021/06/MISRA-C-2012-AMD2.pdf) and TC2  | 175         | 164                     | 162[^3] | Implemented |
-| MISRA C++                                | [2023](https://misra.org.uk/product/misra-cpp2023/)  | 179         | 176[^4]                     | 0 | Under development |
+| MISRA C                                | [2012 Third Edition, First Revision](https://www.misra.org.uk/product/misra-c2012-third-edition-first-revision/), [Amendment 2](https://misra.org.uk/app/uploads/2021/06/MISRA-C-2012-AMD2.pdf) and TC2  | 175         | 164                     | 162[^3] | Implemented |
+|                                | [MISRA C 2012 Amendment 3](https://misra.org.uk/app/uploads/2021/06/MISRA-C-2012-AMD3.pdf)   | 24         | 24                     | - | Under development |
+|                                 | [MISRA C 2012 Amendment 4](https://misra.org.uk/app/uploads/2021/06/MISRA-C-2012-AMD4.pdf)   | 22         | 22                     | - | Under development |
+|                                 | [2023 Third Edition, Second Revision](https://misra.org.uk/product/misra-c2023/)  | 221         | 210                     | - | Under development |
+| MISRA C++                                | [2023](https://misra.org.uk/product/misra-cpp2023/)  | 179         | 176[^4]                     | - | Under development |
 
 Not all rules in these standards are amenable to static analysis by CodeQL - some rules require external or domain specific knowledge to validate, or refer to properties which are not present in our representation of the codebase under analysis. In addition, some rules are natively enforced by the supported compilers. As CodeQL requires that the program under analysis compiles, we are unable to implement queries for these rules, and doing so would be redundant.
 

From bd83048f7d9d9e76a9c7e8a5d6ee0d252947ff83 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Thu, 3 Oct 2024 17:39:05 +0900
Subject: [PATCH 208/435] Reuse SpecialMemberFunction class

---
 .../cpp/deadcode/UnusedFunctions.qll          | 35 +++----------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll b/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll
index 2dc24025ce..fdd713b436 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UnusedFunctions.qll
@@ -13,6 +13,7 @@ import cpp
 import codingstandards.cpp.DynamicCallGraph
 import codingstandards.cpp.EncapsulatingFunctions
 import codingstandards.cpp.FunctionEquivalence
+import codingstandards.cpp.Class
 
 module UnusedFunctions {
   /**
@@ -75,9 +76,7 @@ module UnusedFunctions {
    */
 
   private class MainLikeFunctionEntryPoint extends EntryPoint, MainLikeFunction {
-    MainLikeFunctionEntryPoint() {
-      this instanceof MainLikeFunction or this instanceof GTestFunction
-    }
+    MainLikeFunctionEntryPoint() { this instanceof MainLikeFunction }
 
     override Function getAReachableFunction() { reachable*(this, result) }
   }
@@ -113,26 +112,6 @@ module UnusedFunctions {
     }
   }
 
-  /**
-   * A `MemberFunction` which is either a Default constructor, Destructor
-   * CopyConstructor, CopyAssingmentOperator, MoveConstructor or a
-   * MoveAssignmentOperator
-   */
-  predicate isASpecialMemberFunction(MemberFunction f) {
-    // Default constructor
-    f instanceof NoArgConstructor
-    or
-    f instanceof Destructor
-    or
-    f instanceof CopyConstructor
-    or
-    f instanceof CopyAssignmentOperator
-    or
-    f instanceof MoveConstructor
-    or
-    f instanceof MoveAssignmentOperator
-  }
-
   /**
    * A `Function` which is not used from an `EntryPoint`.
    *
@@ -156,12 +135,6 @@ module UnusedFunctions {
     }
   }
 
-  /**
-   * A Special `MemberFunction` which is an `UnusedFunction`.
-   *
-   * Refer isASpecialMemberFunction predicate.
-   */
-  class UnusedSplMemberFunction extends UnusedFunction {
-    UnusedSplMemberFunction() { isASpecialMemberFunction(this) }
-  }
+  /** A `SpecialMemberFunction` which is an `UnusedFunction`. */
+  class UnusedSplMemberFunction extends UnusedFunction, SpecialMemberFunction { }
 }

From ecb3a4a6ddeae46ff9bb3852688d97672fc5ea5d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 09:59:48 +0100
Subject: [PATCH 209/435] Add new MISRA C++ query suites

Provide clearer naming for the MISRA C++ query suites, to avoid
confusion with the MISRA C query suites.
---
 change_notes/2024-10-03-misra-c-query-suites.md    |  6 +++++-
 cpp/misra/src/codeql-suites/misra-cpp-default.qls  | 10 ++++++++++
 .../misra-cpp-single-translation-unit.qls          | 12 ++++++++++++
 cpp/misra/src/codeql-suites/misra-default.qls      | 12 ++----------
 .../misra-single-translation-unit.qls              | 14 ++------------
 cpp/misra/src/qlpack.yml                           |  2 +-
 6 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 cpp/misra/src/codeql-suites/misra-cpp-default.qls
 create mode 100644 cpp/misra/src/codeql-suites/misra-cpp-single-translation-unit.qls

diff --git a/change_notes/2024-10-03-misra-c-query-suites.md b/change_notes/2024-10-03-misra-c-query-suites.md
index 3eb3521ec9..067944cf2f 100644
--- a/change_notes/2024-10-03-misra-c-query-suites.md
+++ b/change_notes/2024-10-03-misra-c-query-suites.md
@@ -3,4 +3,8 @@
      - The `misra-c-default.qls` suite has been specified as the default for the pack, and will include our most up-to-date coverage for MISRA C.
    - A new query suite `misra-c-2012-third-edition-with-amendment-2.qls` has been created to represent our previous MISRA C coverage. Note: this query suite will run the rules that were present in MISRA C 2012, Third Edition, First Revision and Amendment 2. The interpretation of those
    rules may be updated to reflect changes in more recent MISRA standards.
-   - A pair of new query suites, `misra-c-required.qls` and `misra-c-advisory.qls`, have been added to enable running only the required or advisory queries.
\ No newline at end of file
+   - A pair of new query suites, `misra-c-required.qls` and `misra-c-advisory.qls`, have been added to enable running only the required or advisory queries.
+ - The following query suites have been added or modified for MISRA C++:
+   - A new query suite has been created `misra-cpp-default.qls` to avoid confusion with the MISRA C query suites. The `misra-default.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-cpp-default.qls` suite.
+     - The `misra-cpp-default.qls` suite has been specified as the default for the pack, and will include our most up-to-date coverage for MISRA C.
+   - A new query suite has been created `misra-cpp-single-translation-unit.qls` to avoid confusion with the MISRA C query suites. The `misra-single-translation-unit.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-cpp-single-translation-unit.qls` suite.
\ No newline at end of file
diff --git a/cpp/misra/src/codeql-suites/misra-cpp-default.qls b/cpp/misra/src/codeql-suites/misra-cpp-default.qls
new file mode 100644
index 0000000000..670b043caa
--- /dev/null
+++ b/cpp/misra/src/codeql-suites/misra-cpp-default.qls
@@ -0,0 +1,10 @@
+- description: MISRA C++ 2023 (Default)
+- qlpack: codeql/misra-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/cpp/misra/src/codeql-suites/misra-cpp-single-translation-unit.qls b/cpp/misra/src/codeql-suites/misra-cpp-single-translation-unit.qls
new file mode 100644
index 0000000000..0782dd876d
--- /dev/null
+++ b/cpp/misra/src/codeql-suites/misra-cpp-single-translation-unit.qls
@@ -0,0 +1,12 @@
+- description: MISRA C++ 2023 (Single Translation Unit)
+- qlpack: codeql/misra-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - scope/single-translation-unit
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/cpp/misra/src/codeql-suites/misra-default.qls b/cpp/misra/src/codeql-suites/misra-default.qls
index 670b043caa..8609e3df64 100644
--- a/cpp/misra/src/codeql-suites/misra-default.qls
+++ b/cpp/misra/src/codeql-suites/misra-default.qls
@@ -1,10 +1,2 @@
-- description: MISRA C++ 2023 (Default)
-- qlpack: codeql/misra-cpp-coding-standards
-- include:
-    kind:
-    - problem
-    - path-problem
-- exclude:
-    tags contain:
-    - external/misra/audit
-    - external/misra/default-disabled
+- description: "DEPRECATED - MISRA C++ 2023 - use misra-cpp-default.qls instead"
+- import: codeql-suites/misra-cpp-default.qls
\ No newline at end of file
diff --git a/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls b/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls
index 0782dd876d..0351768470 100644
--- a/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls
+++ b/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls
@@ -1,12 +1,2 @@
-- description: MISRA C++ 2023 (Single Translation Unit)
-- qlpack: codeql/misra-cpp-coding-standards
-- include:
-    kind:
-    - problem
-    - path-problem
-    tags contain:
-    - scope/single-translation-unit
-- exclude:
-    tags contain:
-    - external/misra/audit
-    - external/misra/default-disabled
+- description: "DEPRECATED - MISRA C++ 2023 (Single Translation Unit) - use misra-cpp-single-translation-unit.qls instead"
+- import: codeql-suites/misra-cpp-single-translation-unit.qls
\ No newline at end of file
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index 5e50eb563a..4c0aa45f4f 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/misra-cpp-coding-standards
 version: 2.36.0-dev
 description: MISRA C++ 2023
-suites: codeql-suites
+default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'

From b60dcd07b5ef8355c2e58a94394fecd67031bcf6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 10:08:28 +0100
Subject: [PATCH 210/435] Add query suites for mandatory, required and advisory
 rules.

---
 change_notes/2024-10-03-misra-c-query-suites.md     |  3 ++-
 cpp/misra/src/codeql-suites/misra-cpp-advisory.qls  | 12 ++++++++++++
 cpp/misra/src/codeql-suites/misra-cpp-mandatory.qls | 12 ++++++++++++
 cpp/misra/src/codeql-suites/misra-cpp-required.qls  | 12 ++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 cpp/misra/src/codeql-suites/misra-cpp-advisory.qls
 create mode 100644 cpp/misra/src/codeql-suites/misra-cpp-mandatory.qls
 create mode 100644 cpp/misra/src/codeql-suites/misra-cpp-required.qls

diff --git a/change_notes/2024-10-03-misra-c-query-suites.md b/change_notes/2024-10-03-misra-c-query-suites.md
index 067944cf2f..2b34df98e5 100644
--- a/change_notes/2024-10-03-misra-c-query-suites.md
+++ b/change_notes/2024-10-03-misra-c-query-suites.md
@@ -7,4 +7,5 @@
  - The following query suites have been added or modified for MISRA C++:
    - A new query suite has been created `misra-cpp-default.qls` to avoid confusion with the MISRA C query suites. The `misra-default.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-cpp-default.qls` suite.
      - The `misra-cpp-default.qls` suite has been specified as the default for the pack, and will include our most up-to-date coverage for MISRA C.
-   - A new query suite has been created `misra-cpp-single-translation-unit.qls` to avoid confusion with the MISRA C query suites. The `misra-single-translation-unit.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-cpp-single-translation-unit.qls` suite.
\ No newline at end of file
+   - A new query suite has been created `misra-cpp-single-translation-unit.qls` to avoid confusion with the MISRA C query suites. The `misra-single-translation-unit.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-cpp-single-translation-unit.qls` suite.
+   - Three new query suites, `misra-cpp-mandatory.qls`, `misra-c-required.qls` and `misra-c-advisory.qls`, have been added to enable running mandatory, required or advisory queries.
\ No newline at end of file
diff --git a/cpp/misra/src/codeql-suites/misra-cpp-advisory.qls b/cpp/misra/src/codeql-suites/misra-cpp-advisory.qls
new file mode 100644
index 0000000000..5da16cc2af
--- /dev/null
+++ b/cpp/misra/src/codeql-suites/misra-cpp-advisory.qls
@@ -0,0 +1,12 @@
+- description: MISRA C++ 2023 (Default)
+- qlpack: codeql/misra-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - external/misra/obligation/advisory
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/cpp/misra/src/codeql-suites/misra-cpp-mandatory.qls b/cpp/misra/src/codeql-suites/misra-cpp-mandatory.qls
new file mode 100644
index 0000000000..0c5ec7155f
--- /dev/null
+++ b/cpp/misra/src/codeql-suites/misra-cpp-mandatory.qls
@@ -0,0 +1,12 @@
+- description: MISRA C++ 2023 (Default)
+- qlpack: codeql/misra-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - external/misra/obligation/mandatory
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/cpp/misra/src/codeql-suites/misra-cpp-required.qls b/cpp/misra/src/codeql-suites/misra-cpp-required.qls
new file mode 100644
index 0000000000..2fe61301e7
--- /dev/null
+++ b/cpp/misra/src/codeql-suites/misra-cpp-required.qls
@@ -0,0 +1,12 @@
+- description: MISRA C++ 2023 (Default)
+- qlpack: codeql/misra-cpp-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - external/misra/obligation/required
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled

From b06feabb069929e346dd18fa731826936bd286e3 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 10:10:49 +0100
Subject: [PATCH 211/435] Add MISRA C mandatory query suite

---
 c/misra/src/codeql-suites/misra-c-mandatory.qls | 12 ++++++++++++
 change_notes/2024-10-03-misra-c-query-suites.md |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 c/misra/src/codeql-suites/misra-c-mandatory.qls

diff --git a/c/misra/src/codeql-suites/misra-c-mandatory.qls b/c/misra/src/codeql-suites/misra-c-mandatory.qls
new file mode 100644
index 0000000000..454b8487ab
--- /dev/null
+++ b/c/misra/src/codeql-suites/misra-c-mandatory.qls
@@ -0,0 +1,12 @@
+- description: MISRA C 2012 (Advisory)
+- qlpack: codeql/misra-c-coding-standards
+- include:
+    kind:
+    - problem
+    - path-problem
+    tags contain:
+    - external/misra/obligation/mandatory
+- exclude:
+    tags contain:
+    - external/misra/audit
+    - external/misra/default-disabled
diff --git a/change_notes/2024-10-03-misra-c-query-suites.md b/change_notes/2024-10-03-misra-c-query-suites.md
index 2b34df98e5..cdc6982673 100644
--- a/change_notes/2024-10-03-misra-c-query-suites.md
+++ b/change_notes/2024-10-03-misra-c-query-suites.md
@@ -3,7 +3,7 @@
      - The `misra-c-default.qls` suite has been specified as the default for the pack, and will include our most up-to-date coverage for MISRA C.
    - A new query suite `misra-c-2012-third-edition-with-amendment-2.qls` has been created to represent our previous MISRA C coverage. Note: this query suite will run the rules that were present in MISRA C 2012, Third Edition, First Revision and Amendment 2. The interpretation of those
    rules may be updated to reflect changes in more recent MISRA standards.
-   - A pair of new query suites, `misra-c-required.qls` and `misra-c-advisory.qls`, have been added to enable running only the required or advisory queries.
+   - Three new query suites, `misra-c-mandatory.qls`, `misra-c-required.qls` and `misra-c-advisory.qls`, have been added to enable running mandatory, required or advisory queries.
  - The following query suites have been added or modified for MISRA C++:
    - A new query suite has been created `misra-cpp-default.qls` to avoid confusion with the MISRA C query suites. The `misra-default.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-cpp-default.qls` suite.
      - The `misra-cpp-default.qls` suite has been specified as the default for the pack, and will include our most up-to-date coverage for MISRA C.

From fee630ba3ccdeea6f92e87d115a89b459244c67f Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 10:11:49 +0100
Subject: [PATCH 212/435] MISRA C misra-default.qls update deprecation message,
 use import

---
 c/misra/src/codeql-suites/misra-default.qls | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/c/misra/src/codeql-suites/misra-default.qls b/c/misra/src/codeql-suites/misra-default.qls
index 343379a2b3..66a0161628 100644
--- a/c/misra/src/codeql-suites/misra-default.qls
+++ b/c/misra/src/codeql-suites/misra-default.qls
@@ -1,10 +1,2 @@
-- description: MISRA C 2012 (Default)
-- qlpack: codeql/misra-c-coding-standards
-- include:
-    kind:
-    - problem
-    - path-problem
-- exclude:
-    tags contain:
-    - external/misra/audit
-    - external/misra/default-disabled
+- description: "DEPRECATED - MISRA C  2012 - use misra-c-default.qls instead"
+- import: codeql-suites/misra-c-default.qls
\ No newline at end of file

From b946bd8850a15ac69c6de2af78dffa09fab644cf Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 10:21:53 +0100
Subject: [PATCH 213/435] Pin actions/create-github-app-token to v1

---
 .github/workflows/dispatch-matrix-check.yml              | 2 +-
 .github/workflows/dispatch-matrix-test-on-comment.yml    | 2 +-
 .github/workflows/dispatch-release-performance-check.yml | 2 +-
 .github/workflows/finalize-release.yml                   | 2 +-
 .github/workflows/prepare-release.yml                    | 2 +-
 .github/workflows/update-release.yml                     | 2 +-
 .github/workflows/validate-release.yml                   | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dispatch-matrix-check.yml b/.github/workflows/dispatch-matrix-check.yml
index f9b0260594..845a8fc4ae 100644
--- a/.github/workflows/dispatch-matrix-check.yml
+++ b/.github/workflows/dispatch-matrix-check.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Generate token
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
index 6500e3f6bc..4f9f9a5b1e 100644
--- a/.github/workflows/dispatch-matrix-test-on-comment.yml
+++ b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Generate token
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index d6311babb3..7e28a9c4f9 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Generate token
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/finalize-release.yml b/.github/workflows/finalize-release.yml
index d3f511caba..7afc516aac 100644
--- a/.github/workflows/finalize-release.yml
+++ b/.github/workflows/finalize-release.yml
@@ -103,7 +103,7 @@ jobs:
       - name: Generate token
         if: env.HOTFIX_RELEASE == 'false'
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 9bbd27ce26..ba258e06f5 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -143,7 +143,7 @@ jobs:
 
       - name: Generate token
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/update-release.yml b/.github/workflows/update-release.yml
index 21838c1d9f..c825fab347 100644
--- a/.github/workflows/update-release.yml
+++ b/.github/workflows/update-release.yml
@@ -43,7 +43,7 @@ jobs:
 
       - name: Generate token
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/validate-release.yml b/.github/workflows/validate-release.yml
index 5f5382f5dd..63aa9e90e3 100644
--- a/.github/workflows/validate-release.yml
+++ b/.github/workflows/validate-release.yml
@@ -40,7 +40,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
@@ -108,7 +108,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate-token
-        uses: actions/create-github-app-token@eaddb9eb7e4226c68cf4b39f167c83e5bd132b3e
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ vars.AUTOMATION_APP_ID }}
           private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}

From c407583245e547afc2ead0590f698f78d3accafe Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 10:34:52 +0100
Subject: [PATCH 214/435] Update schema validation with new tags

---
 schemas/rule-package.schema.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/schemas/rule-package.schema.json b/schemas/rule-package.schema.json
index daeb1ade51..b27815163e 100644
--- a/schemas/rule-package.schema.json
+++ b/schemas/rule-package.schema.json
@@ -338,7 +338,11 @@
                             "external/cert/default-disabled",
                             "external/autosar/strict",
                             "scope/single-translation-unit",
-                            "scope/system"
+                            "scope/system",
+                            "external/misra/c/2012/third-edition-first-revision",
+                            "external/misra/c/2012/amendment2",
+                            "external/misra/c/2012/amendment3",
+                            "external/misra/c/2012/amendment4"
                         ]
                     },
                     "minLength": 1

From 8cfa9cfa49a18f50578ac4bfcca5f7125fa6509e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 23:31:50 +0100
Subject: [PATCH 215/435] Upgrade CodeQL dependencies now updates qlpack.yml
 files

The appropriate version of the `codeql/cpp-all` pack is identified
by querying the qlpack.yml of the tag for the CodeQL version on
github/codeql. This is then applied to all relevant qlpack.yml
files in the repo, then codeql pack upgrade is used to update the
lock files.
---
 .../requirements.txt                          |  1 +
 .../upgrade-codeql-dependencies.py            | 47 ++++++++++++++++---
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade-codeql-dependencies/requirements.txt b/scripts/upgrade-codeql-dependencies/requirements.txt
index 009d2dc5aa..55b810e4aa 100644
--- a/scripts/upgrade-codeql-dependencies/requirements.txt
+++ b/scripts/upgrade-codeql-dependencies/requirements.txt
@@ -4,3 +4,4 @@ idna==3.4
 requests==2.31.0
 semantic-version==2.10.0
 urllib3==1.26.18
+pyyaml==6.0.1
\ No newline at end of file
diff --git a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
index 6c98216ca0..6d0baab609 100644
--- a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
+++ b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
@@ -1,18 +1,23 @@
 import json
 import requests
-from typing import Optional, Dict, List
+from typing import Optional, Dict, List, Tuple
 from semantic_version import Version
 from pathlib import Path
+import yaml
 
 SCRIPT_PATH = Path(__file__)
-SUPPORTED_VERSIONS_PATH = SCRIPT_PATH.parent.parent.parent / "supported_codeql_configs.json"
+CODING_STANDARDS_ROOT = SCRIPT_PATH.parent.parent.parent
+SUPPORTED_VERSIONS_PATH = CODING_STANDARDS_ROOT / "supported_codeql_configs.json"
 
-def get_compatible_stdlib(version: Version) -> Optional[str]:
+def get_compatible_stdlib(version: Version) -> Optional[Tuple[str, str]]:
     tag = f"codeql-cli/v{version}"
     response = requests.get(f"https://raw.githubusercontent.com/github/codeql/{tag}/cpp/ql/lib/qlpack.yml")
 
     if response.status_code == 200:
-        return tag
+        # Parse the qlpack.yml returned in the response as a yaml file to read the version property
+        qlpack = yaml.safe_load(response.text)
+        if qlpack is not None and "version" in qlpack:
+            return (tag, qlpack["version"])
     return None
 
 def get_compatible_bundle(version: Version, token: str) -> Optional[str]:
@@ -30,8 +35,8 @@ def get_compatible_bundle(version: Version, token: str) -> Optional[str]:
 def main(cli_version : str, github_token: str) -> None:
     try:
         parsed_cli_version = Version(cli_version)
-        compatible_stdlib = get_compatible_stdlib(parsed_cli_version)
-        if compatible_stdlib is None:
+        compatible_stdlib_return = get_compatible_stdlib(parsed_cli_version)
+        if compatible_stdlib_return is None:
             print(f"Unable to find compatible standard library for: {parsed_cli_version}")
             exit(1)
         compatible_bundle = get_compatible_bundle(parsed_cli_version, github_token)
@@ -39,6 +44,8 @@ def main(cli_version : str, github_token: str) -> None:
             print(f"Unable to find compatible bundle for: {parsed_cli_version}")
             exit(1)
 
+        compatible_stdlib_tag, compatible_stdlib_version = compatible_stdlib_return
+
         with SUPPORTED_VERSIONS_PATH.open("r") as f:
             supported_versions = json.load(f)
 
@@ -49,10 +56,36 @@ def main(cli_version : str, github_token: str) -> None:
         supported_env = supported_envs[0]
         supported_env["codeql_cli"] = str(parsed_cli_version)
         supported_env["codeql_cli_bundle"] = compatible_bundle
-        supported_env["codeql_standard_library"] = compatible_stdlib
+        supported_env["codeql_standard_library"] = compatible_stdlib_tag
 
         with SUPPORTED_VERSIONS_PATH.open("w") as f:
             json.dump(supported_versions, f, indent=2)
+
+        # Find every qlpack.yml file in the repository
+        qlpack_files = list(CODING_STANDARDS_ROOT.rglob("qlpack.yml"))
+        # Filter out any files that are in a hidden directory
+        qlpack_files = [f for f in qlpack_files if not any(part for part in f.parts if part.startswith("."))]
+
+        # Update the "codeql/cpp-all" entries in the "dependencies" property in every qlpack.yml file
+        updated_qlpacks = []
+        for qlpack_file in qlpack_files:
+            with qlpack_file.open("r") as f:
+                qlpack = yaml.safe_load(f)
+            print("Updating dependencies in " + str(qlpack_file))
+            if "codeql/cpp-all" in qlpack["dependencies"]:
+                qlpack["dependencies"]["codeql/cpp-all"] = compatible_stdlib_version
+                with qlpack_file.open("w") as f:
+                    yaml.safe_dump(qlpack, f)
+                updated_qlpacks.append(qlpack_file.parent)
+
+        # Call CodeQL to update the lock files by running codeql pack upgrade
+        # Note: we need to do this after updating all the qlpack files,
+        #       otherwise we may get dependency resolution errors
+        for qlpack in updated_qlpacks:
+            print("Updating lock files for " + str(qlpack))
+            os.system(f"codeql pack upgrade {qlpack}")
+
+
     except ValueError as e:
         print(e)
         exit(1)

From 4b13ea4fab6093653d72156b2842731cdf2ebcd1 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 23:41:46 +0100
Subject: [PATCH 216/435] Upgrade workflow now provides codeql binary on path

This enables the python script to update the lock files
---
 .../workflows/upgrade_codeql_dependencies.yml | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/upgrade_codeql_dependencies.yml b/.github/workflows/upgrade_codeql_dependencies.yml
index 73721d5581..34018f9da8 100644
--- a/.github/workflows/upgrade_codeql_dependencies.yml
+++ b/.github/workflows/upgrade_codeql_dependencies.yml
@@ -20,6 +20,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Fetch CodeQL
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          RUNNER_TEMP: ${{ runner.temp }}
+        run: |
+          cd $RUNNER_TEMP
+          gh release download "v${CODEQL_CLI_VERSION}" --repo https://github.com/github/codeql-cli-binaries --pattern codeql-linux64.zip
+          unzip -q codeql-linux64.zip
+          echo "$RUNNER_TEMP/codeql/" >> $GITHUB_PATH
+
       - name: Install Python
         uses: actions/setup-python@v4
         with:
@@ -35,21 +45,12 @@ jobs:
         run: |
           python3 scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py --cli-version "$CODEQL_CLI_VERSION"
 
-      - name: Fetch CodeQL
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          RUNNER_TEMP: ${{ runner.temp }}
-        run: |
-          cd $RUNNER_TEMP
-          gh release download "v${CODEQL_CLI_VERSION}" --repo https://github.com/github/codeql-cli-binaries --pattern codeql-linux64.zip
-          unzip -q codeql-linux64.zip
-
       - name: Update CodeQL formatting based on new CLI version
         env:
           RUNNER_TEMP: ${{ runner.temp }}
         run: |
-          find cpp \( -name '*.ql' -or -name '*.qll' \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" $RUNNER_TEMP/codeql/codeql query format --in-place
-          find c \( -name '*.ql' -or -name '*.qll' \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" $RUNNER_TEMP/codeql/codeql query format --in-place
+          find cpp \( -name '*.ql' -or -name '*.qll' \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
+          find c \( -name '*.ql' -or -name '*.qll' \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3

From 1fe51d596cbf8e360cbf662dab0a40a663c109c6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 23:42:24 +0100
Subject: [PATCH 217/435] Update upgrade documentation

Improve the documentation and automatic commit message for
upgrades.
---
 .github/workflows/upgrade_codeql_dependencies.yml | 13 +++++++++++--
 docs/development_handbook.md                      | 14 +++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/upgrade_codeql_dependencies.yml b/.github/workflows/upgrade_codeql_dependencies.yml
index 34018f9da8..a978980e11 100644
--- a/.github/workflows/upgrade_codeql_dependencies.yml
+++ b/.github/workflows/upgrade_codeql_dependencies.yml
@@ -55,8 +55,17 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          title: "Upgrading `github/codeql` dependency to ${{ github.event.inputs.codeql_cli_version }}"
-          body: "This PR upgrades the CodeQL CLI version to ${{ github.event.inputs.codeql_cli_version }}."
+          title: "Upgrade `github/codeql` dependency to ${{ github.event.inputs.codeql_cli_version }}"
+          body: |
+            This PR upgrades the CodeQL CLI version to ${{ github.event.inputs.codeql_cli_version }}.
+
+            ## CodeQL dependency upgrade checklist:
+
+            - [ ] Confirm the code has been correctly reformatted according to the new CodeQL CLI.
+            - [ ] Identify any CodeQL compiler warnings and errors, and update queries as required.
+            - [ ] Validate that the `github/codeql` test cases succeed.
+            - [ ] Address any CodeQL test failures in the `github/codeql-coding-standards` repository.
+            - [ ] Validate performance vs pre-upgrade, using /test-performance
           commit-message: "Upgrading `github/codeql` dependency to ${{ github.event.inputs.codeql_cli_version }}"
           delete-branch: true
           branch: "codeql/upgrade-to-${{ github.event.inputs.codeql_cli_version }}"
diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index de283bb946..b9f5bd9e74 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -514,23 +514,15 @@ To upgrade the CodeQL external dependencies:
 5. Submit a Pull Request to the `github/codeql-coding-standards` repository with the title `Upgrade `github/codeql` dependency to <insert codeql_standard_library value>`. Use this template for the description, filling :
 
     ```md
-    This PR updates the `supported_codeql_configs.json` file to target:
-
-    - CodeQL CLI <codeql_cli>
-    - CodeQL Standard Library <codeql_standard_library>
-    - GHES <ghes>
-    - CodeQL CLI Bundle <date_of_bundle>
-
-    <EITHER:This should match the versions of CodeQL deployed with GitHub Enterprise Server <ghes>>
-    <OR: This does not match any released version of GitHub Enterprise Server.>
+    This PR updates the `supported_codeql_configs.json` file to target CodeQL CLI <codeql_cli>.
 
     ## CodeQL dependency upgrade checklist:
 
-    - [ ] Reformat our CodeQL using the latest version (if required)
+    - [ ] Confirm the code has been correctly reformatted according to the new CodeQL CLI.
     - [ ] Identify any CodeQL compiler warnings and errors, and update queries as required.
     - [ ] Validate that the `github/codeql` test cases succeed.
     - [ ] Address any CodeQL test failures in the `github/codeql-coding-standards` repository.
-    - [ ] Validate performance vs pre-upgrade
+    - [ ] Validate performance vs pre-upgrade, using /test-performance
     ```
 
 6. Follow the dependency upgrade checklist, confirming each step. The `.github/workflows/standard_library_upgrade_tests.yml` will trigger automation for running the `github/codeql` unit tests with the appropriate CLI version.

From 8bd60fb7956882f3b27e7720ae63fff5d6e9e427 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 23:54:58 +0100
Subject: [PATCH 218/435] Developer handbook: improve upgrade documentation

 - Remove reference to GHES, which is no longer required.
 - Clarify use of the automatic workflow vs. manual workflow
---
 docs/development_handbook.md | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/docs/development_handbook.md b/docs/development_handbook.md
index b9f5bd9e74..dc50bf59ff 100644
--- a/docs/development_handbook.md
+++ b/docs/development_handbook.md
@@ -496,12 +496,11 @@ There are two external dependencies required for running the coding standards qu
 
 For the purpose of this repository, and any tool qualification, we consider these external dependencies to be "black boxes" which require verification when upgrading.
 
-To (a) clearly specify the supported versions of these external dependencies and to (b) enable automation around them, the repository contains a `supported_codeql_configs.json` which lists the sets of supported configurations. There are four fields:
+To (a) clearly specify the supported versions of these external dependencies and to (b) enable automation around them, the repository contains a `supported_codeql_configs.json` which lists the sets of supported configurations under the `supported_environments` property. There are three fields:
 
 - `codeql_cli` - this is the plain version number of the supported CodeQL CLI, e.g. `2.6.3`.
 - `codeql_standard_library` - this is the name of a tag on the `github.com/github/codeql` repository. The tag should be compatible with the CodeQL CLI given above. This would typically use the `codeql-cli/v<version-number>` tag for the release, although any tag which is compatible is allowed.
 - `codeql_cli_bundle` - (optional) - if present, describes the CodeQL CLI bundle version that is compatible. The bundle should include precisely the CodeQL CLI version and CodeQL Standard Library versions specified in the two mandatory fields.
-- `ghes` - (optional) - if present describes the GitHub Enterprise Server release whose integrated copy of the CodeQL Action points to the CodeQL CLI bundle specified in the `codeql_cli_bundle` field.
 
 #### Upgrading external dependencies
 
@@ -509,9 +508,24 @@ To upgrade the CodeQL external dependencies:
 
 1. Determine appropriate versions of the CodeQL CLI and `github/codeql` repository, according to the release schedule and customer demands.
 2. Determine if there is a compatible CodeQL CLI bundle version by looking at the releases specified at [CodeQL Action releases](https://github.com/github/codeql-action/releases). The bundle always includes the standard library at the version specified by the `codeql-cli/v<version-number>` tag in the `github/codeql` repository.
-3. If you find a compatible CodeQL CLI bundle, determine whether that bundle was released in a GitHub Enterprise server release, by inspecting the `defaults.json` file at https://github.com/github/codeql-action/blob/main/lib/defaults.json#L2 for the CodeQL Action submitted with
-4. Populated the `supported_codeql_configs.json` file with the given values, ensuring to delete the optional fields if they are not populated.
-5. Submit a Pull Request to the `github/codeql-coding-standards` repository with the title `Upgrade `github/codeql` dependency to <insert codeql_standard_library value>`. Use this template for the description, filling :
+
+If all components are being upgraded to a consistent veresion (e.g. CodeQL CLI v2.15.5, with `github/codeql` tag `codeql-cli/v2.15.5` and bundle `codeql-cli-bundle-v2.15.5`) then the following process can be used:
+
+1. Run the [upgrade_codeql_dependencies.yml](./github/workflows/upgrade_codeql_dependencies.yml) workflow, with the plain version number, e.g. `2.15.5`. This will:
+  - Download the specified version of the CodeQL CLI
+  - Run the [upgrade-codeql-dependencies.py](scripts/release/upgrade-codeql-dependencies.py) script, which
+    - Validates the version selected exists in all relevant places
+    - Updates the `supported_codeql_configs.json` file.
+    - Updates each `qlpack.yml` in the repository with an appropriate value for the `codeql/cpp-all` pack, consistent with the selected CodeQL CLI version.
+    - Updates each `codeql-lock.yml` file to upgrade to the new version.
+2. Follow the dependency upgrade checklist, confirming each step. The `.github/workflows/standard_library_upgrade_tests.yml` will trigger automation for running the `github/codeql` unit tests with the appropriate CLI version.
+3. Once all the automate tests have passed, and the checklist is complete, the PR can be merged.
+4. An internal notification should be shared with the development team.
+
+If the upgrade is of mismatched versions you will need to manually create the upgrade following this process:
+
+1. Populate the `supported_codeql_configs.json` file with the given values, ensuring to delete the optional fields if they are not populated.
+2. Submit a Pull Request to the `github/codeql-coding-standards` repository with the title `Upgrade `github/codeql` dependency to <insert codeql_standard_library value>`. Use this template for the description, filling:
 
     ```md
     This PR updates the `supported_codeql_configs.json` file to target CodeQL CLI <codeql_cli>.
@@ -525,9 +539,10 @@ To upgrade the CodeQL external dependencies:
     - [ ] Validate performance vs pre-upgrade, using /test-performance
     ```
 
-6. Follow the dependency upgrade checklist, confirming each step. The `.github/workflows/standard_library_upgrade_tests.yml` will trigger automation for running the `github/codeql` unit tests with the appropriate CLI version.
-7. Once all the automate tests have passed, and the checklist is complete, the PR can be merged.
-8. An internal notification should be shared with the development team.
+3. Follow the dependency upgrade checklist, confirming each step. The `.github/workflows/standard_library_upgrade_tests.yml` will trigger automation for running the `github/codeql` unit tests with the appropriate CLI version.
+4. Once all the automate tests have passed, and the checklist is complete, the PR can be merged.
+5. An internal notification should be shared with the development team.
+
 
 ### Release process
 

From 6e89bb14c19a74284522fafd7f7280397a29b40e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 3 Oct 2024 23:55:46 +0100
Subject: [PATCH 219/435] Upgrade CodeQL - ensure minimal changes to
 qlpacks.yml

Ensure the qlpack.yml files are written out in the same order they
were read.
---
 .../upgrade-codeql-dependencies/upgrade-codeql-dependencies.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
index 6d0baab609..ab947f0ef2 100644
--- a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
+++ b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
@@ -75,7 +75,7 @@ def main(cli_version : str, github_token: str) -> None:
             if "codeql/cpp-all" in qlpack["dependencies"]:
                 qlpack["dependencies"]["codeql/cpp-all"] = compatible_stdlib_version
                 with qlpack_file.open("w") as f:
-                    yaml.safe_dump(qlpack, f)
+                    yaml.safe_dump(qlpack, f, sort_keys=False)
                 updated_qlpacks.append(qlpack_file.parent)
 
         # Call CodeQL to update the lock files by running codeql pack upgrade

From e00e4501ee88fde0f5a6db34bfc578f4608c5e43 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Fri, 4 Oct 2024 12:56:48 +0900
Subject: [PATCH 220/435] Fix(common/cpp): useless assignment false positive on
 constexpr array size.

---
 change_notes/2024-10-04-fix-constexpr-arr-size-fp-a0-1-1.md  | 2 ++
 .../src/codingstandards/cpp/deadcode/UselessAssignments.qll  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 change_notes/2024-10-04-fix-constexpr-arr-size-fp-a0-1-1.md

diff --git a/change_notes/2024-10-04-fix-constexpr-arr-size-fp-a0-1-1.md b/change_notes/2024-10-04-fix-constexpr-arr-size-fp-a0-1-1.md
new file mode 100644
index 0000000000..184efa9462
--- /dev/null
+++ b/change_notes/2024-10-04-fix-constexpr-arr-size-fp-a0-1-1.md
@@ -0,0 +1,2 @@
+- `A0-1-1` - `UselessAssignments.qll`:
+  - Remove (dead code) useless assignment false positive when integer constant expression is used to define the size of an array.
diff --git a/cpp/common/src/codingstandards/cpp/deadcode/UselessAssignments.qll b/cpp/common/src/codingstandards/cpp/deadcode/UselessAssignments.qll
index 465b023f3f..031ad2aa7c 100644
--- a/cpp/common/src/codingstandards/cpp/deadcode/UselessAssignments.qll
+++ b/cpp/common/src/codingstandards/cpp/deadcode/UselessAssignments.qll
@@ -3,6 +3,7 @@
  */
 
 import cpp
+import codingstandards.cpp.deadcode.UnusedVariables
 import codingstandards.cpp.enhancements.ControlFlowGraphEnhancements
 
 /** If a variable may escape from the local context */
@@ -47,7 +48,9 @@ class InterestingStackVariable extends StackVariable {
     // Ignore variables in uninstantiated templates
     not this.isFromUninstantiatedTemplate(_) and
     // Ignore compiler generated variables, such as those generated for range based for loops
-    not this.isCompilerGenerated()
+    not this.isCompilerGenerated() and
+    // Explicitly ignore (propagated) constants that may be used to define sizes of local arrays
+    not countUsesInLocalArraySize(this) > 0
   }
 }
 

From 6278a0948974f2058c46456f475bcdf206a1761d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 10:23:24 +0100
Subject: [PATCH 221/435] Upgrade GitHub Actions versions

Upgrade to versions which use a more recent node.
---
 .github/workflows/upgrade_codeql_dependencies.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/upgrade_codeql_dependencies.yml b/.github/workflows/upgrade_codeql_dependencies.yml
index a978980e11..b2be95a055 100644
--- a/.github/workflows/upgrade_codeql_dependencies.yml
+++ b/.github/workflows/upgrade_codeql_dependencies.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Fetch CodeQL
         env:
@@ -31,7 +31,7 @@ jobs:
           echo "$RUNNER_TEMP/codeql/" >> $GITHUB_PATH
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
@@ -53,7 +53,7 @@ jobs:
           find c \( -name '*.ql' -or -name '*.qll' \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v7
         with:
           title: "Upgrade `github/codeql` dependency to ${{ github.event.inputs.codeql_cli_version }}"
           body: |

From 51e4d9534f0ccadc8d80ccfbd0b3ed329f3fd2b2 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 10:27:18 +0100
Subject: [PATCH 222/435] Use pinned commit to avoid supply chain injection

---
 .github/workflows/upgrade_codeql_dependencies.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/upgrade_codeql_dependencies.yml b/.github/workflows/upgrade_codeql_dependencies.yml
index b2be95a055..841b78fcd6 100644
--- a/.github/workflows/upgrade_codeql_dependencies.yml
+++ b/.github/workflows/upgrade_codeql_dependencies.yml
@@ -53,7 +53,7 @@ jobs:
           find c \( -name '*.ql' -or -name '*.qll' \) -print0 | xargs -0 --max-procs "$XARGS_MAX_PROCS" codeql query format --in-place
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
         with:
           title: "Upgrade `github/codeql` dependency to ${{ github.event.inputs.codeql_cli_version }}"
           body: |

From 6da5c4d051489348935a9e47ed980733e62931da Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 11:11:08 +0100
Subject: [PATCH 223/435] Address whitespace issues

---
 c/misra/src/codeql-suites/misra-default.qls                   | 2 +-
 change_notes/2024-10-03-misra-c-query-suites.md               | 3 +--
 cpp/misra/src/codeql-suites/misra-default.qls                 | 2 +-
 cpp/misra/src/codeql-suites/misra-single-translation-unit.qls | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/c/misra/src/codeql-suites/misra-default.qls b/c/misra/src/codeql-suites/misra-default.qls
index 66a0161628..e645bb1545 100644
--- a/c/misra/src/codeql-suites/misra-default.qls
+++ b/c/misra/src/codeql-suites/misra-default.qls
@@ -1,2 +1,2 @@
 - description: "DEPRECATED - MISRA C  2012 - use misra-c-default.qls instead"
-- import: codeql-suites/misra-c-default.qls
\ No newline at end of file
+- import: codeql-suites/misra-c-default.qls
diff --git a/change_notes/2024-10-03-misra-c-query-suites.md b/change_notes/2024-10-03-misra-c-query-suites.md
index cdc6982673..c60aac8941 100644
--- a/change_notes/2024-10-03-misra-c-query-suites.md
+++ b/change_notes/2024-10-03-misra-c-query-suites.md
@@ -1,8 +1,7 @@
  - The following query suites have been added or modified for MISRA C:
    - A new query suite has been created `misra-c-default.qls` to avoid confusion with the MISRA C++ query suites. The `misra-default.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-c-default.qls` suite.
      - The `misra-c-default.qls` suite has been specified as the default for the pack, and will include our most up-to-date coverage for MISRA C.
-   - A new query suite `misra-c-2012-third-edition-with-amendment-2.qls` has been created to represent our previous MISRA C coverage. Note: this query suite will run the rules that were present in MISRA C 2012, Third Edition, First Revision and Amendment 2. The interpretation of those
-   rules may be updated to reflect changes in more recent MISRA standards.
+   - A new query suite `misra-c-2012-third-edition-with-amendment-2.qls` has been created to represent our previous MISRA C coverage. Note: this query suite will run the rules that were present in MISRA C 2012, Third Edition, First Revision and Amendment 2. The interpretation of those rules may be updated to reflect changes in more recent MISRA standards.
    - Three new query suites, `misra-c-mandatory.qls`, `misra-c-required.qls` and `misra-c-advisory.qls`, have been added to enable running mandatory, required or advisory queries.
  - The following query suites have been added or modified for MISRA C++:
    - A new query suite has been created `misra-cpp-default.qls` to avoid confusion with the MISRA C query suites. The `misra-default.qls` suite has been deprecated, and will be removed in a future releases, and is replaced by the `misra-cpp-default.qls` suite.
diff --git a/cpp/misra/src/codeql-suites/misra-default.qls b/cpp/misra/src/codeql-suites/misra-default.qls
index 8609e3df64..3c205157cd 100644
--- a/cpp/misra/src/codeql-suites/misra-default.qls
+++ b/cpp/misra/src/codeql-suites/misra-default.qls
@@ -1,2 +1,2 @@
 - description: "DEPRECATED - MISRA C++ 2023 - use misra-cpp-default.qls instead"
-- import: codeql-suites/misra-cpp-default.qls
\ No newline at end of file
+- import: codeql-suites/misra-cpp-default.qls
diff --git a/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls b/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls
index 0351768470..9dcd3f0c97 100644
--- a/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls
+++ b/cpp/misra/src/codeql-suites/misra-single-translation-unit.qls
@@ -1,2 +1,2 @@
 - description: "DEPRECATED - MISRA C++ 2023 (Single Translation Unit) - use misra-cpp-single-translation-unit.qls instead"
-- import: codeql-suites/misra-cpp-single-translation-unit.qls
\ No newline at end of file
+- import: codeql-suites/misra-cpp-single-translation-unit.qls

From 5497cfafca5f671db2221dfa659e4719ebbc4b3e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 11:41:23 +0100
Subject: [PATCH 224/435] Update NoReturn.json with MISRA C 2012 tags

---
 rule_packages/c/NoReturn.json | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/rule_packages/c/NoReturn.json b/rule_packages/c/NoReturn.json
index 49cdb4c255..f485060095 100644
--- a/rule_packages/c/NoReturn.json
+++ b/rule_packages/c/NoReturn.json
@@ -12,7 +12,10 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "NonVoidReturnTypeOfNoreturnFunction",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/amendment3"
+          ]
         }
       ],
       "title": "A function declared with _noreturn shall have a return type of void"
@@ -29,7 +32,10 @@
           "precision": "very-high",
           "severity": "recommendation",
           "short_name": "FunctionWithNoReturningBranchShouldBeNoreturn",
-          "tags": ["correctness"]
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/amendment3"
+          ]
         }
       ],
       "title": "A function without a branch that returns shall be declared with _Noreturn"
@@ -46,7 +52,10 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "ReturnStatementInNoreturnFunction",
-          "tags": ["correctness"],
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/amendment3"
+          ],
           "shared_implementation_short_name": "FunctionNoReturnAttributeCondition"
         }
       ],

From 4b9e9fdd18b905fd455dae9028fefcc512316eb8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 11:41:40 +0100
Subject: [PATCH 225/435] Check MISRA C 2012 rules have MISRA C 2012 tags

Needed to specify which amendment or rule set they come from.
---
 scripts/verify_rule_package_consistency.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/verify_rule_package_consistency.py b/scripts/verify_rule_package_consistency.py
index 7d111e81bc..1f3ab337b4 100644
--- a/scripts/verify_rule_package_consistency.py
+++ b/scripts/verify_rule_package_consistency.py
@@ -100,6 +100,11 @@
                         print(
                             f" - ERROR: Rule {rule_id} included in {package_name}.json but not marked as supportable in rules.csv.")
                         failed = True
+                    for query in rule_details["queries"]:
+                        if standard_name == "MISRA-C-2012" and not any(tag for tag in query["tags"] if tag.startswith("external/misra/c/2012/")):
+                            print(
+                                f" - ERROR: MISRA C 2012 query {query["name"]} for Rule {rule_id} in {package_name}.json is missing a `external/misra/c/2012/...` tag.")
+                            failed = True
             rules_csv_rule_ids = package_rules_from_csv[package_name]
 
             json_missing_rules = rules_csv_rule_ids.difference(package_json_rule_ids)

From aab6e177af7431fd6c1c4ac5b882e5bc3a3196e2 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 11:41:40 +0100
Subject: [PATCH 226/435] Check MISRA C 2012 tags are not on other rules

---
 scripts/verify_rule_package_consistency.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/verify_rule_package_consistency.py b/scripts/verify_rule_package_consistency.py
index 1f3ab337b4..57caee8bb8 100644
--- a/scripts/verify_rule_package_consistency.py
+++ b/scripts/verify_rule_package_consistency.py
@@ -103,7 +103,11 @@
                     for query in rule_details["queries"]:
                         if standard_name == "MISRA-C-2012" and not any(tag for tag in query["tags"] if tag.startswith("external/misra/c/2012/")):
                             print(
-                                f" - ERROR: MISRA C 2012 query {query["name"]} for Rule {rule_id} in {package_name}.json is missing a `external/misra/c/2012/...` tag.")
+                                f" - ERROR: MISRA C 2012 query {query["short_name"]}.ql for Rule {rule_id} in {package_name}.json is missing a `external/misra/c/2012/...` tag.")
+                            failed = True
+                        if not standard_name == "MISRA-C-2012" and any(tag for tag in query["tags"] if tag.startswith("external/misra/c/2012/")):
+                            print(
+                                f" - ERROR: {standard_name} query {query["short_name"]}.ql for Rule {rule_id} in {package_name}.json has a spurious `external/misra/c/2012/...` tag.")
                             failed = True
             rules_csv_rule_ids = package_rules_from_csv[package_name]
 

From 7cc5b574fa734ec48f8c998c4e0dfbe5562c0cfb Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 11:56:21 +0100
Subject: [PATCH 227/435] Upgrade all qlpacks

Otherwise the lock files may not be updated for packs which
transitively depend on codeql/cpp-all
---
 .../upgrade-codeql-dependencies.py                         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
index ab947f0ef2..f6ab6aa383 100644
--- a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
+++ b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
@@ -67,7 +67,6 @@ def main(cli_version : str, github_token: str) -> None:
         qlpack_files = [f for f in qlpack_files if not any(part for part in f.parts if part.startswith("."))]
 
         # Update the "codeql/cpp-all" entries in the "dependencies" property in every qlpack.yml file
-        updated_qlpacks = []
         for qlpack_file in qlpack_files:
             with qlpack_file.open("r") as f:
                 qlpack = yaml.safe_load(f)
@@ -76,12 +75,14 @@ def main(cli_version : str, github_token: str) -> None:
                 qlpack["dependencies"]["codeql/cpp-all"] = compatible_stdlib_version
                 with qlpack_file.open("w") as f:
                     yaml.safe_dump(qlpack, f, sort_keys=False)
-                updated_qlpacks.append(qlpack_file.parent)
 
         # Call CodeQL to update the lock files by running codeql pack upgrade
         # Note: we need to do this after updating all the qlpack files,
         #       otherwise we may get dependency resolution errors
-        for qlpack in updated_qlpacks:
+        # Note: we need to update all qlpack files, because they may
+        #       transitively depend on the packs we changed
+        for qlpack_file in qlpack_files:
+            qlpack = qlpack.parent
             print("Updating lock files for " + str(qlpack))
             os.system(f"codeql pack upgrade {qlpack}")
 

From cbc63883d7b82c28b7166b7b106d3cfcc3c61563 Mon Sep 17 00:00:00 2001
From: Nicolas Will <nicolaswill@github.com>
Date: Fri, 4 Oct 2024 13:29:03 +0200
Subject: [PATCH 228/435] Update
 c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected

---
 .../rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
index d0303f9a7f..0e2cbb26ee 100644
--- a/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
+++ b/c/misra/test/rules/RULE-1-2/LanguageExtensionsShouldNotBeUsed.expected
@@ -23,7 +23,7 @@
 | test.c:182:8:182:11 | gf19 | Empty structures are a compiler extension and are not portable to other compilers. |
 | test.c:216:9:216:10 | definition of x1 | Zero length arrays are a compiler extension and are not portable to other compilers. |
 | test.c:266:16:266:21 | access | Use of attribute  'access' is a compiler extension and is not portable to other compilers. |
-| test.c:270:5:270:9 | alias | Use of attribute  'alias' is a compiler extension and is not portable to other compilers. |
+| test.c:269:27:269:31 | alias | Use of attribute  'alias' is a compiler extension and is not portable to other compilers. |
 | test.c:272:23:272:29 | aligned | Use of attribute  'aligned' is a compiler extension and is not portable to other compilers. |
 | test.c:283:25:283:34 | deprecated | Use of attribute  'deprecated' is a compiler extension and is not portable to other compilers. |
 | test.c:295:20:295:30 | fallthrough | Use of attribute  'fallthrough' is a compiler extension and is not portable to other compilers. |

From 61e7c6da6f98d0933477674b52c25828df2c2283 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 14:17:40 +0100
Subject: [PATCH 229/435] Fix typo

---
 .../upgrade-codeql-dependencies/upgrade-codeql-dependencies.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
index f6ab6aa383..c76303e654 100644
--- a/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
+++ b/scripts/upgrade-codeql-dependencies/upgrade-codeql-dependencies.py
@@ -82,7 +82,7 @@ def main(cli_version : str, github_token: str) -> None:
         # Note: we need to update all qlpack files, because they may
         #       transitively depend on the packs we changed
         for qlpack_file in qlpack_files:
-            qlpack = qlpack.parent
+            qlpack = qlpack_file.parent
             print("Updating lock files for " + str(qlpack))
             os.system(f"codeql pack upgrade {qlpack}")
 

From 0f89f16c2cd404ed21ec2c2b84ba7e93532a9b82 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 14:31:41 +0100
Subject: [PATCH 230/435] Avoid confusion over double quotes in double quotes

---
 scripts/verify_rule_package_consistency.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/verify_rule_package_consistency.py b/scripts/verify_rule_package_consistency.py
index 57caee8bb8..034e367db2 100644
--- a/scripts/verify_rule_package_consistency.py
+++ b/scripts/verify_rule_package_consistency.py
@@ -103,11 +103,11 @@
                     for query in rule_details["queries"]:
                         if standard_name == "MISRA-C-2012" and not any(tag for tag in query["tags"] if tag.startswith("external/misra/c/2012/")):
                             print(
-                                f" - ERROR: MISRA C 2012 query {query["short_name"]}.ql for Rule {rule_id} in {package_name}.json is missing a `external/misra/c/2012/...` tag.")
+                                f' - ERROR: MISRA C 2012 query {query["short_name"]}.ql for Rule {rule_id} in {package_name}.json is missing a `external/misra/c/2012/...` tag.')
                             failed = True
                         if not standard_name == "MISRA-C-2012" and any(tag for tag in query["tags"] if tag.startswith("external/misra/c/2012/")):
                             print(
-                                f" - ERROR: {standard_name} query {query["short_name"]}.ql for Rule {rule_id} in {package_name}.json has a spurious `external/misra/c/2012/...` tag.")
+                                f' - ERROR: {standard_name} query {query["short_name"]}.ql for Rule {rule_id} in {package_name}.json has a spurious `external/misra/c/2012/...` tag.')
                             failed = True
             rules_csv_rule_ids = package_rules_from_csv[package_name]
 

From 893231056dc2b91e753748825352284ffc9aa88e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 14:53:17 +0100
Subject: [PATCH 231/435] Add tags to queries

---
 .../src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql  | 1 +
 .../RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql  | 1 +
 c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql | 1 +
 3 files changed, 3 insertions(+)

diff --git a/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
index 68c5faeb1b..1e32793c3f 100644
--- a/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-10/NonVoidReturnTypeOfNoreturnFunction.ql
@@ -8,6 +8,7 @@
  * @problem.severity recommendation
  * @tags external/misra/id/rule-17-10
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
index 90cb1af7c2..4dd939effe 100644
--- a/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
+++ b/c/misra/src/rules/RULE-17-11/FunctionWithNoReturningBranchShouldBeNoreturn.ql
@@ -7,6 +7,7 @@
  * @problem.severity recommendation
  * @tags external/misra/id/rule-17-11
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
  */
 
diff --git a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
index 360be01b7c..dedac9da9e 100644
--- a/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
+++ b/c/misra/src/rules/RULE-17-9/ReturnStatementInNoreturnFunction.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-17-9
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/mandatory
  */
 

From 46d09db02ea2ce17a6a6996039dddb9a969592dd Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Tue, 24 Sep 2024 10:32:11 -0700
Subject: [PATCH 232/435] First pass on 17-12, 17-13, both facing extractor
 issues.

---
 .../FunctionAddressesShouldAddressOperator.ql |  83 ++++++++++
 .../DisallowedFunctionTypeQualifier.ql        | 147 ++++++++++++++++++
 ...ionAddressesShouldAddressOperator.expected |  18 +++
 ...nctionAddressesShouldAddressOperator.qlref |   1 +
 c/misra/test/rules/RULE-17-12/test.c          | 106 +++++++++++++
 .../DisallowedFunctionTypeQualifier.expected  |   1 +
 .../DisallowedFunctionTypeQualifier.qlref     |   1 +
 c/misra/test/rules/RULE-17-13/test.c          |  56 +++++++
 .../cpp/exclusions/c/FunctionTypes.qll        |  44 ++++++
 .../cpp/exclusions/c/RuleMetadata.qll         |   3 +
 rule_packages/c/FunctionTypes.json            |  42 +++++
 11 files changed, 502 insertions(+)
 create mode 100644 c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
 create mode 100644 c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
 create mode 100644 c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
 create mode 100644 c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.qlref
 create mode 100644 c/misra/test/rules/RULE-17-12/test.c
 create mode 100644 c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected
 create mode 100644 c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref
 create mode 100644 c/misra/test/rules/RULE-17-13/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll
 create mode 100644 rule_packages/c/FunctionTypes.json

diff --git a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
new file mode 100644
index 0000000000..4c3386c68b
--- /dev/null
+++ b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
@@ -0,0 +1,83 @@
+/**
+ * @id c/misra/function-addresses-should-address-operator
+ * @name RULE-17-12: A function identifier should only be called with a parenthesized parameter list or used with a &
+ * @description A function identifier should only be called with a parenthesized parameter list or
+ *              used with a & (address-of).
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-17-12
+ *       readability
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.c.misra
+
+abstract class AddressOfFunction extends Expr {
+  abstract predicate isImplicitlyAddressed();
+
+  abstract string getFuncName();
+}
+
+class FunctionTypeAccess extends FunctionAccess, AddressOfFunction {
+
+  predicate isImmediatelyParenthesized() {
+    exists(ParenthesisExpr parens | parens.getExpr() = this)
+  }
+
+  predicate isExplicitlyAddressed() {
+    getParent() instanceof AddressOfExpr and
+    not isImmediatelyParenthesized()
+  }
+
+  override predicate isImplicitlyAddressed() {
+    not isExplicitlyAddressed()
+  }
+
+  override string getFuncName() {
+    result = getTarget().getName()
+  }
+}
+
+/*
+class IndirectFunctionCall extends FunctionCall, AddressOfFunction {
+  override predicate isImplicitlyAddressed() {
+    getConversion+() instanceof ParenthesisExpr
+  }
+  
+  override string getFuncName() {
+    result = getTarget().getName()
+  }
+}
+  */
+
+class MacroArgTakesFunction extends AddressOfFunction {
+  MacroInvocation m;
+  MacroArgTakesFunction() {
+    m.getExpr() = this
+  }
+
+  override predicate isImplicitlyAddressed() {
+    any()
+  }
+
+  string getProp() {
+    result = m.getExpandedArgument(_)
+    and this.get
+  }
+
+  override string getFuncName() {
+    result = "a macro argument"
+  }
+
+}
+
+from AddressOfFunction funcAddr
+where
+  not isExcluded(funcAddr, FunctionTypesPackage::functionAddressesShouldAddressOperatorQuery()) and
+  //not funcAccess.isImmediatelyCalled() and
+  //not funcAccess.isExplicitlyAddressed()
+  funcAddr.isImplicitlyAddressed()
+select
+  funcAddr, "The address of function " + funcAddr.getFuncName() + " is taken without the & operator."
\ No newline at end of file
diff --git a/c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql b/c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
new file mode 100644
index 0000000000..a40dadef6c
--- /dev/null
+++ b/c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
@@ -0,0 +1,147 @@
+/**
+ * @id c/misra/disallowed-function-type-qualifier
+ * @name RULE-17-13: A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)
+ * @description The behavior of type qualifiers on a function type is undefined.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-17-13
+ *       correctness
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+//from DeclarationEntry decl, Type type //, Specifier specifier
+//where
+//  not isExcluded(decl, FunctionTypesPackage::disallowedFunctionTypeQualifierQuery()) and
+//  //decl.getType() instanceof FunctionPointerType and
+//  //decl.getType().(FunctionPointerType).hasSpecifier(specifier)
+//  (type = decl.getType().getUnderlyingType*()
+//  or type = decl.getType())
+//   and
+//  //specifier = type.getASpecifier()
+//  any()
+//select decl, type //, specifier // "The behavior of type qualifier " + specifier + " on a function type is undefined." 
+
+newtype TDeclaredFunction =
+  TFunctionDeclaration(Declaration declaration)
+
+abstract class DeclaredFunction extends TDeclaredFunction {
+  abstract string toString();
+}
+
+predicate isConstFunction(Type type) {
+  (type.getASpecifier().getName() = "const"
+  or type.isConst())
+  and isFunctionType(type)
+  or isConstFunction(type.getUnderlyingType())
+}
+
+predicate isFunctionType(Type type) {
+  type instanceof FunctionPointerType
+  or isFunctionType(type.getUnderlyingType())
+}
+
+predicate declaresConstFunction(DeclarationEntry entry) {
+  (entry.getDeclaration().getASpecifier().getName() = "const"
+  and isFunctionType(entry.getType()))
+  or isConstFunction(entry.getType())
+}
+
+class QualifiableRoutineType extends RoutineType, QualifiableType {
+  override string explainQualifiers() {
+    result = "func{"
+      + specifiersOf(this) + this.getReturnType().(QualifiableType).explainQualifiers()
+      + " ("
+      + paramString(0)
+      + ")}"
+  }
+
+  string paramString(int i) {
+    i = 0 and result = "" and not exists(this.getAParameterType())
+    or
+    (
+      if i < max(int j | exists(this.getParameterType(j)))
+      then
+        // Not the last one
+        result = this.getParameterType(i).(QualifiableType).explainQualifiers() + "," + this.paramString(i + 1)
+      else
+        // Last parameter
+        result = this.getParameterType(i).(QualifiableType).explainQualifiers()
+    )
+  }
+}
+
+class QualifiableIntType extends IntType, QualifiableType {
+  override string explainQualifiers() {
+    result = specifiersOf(this) + " " + this.toString()
+  }
+}
+
+class QualifiablePointerType extends PointerType, QualifiableType {
+  override string explainQualifiers() {
+    result = "{" 
+      + specifiersOf(this)
+      + " pointer to "
+      + this.getBaseType().(QualifiableType).explainQualifiers()
+      + "}"
+  }
+}
+
+class QualifiableType extends Type {
+  string explainQualifiers() {
+    result = "Unimplemented explainQualifiers for type(s): " + concat(string s | s = getAQlClass() | s, ",")
+  }
+}
+
+class QualifiableTypedefType extends TypedefType, QualifiableType {
+  override string explainQualifiers() {
+    result = "{ typedef "
+      + specifiersOf(this)
+      + " "
+      + this.getBaseType().(QualifiableType).explainQualifiers()
+      + "}"
+  }
+}
+
+class QualifiableSpecifiedType extends SpecifiedType, QualifiableType {
+  override string explainQualifiers() {
+    result = "{"
+      + specifiersOf(this)
+      + " "
+      + this.getBaseType().(QualifiableType).explainQualifiers()
+      + "}"
+  }
+}
+
+string typeString(Type t) {
+  //if 
+  //  t instanceof CTypedefType
+  //  then result = t.(CTypedefType).explain() + "specs:" + specifiersOf(t.(CTypedefType).getBaseType()) + "/" + typeString(t.(CTypedefType).getBaseType())
+  //  else
+  //result = concat(string s | s = t.getAQlClass() | s, ",")
+  result = t.(QualifiableType).explainQualifiers()
+}
+
+string specifiersOf(Type t) {
+  result = concat(Specifier s | s = t.getASpecifier()| s.getName(), ", ")
+}
+
+string declSpecifiersOf(Declaration d) {
+  result = concat(Specifier s | s = d.getASpecifier()| s.getName(), ", ")
+}
+
+string underlying(Type t) {
+  exists(Type u | u = t.getUnderlyingType() | result = u.toString())
+  or  result = "[no underlying]"
+
+}
+
+from DeclarationEntry entry
+select entry, entry.getType(), typeString(entry.getType()), declSpecifiersOf(entry.getDeclaration()), specifiersOf(entry.getType())
+
+//from Type t
+//where any()//isFunctionType(t)
+//select t, specifiersOf(t), underlying(t)
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
new file mode 100644
index 0000000000..1cc92e95e1
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
@@ -0,0 +1,18 @@
+| test.c:15:25:15:29 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:16:27:16:31 | func3 | The address of function func3 is taken without the & operator. |
+| test.c:22:16:22:20 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:38:5:38:9 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:39:5:39:9 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:47:7:47:11 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:48:7:48:11 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:57:15:57:19 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:58:23:58:27 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:59:15:59:19 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:59:22:59:26 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:67:13:67:17 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:68:14:68:18 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:69:14:69:18 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:71:20:71:24 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:72:20:72:24 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:76:20:76:24 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:77:20:77:24 | func1 | The address of function func1 is taken without the & operator. |
diff --git a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.qlref b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.qlref
new file mode 100644
index 0000000000..f0a4753620
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.qlref
@@ -0,0 +1 @@
+rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-12/test.c b/c/misra/test/rules/RULE-17-12/test.c
new file mode 100644
index 0000000000..1c580f917e
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-12/test.c
@@ -0,0 +1,106 @@
+void func1() {}
+void func2(int x, char* y) {}
+
+typedef struct {} s;
+
+int func3() {
+    return 0;
+}
+
+typedef void (*func_ptr_t1)();
+typedef void (*func_ptr_t2)(int x, char* y);
+typedef s (*func_ptr_t3)();
+
+func_ptr_t1 func_ptr1 = &func1; // COMPLIANT
+func_ptr_t2 func_ptr2 = func2; // NON-COMPLIANT
+func_ptr_t3 func_ptr3 = &(func3); // NON-COMPLIANT
+
+void take_func(func_ptr_t1 f1, func_ptr_t2 f2);
+
+func_ptr_t1 returns_func(int x) {
+    if (x == 0) {
+        return func1; // NON-COMPLIANT
+    } else if (x == 1) {
+        return &func1; // COMPLIANT
+    }
+
+    return returns_func(0); // COMPLIANT
+}
+
+#define MACRO_IDENTITY(f) (f)
+#define MACRO_INVOKE_RISKY(f) (f())
+#define MACRO_INVOKE_IMPROVED(f) ((f)())
+
+void test() {
+    func1();     // COMPLIANT
+    func2(1, "hello"); // COMPLIANT
+
+    func1;     // NON-COMPLIANT 
+    func2;     // NON-COMPLIANT 
+
+    &func1;     // COMPLIANT 
+    &func2;     // COMPLIANT 
+
+    (func1)();     // COMPLIANT
+    (func2)(1, "hello"); // COMPLIANT
+
+    &(func1); // NON-COMPLIANT
+    &(func2); // NON-COMPLIANT
+
+    (&func1)();     // COMPLIANT
+    (&func2)(1, "hello"); // COMPLIANT
+
+    (func1());     // COMPLIANT
+    (func2(1, "hello")); // COMPLIANT
+
+    take_func(&func1, &func2); // COMPLIANT
+    take_func(func1, &func2); // NON-COMPLIANT
+    take_func(&func1, func2); // NON-COMPLIANT
+    take_func(func1, func2); // NON-COMPLIANT
+
+    returns_func(0); // COMPLIANT
+    returns_func(0)(); // COMPLIANT
+    (returns_func(0))(); // COMPLIANT
+
+    (void*) &func1;     // COMPLIANT 
+    (void*) (&func1);     // COMPLIANT 
+    (void*) func1;     // NON-COMPLIANT 
+    (void*) (func1);     // NON-COMPLIANT 
+    ((void*) func1);     // NON-COMPLIANT 
+
+    MACRO_IDENTITY(func1); // NON-COMPLIANT
+    MACRO_IDENTITY(func1)(); // NON-COMPLIANT
+    MACRO_IDENTITY(&func1); // COMPLIANT
+    MACRO_IDENTITY(&func1)(); // COMPLIANT
+
+    MACRO_INVOKE_RISKY(func3); // NON-COMPLIANT
+    MACRO_INVOKE_IMPROVED(func3); // NON-COMPLIANT
+    MACRO_INVOKE_IMPROVED(&func3); // COMPLIANT
+
+    // Function pointers are exempt from this rule.
+    func_ptr1(); // COMPLIANT
+    func_ptr2(1, "hello"); // COMPLIANT
+    func_ptr1; // COMPLIANT
+    func_ptr2; // COMPLIANT
+    &func_ptr1; // COMPLIANT
+    &func_ptr2; // COMPLIANT
+    (func_ptr1)(); // COMPLIANT
+    (func_ptr2)(1, "hello"); // COMPLIANT
+    (*func_ptr1)(); // COMPLIANT
+    (*func_ptr2)(1, "hello"); // COMPLIANT
+    take_func(func_ptr1, func_ptr2); // COMPLIANT
+    (void*) func_ptr1; // COMPLIANT
+    (void*) &func_ptr1;     // COMPLIANT 
+    (void*) (&func_ptr1);     // COMPLIANT 
+    (void*) func_ptr1;     // COMPLIANT 
+    (void*) (func_ptr1);     // COMPLIANT 
+    ((void*) func_ptr1);     // COMPLIANT 
+    MACRO_IDENTITY(func_ptr1); // COMPLIANT
+    MACRO_IDENTITY(func_ptr1)(); // COMPLIANT
+    MACRO_IDENTITY(&func_ptr1); // COMPLIANT
+    (*MACRO_IDENTITY(&func_ptr1))(); // COMPLIANT
+    MACRO_INVOKE_RISKY(func_ptr3); // COMPLIANT
+    MACRO_INVOKE_IMPROVED(func_ptr3); // COMPLIANT
+    MACRO_INVOKE_IMPROVED(*&func_ptr3); // COMPLIANT
+
+}
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected b/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected
new file mode 100644
index 0000000000..2ec1a0ac6c
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected
@@ -0,0 +1 @@
+No expected results have yet been specified
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref b/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref
new file mode 100644
index 0000000000..cbf7c583ec
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref
@@ -0,0 +1 @@
+rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-13/test.c b/c/misra/test/rules/RULE-17-13/test.c
new file mode 100644
index 0000000000..8326b30a28
--- /dev/null
+++ b/c/misra/test/rules/RULE-17-13/test.c
@@ -0,0 +1,56 @@
+// semmle-extractor-options: --language=c -std=c99
+const int x; // COMPLIANT
+const int f_ret_const_int(void); // COMPLIANT
+const int* f_ret_const_int_ptr(void); // COMPLIANT
+
+// Basic function typedefs
+typedef int ftype_ret_int(void);
+typedef const int ftype_ret_const_int(void); // COMPLIANT
+typedef const int* ftype_ret_const_int_ptr(void); // COMPLIANT
+typedef int const* ftype_ret_int_const_ptr(void); // COMPLIANT
+
+// Typedefs that use function typedefs
+typedef ftype_ret_int ftype_ret_int2; // COMPLIANT
+typedef const ftype_ret_int *ptr_const_ftype_ret_int; // NON-COMPLIANT
+typedef ftype_ret_int *const const_ptr_ftype_ret_int; // COMPLIANT
+typedef ftype_ret_int const* const_ptr_ftype_ret_int_; // NON-COMPLIANT
+
+// Test all qualifiers
+typedef const ftype_ret_int const_ftype_ret_int; // NON-COMPLIANT
+typedef volatile ftype_ret_int volatile_ftype_ret_int; // NON-COMPLIANT
+typedef _Atomic ftype_ret_int atomic_ftype_ret_int; // NON-COMPLIANT
+//extern restrict ftype_ret_int restrict_ftype_ret_int; // NON-COMPLIANT
+
+// Test parameters of declaration specifiers
+typedef void (*take_ftype_ret_int)(ftype_ret_int); // COMPLIANT
+typedef void (*take_const_ftype_ret_int)(const ftype_ret_int); // NON-COMPLIANT
+typedef void (*take_ptr_ftype_ret_int)(ftype_ret_int*); // COMPLIANT
+typedef void (*take_ptr_const_ftype_ret_int)(const ftype_ret_int *); // NON-COMPLIANT
+typedef void (*take_const_ptr_ftype_ret_int)(ftype_ret_int const *); // COMPLIANT
+
+// Test return types of declaration specifiers
+typedef ftype_ret_int* (return_ftype_ret_int)(void); // COMPLIANT
+typedef const ftype_ret_int* (return_ftype_ret_int)(void); // NON-COMPLIANT
+typedef ftype_ret_int const* (return_ftype_ret_int)(void); // COMPLIANT
+
+// Other storage class specifiers
+extern const ftype_ret_int extern_ftype; // NON-COMPLIANT
+extern const ftype_ret_int *extern_const_ftype_type; // NON-COMPLIANT
+extern ftype_ret_int const * extern_ftype_const_ptr; // COMPLIANT
+
+// Other declarations
+void param_list(
+    const ftype_ret_int *param_ftype, // NON-COMPLIANT
+    const ftype_ret_int *param_const_ftype_type, // NON-COMPLIANT
+    ftype_ret_int const *param_ftype_const_ptr // COMPLIANT
+) {
+    const ftype_ret_int *var_ftype; // NON-COMPLIANT
+    const ftype_ret_int *var_const_ftype_type; // NON-COMPLIANT
+    ftype_ret_int const *var_ftype_const_ptr; // COMPLIANT
+
+    struct TestStruct {
+        const ftype_ret_int *struct_ftype; // NON-COMPLIANT
+        const ftype_ret_int *struct_const_ftype_type; // NON-COMPLIANT
+        ftype_ret_int const *struct_ftype_const_ptr; // COMPLIANT
+    };
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll
new file mode 100644
index 0000000000..176b9871d3
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll
@@ -0,0 +1,44 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype FunctionTypesQuery =
+  TFunctionAddressesShouldAddressOperatorQuery() or
+  TDisallowedFunctionTypeQualifierQuery()
+
+predicate isFunctionTypesQueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `functionAddressesShouldAddressOperator` query
+    FunctionTypesPackage::functionAddressesShouldAddressOperatorQuery() and
+  queryId =
+    // `@id` for the `functionAddressesShouldAddressOperator` query
+    "c/misra/function-addresses-should-address-operator" and
+  ruleId = "RULE-17-12" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `disallowedFunctionTypeQualifier` query
+    FunctionTypesPackage::disallowedFunctionTypeQualifierQuery() and
+  queryId =
+    // `@id` for the `disallowedFunctionTypeQualifier` query
+    "c/misra/disallowed-function-type-qualifier" and
+  ruleId = "RULE-17-13" and
+  category = "required"
+}
+
+module FunctionTypesPackage {
+  Query functionAddressesShouldAddressOperatorQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `functionAddressesShouldAddressOperator` query
+      TQueryC(TFunctionTypesPackageQuery(TFunctionAddressesShouldAddressOperatorQuery()))
+  }
+
+  Query disallowedFunctionTypeQualifierQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `disallowedFunctionTypeQualifier` query
+      TQueryC(TFunctionTypesPackageQuery(TDisallowedFunctionTypeQualifierQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index b10fbf0a2f..581585da5c 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -29,6 +29,7 @@ import Declarations8
 import EssentialTypes
 import Expressions
 import FloatingTypes
+import FunctionTypes
 import IO1
 import IO2
 import IO3
@@ -102,6 +103,7 @@ newtype TCQuery =
   TEssentialTypesPackageQuery(EssentialTypesQuery q) or
   TExpressionsPackageQuery(ExpressionsQuery q) or
   TFloatingTypesPackageQuery(FloatingTypesQuery q) or
+  TFunctionTypesPackageQuery(FunctionTypesQuery q) or
   TIO1PackageQuery(IO1Query q) or
   TIO2PackageQuery(IO2Query q) or
   TIO3PackageQuery(IO3Query q) or
@@ -175,6 +177,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isEssentialTypesQueryMetadata(query, queryId, ruleId, category) or
   isExpressionsQueryMetadata(query, queryId, ruleId, category) or
   isFloatingTypesQueryMetadata(query, queryId, ruleId, category) or
+  isFunctionTypesQueryMetadata(query, queryId, ruleId, category) or
   isIO1QueryMetadata(query, queryId, ruleId, category) or
   isIO2QueryMetadata(query, queryId, ruleId, category) or
   isIO3QueryMetadata(query, queryId, ruleId, category) or
diff --git a/rule_packages/c/FunctionTypes.json b/rule_packages/c/FunctionTypes.json
new file mode 100644
index 0000000000..bfa96d09eb
--- /dev/null
+++ b/rule_packages/c/FunctionTypes.json
@@ -0,0 +1,42 @@
+{
+  "MISRA-C-2012": {
+    "RULE-17-12": {
+      "properties": {
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "A function identifier should only be called with a parenthesized parameter list or used with a & (address-of).",
+          "kind": "problem",
+          "name": "A function identifier should only be called with a parenthesized parameter list or used with a &",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "FunctionAddressesShouldAddressOperator",
+          "tags": [
+            "readability"
+          ]
+        }
+      ],
+      "title": "A function identifier should only be called with a parenthesized parameter list or used with a & (address-of)"
+    },
+    "RULE-17-13": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The behavior of type qualifiers on a function type is undefined.",
+          "kind": "problem",
+          "name": "A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "DisallowedFunctionTypeQualifier",
+          "tags": [
+            "correctness"
+          ]
+        }
+      ],
+      "title": "A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)"
+    }
+  }
+}
\ No newline at end of file

From d798fc87149908f801fceb4d495888d9d909ff08 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 27 Sep 2024 15:34:14 -0700
Subject: [PATCH 233/435] Remove 17-13, simpler implementation for 17-12.

---
 .../FunctionAddressesShouldAddressOperator.ql |  73 ++-------
 .../DisallowedFunctionTypeQualifier.ql        | 147 ------------------
 ...ionAddressesShouldAddressOperator.expected |  23 ++-
 c/misra/test/rules/RULE-17-12/test.c          |   9 +-
 .../DisallowedFunctionTypeQualifier.expected  |   1 -
 .../DisallowedFunctionTypeQualifier.qlref     |   1 -
 c/misra/test/rules/RULE-17-13/test.c          |  56 -------
 .../cpp/exclusions/c/FunctionTypes.qll        |  20 +--
 rule_packages/c/FunctionTypes.json            |  14 +-
 9 files changed, 27 insertions(+), 317 deletions(-)
 delete mode 100644 c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
 delete mode 100644 c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected
 delete mode 100644 c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref
 delete mode 100644 c/misra/test/rules/RULE-17-13/test.c

diff --git a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
index 4c3386c68b..96c466150b 100644
--- a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
+++ b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
@@ -14,70 +14,15 @@
 import cpp
 import codingstandards.c.misra
 
-abstract class AddressOfFunction extends Expr {
-  abstract predicate isImplicitlyAddressed();
-
-  abstract string getFuncName();
-}
-
-class FunctionTypeAccess extends FunctionAccess, AddressOfFunction {
-
-  predicate isImmediatelyParenthesized() {
-    exists(ParenthesisExpr parens | parens.getExpr() = this)
-  }
-
-  predicate isExplicitlyAddressed() {
-    getParent() instanceof AddressOfExpr and
-    not isImmediatelyParenthesized()
-  }
-
-  override predicate isImplicitlyAddressed() {
-    not isExplicitlyAddressed()
-  }
-
-  override string getFuncName() {
-    result = getTarget().getName()
-  }
-}
-
-/*
-class IndirectFunctionCall extends FunctionCall, AddressOfFunction {
-  override predicate isImplicitlyAddressed() {
-    getConversion+() instanceof ParenthesisExpr
-  }
-  
-  override string getFuncName() {
-    result = getTarget().getName()
-  }
-}
-  */
-
-class MacroArgTakesFunction extends AddressOfFunction {
-  MacroInvocation m;
-  MacroArgTakesFunction() {
-    m.getExpr() = this
-  }
-
-  override predicate isImplicitlyAddressed() {
-    any()
-  }
-
-  string getProp() {
-    result = m.getExpandedArgument(_)
-    and this.get
-  }
-
-  override string getFuncName() {
-    result = "a macro argument"
-  }
-
+predicate isImplicitlyAddressed(FunctionAccess access) {
+  not access.getParent() instanceof AddressOfExpr or
+  exists(ParenthesisExpr parens | parens.getExpr() = access)
 }
 
-from AddressOfFunction funcAddr
+from FunctionAccess funcAccess
 where
-  not isExcluded(funcAddr, FunctionTypesPackage::functionAddressesShouldAddressOperatorQuery()) and
-  //not funcAccess.isImmediatelyCalled() and
-  //not funcAccess.isExplicitlyAddressed()
-  funcAddr.isImplicitlyAddressed()
-select
-  funcAddr, "The address of function " + funcAddr.getFuncName() + " is taken without the & operator."
\ No newline at end of file
+  not isExcluded(funcAccess, FunctionTypesPackage::functionAddressesShouldAddressOperatorQuery()) and
+  isImplicitlyAddressed(funcAccess)
+select funcAccess,
+  "The address of function " + funcAccess.getTarget().getName() +
+    " is taken without the & operator."
diff --git a/c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql b/c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
deleted file mode 100644
index a40dadef6c..0000000000
--- a/c/misra/src/rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * @id c/misra/disallowed-function-type-qualifier
- * @name RULE-17-13: A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)
- * @description The behavior of type qualifiers on a function type is undefined.
- * @kind problem
- * @precision very-high
- * @problem.severity error
- * @tags external/misra/id/rule-17-13
- *       correctness
- *       external/misra/obligation/required
- */
-
-import cpp
-import codingstandards.c.misra
-
-//from DeclarationEntry decl, Type type //, Specifier specifier
-//where
-//  not isExcluded(decl, FunctionTypesPackage::disallowedFunctionTypeQualifierQuery()) and
-//  //decl.getType() instanceof FunctionPointerType and
-//  //decl.getType().(FunctionPointerType).hasSpecifier(specifier)
-//  (type = decl.getType().getUnderlyingType*()
-//  or type = decl.getType())
-//   and
-//  //specifier = type.getASpecifier()
-//  any()
-//select decl, type //, specifier // "The behavior of type qualifier " + specifier + " on a function type is undefined." 
-
-newtype TDeclaredFunction =
-  TFunctionDeclaration(Declaration declaration)
-
-abstract class DeclaredFunction extends TDeclaredFunction {
-  abstract string toString();
-}
-
-predicate isConstFunction(Type type) {
-  (type.getASpecifier().getName() = "const"
-  or type.isConst())
-  and isFunctionType(type)
-  or isConstFunction(type.getUnderlyingType())
-}
-
-predicate isFunctionType(Type type) {
-  type instanceof FunctionPointerType
-  or isFunctionType(type.getUnderlyingType())
-}
-
-predicate declaresConstFunction(DeclarationEntry entry) {
-  (entry.getDeclaration().getASpecifier().getName() = "const"
-  and isFunctionType(entry.getType()))
-  or isConstFunction(entry.getType())
-}
-
-class QualifiableRoutineType extends RoutineType, QualifiableType {
-  override string explainQualifiers() {
-    result = "func{"
-      + specifiersOf(this) + this.getReturnType().(QualifiableType).explainQualifiers()
-      + " ("
-      + paramString(0)
-      + ")}"
-  }
-
-  string paramString(int i) {
-    i = 0 and result = "" and not exists(this.getAParameterType())
-    or
-    (
-      if i < max(int j | exists(this.getParameterType(j)))
-      then
-        // Not the last one
-        result = this.getParameterType(i).(QualifiableType).explainQualifiers() + "," + this.paramString(i + 1)
-      else
-        // Last parameter
-        result = this.getParameterType(i).(QualifiableType).explainQualifiers()
-    )
-  }
-}
-
-class QualifiableIntType extends IntType, QualifiableType {
-  override string explainQualifiers() {
-    result = specifiersOf(this) + " " + this.toString()
-  }
-}
-
-class QualifiablePointerType extends PointerType, QualifiableType {
-  override string explainQualifiers() {
-    result = "{" 
-      + specifiersOf(this)
-      + " pointer to "
-      + this.getBaseType().(QualifiableType).explainQualifiers()
-      + "}"
-  }
-}
-
-class QualifiableType extends Type {
-  string explainQualifiers() {
-    result = "Unimplemented explainQualifiers for type(s): " + concat(string s | s = getAQlClass() | s, ",")
-  }
-}
-
-class QualifiableTypedefType extends TypedefType, QualifiableType {
-  override string explainQualifiers() {
-    result = "{ typedef "
-      + specifiersOf(this)
-      + " "
-      + this.getBaseType().(QualifiableType).explainQualifiers()
-      + "}"
-  }
-}
-
-class QualifiableSpecifiedType extends SpecifiedType, QualifiableType {
-  override string explainQualifiers() {
-    result = "{"
-      + specifiersOf(this)
-      + " "
-      + this.getBaseType().(QualifiableType).explainQualifiers()
-      + "}"
-  }
-}
-
-string typeString(Type t) {
-  //if 
-  //  t instanceof CTypedefType
-  //  then result = t.(CTypedefType).explain() + "specs:" + specifiersOf(t.(CTypedefType).getBaseType()) + "/" + typeString(t.(CTypedefType).getBaseType())
-  //  else
-  //result = concat(string s | s = t.getAQlClass() | s, ",")
-  result = t.(QualifiableType).explainQualifiers()
-}
-
-string specifiersOf(Type t) {
-  result = concat(Specifier s | s = t.getASpecifier()| s.getName(), ", ")
-}
-
-string declSpecifiersOf(Declaration d) {
-  result = concat(Specifier s | s = d.getASpecifier()| s.getName(), ", ")
-}
-
-string underlying(Type t) {
-  exists(Type u | u = t.getUnderlyingType() | result = u.toString())
-  or  result = "[no underlying]"
-
-}
-
-from DeclarationEntry entry
-select entry, entry.getType(), typeString(entry.getType()), declSpecifiersOf(entry.getDeclaration()), specifiersOf(entry.getType())
-
-//from Type t
-//where any()//isFunctionType(t)
-//select t, specifiersOf(t), underlying(t)
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
index 1cc92e95e1..d4862c5978 100644
--- a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
+++ b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
@@ -1,18 +1,15 @@
 | test.c:15:25:15:29 | func2 | The address of function func2 is taken without the & operator. |
 | test.c:16:27:16:31 | func3 | The address of function func3 is taken without the & operator. |
 | test.c:22:16:22:20 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:38:5:38:9 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:39:5:39:9 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:47:7:47:11 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:48:7:48:11 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:57:15:57:19 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:58:23:58:27 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:59:15:59:19 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:59:22:59:26 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:67:13:67:17 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:68:14:68:18 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:39:5:39:9 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:40:5:40:9 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:48:7:48:11 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:49:7:49:11 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:58:15:58:19 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:59:23:59:27 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:60:15:60:19 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:60:22:60:26 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:68:13:68:17 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:69:14:69:18 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:71:20:71:24 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:70:14:70:18 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:72:20:72:24 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:76:20:76:24 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:77:20:77:24 | func1 | The address of function func1 is taken without the & operator. |
diff --git a/c/misra/test/rules/RULE-17-12/test.c b/c/misra/test/rules/RULE-17-12/test.c
index 1c580f917e..4cfe1f6de6 100644
--- a/c/misra/test/rules/RULE-17-12/test.c
+++ b/c/misra/test/rules/RULE-17-12/test.c
@@ -30,6 +30,7 @@ func_ptr_t1 returns_func(int x) {
 #define MACRO_IDENTITY(f) (f)
 #define MACRO_INVOKE_RISKY(f) (f())
 #define MACRO_INVOKE_IMPROVED(f) ((f)())
+#define MACRO_INVOKE_AND_USE_AS_TOKEN(f) f(0, #f)
 
 void test() {
     func1();     // COMPLIANT
@@ -69,14 +70,16 @@ void test() {
     ((void*) func1);     // NON-COMPLIANT 
 
     MACRO_IDENTITY(func1); // NON-COMPLIANT
-    MACRO_IDENTITY(func1)(); // NON-COMPLIANT
+    MACRO_IDENTITY(func1)(); // NON-COMPLIANT[FALSE NEGATIVE]
     MACRO_IDENTITY(&func1); // COMPLIANT
     MACRO_IDENTITY(&func1)(); // COMPLIANT
 
-    MACRO_INVOKE_RISKY(func3); // NON-COMPLIANT
-    MACRO_INVOKE_IMPROVED(func3); // NON-COMPLIANT
+    MACRO_INVOKE_RISKY(func3); // NON-COMPLIANT[FALSE NEGATIVE]
+    MACRO_INVOKE_IMPROVED(func3); // NON-COMPLIANT[FALSE NEGATIVE]
     MACRO_INVOKE_IMPROVED(&func3); // COMPLIANT
 
+    MACRO_INVOKE_AND_USE_AS_TOKEN(func1); // COMPLIANT
+
     // Function pointers are exempt from this rule.
     func_ptr1(); // COMPLIANT
     func_ptr2(1, "hello"); // COMPLIANT
diff --git a/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected b/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected
deleted file mode 100644
index 2ec1a0ac6c..0000000000
--- a/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.expected
+++ /dev/null
@@ -1 +0,0 @@
-No expected results have yet been specified
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref b/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref
deleted file mode 100644
index cbf7c583ec..0000000000
--- a/c/misra/test/rules/RULE-17-13/DisallowedFunctionTypeQualifier.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-17-13/DisallowedFunctionTypeQualifier.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-17-13/test.c b/c/misra/test/rules/RULE-17-13/test.c
deleted file mode 100644
index 8326b30a28..0000000000
--- a/c/misra/test/rules/RULE-17-13/test.c
+++ /dev/null
@@ -1,56 +0,0 @@
-// semmle-extractor-options: --language=c -std=c99
-const int x; // COMPLIANT
-const int f_ret_const_int(void); // COMPLIANT
-const int* f_ret_const_int_ptr(void); // COMPLIANT
-
-// Basic function typedefs
-typedef int ftype_ret_int(void);
-typedef const int ftype_ret_const_int(void); // COMPLIANT
-typedef const int* ftype_ret_const_int_ptr(void); // COMPLIANT
-typedef int const* ftype_ret_int_const_ptr(void); // COMPLIANT
-
-// Typedefs that use function typedefs
-typedef ftype_ret_int ftype_ret_int2; // COMPLIANT
-typedef const ftype_ret_int *ptr_const_ftype_ret_int; // NON-COMPLIANT
-typedef ftype_ret_int *const const_ptr_ftype_ret_int; // COMPLIANT
-typedef ftype_ret_int const* const_ptr_ftype_ret_int_; // NON-COMPLIANT
-
-// Test all qualifiers
-typedef const ftype_ret_int const_ftype_ret_int; // NON-COMPLIANT
-typedef volatile ftype_ret_int volatile_ftype_ret_int; // NON-COMPLIANT
-typedef _Atomic ftype_ret_int atomic_ftype_ret_int; // NON-COMPLIANT
-//extern restrict ftype_ret_int restrict_ftype_ret_int; // NON-COMPLIANT
-
-// Test parameters of declaration specifiers
-typedef void (*take_ftype_ret_int)(ftype_ret_int); // COMPLIANT
-typedef void (*take_const_ftype_ret_int)(const ftype_ret_int); // NON-COMPLIANT
-typedef void (*take_ptr_ftype_ret_int)(ftype_ret_int*); // COMPLIANT
-typedef void (*take_ptr_const_ftype_ret_int)(const ftype_ret_int *); // NON-COMPLIANT
-typedef void (*take_const_ptr_ftype_ret_int)(ftype_ret_int const *); // COMPLIANT
-
-// Test return types of declaration specifiers
-typedef ftype_ret_int* (return_ftype_ret_int)(void); // COMPLIANT
-typedef const ftype_ret_int* (return_ftype_ret_int)(void); // NON-COMPLIANT
-typedef ftype_ret_int const* (return_ftype_ret_int)(void); // COMPLIANT
-
-// Other storage class specifiers
-extern const ftype_ret_int extern_ftype; // NON-COMPLIANT
-extern const ftype_ret_int *extern_const_ftype_type; // NON-COMPLIANT
-extern ftype_ret_int const * extern_ftype_const_ptr; // COMPLIANT
-
-// Other declarations
-void param_list(
-    const ftype_ret_int *param_ftype, // NON-COMPLIANT
-    const ftype_ret_int *param_const_ftype_type, // NON-COMPLIANT
-    ftype_ret_int const *param_ftype_const_ptr // COMPLIANT
-) {
-    const ftype_ret_int *var_ftype; // NON-COMPLIANT
-    const ftype_ret_int *var_const_ftype_type; // NON-COMPLIANT
-    ftype_ret_int const *var_ftype_const_ptr; // COMPLIANT
-
-    struct TestStruct {
-        const ftype_ret_int *struct_ftype; // NON-COMPLIANT
-        const ftype_ret_int *struct_const_ftype_type; // NON-COMPLIANT
-        ftype_ret_int const *struct_ftype_const_ptr; // COMPLIANT
-    };
-}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll
index 176b9871d3..3d6faadb42 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/FunctionTypes.qll
@@ -3,9 +3,7 @@ import cpp
 import RuleMetadata
 import codingstandards.cpp.exclusions.RuleMetadata
 
-newtype FunctionTypesQuery =
-  TFunctionAddressesShouldAddressOperatorQuery() or
-  TDisallowedFunctionTypeQualifierQuery()
+newtype FunctionTypesQuery = TFunctionAddressesShouldAddressOperatorQuery()
 
 predicate isFunctionTypesQueryMetadata(Query query, string queryId, string ruleId, string category) {
   query =
@@ -16,15 +14,6 @@ predicate isFunctionTypesQueryMetadata(Query query, string queryId, string ruleI
     "c/misra/function-addresses-should-address-operator" and
   ruleId = "RULE-17-12" and
   category = "advisory"
-  or
-  query =
-    // `Query` instance for the `disallowedFunctionTypeQualifier` query
-    FunctionTypesPackage::disallowedFunctionTypeQualifierQuery() and
-  queryId =
-    // `@id` for the `disallowedFunctionTypeQualifier` query
-    "c/misra/disallowed-function-type-qualifier" and
-  ruleId = "RULE-17-13" and
-  category = "required"
 }
 
 module FunctionTypesPackage {
@@ -34,11 +23,4 @@ module FunctionTypesPackage {
       // `Query` type for `functionAddressesShouldAddressOperator` query
       TQueryC(TFunctionTypesPackageQuery(TFunctionAddressesShouldAddressOperatorQuery()))
   }
-
-  Query disallowedFunctionTypeQualifierQuery() {
-    //autogenerate `Query` type
-    result =
-      // `Query` type for `disallowedFunctionTypeQualifier` query
-      TQueryC(TFunctionTypesPackageQuery(TDisallowedFunctionTypeQualifierQuery()))
-  }
 }
diff --git a/rule_packages/c/FunctionTypes.json b/rule_packages/c/FunctionTypes.json
index bfa96d09eb..aae4ba8a0f 100644
--- a/rule_packages/c/FunctionTypes.json
+++ b/rule_packages/c/FunctionTypes.json
@@ -23,19 +23,7 @@
       "properties": {
         "obligation": "required"
       },
-      "queries": [
-        {
-          "description": "The behavior of type qualifiers on a function type is undefined.",
-          "kind": "problem",
-          "name": "A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)",
-          "precision": "very-high",
-          "severity": "error",
-          "short_name": "DisallowedFunctionTypeQualifier",
-          "tags": [
-            "correctness"
-          ]
-        }
-      ],
+      "queries": [],
       "title": "A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)"
     }
   }

From d49984d0216a62f25e983e70198e6f7b11a50f0e Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 27 Sep 2024 16:13:42 -0700
Subject: [PATCH 234/435] Format test, commit user README changes.

---
 ...ionAddressesShouldAddressOperator.expected |  30 +--
 c/misra/test/rules/RULE-17-12/test.c          | 172 +++++++++---------
 docs/user_manual.md                           |   2 +-
 3 files changed, 101 insertions(+), 103 deletions(-)

diff --git a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
index d4862c5978..1a3165a32f 100644
--- a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
+++ b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
@@ -1,15 +1,15 @@
-| test.c:15:25:15:29 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:16:27:16:31 | func3 | The address of function func3 is taken without the & operator. |
-| test.c:22:16:22:20 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:39:5:39:9 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:40:5:40:9 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:48:7:48:11 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:49:7:49:11 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:58:15:58:19 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:59:23:59:27 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:60:15:60:19 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:60:22:60:26 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:68:13:68:17 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:69:14:69:18 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:70:14:70:18 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:72:20:72:24 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:14:25:14:29 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:15:27:15:31 | func3 | The address of function func3 is taken without the & operator. |
+| test.c:21:12:21:16 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:38:3:38:7 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:39:3:39:7 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:47:5:47:9 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:48:5:48:9 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:57:13:57:17 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:58:21:58:25 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:59:13:59:17 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:59:20:59:24 | func2 | The address of function func2 is taken without the & operator. |
+| test.c:67:11:67:15 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:68:12:68:16 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:69:12:69:16 | func1 | The address of function func1 is taken without the & operator. |
+| test.c:71:18:71:22 | func1 | The address of function func1 is taken without the & operator. |
diff --git a/c/misra/test/rules/RULE-17-12/test.c b/c/misra/test/rules/RULE-17-12/test.c
index 4cfe1f6de6..04aaa96af6 100644
--- a/c/misra/test/rules/RULE-17-12/test.c
+++ b/c/misra/test/rules/RULE-17-12/test.c
@@ -1,30 +1,29 @@
 void func1() {}
-void func2(int x, char* y) {}
+void func2(int x, char *y) {}
 
-typedef struct {} s;
+typedef struct {
+} s;
 
-int func3() {
-    return 0;
-}
+int func3() { return 0; }
 
 typedef void (*func_ptr_t1)();
-typedef void (*func_ptr_t2)(int x, char* y);
+typedef void (*func_ptr_t2)(int x, char *y);
 typedef s (*func_ptr_t3)();
 
-func_ptr_t1 func_ptr1 = &func1; // COMPLIANT
-func_ptr_t2 func_ptr2 = func2; // NON-COMPLIANT
+func_ptr_t1 func_ptr1 = &func1;   // COMPLIANT
+func_ptr_t2 func_ptr2 = func2;    // NON-COMPLIANT
 func_ptr_t3 func_ptr3 = &(func3); // NON-COMPLIANT
 
 void take_func(func_ptr_t1 f1, func_ptr_t2 f2);
 
 func_ptr_t1 returns_func(int x) {
-    if (x == 0) {
-        return func1; // NON-COMPLIANT
-    } else if (x == 1) {
-        return &func1; // COMPLIANT
-    }
+  if (x == 0) {
+    return func1; // NON-COMPLIANT
+  } else if (x == 1) {
+    return &func1; // COMPLIANT
+  }
 
-    return returns_func(0); // COMPLIANT
+  return returns_func(0); // COMPLIANT
 }
 
 #define MACRO_IDENTITY(f) (f)
@@ -33,77 +32,76 @@ func_ptr_t1 returns_func(int x) {
 #define MACRO_INVOKE_AND_USE_AS_TOKEN(f) f(0, #f)
 
 void test() {
-    func1();     // COMPLIANT
-    func2(1, "hello"); // COMPLIANT
-
-    func1;     // NON-COMPLIANT 
-    func2;     // NON-COMPLIANT 
-
-    &func1;     // COMPLIANT 
-    &func2;     // COMPLIANT 
-
-    (func1)();     // COMPLIANT
-    (func2)(1, "hello"); // COMPLIANT
-
-    &(func1); // NON-COMPLIANT
-    &(func2); // NON-COMPLIANT
-
-    (&func1)();     // COMPLIANT
-    (&func2)(1, "hello"); // COMPLIANT
-
-    (func1());     // COMPLIANT
-    (func2(1, "hello")); // COMPLIANT
-
-    take_func(&func1, &func2); // COMPLIANT
-    take_func(func1, &func2); // NON-COMPLIANT
-    take_func(&func1, func2); // NON-COMPLIANT
-    take_func(func1, func2); // NON-COMPLIANT
-
-    returns_func(0); // COMPLIANT
-    returns_func(0)(); // COMPLIANT
-    (returns_func(0))(); // COMPLIANT
-
-    (void*) &func1;     // COMPLIANT 
-    (void*) (&func1);     // COMPLIANT 
-    (void*) func1;     // NON-COMPLIANT 
-    (void*) (func1);     // NON-COMPLIANT 
-    ((void*) func1);     // NON-COMPLIANT 
-
-    MACRO_IDENTITY(func1); // NON-COMPLIANT
-    MACRO_IDENTITY(func1)(); // NON-COMPLIANT[FALSE NEGATIVE]
-    MACRO_IDENTITY(&func1); // COMPLIANT
-    MACRO_IDENTITY(&func1)(); // COMPLIANT
-
-    MACRO_INVOKE_RISKY(func3); // NON-COMPLIANT[FALSE NEGATIVE]
-    MACRO_INVOKE_IMPROVED(func3); // NON-COMPLIANT[FALSE NEGATIVE]
-    MACRO_INVOKE_IMPROVED(&func3); // COMPLIANT
-
-    MACRO_INVOKE_AND_USE_AS_TOKEN(func1); // COMPLIANT
-
-    // Function pointers are exempt from this rule.
-    func_ptr1(); // COMPLIANT
-    func_ptr2(1, "hello"); // COMPLIANT
-    func_ptr1; // COMPLIANT
-    func_ptr2; // COMPLIANT
-    &func_ptr1; // COMPLIANT
-    &func_ptr2; // COMPLIANT
-    (func_ptr1)(); // COMPLIANT
-    (func_ptr2)(1, "hello"); // COMPLIANT
-    (*func_ptr1)(); // COMPLIANT
-    (*func_ptr2)(1, "hello"); // COMPLIANT
-    take_func(func_ptr1, func_ptr2); // COMPLIANT
-    (void*) func_ptr1; // COMPLIANT
-    (void*) &func_ptr1;     // COMPLIANT 
-    (void*) (&func_ptr1);     // COMPLIANT 
-    (void*) func_ptr1;     // COMPLIANT 
-    (void*) (func_ptr1);     // COMPLIANT 
-    ((void*) func_ptr1);     // COMPLIANT 
-    MACRO_IDENTITY(func_ptr1); // COMPLIANT
-    MACRO_IDENTITY(func_ptr1)(); // COMPLIANT
-    MACRO_IDENTITY(&func_ptr1); // COMPLIANT
-    (*MACRO_IDENTITY(&func_ptr1))(); // COMPLIANT
-    MACRO_INVOKE_RISKY(func_ptr3); // COMPLIANT
-    MACRO_INVOKE_IMPROVED(func_ptr3); // COMPLIANT
-    MACRO_INVOKE_IMPROVED(*&func_ptr3); // COMPLIANT
-
+  func1();           // COMPLIANT
+  func2(1, "hello"); // COMPLIANT
+
+  func1; // NON-COMPLIANT
+  func2; // NON-COMPLIANT
+
+  &func1; // COMPLIANT
+  &func2; // COMPLIANT
+
+  (func1)();           // COMPLIANT
+  (func2)(1, "hello"); // COMPLIANT
+
+  &(func1); // NON-COMPLIANT
+  &(func2); // NON-COMPLIANT
+
+  (&func1)();           // COMPLIANT
+  (&func2)(1, "hello"); // COMPLIANT
+
+  (func1());           // COMPLIANT
+  (func2(1, "hello")); // COMPLIANT
+
+  take_func(&func1, &func2); // COMPLIANT
+  take_func(func1, &func2);  // NON-COMPLIANT
+  take_func(&func1, func2);  // NON-COMPLIANT
+  take_func(func1, func2);   // NON-COMPLIANT
+
+  returns_func(0);     // COMPLIANT
+  returns_func(0)();   // COMPLIANT
+  (returns_func(0))(); // COMPLIANT
+
+  (void *)&func1;   // COMPLIANT
+  (void *)(&func1); // COMPLIANT
+  (void *)func1;    // NON-COMPLIANT
+  (void *)(func1);  // NON-COMPLIANT
+  ((void *)func1);  // NON-COMPLIANT
+
+  MACRO_IDENTITY(func1);     // NON-COMPLIANT
+  MACRO_IDENTITY(func1)();   // NON-COMPLIANT[FALSE NEGATIVE]
+  MACRO_IDENTITY(&func1);    // COMPLIANT
+  MACRO_IDENTITY (&func1)(); // COMPLIANT
+
+  MACRO_INVOKE_RISKY(func3);     // NON-COMPLIANT[FALSE NEGATIVE]
+  MACRO_INVOKE_IMPROVED(func3);  // NON-COMPLIANT[FALSE NEGATIVE]
+  MACRO_INVOKE_IMPROVED(&func3); // COMPLIANT
+
+  MACRO_INVOKE_AND_USE_AS_TOKEN(func1); // COMPLIANT
+
+  // Function pointers are exempt from this rule.
+  func_ptr1();                        // COMPLIANT
+  func_ptr2(1, "hello");              // COMPLIANT
+  func_ptr1;                          // COMPLIANT
+  func_ptr2;                          // COMPLIANT
+  &func_ptr1;                         // COMPLIANT
+  &func_ptr2;                         // COMPLIANT
+  (func_ptr1)();                      // COMPLIANT
+  (func_ptr2)(1, "hello");            // COMPLIANT
+  (*func_ptr1)();                     // COMPLIANT
+  (*func_ptr2)(1, "hello");           // COMPLIANT
+  take_func(func_ptr1, func_ptr2);    // COMPLIANT
+  (void *)func_ptr1;                  // COMPLIANT
+  (void *)&func_ptr1;                 // COMPLIANT
+  (void *)(&func_ptr1);               // COMPLIANT
+  (void *)func_ptr1;                  // COMPLIANT
+  (void *)(func_ptr1);                // COMPLIANT
+  ((void *)func_ptr1);                // COMPLIANT
+  MACRO_IDENTITY(func_ptr1);          // COMPLIANT
+  MACRO_IDENTITY(func_ptr1)();        // COMPLIANT
+  MACRO_IDENTITY(&func_ptr1);         // COMPLIANT
+  (*MACRO_IDENTITY(&func_ptr1))();    // COMPLIANT
+  MACRO_INVOKE_RISKY(func_ptr3);      // COMPLIANT
+  MACRO_INVOKE_IMPROVED(func_ptr3);   // COMPLIANT
+  MACRO_INVOKE_IMPROVED(*&func_ptr3); // COMPLIANT
 }
\ No newline at end of file
diff --git a/docs/user_manual.md b/docs/user_manual.md
index 5799d73e6f..db0f836339 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -78,7 +78,7 @@ The datasheet _"CodeQL Coding Standards: supported rules"_, provided with each r
 
 [^1]: AUTOSAR C++ versions R22-11, R21-11, R20-11, R19-11 and R19-03 are all identical as indicated in the document change history.
 [^2]: The unimplemented supportable AUTOSAR rules are `A7-1-8` and `A8-2-1`. These rules require additional support in the CodeQL CLI to ensure the required information is available in the CodeQL database to identify violations of these rules.
-[^3]: The unimplemented supportable MISRA C 2012 rules are `Rule 9.5` and `Dir 4.14`. `Rule 9.5` requires additional support in the CodeQL CLI to ensure the required information is available in the CodeQL database to identify violations of these rules. `Dir 4.14` is covered by the default CodeQL queries, which identify potential security vulnerabilities caused by not validating external input.
+[^3]: The unimplemented supportable MISRA C 2012 rules are `Rule 9.5`, `Rule 17.13`, and `Dir 4.14`. `Rule 9.5` and `Rule 17.13` require additional support in the CodeQL CLI to ensure the required information is available in the CodeQL database to identify violations of these rules. `Dir 4.14` is covered by the default CodeQL queries, which identify potential security vulnerabilities caused by not validating external input.
 [^4]: The rules 5.13.7, 19.0.1 and 19.1.2 are not planned to be implemented by CodeQL as they are compiler checked in all supported compilers.
 
 ## Supported environment

From a8d832b0606b46a5dd05bc22558b95ebbc7c0df7 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Sat, 28 Sep 2024 11:24:01 -0700
Subject: [PATCH 235/435] Add defense against cpp code based on MRVA results.
 Add comments.

---
 .../FunctionAddressesShouldAddressOperator.ql      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
index 96c466150b..824e873e28 100644
--- a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
+++ b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
@@ -15,8 +15,18 @@ import cpp
 import codingstandards.c.misra
 
 predicate isImplicitlyAddressed(FunctionAccess access) {
-  not access.getParent() instanceof AddressOfExpr or
-  exists(ParenthesisExpr parens | parens.getExpr() = access)
+  (
+    not access.getParent() instanceof AddressOfExpr
+    or
+    // This catches "&(foo)", which could be considered to be somewhat less
+    // readable than "(&foo)".
+    exists(ParenthesisExpr parens | parens.getExpr() = access)
+  ) and
+  // Note: the following *seems* to only exist in c++ codebases, for instance,
+  // when calling a member. In c, this syntax should always extract as a
+  // [FunctionCall] rather than a [ExprCall] of a [FunctionAccess]. Still, this
+  // is a good pattern to be defensive against.
+  not exists(ExprCall call | call.getExpr() = access)
 }
 
 from FunctionAccess funcAccess

From 1007a5324883e41523ff7e4bd6e20024c4f151a4 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 09:38:41 -0700
Subject: [PATCH 236/435] Allow `&(f)` under rule 17-12

---
 .../FunctionAddressesShouldAddressOperator.ql          |  8 +-------
 .../FunctionAddressesShouldAddressOperator.expected    |  4 +---
 c/misra/test/rules/RULE-17-12/test.c                   | 10 +++++-----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
index 824e873e28..30d86b0447 100644
--- a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
+++ b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
@@ -15,13 +15,7 @@ import cpp
 import codingstandards.c.misra
 
 predicate isImplicitlyAddressed(FunctionAccess access) {
-  (
-    not access.getParent() instanceof AddressOfExpr
-    or
-    // This catches "&(foo)", which could be considered to be somewhat less
-    // readable than "(&foo)".
-    exists(ParenthesisExpr parens | parens.getExpr() = access)
-  ) and
+  not access.getParent() instanceof AddressOfExpr and
   // Note: the following *seems* to only exist in c++ codebases, for instance,
   // when calling a member. In c, this syntax should always extract as a
   // [FunctionCall] rather than a [ExprCall] of a [FunctionAccess]. Still, this
diff --git a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
index 1a3165a32f..5a37cbd97e 100644
--- a/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
+++ b/c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected
@@ -1,10 +1,8 @@
 | test.c:14:25:14:29 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:15:27:15:31 | func3 | The address of function func3 is taken without the & operator. |
+| test.c:15:25:15:29 | func3 | The address of function func3 is taken without the & operator. |
 | test.c:21:12:21:16 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:38:3:38:7 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:39:3:39:7 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:47:5:47:9 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:48:5:48:9 | func2 | The address of function func2 is taken without the & operator. |
 | test.c:57:13:57:17 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:58:21:58:25 | func2 | The address of function func2 is taken without the & operator. |
 | test.c:59:13:59:17 | func1 | The address of function func1 is taken without the & operator. |
diff --git a/c/misra/test/rules/RULE-17-12/test.c b/c/misra/test/rules/RULE-17-12/test.c
index 04aaa96af6..5ab5a4984d 100644
--- a/c/misra/test/rules/RULE-17-12/test.c
+++ b/c/misra/test/rules/RULE-17-12/test.c
@@ -10,9 +10,9 @@ typedef void (*func_ptr_t1)();
 typedef void (*func_ptr_t2)(int x, char *y);
 typedef s (*func_ptr_t3)();
 
-func_ptr_t1 func_ptr1 = &func1;   // COMPLIANT
-func_ptr_t2 func_ptr2 = func2;    // NON-COMPLIANT
-func_ptr_t3 func_ptr3 = &(func3); // NON-COMPLIANT
+func_ptr_t1 func_ptr1 = &func1;    // COMPLIANT
+func_ptr_t2 func_ptr2 = func2;     // NON-COMPLIANT
+func_ptr_t3 func_ptr3 = func3 + 0; // NON-COMPLIANT
 
 void take_func(func_ptr_t1 f1, func_ptr_t2 f2);
 
@@ -44,8 +44,8 @@ void test() {
   (func1)();           // COMPLIANT
   (func2)(1, "hello"); // COMPLIANT
 
-  &(func1); // NON-COMPLIANT
-  &(func2); // NON-COMPLIANT
+  &(func1); // COMPLIANT
+  &(func2); // COMPLIANT
 
   (&func1)();           // COMPLIANT
   (&func2)(1, "hello"); // COMPLIANT

From c972403d1a2f39874d66a355cc69cdbb6d5cd523 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 11:35:49 -0700
Subject: [PATCH 237/435] Tag as amendment3, mark 17-13 not supportable

---
 .../FunctionAddressesShouldAddressOperator.ql          |  1 +
 rule_packages/c/FunctionTypes.json                     | 10 ++--------
 rules.csv                                              |  2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
index 30d86b0447..c95612b7ba 100644
--- a/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
+++ b/c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-17-12
  *       readability
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/advisory
  */
 
diff --git a/rule_packages/c/FunctionTypes.json b/rule_packages/c/FunctionTypes.json
index aae4ba8a0f..d9d8b6496d 100644
--- a/rule_packages/c/FunctionTypes.json
+++ b/rule_packages/c/FunctionTypes.json
@@ -13,18 +13,12 @@
           "severity": "error",
           "short_name": "FunctionAddressesShouldAddressOperator",
           "tags": [
-            "readability"
+            "readability",
+            "external/misra/c/2012/amendment3"
           ]
         }
       ],
       "title": "A function identifier should only be called with a parenthesized parameter list or used with a & (address-of)"
-    },
-    "RULE-17-13": {
-      "properties": {
-        "obligation": "required"
-      },
-      "queries": [],
-      "title": "A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)"
     }
   }
 }
\ No newline at end of file
diff --git a/rules.csv b/rules.csv
index b5e15ba6f6..475ea1d66c 100644
--- a/rules.csv
+++ b/rules.csv
@@ -739,7 +739,7 @@ c,MISRA-C-2012,RULE-17-9,Yes,Mandatory,,,Verify that a function declared with _N
 c,MISRA-C-2012,RULE-17-10,Yes,Required,,,A function declared with _noreturn shall have a return type of void,,NoReturn,Easy,
 c,MISRA-C-2012,RULE-17-11,Yes,Advisory,,,A function without a branch that returns shall be declared with _Noreturn,,NoReturn,Easy,
 c,MISRA-C-2012,RULE-17-12,Yes,Advisory,,,A function identifier should only be called with a parenthesized parameter list or used with a & (address-of),,FunctionTypes,Easy,
-c,MISRA-C-2012,RULE-17-13,Yes,Required,,,"A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)",,FunctionTypes,Easy,
+c,MISRA-C-2012,RULE-17-13,No,Required,,,"A function type shall not include any type qualifiers (const, volatile, restrict, or _Atomic)",,,Easy,
 c,MISRA-C-2012,RULE-18-1,Yes,Required,,,A pointer resulting from arithmetic on a pointer operand shall address an element of the same array as that pointer operand,M5-0-16,Pointers1,Import,
 c,MISRA-C-2012,RULE-18-2,Yes,Required,,,Subtraction between pointers shall only be applied to pointers that address elements of the same array,M5-0-17,Pointers1,Import,
 c,MISRA-C-2012,RULE-18-3,Yes,Required,,,"The relational operators >, >=, < and <= shall not be applied to objects of pointer type except where they point into the same object",M5-0-18,Pointers1,Import,

From 6de14caa4d36f6fd9d19a97987c8e1ef55004fc1 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 3 Oct 2024 15:38:08 -0700
Subject: [PATCH 238/435] Implement Language4 package, banning obsolete
 language features.

Many of the cases outlined in the amendment are covered by other rules. Add
support for new cases where possible (was not possible for ID 3, storage class
specifiers not at beginning of declaration, or ID 2, which is a feature of the
implementation not determinable by static analysis), and reference existing
rules in one comprehensive test for maximal clarity that those parts of rule
1-5 are indeed supported by our existing queries.
---
 .../RULE-1-5/CallToReallocWithSizeZero.ql     | 24 +++++++
 .../InvalidDefineOrUndefOfStdBoolMacro.ql     | 31 +++++++++
 .../UseOfObsoleteMacroAtomicVarInit.ql        | 24 +++++++
 .../CallToReallocWithSizeZero.expected        |  1 +
 .../RULE-1-5/CallToReallocWithSizeZero.qlref  |  1 +
 .../FunctionTypesNotInPrototypeForm.expected  |  2 +
 .../FunctionTypesNotInPrototypeForm.qlref     |  1 +
 ...nvalidDefineOrUndefOfStdBoolMacro.expected |  6 ++
 .../InvalidDefineOrUndefOfStdBoolMacro.qlref  |  1 +
 ...llocDeallocFunctionsOfStdlibhUsed.expected |  3 +
 ...ryAllocDeallocFunctionsOfStdlibhUsed.qlref |  1 +
 ...aticSpecifierObjectRedeclarationC.expected |  1 +
 ...gStaticSpecifierObjectRedeclarationC.qlref |  1 +
 ...rdLibraryInputoutputFunctionsUsed.expected |  3 +
 ...ndardLibraryInputoutputFunctionsUsed.qlref |  1 +
 .../UseOfObsoleteMacroAtomicVarInit.expected  |  1 +
 .../UseOfObsoleteMacroAtomicVarInit.qlref     |  1 +
 c/misra/test/rules/RULE-1-5/options           |  1 +
 c/misra/test/rules/RULE-1-5/test.c            | 63 +++++++++++++++++++
 .../cpp/exclusions/c/Language4.qll            | 61 ++++++++++++++++++
 .../cpp/exclusions/c/RuleMetadata.qll         |  3 +
 rule_packages/c/Language4.json                | 47 ++++++++++++++
 22 files changed, 278 insertions(+)
 create mode 100644 c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
 create mode 100644 c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
 create mode 100644 c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
 create mode 100644 c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/options
 create mode 100644 c/misra/test/rules/RULE-1-5/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
 create mode 100644 rule_packages/c/Language4.json

diff --git a/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql b/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
new file mode 100644
index 0000000000..224ca2a6bf
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
@@ -0,0 +1,24 @@
+/**
+ * @id c/misra/call-to-realloc-with-size-zero
+ * @name RULE-1-5: Disallowed size argument value equal to zero in call to realloc
+ * @description Invoking realloc with a size argument set to zero is implementation-defined behavior
+ *              and declared as an obsolete feature in C18.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-1-5
+ *       correctness
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import semmle.code.cpp.rangeanalysis.new.RangeAnalysis
+
+from FunctionCall call, Expr arg
+where
+  not isExcluded(call, Language4Package::callToReallocWithSizeZeroQuery()) and
+  call.getTarget().hasGlobalOrStdName("realloc") and
+  arg = call.getArgument(1) and
+  upperBound(arg) = 0
+select arg, "Calling realloc with size zero results in implementation-defined behavior."
diff --git a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
new file mode 100644
index 0000000000..3d33103988
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
@@ -0,0 +1,31 @@
+/**
+ * @id c/misra/invalid-define-or-undef-of-std-bool-macro
+ * @name RULE-1-5: Programs may not undefine or redefine the macros bool, true, or false
+ * @description Directives that undefine and/or redefine the standard boolean macros has been
+ *              declared an obsolescent language feature since C99.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-1-5
+ *       maintainability
+ *       readability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+string getABoolMacroName() { result = ["true", "false", "bool"] }
+
+from PreprocessorDirective directive, string opString, string macroName
+where
+  not isExcluded(directive, Language4Package::invalidDefineOrUndefOfStdBoolMacroQuery()) and
+  macroName = getABoolMacroName() and
+  (
+    macroName = directive.(Macro).getName() and
+    opString = "define"
+    or
+    macroName = directive.(PreprocessorUndef).getName() and
+    opString = "undefine"
+  )
+select directive, "Invalid " + opString + " of boolean standard macro " + macroName
diff --git a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
new file mode 100644
index 0000000000..38dd7c0386
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
@@ -0,0 +1,24 @@
+/**
+ * @id c/misra/use-of-obsolete-macro-atomic-var-init
+ * @name RULE-1-5: Disallowed usage of obsolete macro ATOMIC_VAR_INIT compiled as C18
+ * @description The macro ATOMIC_VAR_INIT is has been declared an obsolescent language feature since
+ *              C18.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity recommendation
+ * @tags external/misra/id/rule-1-5
+ *       maintainability
+ *       readability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from MacroInvocation invoke, Compilation c, string flag
+where
+  not isExcluded(invoke, Language4Package::useOfObsoleteMacroAtomicVarInitQuery()) and
+  invoke.getMacroName() = "ATOMIC_VAR_INIT" and
+  flag = c.getAnArgument() and
+  flag.regexpMatch("-std=c1[78]")
+select invoke, "Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version " + flag
diff --git a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
new file mode 100644
index 0000000000..0e58d0cd0d
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
@@ -0,0 +1 @@
+| test.c:13:14:13:14 | 0 | Calling realloc with size zero results in implementation-defined behavior. |
diff --git a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref
new file mode 100644
index 0000000000..218be6b3ef
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref
@@ -0,0 +1 @@
+rules/RULE-1-5/CallToReallocWithSizeZero.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
new file mode 100644
index 0000000000..9f9157ca8e
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
@@ -0,0 +1,2 @@
+| test.c:40:6:40:7 | f2 | Function f2 does not specify void for no parameters present. |
+| test.c:44:5:44:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref
new file mode 100644
index 0000000000..0a6121b324
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref
@@ -0,0 +1 @@
+rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
new file mode 100644
index 0000000000..a29c5efe56
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
@@ -0,0 +1,6 @@
+| test.c:23:1:23:14 | #define true 3 | Invalid define of boolean standard macro true |
+| test.c:24:1:24:15 | #define false 3 | Invalid define of boolean standard macro false |
+| test.c:25:1:25:18 | #define bool int * | Invalid define of boolean standard macro bool |
+| test.c:26:1:26:11 | #undef true | Invalid undefine of boolean standard macro true |
+| test.c:27:1:27:12 | #undef false | Invalid undefine of boolean standard macro false |
+| test.c:28:1:28:11 | #undef bool | Invalid undefine of boolean standard macro bool |
diff --git a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.qlref b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.qlref
new file mode 100644
index 0000000000..5b112609cc
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.qlref
@@ -0,0 +1 @@
+rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
new file mode 100644
index 0000000000..3f8fa3cf3f
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
@@ -0,0 +1,3 @@
+| test.c:10:12:10:17 | call to malloc | Use of banned dynamic memory allocation. |
+| test.c:13:3:13:9 | call to realloc | Use of banned dynamic memory allocation. |
+| test.c:16:3:16:9 | call to realloc | Use of banned dynamic memory allocation. |
diff --git a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref
new file mode 100644
index 0000000000..8f64b81ced
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref
@@ -0,0 +1 @@
+rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
new file mode 100644
index 0000000000..4c3d4614fa
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
@@ -0,0 +1 @@
+| test.c:37:12:37:13 | declaration of g5 | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:36:12:36:13 | definition of g5 | g5 |
diff --git a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref
new file mode 100644
index 0000000000..70b6073e14
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref
@@ -0,0 +1 @@
+rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
new file mode 100644
index 0000000000..ca49894238
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
@@ -0,0 +1,3 @@
+| test.c:57:3:57:8 | call to ungetc | Call to banned function ungetc. |
+| test.c:60:3:60:7 | call to fread | Call to banned function fread. |
+| test.c:62:3:62:8 | call to ungetc | Call to banned function ungetc. |
diff --git a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref
new file mode 100644
index 0000000000..0a8cd754ef
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref
@@ -0,0 +1 @@
+rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
new file mode 100644
index 0000000000..6fe4cee5f4
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
@@ -0,0 +1 @@
+| test.c:30:18:30:36 | ATOMIC_VAR_INIT(value) | Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version -std=c17 |
diff --git a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.qlref b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.qlref
new file mode 100644
index 0000000000..9a54fdc83a
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.qlref
@@ -0,0 +1 @@
+rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/options b/c/misra/test/rules/RULE-1-5/options
new file mode 100644
index 0000000000..2ba2218a05
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/options
@@ -0,0 +1 @@
+semmle-extractor-options:-std=c17 -I../../../../common/test/includes/standard-library
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/test.c b/c/misra/test/rules/RULE-1-5/test.c
new file mode 100644
index 0000000000..43faa71f3c
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/test.c
@@ -0,0 +1,63 @@
+// Compiled with -std=c17
+
+#include "stdatomic.h"
+#include "stdbool.h"
+#include "stdio.h"
+#include "stdlib.h"
+
+void f1(void) {
+  // malloc() is not obsolete, but banned by Rule 21.3
+  int *t = malloc(10); // COMPLIANT[False Negative]
+
+  // Obsolete usage of realloc.
+  realloc(t, 0); // NON-COMPLIANT
+
+  // Valid usage of realloc, but all use of realloc is banned by Rule 21.3
+  realloc(t, 20); // NON-COMPLIANT
+}
+
+extern const int g1; // COMPLIANT
+const extern int g2; // NON-COMPLIANT
+
+#define MY_TRUE 3  // COMPLIANT
+#define true 3     // NON-COMPLIANT
+#define false 3    // NON-COMPLIANT
+#define bool int * // NON-COMPLIANT
+#undef true        // NON-COMPLIANT
+#undef false       // NON-COMPLIANT
+#undef bool        // NON-COMPLIANT
+
+_Atomic int g3 = ATOMIC_VAR_INIT(18); // NON-COMPLIANT
+_Atomic int g4 = 18;                  // COMPLIANT
+
+// The following cases are already covered by other rules:
+
+// Rule 8.8:
+static int g5 = 3; // COMPLIANT
+extern int g5;     // NON-COMPLIANT
+
+// Rule 8.2:
+void f2();     // NON-COMPLIANT
+void f3(void); // COMPLIANT
+
+void f4(int p1) {}; // COMPLIANT
+int f5(x)           // NON_COMPLIANT
+int x;
+{
+  return 1;
+}
+
+// Rule 21.6 covers the below cases:
+void f6(void) {
+  // `gets` was removed from C11.
+  // gets(stdin); // NON_COMPLIANT
+
+  FILE *file = fopen("", 0);
+  // Obsolete usage of ungetc.
+  ungetc('c', file); // NON-COMPLIANT
+
+  char buf[10];
+  fread(buf, sizeof(buf), 10, file);
+  // This is not an obsolete usage of ungetc, but ungetc isn't allowed.
+  ungetc('c', file); // NON-COMPLIANT[FALSE NEGATIVE]
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
new file mode 100644
index 0000000000..f26cae3e9a
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
@@ -0,0 +1,61 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Language4Query =
+  TUseOfObsoleteMacroAtomicVarInitQuery() or
+  TInvalidDefineOrUndefOfStdBoolMacroQuery() or
+  TCallToReallocWithSizeZeroQuery()
+
+predicate isLanguage4QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `useOfObsoleteMacroAtomicVarInit` query
+    Language4Package::useOfObsoleteMacroAtomicVarInitQuery() and
+  queryId =
+    // `@id` for the `useOfObsoleteMacroAtomicVarInit` query
+    "c/misra/use-of-obsolete-macro-atomic-var-init" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `invalidDefineOrUndefOfStdBoolMacro` query
+    Language4Package::invalidDefineOrUndefOfStdBoolMacroQuery() and
+  queryId =
+    // `@id` for the `invalidDefineOrUndefOfStdBoolMacro` query
+    "c/misra/invalid-define-or-undef-of-std-bool-macro" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `callToReallocWithSizeZero` query
+    Language4Package::callToReallocWithSizeZeroQuery() and
+  queryId =
+    // `@id` for the `callToReallocWithSizeZero` query
+    "c/misra/call-to-realloc-with-size-zero" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+}
+
+module Language4Package {
+  Query useOfObsoleteMacroAtomicVarInitQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `useOfObsoleteMacroAtomicVarInit` query
+      TQueryC(TLanguage4PackageQuery(TUseOfObsoleteMacroAtomicVarInitQuery()))
+  }
+
+  Query invalidDefineOrUndefOfStdBoolMacroQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `invalidDefineOrUndefOfStdBoolMacro` query
+      TQueryC(TLanguage4PackageQuery(TInvalidDefineOrUndefOfStdBoolMacroQuery()))
+  }
+
+  Query callToReallocWithSizeZeroQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `callToReallocWithSizeZero` query
+      TQueryC(TLanguage4PackageQuery(TCallToReallocWithSizeZeroQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index b10fbf0a2f..cff145d562 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -39,6 +39,7 @@ import InvalidMemory2
 import Language1
 import Language2
 import Language3
+import Language4
 import Memory1
 import Memory2
 import Memory3
@@ -112,6 +113,7 @@ newtype TCQuery =
   TLanguage1PackageQuery(Language1Query q) or
   TLanguage2PackageQuery(Language2Query q) or
   TLanguage3PackageQuery(Language3Query q) or
+  TLanguage4PackageQuery(Language4Query q) or
   TMemory1PackageQuery(Memory1Query q) or
   TMemory2PackageQuery(Memory2Query q) or
   TMemory3PackageQuery(Memory3Query q) or
@@ -185,6 +187,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isLanguage1QueryMetadata(query, queryId, ruleId, category) or
   isLanguage2QueryMetadata(query, queryId, ruleId, category) or
   isLanguage3QueryMetadata(query, queryId, ruleId, category) or
+  isLanguage4QueryMetadata(query, queryId, ruleId, category) or
   isMemory1QueryMetadata(query, queryId, ruleId, category) or
   isMemory2QueryMetadata(query, queryId, ruleId, category) or
   isMemory3QueryMetadata(query, queryId, ruleId, category) or
diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
new file mode 100644
index 0000000000..ff85927a61
--- /dev/null
+++ b/rule_packages/c/Language4.json
@@ -0,0 +1,47 @@
+{
+  "MISRA-C-2012": {
+    "RULE-1-5": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The macro ATOMIC_VAR_INIT is has been declared an obsolescent language feature since C18.",
+          "kind": "problem",
+          "name": "Disallowed usage of obsolete macro ATOMIC_VAR_INIT compiled as C18",
+          "precision": "very-high",
+          "severity": "recommendation",
+          "short_name": "UseOfObsoleteMacroAtomicVarInit",
+          "tags": [
+            "maintainability",
+            "readability"
+          ]
+        },
+        {
+          "description": "Directives that undefine and/or redefine the standard boolean macros has been declared an obsolescent language feature since C99.",
+          "kind": "problem",
+          "name": "Programs may not undefine or redefine the macros bool, true, or false",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "InvalidDefineOrUndefOfStdBoolMacro",
+          "tags": [
+            "maintainability",
+            "readability"
+          ]
+        },
+        {
+          "description": "Invoking realloc with a size argument set to zero is implementation-defined behavior and declared as an obsolete feature in C18.",
+          "kind": "problem",
+          "name": "Disallowed size argument value equal to zero in call to realloc",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "CallToReallocWithSizeZero",
+          "tags": [
+            "correctness"
+          ]
+        }
+      ],
+      "title": "Obsolencent language features shall not be used"
+    }
+  }
+}
\ No newline at end of file

From 3adf181c92efb89e3d8fc4fa4b58f0ebb076a712 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 3 Oct 2024 15:49:44 -0700
Subject: [PATCH 239/435] Add full stops to query messages.

---
 .../RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql   |  2 +-
 .../RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql      |  3 ++-
 .../InvalidDefineOrUndefOfStdBoolMacro.expected      | 12 ++++++------
 .../UseOfObsoleteMacroAtomicVarInit.expected         |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
index 3d33103988..8b6abe47dd 100644
--- a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
+++ b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
@@ -28,4 +28,4 @@ where
     macroName = directive.(PreprocessorUndef).getName() and
     opString = "undefine"
   )
-select directive, "Invalid " + opString + " of boolean standard macro " + macroName
+select directive, "Invalid " + opString + " of boolean standard macro '" + macroName + "'."
diff --git a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
index 38dd7c0386..82bde8471a 100644
--- a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
+++ b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
@@ -21,4 +21,5 @@ where
   invoke.getMacroName() = "ATOMIC_VAR_INIT" and
   flag = c.getAnArgument() and
   flag.regexpMatch("-std=c1[78]")
-select invoke, "Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version " + flag
+select invoke,
+  "Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version '" + flag + "'."
diff --git a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
index a29c5efe56..e2a072d2b4 100644
--- a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
+++ b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
@@ -1,6 +1,6 @@
-| test.c:23:1:23:14 | #define true 3 | Invalid define of boolean standard macro true |
-| test.c:24:1:24:15 | #define false 3 | Invalid define of boolean standard macro false |
-| test.c:25:1:25:18 | #define bool int * | Invalid define of boolean standard macro bool |
-| test.c:26:1:26:11 | #undef true | Invalid undefine of boolean standard macro true |
-| test.c:27:1:27:12 | #undef false | Invalid undefine of boolean standard macro false |
-| test.c:28:1:28:11 | #undef bool | Invalid undefine of boolean standard macro bool |
+| test.c:23:1:23:14 | #define true 3 | Invalid define of boolean standard macro 'true'. |
+| test.c:24:1:24:15 | #define false 3 | Invalid define of boolean standard macro 'false'. |
+| test.c:25:1:25:18 | #define bool int * | Invalid define of boolean standard macro 'bool'. |
+| test.c:26:1:26:11 | #undef true | Invalid undefine of boolean standard macro 'true'. |
+| test.c:27:1:27:12 | #undef false | Invalid undefine of boolean standard macro 'false'. |
+| test.c:28:1:28:11 | #undef bool | Invalid undefine of boolean standard macro 'bool'. |
diff --git a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
index 6fe4cee5f4..c38a6263a9 100644
--- a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
+++ b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
@@ -1 +1 @@
-| test.c:30:18:30:36 | ATOMIC_VAR_INIT(value) | Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version -std=c17 |
+| test.c:30:18:30:36 | ATOMIC_VAR_INIT(value) | Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version '-std=c17'. |

From 31dc8bc08c49e8872f6ebf79fc7bf46059a172b5 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 3 Oct 2024 15:56:04 -0700
Subject: [PATCH 240/435] Fix test.c format

---
 .../StandardLibraryInputoutputFunctionsUsed.expected      | 6 +++---
 c/misra/test/rules/RULE-1-5/test.c                        | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
index ca49894238..d0cf1351c7 100644
--- a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
+++ b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
@@ -1,3 +1,3 @@
-| test.c:57:3:57:8 | call to ungetc | Call to banned function ungetc. |
-| test.c:60:3:60:7 | call to fread | Call to banned function fread. |
-| test.c:62:3:62:8 | call to ungetc | Call to banned function ungetc. |
+| test.c:55:3:55:8 | call to ungetc | Call to banned function ungetc. |
+| test.c:58:3:58:7 | call to fread | Call to banned function fread. |
+| test.c:60:3:60:8 | call to ungetc | Call to banned function ungetc. |
diff --git a/c/misra/test/rules/RULE-1-5/test.c b/c/misra/test/rules/RULE-1-5/test.c
index 43faa71f3c..51399e32c6 100644
--- a/c/misra/test/rules/RULE-1-5/test.c
+++ b/c/misra/test/rules/RULE-1-5/test.c
@@ -40,12 +40,10 @@ extern int g5;     // NON-COMPLIANT
 void f2();     // NON-COMPLIANT
 void f3(void); // COMPLIANT
 
-void f4(int p1) {}; // COMPLIANT
-int f5(x)           // NON_COMPLIANT
+void f4(int p1){}; // COMPLIANT
+int f5(x)          // NON_COMPLIANT
 int x;
-{
-  return 1;
-}
+{ return 1; }
 
 // Rule 21.6 covers the below cases:
 void f6(void) {

From d077885f68d65ee72c17614aa41c066ddf4c7c3b Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 07:51:44 -0700
Subject: [PATCH 241/435] Add tag misra c 2012 amendment 3

---
 c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql  | 1 +
 .../rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql | 1 +
 .../rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql    | 1 +
 rule_packages/c/Language4.json                           | 9 ++++++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql b/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
index 224ca2a6bf..2ea90e8b12 100644
--- a/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
+++ b/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
@@ -8,6 +8,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-1-5
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
index 8b6abe47dd..9d10522ecf 100644
--- a/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
+++ b/c/misra/src/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-1-5
  *       maintainability
  *       readability
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
index 82bde8471a..b2fb5f0167 100644
--- a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
+++ b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
@@ -9,6 +9,7 @@
  * @tags external/misra/id/rule-1-5
  *       maintainability
  *       readability
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index ff85927a61..a9f5ddde92 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -14,7 +14,8 @@
           "short_name": "UseOfObsoleteMacroAtomicVarInit",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/amendment3"
           ]
         },
         {
@@ -26,7 +27,8 @@
           "short_name": "InvalidDefineOrUndefOfStdBoolMacro",
           "tags": [
             "maintainability",
-            "readability"
+            "readability",
+            "external/misra/c/2012/amendment3"
           ]
         },
         {
@@ -37,7 +39,8 @@
           "severity": "error",
           "short_name": "CallToReallocWithSizeZero",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/amendment3"
           ]
         }
       ],

From e27e49a004f4ac240535d9cc4971c3261d32208b Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 12:10:22 -0700
Subject: [PATCH 242/435] Add implementation scope to Language4.json

---
 rule_packages/c/Language4.json   |  5 ++++-
 schemas/rule-package.schema.json | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index a9f5ddde92..0ba6bfcc55 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -44,7 +44,10 @@
           ]
         }
       ],
-      "title": "Obsolencent language features shall not be used"
+      "title": "Obsolencent language features shall not be used",
+      "implementation_scope": {
+        "description": "Usage of obsolescent language features that are already disallowed by Rule 8.2, Rule 8.8, and 21.6 are not redundantly checked by this rule."
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/schemas/rule-package.schema.json b/schemas/rule-package.schema.json
index b27815163e..087a6087ea 100644
--- a/schemas/rule-package.schema.json
+++ b/schemas/rule-package.schema.json
@@ -207,6 +207,18 @@
                                 },
                                 "title": {
                                     "type": "string"
+                                },
+                                "implementation_scope": {
+                                    "type": "object",
+                                    "properties": {
+                                        "description": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "description"
+                                    ],
+                                    "additionalProperties": false
                                 }
                             },
                             "required": [

From cca63e439ff2d3bf9a0dd9124a77c6f311838095 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 12:22:22 -0700
Subject: [PATCH 243/435] Report ATOMIC_VAR_INIT for all C versions.

---
 .../RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql      |  8 +++-----
 .../RULE-1-5/CallToReallocWithSizeZero.expected      |  2 +-
 .../FunctionTypesNotInPrototypeForm.expected         |  4 ++--
 .../InvalidDefineOrUndefOfStdBoolMacro.expected      | 12 ++++++------
 ...MemoryAllocDeallocFunctionsOfStdlibhUsed.expected |  6 +++---
 ...ssingStaticSpecifierObjectRedeclarationC.expected |  2 +-
 .../StandardLibraryInputoutputFunctionsUsed.expected |  6 +++---
 .../UseOfObsoleteMacroAtomicVarInit.expected         |  2 +-
 c/misra/test/rules/RULE-1-5/options                  |  1 -
 c/misra/test/rules/RULE-1-5/test.c                   |  2 --
 10 files changed, 20 insertions(+), 25 deletions(-)
 delete mode 100644 c/misra/test/rules/RULE-1-5/options

diff --git a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
index b2fb5f0167..e8abf1bbfb 100644
--- a/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
+++ b/c/misra/src/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.ql
@@ -16,11 +16,9 @@
 import cpp
 import codingstandards.c.misra
 
-from MacroInvocation invoke, Compilation c, string flag
+from MacroInvocation invoke
 where
   not isExcluded(invoke, Language4Package::useOfObsoleteMacroAtomicVarInitQuery()) and
-  invoke.getMacroName() = "ATOMIC_VAR_INIT" and
-  flag = c.getAnArgument() and
-  flag.regexpMatch("-std=c1[78]")
+  invoke.getMacroName() = "ATOMIC_VAR_INIT"
 select invoke,
-  "Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version '" + flag + "'."
+  "Usage of macro ATOMIC_VAR_INIT() is declared obscelescent in C18, and discouraged in earlier C versions."
diff --git a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
index 0e58d0cd0d..89e54a38c2 100644
--- a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
+++ b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
@@ -1 +1 @@
-| test.c:13:14:13:14 | 0 | Calling realloc with size zero results in implementation-defined behavior. |
+| test.c:11:14:11:14 | 0 | Calling realloc with size zero results in implementation-defined behavior. |
diff --git a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
index 9f9157ca8e..29faec8b55 100644
--- a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
+++ b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
@@ -1,2 +1,2 @@
-| test.c:40:6:40:7 | f2 | Function f2 does not specify void for no parameters present. |
-| test.c:44:5:44:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
\ No newline at end of file
+| test.c:38:6:38:7 | f2 | Function f2 does not specify void for no parameters present. |
+| test.c:42:5:42:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
index e2a072d2b4..7a6ca9824e 100644
--- a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
+++ b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
@@ -1,6 +1,6 @@
-| test.c:23:1:23:14 | #define true 3 | Invalid define of boolean standard macro 'true'. |
-| test.c:24:1:24:15 | #define false 3 | Invalid define of boolean standard macro 'false'. |
-| test.c:25:1:25:18 | #define bool int * | Invalid define of boolean standard macro 'bool'. |
-| test.c:26:1:26:11 | #undef true | Invalid undefine of boolean standard macro 'true'. |
-| test.c:27:1:27:12 | #undef false | Invalid undefine of boolean standard macro 'false'. |
-| test.c:28:1:28:11 | #undef bool | Invalid undefine of boolean standard macro 'bool'. |
+| test.c:21:1:21:14 | #define true 3 | Invalid define of boolean standard macro 'true'. |
+| test.c:22:1:22:15 | #define false 3 | Invalid define of boolean standard macro 'false'. |
+| test.c:23:1:23:18 | #define bool int * | Invalid define of boolean standard macro 'bool'. |
+| test.c:24:1:24:11 | #undef true | Invalid undefine of boolean standard macro 'true'. |
+| test.c:25:1:25:12 | #undef false | Invalid undefine of boolean standard macro 'false'. |
+| test.c:26:1:26:11 | #undef bool | Invalid undefine of boolean standard macro 'bool'. |
diff --git a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
index 3f8fa3cf3f..de87fc8542 100644
--- a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
+++ b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
@@ -1,3 +1,3 @@
-| test.c:10:12:10:17 | call to malloc | Use of banned dynamic memory allocation. |
-| test.c:13:3:13:9 | call to realloc | Use of banned dynamic memory allocation. |
-| test.c:16:3:16:9 | call to realloc | Use of banned dynamic memory allocation. |
+| test.c:8:12:8:17 | call to malloc | Use of banned dynamic memory allocation. |
+| test.c:11:3:11:9 | call to realloc | Use of banned dynamic memory allocation. |
+| test.c:14:3:14:9 | call to realloc | Use of banned dynamic memory allocation. |
diff --git a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
index 4c3d4614fa..48275eb504 100644
--- a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
+++ b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
@@ -1 +1 @@
-| test.c:37:12:37:13 | declaration of g5 | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:36:12:36:13 | definition of g5 | g5 |
+| test.c:35:12:35:13 | declaration of g5 | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:34:12:34:13 | definition of g5 | g5 |
diff --git a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
index d0cf1351c7..396b181150 100644
--- a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
+++ b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
@@ -1,3 +1,3 @@
-| test.c:55:3:55:8 | call to ungetc | Call to banned function ungetc. |
-| test.c:58:3:58:7 | call to fread | Call to banned function fread. |
-| test.c:60:3:60:8 | call to ungetc | Call to banned function ungetc. |
+| test.c:53:3:53:8 | call to ungetc | Call to banned function ungetc. |
+| test.c:56:3:56:7 | call to fread | Call to banned function fread. |
+| test.c:58:3:58:8 | call to ungetc | Call to banned function ungetc. |
diff --git a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
index c38a6263a9..bc903de094 100644
--- a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
+++ b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
@@ -1 +1 @@
-| test.c:30:18:30:36 | ATOMIC_VAR_INIT(value) | Usage of macro ATOMIC_VAR_INIT() is considered obsolete for c version '-std=c17'. |
+| test.c:28:18:28:36 | ATOMIC_VAR_INIT(value) | Usage of macro ATOMIC_VAR_INIT() is declared obscelescent in C18, and discouraged in earlier C versions. |
diff --git a/c/misra/test/rules/RULE-1-5/options b/c/misra/test/rules/RULE-1-5/options
deleted file mode 100644
index 2ba2218a05..0000000000
--- a/c/misra/test/rules/RULE-1-5/options
+++ /dev/null
@@ -1 +0,0 @@
-semmle-extractor-options:-std=c17 -I../../../../common/test/includes/standard-library
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/test.c b/c/misra/test/rules/RULE-1-5/test.c
index 51399e32c6..4709381898 100644
--- a/c/misra/test/rules/RULE-1-5/test.c
+++ b/c/misra/test/rules/RULE-1-5/test.c
@@ -1,5 +1,3 @@
-// Compiled with -std=c17
-
 #include "stdatomic.h"
 #include "stdbool.h"
 #include "stdio.h"

From 794e97ab06f22edcad8759ae167463ffdd9d0aa9 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 12:42:55 -0700
Subject: [PATCH 244/435] Reuse implementation_scope schema, detailed items for
 1.5

---
 rule_packages/c/Language4.json   | 12 +++++++++-
 schemas/rule-package.schema.json | 38 ++++++++++++++------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index 0ba6bfcc55..54708d73da 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -46,7 +46,17 @@
       ],
       "title": "Obsolencent language features shall not be used",
       "implementation_scope": {
-        "description": "Usage of obsolescent language features that are already disallowed by Rule 8.2, Rule 8.8, and 21.6 are not redundantly checked by this rule."
+        "description": "Not all items from Appendix F are covered by this rule. Some are not supportable and some are covered already by other rules.",
+        "items": [
+          "Appendix F, item ID 1 is covered by Rule 8.8 and not reported as part of this implementation of Rule 1.5.",
+          "Appendix F, item ID 2 refers to compiler behavior which cannot be statically analyzed.",
+          "Appendix F, item ID 3, which states that storage-class specifiers may not be used except in the beginning of a declaration, is not supportable without additional changes to the CodeQL CLI.",
+          "Appendix F, item ID 6 is reported for all C versions, though the macro ATOMIC_VAR_INIT was not officially declared obsolescent until C18.",
+          "Appendix F, item IDs 4 and 5 are covered by Rule 8.2 and not reported as part of this implementation of Rule 1.5.",
+          "Appendix F, item IDs 8 and 9 is covered by Rule 21.6 and not reported as part of this implementation of Rule 1.5.",
+          "Appendix F, item ID 10 is checked by this implementation of 1.5, though it is a redundant subset of cases reported by Rule 21.3.",
+          "Appendix F, item ID 10 is reported for all C versions, as realloc() with a size argument of zero was implementation-defined behavior in C99 and C11."
+        ]
       }
     }
   }
diff --git a/schemas/rule-package.schema.json b/schemas/rule-package.schema.json
index 087a6087ea..63cbbf3ac5 100644
--- a/schemas/rule-package.schema.json
+++ b/schemas/rule-package.schema.json
@@ -209,16 +209,7 @@
                                     "type": "string"
                                 },
                                 "implementation_scope": {
-                                    "type": "object",
-                                    "properties": {
-                                        "description": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "required": [
-                                        "description"
-                                    ],
-                                    "additionalProperties": false
+                                    "$ref": "#/$defs/implementation_scope"
                                 }
                             },
                             "required": [
@@ -360,6 +351,20 @@
                     "minLength": 1
                 },
                 "implementation_scope": {
+                    "$ref": "#/$defs/implementation_scope"
+                }
+            },
+            "required": [
+                "description",
+                "name",
+                "precision",
+                "severity",
+                "short_name",
+                "tags"
+            ]
+        },
+                "implementation_scope": {
+            "$id": "/schemas/implementation_scope",
                     "type": "object",
                     "properties": {
                         "description": {
@@ -374,17 +379,8 @@
                     },
                     "required": [
                         "description"
-                    ]
+                    ],
+                    "additionalProperties": false
                 }
-            },
-            "required": [
-                "description",
-                "name",
-                "precision",
-                "severity",
-                "short_name",
-                "tags"
-            ]
-        }
     }
 }
\ No newline at end of file

From 38a467ddd5c08caa083cbf66a220b6190cbda6d6 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 12:52:25 -0700
Subject: [PATCH 245/435] Add cross-linking comments to tests referencing other
 rules.

---
 ...moryAllocDeallocFunctionsOfStdlibhUsed.expected | 10 +++++-----
 c/misra/test/rules/RULE-21-3/test.c                |  5 +++++
 ...tandardLibraryInputoutputFunctionsUsed.expected | 14 +++++++-------
 c/misra/test/rules/RULE-21-6/test.c                |  5 +++++
 .../FunctionTypesNotInPrototypeForm.expected       |  8 ++++----
 c/misra/test/rules/RULE-8-2/test.c                 |  5 +++++
 ...ingStaticSpecifierObjectRedeclarationC.expected |  2 +-
 c/misra/test/rules/RULE-8-8/test.c                 |  5 +++++
 8 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/c/misra/test/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected b/c/misra/test/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
index 0215c2e5b8..e9ea6daecc 100644
--- a/c/misra/test/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
+++ b/c/misra/test/rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
@@ -1,5 +1,5 @@
-| test.c:8:15:8:20 | call to malloc | Use of banned dynamic memory allocation. |
-| test.c:9:15:9:20 | call to calloc | Use of banned dynamic memory allocation. |
-| test.c:10:8:10:14 | call to realloc | Use of banned dynamic memory allocation. |
-| test.c:11:3:11:6 | call to free | Use of banned dynamic memory deallocation. |
-| test.c:12:3:12:6 | call to free | Use of banned dynamic memory deallocation. |
+| test.c:13:15:13:20 | call to malloc | Use of banned dynamic memory allocation. |
+| test.c:14:15:14:20 | call to calloc | Use of banned dynamic memory allocation. |
+| test.c:15:8:15:14 | call to realloc | Use of banned dynamic memory allocation. |
+| test.c:16:3:16:6 | call to free | Use of banned dynamic memory deallocation. |
+| test.c:17:3:17:6 | call to free | Use of banned dynamic memory deallocation. |
diff --git a/c/misra/test/rules/RULE-21-3/test.c b/c/misra/test/rules/RULE-21-3/test.c
index d9aee3a322..fd4543faaf 100644
--- a/c/misra/test/rules/RULE-21-3/test.c
+++ b/c/misra/test/rules/RULE-21-3/test.c
@@ -1,3 +1,8 @@
+// Note: A subset of these cases are also tested in c/misra/test/rules/RULE-1-5
+// via a MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref and .expected file in
+// that directory. Changes to these tests may require updating the test code or
+// expectations in that directory as well.
+
 #include <stdio.h>
 #include <stdlib.h>
 void f2();
diff --git a/c/misra/test/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.expected b/c/misra/test/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.expected
index 0dee7e9b3d..672480db33 100644
--- a/c/misra/test/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.expected
+++ b/c/misra/test/rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.expected
@@ -1,7 +1,7 @@
-| test.c:8:10:8:14 | call to scanf | Call to banned function scanf. |
-| test.c:9:5:9:10 | call to printf | Call to banned function printf. |
-| test.c:16:16:16:21 | call to fgetwc | Call to banned function fgetwc. |
-| test.c:17:5:17:12 | call to putwchar | Call to banned function putwchar. |
-| test.c:22:7:22:10 | call to puts | Call to banned function puts. |
-| test.c:24:7:24:10 | call to puts | Call to banned function puts. |
-| test.c:26:5:26:8 | call to puts | Call to banned function puts. |
+| test.c:13:10:13:14 | call to scanf | Call to banned function scanf. |
+| test.c:14:5:14:10 | call to printf | Call to banned function printf. |
+| test.c:21:16:21:21 | call to fgetwc | Call to banned function fgetwc. |
+| test.c:22:5:22:12 | call to putwchar | Call to banned function putwchar. |
+| test.c:27:7:27:10 | call to puts | Call to banned function puts. |
+| test.c:29:7:29:10 | call to puts | Call to banned function puts. |
+| test.c:31:5:31:8 | call to puts | Call to banned function puts. |
diff --git a/c/misra/test/rules/RULE-21-6/test.c b/c/misra/test/rules/RULE-21-6/test.c
index 0ae580164e..b66bb9b6b7 100644
--- a/c/misra/test/rules/RULE-21-6/test.c
+++ b/c/misra/test/rules/RULE-21-6/test.c
@@ -1,3 +1,8 @@
+// Note: A subset of these cases are also tested in c/misra/test/rules/RULE-1-5
+// via a StandardLibraryInputoutputFunctionsUsed.qlref and .expected file in
+// that directory. Changes to these tests may require updating the test code or
+// expectations in that directory as well.
+
 #include <errno.h>
 #include <locale.h>
 #include <stdio.h>
diff --git a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected b/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected
index f2c08897b8..1264797088 100644
--- a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected
+++ b/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected
@@ -1,4 +1,4 @@
-| test.c:3:6:3:7 | f1 | Function f1 declares parameter that is unnamed. |
-| test.c:4:6:4:7 | f2 | Function f2 does not specify void for no parameters present. |
-| test.c:5:6:5:7 | f3 | Function f3 does not specify void for no parameters present. |
-| test.c:7:5:7:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
+| test.c:8:6:8:7 | f1 | Function f1 declares parameter that is unnamed. |
+| test.c:9:6:9:7 | f2 | Function f2 does not specify void for no parameters present. |
+| test.c:10:6:10:7 | f3 | Function f3 does not specify void for no parameters present. |
+| test.c:12:5:12:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
diff --git a/c/misra/test/rules/RULE-8-2/test.c b/c/misra/test/rules/RULE-8-2/test.c
index c254a221d9..1ed64c0011 100644
--- a/c/misra/test/rules/RULE-8-2/test.c
+++ b/c/misra/test/rules/RULE-8-2/test.c
@@ -1,3 +1,8 @@
+// Note: A subset of these cases are also tested in c/misra/test/rules/RULE-1-5
+// via a FunctionTypesNotInPrototypeForm.qlref and .expected file in that
+// directory. Changes to these tests may require updating the test code or
+// expectations in that directory as well.
+
 void f(int x);    // COMPLIANT
 void f0(void);    // COMPLIANT
 void f1(int);     // NON_COMPLIANT
diff --git a/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected b/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected
index 34a7723bcd..9c357cf38f 100644
--- a/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected
+++ b/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected
@@ -1 +1 @@
-| test.c:2:12:2:12 | declaration of g | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:1:12:1:12 | definition of g | g |
+| test.c:7:12:7:12 | declaration of g | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:6:12:6:12 | definition of g | g |
diff --git a/c/misra/test/rules/RULE-8-8/test.c b/c/misra/test/rules/RULE-8-8/test.c
index d98d71c6f0..ba78432a40 100644
--- a/c/misra/test/rules/RULE-8-8/test.c
+++ b/c/misra/test/rules/RULE-8-8/test.c
@@ -1,3 +1,8 @@
+// Note: A subset of these cases are also tested in c/misra/test/rules/RULE-1-5
+// via a MissingStaticSpecifierObjectRedeclarationC.qlref and .expected file in
+// that directory. Changes to these tests may require updating the test code or
+// expectations in that directory as well.
+
 static int g = 0;
 extern int g; // NON_COMPLIANT
 

From 730341f99138ca5451dc62e8db19d77a980266d7 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 13:03:25 -0700
Subject: [PATCH 246/435] Fix rule schema for implementation_scope in queries.

---
 schemas/rule-package.schema.json | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/schemas/rule-package.schema.json b/schemas/rule-package.schema.json
index 63cbbf3ac5..a43deb2141 100644
--- a/schemas/rule-package.schema.json
+++ b/schemas/rule-package.schema.json
@@ -351,7 +351,7 @@
                     "minLength": 1
                 },
                 "implementation_scope": {
-                    "$ref": "#/$defs/implementation_scope"
+                    "$ref": "/schemas/implementation_scope"
                 }
             },
             "required": [
@@ -363,24 +363,24 @@
                 "tags"
             ]
         },
-                "implementation_scope": {
+        "implementation_scope": {
             "$id": "/schemas/implementation_scope",
-                    "type": "object",
-                    "properties": {
-                        "description": {
-                            "kind": "string"
-                        },
-                        "items": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        }
-                    },
-                    "required": [
-                        "description"
-                    ],
-                    "additionalProperties": false
+            "type": "object",
+            "properties": {
+                "description": {
+                    "kind": "string"
+                },
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 }
+            },
+            "required": [
+                "description"
+            ],
+            "additionalProperties": false
+        }
     }
 }
\ No newline at end of file

From c9a7b05a886028d36521b01e3db63b4766045f89 Mon Sep 17 00:00:00 2001
From: lcartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 4 Oct 2024 22:18:22 +0000
Subject: [PATCH 247/435] Upgrading `github/codeql` dependency to 2.15.5

---
 c/cert/src/codeql-pack.lock.yml                      | 12 ++++++++----
 c/cert/src/qlpack.yml                                |  2 +-
 c/cert/test/codeql-pack.lock.yml                     | 12 ++++++++----
 c/common/src/codeql-pack.lock.yml                    | 12 ++++++++----
 c/common/src/qlpack.yml                              |  2 +-
 c/common/test/codeql-pack.lock.yml                   | 12 ++++++++----
 c/misra/src/codeql-pack.lock.yml                     | 12 ++++++++----
 c/misra/src/qlpack.yml                               |  2 +-
 c/misra/test/codeql-pack.lock.yml                    | 12 ++++++++----
 cpp/autosar/src/codeql-pack.lock.yml                 | 12 ++++++++----
 cpp/autosar/src/qlpack.yml                           |  2 +-
 cpp/autosar/test/codeql-pack.lock.yml                | 12 ++++++++----
 cpp/cert/src/codeql-pack.lock.yml                    | 12 ++++++++----
 cpp/cert/src/qlpack.yml                              |  2 +-
 cpp/cert/test/codeql-pack.lock.yml                   | 12 ++++++++----
 cpp/common/src/codeql-pack.lock.yml                  | 12 ++++++++----
 cpp/common/src/qlpack.yml                            |  4 ++--
 cpp/common/test/codeql-pack.lock.yml                 | 12 ++++++++----
 cpp/misra/src/codeql-pack.lock.yml                   | 12 ++++++++----
 cpp/misra/src/qlpack.yml                             |  2 +-
 cpp/misra/test/codeql-pack.lock.yml                  | 12 ++++++++----
 cpp/report/src/codeql-pack.lock.yml                  | 12 ++++++++----
 cpp/report/src/qlpack.yml                            |  2 +-
 .../generate_modules/queries/codeql-pack.lock.yml    | 12 ++++++++----
 scripts/generate_modules/queries/qlpack.yml          |  2 +-
 supported_codeql_configs.json                        |  6 +++---
 26 files changed, 141 insertions(+), 77 deletions(-)

diff --git a/c/cert/src/codeql-pack.lock.yml b/c/cert/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/c/cert/src/codeql-pack.lock.yml
+++ b/c/cert/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index a0adb282a4..f0daa6334a 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
diff --git a/c/cert/test/codeql-pack.lock.yml b/c/cert/test/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/c/cert/test/codeql-pack.lock.yml
+++ b/c/cert/test/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/c/common/src/codeql-pack.lock.yml b/c/common/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/c/common/src/codeql-pack.lock.yml
+++ b/c/common/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index b1571ec4ec..5f18365483 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -3,4 +3,4 @@ version: 2.36.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
diff --git a/c/common/test/codeql-pack.lock.yml b/c/common/test/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/c/common/test/codeql-pack.lock.yml
+++ b/c/common/test/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/c/misra/src/codeql-pack.lock.yml b/c/misra/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/c/misra/src/codeql-pack.lock.yml
+++ b/c/misra/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 5de8472821..9d0ed62e06 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -6,4 +6,4 @@ license: MIT
 default-suite-file: codeql-suites/misra-c-default.qls
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
diff --git a/c/misra/test/codeql-pack.lock.yml b/c/misra/test/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/c/misra/test/codeql-pack.lock.yml
+++ b/c/misra/test/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/autosar/src/codeql-pack.lock.yml b/cpp/autosar/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/autosar/src/codeql-pack.lock.yml
+++ b/cpp/autosar/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 947013155f..93a0f4bd9a 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
diff --git a/cpp/autosar/test/codeql-pack.lock.yml b/cpp/autosar/test/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/autosar/test/codeql-pack.lock.yml
+++ b/cpp/autosar/test/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/cert/src/codeql-pack.lock.yml b/cpp/cert/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/cert/src/codeql-pack.lock.yml
+++ b/cpp/cert/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 3a435b5e8e..3a85e2aa20 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -4,5 +4,5 @@ description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
   codeql/common-cpp-coding-standards: '*'
diff --git a/cpp/cert/test/codeql-pack.lock.yml b/cpp/cert/test/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/cert/test/codeql-pack.lock.yml
+++ b/cpp/cert/test/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/common/src/codeql-pack.lock.yml b/cpp/common/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/common/src/codeql-pack.lock.yml
+++ b/cpp/common/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index a2448fd608..b7f90b4cd3 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -2,6 +2,6 @@ name: codeql/common-cpp-coding-standards
 version: 2.36.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
 dataExtensions:
-  - ext/*.model.yml
\ No newline at end of file
+- ext/*.model.yml
diff --git a/cpp/common/test/codeql-pack.lock.yml b/cpp/common/test/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/common/test/codeql-pack.lock.yml
+++ b/cpp/common/test/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/misra/src/codeql-pack.lock.yml b/cpp/misra/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/misra/src/codeql-pack.lock.yml
+++ b/cpp/misra/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index 4c0aa45f4f..b713614f68 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -5,4 +5,4 @@ default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
diff --git a/cpp/misra/test/codeql-pack.lock.yml b/cpp/misra/test/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/misra/test/codeql-pack.lock.yml
+++ b/cpp/misra/test/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/report/src/codeql-pack.lock.yml b/cpp/report/src/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/cpp/report/src/codeql-pack.lock.yml
+++ b/cpp/report/src/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 81f95392c9..f90669908d 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/report-cpp-coding-standards
 version: 2.36.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
diff --git a/scripts/generate_modules/queries/codeql-pack.lock.yml b/scripts/generate_modules/queries/codeql-pack.lock.yml
index 514e6963d0..4edf97c6f8 100644
--- a/scripts/generate_modules/queries/codeql-pack.lock.yml
+++ b/scripts/generate_modules/queries/codeql-pack.lock.yml
@@ -2,13 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.9.3
+    version: 0.12.2
   codeql/dataflow:
+    version: 0.1.5
+  codeql/rangeanalysis:
     version: 0.0.4
   codeql/ssa:
-    version: 0.1.5
+    version: 0.2.5
   codeql/tutorial:
-    version: 0.1.5
+    version: 0.2.5
+  codeql/typetracking:
+    version: 0.2.5
   codeql/util:
-    version: 0.1.5
+    version: 0.2.5
 compiled: false
diff --git a/scripts/generate_modules/queries/qlpack.yml b/scripts/generate_modules/queries/qlpack.yml
index 4f3768cd79..4ab2483c04 100644
--- a/scripts/generate_modules/queries/qlpack.yml
+++ b/scripts/generate_modules/queries/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/standard-library-extraction-cpp-coding-standards
 version: 0.0.0
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.9.3
+  codeql/cpp-all: 0.12.2
diff --git a/supported_codeql_configs.json b/supported_codeql_configs.json
index 227f41babd..a97c7d83d2 100644
--- a/supported_codeql_configs.json
+++ b/supported_codeql_configs.json
@@ -1,9 +1,9 @@
 {
   "supported_environment": [
     {
-      "codeql_cli": "2.14.6",
-      "codeql_standard_library": "codeql-cli/v2.14.6",
-      "codeql_cli_bundle": "codeql-bundle-v2.14.6"
+      "codeql_cli": "2.15.5",
+      "codeql_standard_library": "codeql-cli/v2.15.5",
+      "codeql_cli_bundle": "codeql-bundle-v2.15.5"
     }
   ],
   "supported_language": [

From c7d3c73855de9b5f71e3fb09bda4c0356ba11eca Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 4 Oct 2024 23:31:26 +0100
Subject: [PATCH 248/435] Fix query formatting issue

In CodeQL CLI 2.15.5 it formats this line together.
---
 .../rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
index 2b435de94e..10b24b8c8a 100644
--- a/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
+++ b/c/misra/src/rules/RULE-10-1/OperandsOfAnInappropriateEssentialType.ql
@@ -178,8 +178,7 @@ predicate isInappropriateEssentialType(
     child =
       [
         operator.(BinaryBitwiseOperation).getAnOperand(),
-        operator.(AssignBitwiseOperation).getAnOperand(),
-        operator.(ComplementExpr).getAnOperand()
+        operator.(AssignBitwiseOperation).getAnOperand(), operator.(ComplementExpr).getAnOperand()
       ] and
     not operator instanceof LShiftExpr and
     not operator instanceof RShiftExpr and

From f8b7805652e22402a10a16baf2063fae75794150 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 27 Sep 2024 08:21:00 -0700
Subject: [PATCH 249/435] save work

---
 .../InvalidIntegerConstantMacroArgument.ql    |  86 ++++++++++
 .../UseOfBannedSmallIntegerConstantMacro.ql   |  25 +++
 ...validIntegerConstantMacroArgument.expected |  55 ++++++
 .../InvalidIntegerConstantMacroArgument.qlref |   1 +
 c/misra/test/rules/RULE-7-5/test.c            | 156 ++++++++++++++++++
 ...OfBannedSmallIntegerConstantMacro.expected |   4 +
 ...UseOfBannedSmallIntegerConstantMacro.qlref |   1 +
 c/misra/test/rules/RULE-7-6/test.c            |  10 ++
 .../cpp/IntegerConstantMacro.qll              |  35 ++++
 .../cpp/exclusions/c/RuleMetadata.qll         |   7 +-
 .../cpp/exclusions/c/Types2.qll               |  44 +++++
 rule_packages/c/Types2.json                   |  42 +++++
 12 files changed, 464 insertions(+), 2 deletions(-)
 create mode 100644 c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
 create mode 100644 c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
 create mode 100644 c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
 create mode 100644 c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.qlref
 create mode 100644 c/misra/test/rules/RULE-7-5/test.c
 create mode 100644 c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.expected
 create mode 100644 c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.qlref
 create mode 100644 c/misra/test/rules/RULE-7-6/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll
 create mode 100644 rule_packages/c/Types2.json

diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
new file mode 100644
index 0000000000..b58f87a5ca
--- /dev/null
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -0,0 +1,86 @@
+/**
+ * @id c/misra/invalid-integer-constant-macro-argument
+ * @name RULE-7-5: The argument of an integer constant macro shall have an appropriate form
+ * @description Integer constant macros should be given appropriate values for the size of the
+ *              integer type.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-7-5
+ *       correctness
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.IntegerConstantMacro
+import codingstandards.cpp.Cpp14Literal
+import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
+
+abstract class PossiblyNegativeLiteral extends Expr {
+  abstract Cpp14Literal::IntegerLiteral getBaseLiteral();
+
+  predicate isNegative() {
+    this instanceof NegativeLiteral
+  }
+}
+
+class NegativeLiteral extends PossiblyNegativeLiteral, UnaryMinusExpr {
+  Cpp14Literal::IntegerLiteral literal;
+
+  NegativeLiteral() {
+    literal = getOperand()
+  }
+
+  override Cpp14Literal::IntegerLiteral getBaseLiteral() {
+    result = literal
+  }
+}
+
+class PositiveLiteral extends PossiblyNegativeLiteral, Cpp14Literal::IntegerLiteral {
+  PositiveLiteral() {
+    not exists(UnaryMinusExpr l | l.getOperand() = this)
+  }
+
+  override Cpp14Literal::IntegerLiteral getBaseLiteral() {
+    result = this
+  }
+}
+
+predicate validExpr(Expr expr) {
+  expr instanceof PossiblyNegativeLiteral
+}
+
+predicate usesSuffix(MacroInvocation invoke) {
+  invoke.getUnexpandedArgument(0).regexpMatch(".*[uUlL]")
+}
+
+predicate matchedSign(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
+  literal.isNegative() implies macro.isSigned()
+}
+
+predicate validLiteralType(PossiblyNegativeLiteral expr) {
+  expr.getBaseLiteral() instanceof Cpp14Literal::DecimalLiteral or
+  expr.getBaseLiteral() instanceof Cpp14Literal::OctalLiteral or
+  expr.getBaseLiteral() instanceof Cpp14Literal::HexLiteral
+}
+
+predicate matchesSize(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
+  // Note: upperBound should equal lowerBound.
+  upperBound(literal) <= macro.maxValue() and
+  lowerBound(literal) >= macro.minValue() and exists("123".toBigInt())
+}
+
+from MacroInvocation invoke, IntegerConstantMacro macro, string explanation
+where
+  not isExcluded(invoke, Types2Package::invalidIntegerConstantMacroArgumentQuery()) and
+  invoke.getMacro() = macro and
+  (
+    (not validExpr(invoke.getExpr()) and explanation = "invalid expression") or
+    (validLiteralType(invoke.getExpr()) and explanation = "invalid literal type" + invoke.getExpr().getAQlClass()) or
+    (usesSuffix(invoke) and explanation = "literal suffixes not allowed") or
+    (not matchedSign(macro, invoke.getExpr()) and explanation = "signed/unsigned mismatch") or
+    (not matchesSize(macro, invoke.getExpr()) and explanation  = "invalid size")
+  )
+  
+select invoke.getExpr(), "Invalid integer constant macro: " + explanation
diff --git a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
new file mode 100644
index 0000000000..cac7f091a8
--- /dev/null
+++ b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
@@ -0,0 +1,25 @@
+/**
+ * @id c/misra/use-of-banned-small-integer-constant-macro
+ * @name RULE-7-6: The small integer variants of the minimum-width integer constant macros shall not be used
+ * @description Small integer constant macros expression are promoted to type int, which can lead to
+ *              unexpected results.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-7-6
+ *       readability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.IntegerConstantMacro
+
+
+from MacroInvocation macroInvoke, IntegerConstantMacro macro
+where
+  not isExcluded(macroInvoke, Types2Package::useOfBannedSmallIntegerConstantMacroQuery()) and
+  macroInvoke.getMacro() = macro
+  and macro.isSmall()
+select
+  macroInvoke, "Usage of small integer constant macro " + macro.getName() + " is not allowed."
diff --git a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
new file mode 100644
index 0000000000..b38863eccd
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
@@ -0,0 +1,55 @@
+| test.c:12:13:12:15 | 1.0 | Invalid integer constant macro: invalid literal type |
+| test.c:13:13:12:15 | 0b111 | Invalid integer constant macro: invalid literal type |
+| test.c:16:13:16:14 | 1 | Invalid integer constant macro: literal suffixes not allowed |
+| test.c:17:13:17:14 | 2 | Invalid integer constant macro: literal suffixes not allowed |
+| test.c:18:13:18:14 | 3 | Invalid integer constant macro: literal suffixes not allowed |
+| test.c:19:13:19:14 | 4 | Invalid integer constant macro: literal suffixes not allowed |
+| test.c:20:13:20:15 | 5 | Invalid integer constant macro: literal suffixes not allowed |
+| test.c:26:13:26:15 | 256 | Invalid integer constant macro: invalid size |
+| test.c:27:13:27:16 | 256 | Invalid integer constant macro: invalid size |
+| test.c:28:13:28:17 | 256 | Invalid integer constant macro: invalid size |
+| test.c:31:13:31:14 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
+| test.c:32:13:32:15 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
+| test.c:33:13:33:15 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
+| test.c:34:13:34:17 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
+| test.c:37:13:37:17 | ... + ... | Invalid integer constant macro: invalid expression |
+| test.c:38:13:38:18 | access to array | Invalid integer constant macro: invalid expression |
+| test.c:39:13:39:18 | access to array | Invalid integer constant macro: invalid expression |
+| test.c:40:13:39:18 | UINT8_MAX | Invalid integer constant macro: invalid expression |
+| test.c:54:12:54:15 | 191 | Invalid integer constant macro: invalid size |
+| test.c:55:12:55:14 | 255 | Invalid integer constant macro: invalid size |
+| test.c:56:12:56:15 | 192 | Invalid integer constant macro: invalid size |
+| test.c:57:12:57:15 | 128 | Invalid integer constant macro: invalid size |
+| test.c:61:12:57:15 | -129 | Invalid integer constant macro: invalid size |
+| test.c:62:12:57:15 | -129 | Invalid integer constant macro: invalid size |
+| test.c:63:12:57:15 | -201 | Invalid integer constant macro: invalid size |
+| test.c:64:12:57:15 | -0x81 | Invalid integer constant macro: invalid size |
+| test.c:76:14:76:18 | 65536 | Invalid integer constant macro: invalid size |
+| test.c:78:14:78:20 | 65536 | Invalid integer constant macro: invalid size |
+| test.c:91:13:91:17 | 32768 | Invalid integer constant macro: invalid size |
+| test.c:93:13:93:18 | 32768 | Invalid integer constant macro: invalid size |
+| test.c:97:13:93:18 | -32769 | Invalid integer constant macro: invalid size |
+| test.c:98:13:93:18 | -040001 | Invalid integer constant macro: invalid size |
+| test.c:99:13:93:18 | -0x8001 | Invalid integer constant macro: invalid size |
+| test.c:109:14:109:24 | 4294967296 | Invalid integer constant macro: invalid size |
+| test.c:110:14:110:25 | 4294967296 | Invalid integer constant macro: invalid size |
+| test.c:120:13:120:22 | 2147483648 | Invalid integer constant macro: invalid size |
+| test.c:121:13:121:23 | 34359738368 | Invalid integer constant macro: invalid size |
+| test.c:130:14:130:15 | 0 | Invalid integer constant macro: invalid size |
+| test.c:133:14:133:34 | 18446744073709551615 | Invalid integer constant macro: invalid size |
+| test.c:134:14:134:32 | 18446744073709551615 | Invalid integer constant macro: invalid size |
+| test.c:140:13:140:14 | 0 | Invalid integer constant macro: invalid size |
+| test.c:143:13:143:32 | 9223372036854775807 | Invalid integer constant macro: invalid size |
+| test.c:147:13:147:33 | - ... | Invalid integer constant macro: invalid size |
+| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: invalid expression |
+| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: invalid literal type |
+| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: invalid size |
+| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: signed/unsigned mismatch |
+| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: invalid expression |
+| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: invalid literal type |
+| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: invalid size |
+| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: signed/unsigned mismatch |
+| test.c:152:13:152:31 | 9223372036854775807 | Invalid integer constant macro: invalid size |
+| test.c:153:13:153:31 | 9223372036854775808 | Invalid integer constant macro: invalid size |
+| test.c:154:13:154:31 | - ... | Invalid integer constant macro: invalid size |
+| test.c:155:13:155:30 | - ... | Invalid integer constant macro: invalid size |
diff --git a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.qlref b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.qlref
new file mode 100644
index 0000000000..802f415bc9
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.qlref
@@ -0,0 +1 @@
+rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-5/test.c b/c/misra/test/rules/RULE-7-5/test.c
new file mode 100644
index 0000000000..4412bdf82f
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/test.c
@@ -0,0 +1,156 @@
+#include "stdint.h"
+
+uint_least8_t g1[] = {
+    // Basic valid
+    UINT8_C(0), // COMPLIANT
+    UINT8_C(1), // COMPLIANT
+    UINT8_C(8), // COMPLIANT
+    UINT8_C(0x23), // COMPLIANT
+    UINT8_C(034), // COMPLIANT
+
+    // Incorrect literal types
+    UINT8_C(1.0), // NON-COMPLIANT
+    UINT8_C(0b111), // NON-COMPLIANT
+
+    // Suffixes disallowed
+    UINT8_C(1u), // NON-COMPLIANT
+    UINT8_C(2U), // NON-COMPLIANT
+    UINT8_C(3l), // NON-COMPLIANT
+    UINT8_C(4L), // NON-COMPLIANT
+    UINT8_C(5ul), // NON-COMPLIANT
+
+    // Range tests
+    UINT8_C(255), // COMPLIANT
+    UINT8_C(0xFF), // COMPLIANT
+    UINT8_C(0377), // COMPLIANT
+    UINT8_C(256), // NON-COMPLIANT
+    UINT8_C(0400), // NON-COMPLIANT
+    UINT8_C(0x100), // NON-COMPLIANT
+
+    // Signage tests
+    UINT8_C(-1), // NON-COMPLIANT
+    UINT8_C(-20), // NON-COMPLIANT
+    UINT8_C(-33), // NON-COMPLIANT
+    UINT8_C(-0x44), // NON-COMPLIANT
+
+    // Invalid nonliteral expressions
+    UINT8_C(0 + 0), // NON-COMPLIANT
+    UINT8_C("a"[0]), // NON-COMPLIANT
+    UINT8_C(0["a"]), // NON-COMPLIANT
+    UINT8_C(UINT8_MAX), // NON-COMPLIANT
+};
+
+int_least8_t g2[] = {
+    // Basic valid
+    INT8_C(0), // COMPLIANT
+    INT8_C(1), // COMPLIANT
+    INT8_C(8), // COMPLIANT
+    INT8_C(0x23), // COMPLIANT
+    INT8_C(034), // COMPLIANT
+
+    // Range tests
+    INT8_C(127), // COMPLIANT
+    INT8_C(0x79), // COMPLIANT
+    INT8_C(0177), // COMPLIANT
+    INT8_C(128), // NON-COMPLIANT
+    INT8_C(0200), // NON-COMPLIANT
+    INT8_C(0x80), // NON-COMPLIANT
+    INT8_C(-128), // COMPLIANT
+    INT8_C(-0x80), // COMPLIANT
+    INT8_C(-0200), // COMPLIANT
+    INT8_C(-129), // NON-COMPLIANT
+    INT8_C(-0201), // NON-COMPLIANT
+    INT8_C(-0x81), // NON-COMPLIANT
+};
+
+uint_least16_t g3[] = {
+    // Basic valid
+    UINT16_C(0), // COMPLIANT
+    UINT16_C(0x23), // COMPLIANT
+    UINT16_C(034), // COMPLIANT
+
+    // Range tests
+    UINT16_C(65535), // COMPLIANT
+    UINT16_C(0xFFFF), // COMPLIANT
+    UINT16_C(0177777), // COMPLIANT
+    UINT16_C(65536), // NON-COMPLIANT
+    UINT16_C(0200000), // NON-COMPLIANT
+    UINT16_C(0x10000), // NON-COMPLIANT
+};
+
+int_least16_t g4[] = {
+    // Basic valid
+    INT16_C(0), // COMPLIANT
+    INT16_C(0x23), // COMPLIANT
+    INT16_C(034), // COMPLIANT
+
+    // Range tests
+    INT16_C(32767), // COMPLIANT
+    INT16_C(0x7FFF), // COMPLIANT
+    INT16_C(077777), // COMPLIANT
+    INT16_C(32768), // NON-COMPLIANT
+    INT16_C(0100000), // NON-COMPLIANT
+    INT16_C(0x8000), // NON-COMPLIANT
+    INT16_C(-32768), // COMPLIANT
+    INT16_C(-040000), // COMPLIANT
+    INT16_C(-0x8000), // COMPLIANT
+    INT16_C(-32769), // NON-COMPLIANT
+    INT16_C(-040001), // NON-COMPLIANT
+    INT16_C(-0x8001), // NON-COMPLIANT
+};
+
+uint_least32_t g5[] = {
+    // Basic valid
+    UINT32_C(0), // COMPLIANT
+
+    // Range tests
+    UINT32_C(4294967295), // COMPLIANT
+    UINT32_C(0xFFFFFFFF), // COMPLIANT
+    UINT32_C(4294967296), // NON-COMPLIANT
+    UINT32_C(0x100000000), // NON-COMPLIANT
+};
+
+int_least32_t g6[] = {
+    // Basic valid
+    INT32_C(0), // COMPLIANT
+
+    // Range tests
+    INT32_C(2147483647), // COMPLIANT
+    INT32_C(0x7FFFFFFF), // COMPLIANT
+    INT32_C(2147483648), // NON-COMPLIANT
+    INT32_C(0x800000000), // NON-COMPLIANT
+    INT32_C(-2147483648), // COMPLIANT
+    INT32_C(-0x80000000), // COMPLIANT
+    INT32_C(-2147483647), // NON-COMPLIANT
+    INT32_C(-0x800000001), // NON-COMPLIANT
+};
+
+uint_least64_t g7[] = {
+    // Basic valid
+    UINT64_C(0), // COMPLIANT
+
+    // Range tests
+    UINT64_C(18446744073709551615), // COMPLIANT
+    UINT64_C(0xFFFFFFFFFFFFFFFF), // COMPLIANT
+    // Compile time error if we try to create integer literals beyond this.
+};
+
+int_least64_t g8[] = {
+    // Basic valid
+    INT64_C(0), // COMPLIANT
+
+    // Range tests
+    INT64_C(9223372036854775807), // COMPLIANT
+    // INT64_C(9223372036854775808) is a compile-time error
+
+    // -9223372036854775808 allowed, but cannot be created via unary- without compile time errors.
+    INT64_C(-9223372036854775807), // COMPLIANT
+    INT64_C(-9223372036854775807 - 1), // COMPLIANT
+    // -9223372036854775809 is not allowed, and cannot be created via unary- without compile time errors.
+    INT64_C(-9223372036854775807 - 2), // NON-COMPLIANT
+
+    INT64_C(0x7FFFFFFFFFFFFFFF), // COMPLIANT
+    INT64_C(0x8000000000000000), // NON-COMPLIANT
+    INT64_C(-0x8000000000000000), // COMPLIANT
+    INT64_C(-0x8000000000000001), // NON-COMPLIANT
+};
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.expected b/c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.expected
new file mode 100644
index 0000000000..ddf517ed9e
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.expected
@@ -0,0 +1,4 @@
+| test.c:3:13:3:24 | INT8_C(c) | Usage of small integer constant macro INT8_C is not allowed. |
+| test.c:4:14:4:26 | UINT8_C(c) | Usage of small integer constant macro UINT8_C is not allowed. |
+| test.c:5:14:5:28 | INT16_C(c) | Usage of small integer constant macro INT16_C is not allowed. |
+| test.c:6:15:6:30 | UINT16_C(c) | Usage of small integer constant macro UINT16_C is not allowed. |
diff --git a/c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.qlref b/c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.qlref
new file mode 100644
index 0000000000..e41e2912d8
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.qlref
@@ -0,0 +1 @@
+rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-6/test.c b/c/misra/test/rules/RULE-7-6/test.c
new file mode 100644
index 0000000000..f2b783e800
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-6/test.c
@@ -0,0 +1,10 @@
+#include "stdint.h"
+
+int8_t g1 = INT8_C(0x12); // NON-COMPLIANT
+uint8_t g2 = UINT8_C(0x12); // NON-COMPLIANT
+int16_t g3 = INT16_C(0x1234); // NON-COMPLIANT
+uint16_t g4 = UINT16_C(0x1234); // NON-COMPLIANT
+int32_t g5 = INT32_C(0x1234); // COMPLIANT
+uint32_t g6 = UINT32_C(0x1234); // COMPLIANT
+int64_t g7 = INT64_C(0x1234); // COMPLIANT
+uint64_t g8 = UINT64_C(0x1234); // COMPLIANT
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
new file mode 100644
index 0000000000..472866fdea
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
@@ -0,0 +1,35 @@
+import cpp
+
+class IntegerConstantMacro extends Macro {
+  boolean signed;
+  int size;
+  IntegerConstantMacro() {
+    (
+    signed = true and size = getName().regexpCapture("INT(8|16|32|64)_C", 1).toInt()
+    ) or (
+    signed = false and size = getName().regexpCapture("UINT(8|16|32|64)_C", 1).toInt()
+    )
+  }
+
+  predicate isSmall() {
+    size < 32
+  }
+
+  int getSize() {
+    result = size
+  }
+
+  predicate isSigned() {
+    signed = true
+  }
+
+  int maxValue() {
+    (signed = true and result = 2.pow(getSize() - 1) - 1) or
+    (signed = false and result = 2.pow(getSize()) - 1)
+  }
+
+  int minValue() {
+    (signed = true and result = -(2.0.pow(getSize() - 1))) or
+    (signed = false and result = 0)
+  }
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index b10fbf0a2f..e4b7c88563 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -72,6 +72,7 @@ import Strings2
 import Strings3
 import Syntax
 import Types1
+import Types2
 
 /** The TQuery type representing this language * */
 newtype TCQuery =
@@ -144,7 +145,8 @@ newtype TCQuery =
   TStrings2PackageQuery(Strings2Query q) or
   TStrings3PackageQuery(Strings3Query q) or
   TSyntaxPackageQuery(SyntaxQuery q) or
-  TTypes1PackageQuery(Types1Query q)
+  TTypes1PackageQuery(Types1Query q) or
+  TTypes2PackageQuery(Types2Query q)
 
 /** The metadata predicate * */
 predicate isQueryMetadata(Query query, string queryId, string ruleId, string category) {
@@ -217,5 +219,6 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isStrings2QueryMetadata(query, queryId, ruleId, category) or
   isStrings3QueryMetadata(query, queryId, ruleId, category) or
   isSyntaxQueryMetadata(query, queryId, ruleId, category) or
-  isTypes1QueryMetadata(query, queryId, ruleId, category)
+  isTypes1QueryMetadata(query, queryId, ruleId, category) or
+  isTypes2QueryMetadata(query, queryId, ruleId, category)
 }
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll
new file mode 100644
index 0000000000..fbb5d06ee4
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll
@@ -0,0 +1,44 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Types2Query =
+  TInvalidIntegerConstantMacroArgumentQuery() or
+  TUseOfBannedSmallIntegerConstantMacroQuery()
+
+predicate isTypes2QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `invalidIntegerConstantMacroArgument` query
+    Types2Package::invalidIntegerConstantMacroArgumentQuery() and
+  queryId =
+    // `@id` for the `invalidIntegerConstantMacroArgument` query
+    "c/misra/invalid-integer-constant-macro-argument" and
+  ruleId = "RULE-7-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `useOfBannedSmallIntegerConstantMacro` query
+    Types2Package::useOfBannedSmallIntegerConstantMacroQuery() and
+  queryId =
+    // `@id` for the `useOfBannedSmallIntegerConstantMacro` query
+    "c/misra/use-of-banned-small-integer-constant-macro" and
+  ruleId = "RULE-7-6" and
+  category = "required"
+}
+
+module Types2Package {
+  Query invalidIntegerConstantMacroArgumentQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `invalidIntegerConstantMacroArgument` query
+      TQueryC(TTypes2PackageQuery(TInvalidIntegerConstantMacroArgumentQuery()))
+  }
+
+  Query useOfBannedSmallIntegerConstantMacroQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `useOfBannedSmallIntegerConstantMacro` query
+      TQueryC(TTypes2PackageQuery(TUseOfBannedSmallIntegerConstantMacroQuery()))
+  }
+}
diff --git a/rule_packages/c/Types2.json b/rule_packages/c/Types2.json
new file mode 100644
index 0000000000..9468af278c
--- /dev/null
+++ b/rule_packages/c/Types2.json
@@ -0,0 +1,42 @@
+{
+  "MISRA-C-2012": {
+    "RULE-7-5": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Integer constant macros should be given appropriate values for the size of the integer type.",
+          "kind": "problem",
+          "name": "The argument of an integer constant macro shall have an appropriate form",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "InvalidIntegerConstantMacroArgument",
+          "tags": [
+            "correctness"
+          ]
+        }
+      ],
+      "title": "The argument of an integer constant macro shall have an appropriate form"
+    },
+    "RULE-7-6": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Small integer constant macros expression are promoted to type int, which can lead to unexpected results.",
+          "kind": "problem",
+          "name": "The small integer variants of the minimum-width integer constant macros shall not be used",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "UseOfBannedSmallIntegerConstantMacro",
+          "tags": [
+            "readability"
+          ]
+        }
+      ],
+      "title": "The small integer variants of the minimum-width integer constant macros shall not be used"
+    }
+  }
+}
\ No newline at end of file

From 581366094b70e13905c602470a6b699c868fde13 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 30 Sep 2024 16:41:15 -0700
Subject: [PATCH 250/435] Implement Types2 package.

Break up integer constant macro rules into several queries to make it easier to
handle exceptions and deviations.
---
 ...rectlySizedIntegerConstantMacroArgument.ql |  44 ++++++
 .../IntegerConstantMacroArgumentUsesSuffix.ql |  29 ++++
 .../InvalidIntegerConstantMacroArgument.ql    |  87 +++--------
 ...dLiteralForIntegerConstantMacroArgument.ql |  47 ++++++
 ...SizedIntegerConstantMacroArgument.expected |  28 ++++
 ...tlySizedIntegerConstantMacroArgument.qlref |   1 +
 ...erConstantMacroArgumentUsesSuffix.expected |   5 +
 ...tegerConstantMacroArgumentUsesSuffix.qlref |   1 +
 ...validIntegerConstantMacroArgument.expected |  60 +-------
 ...alForIntegerConstantMacroArgument.expected |   2 +
 ...teralForIntegerConstantMacroArgument.qlref |   1 +
 c/misra/test/rules/RULE-7-5/test.c            | 142 +++++++++---------
 .../cpp/IntegerConstantMacro.qll              |  38 ++---
 .../src/codingstandards/cpp/Literals.qll      |  44 ++++++
 .../cpp/exclusions/c/Types2.qll               |  51 +++++++
 rule_packages/c/Types2.json                   |  41 ++++-
 16 files changed, 410 insertions(+), 211 deletions(-)
 create mode 100644 c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
 create mode 100644 c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
 create mode 100644 c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
 create mode 100644 c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
 create mode 100644 c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.qlref
 create mode 100644 c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
 create mode 100644 c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.qlref
 create mode 100644 c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
 create mode 100644 c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.qlref

diff --git a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
new file mode 100644
index 0000000000..dd1417c2a6
--- /dev/null
+++ b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
@@ -0,0 +1,44 @@
+/**
+ * @id c/misra/incorrectly-sized-integer-constant-macro-argument
+ * @name RULE-7-5: The argument of an integer constant macro shall have an appropriate size
+ * @description Integer constant macros argument values should be values of a compatible size
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-7-5
+ *       correctness
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.IntegerConstantMacro
+import codingstandards.cpp.Literals
+
+predicate matchesSign(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
+  literal.isNegative() implies macro.isSigned()
+}
+
+predicate matchesSize(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
+  // Wait for BigInt support to check 64 bit macro types.
+  (macro.getSize() < 64 and matchesSign(macro, literal))
+  implies
+  (
+    literal.getRawValue() <= macro.maxValue() and
+    literal.getRawValue() >= macro.minValue()
+  )
+}
+
+from
+  PossiblyNegativeLiteral literal, MacroInvocation invoke, IntegerConstantMacro macro,
+  string explanation
+where
+  not isExcluded(invoke, Types2Package::incorrectlySizedIntegerConstantMacroArgumentQuery()) and
+  invoke.getMacro() = macro and
+  literal = invoke.getExpr() and
+  (
+    not matchesSign(macro, invoke.getExpr()) and explanation = "cannot be negative"
+    or
+    not matchesSize(macro, invoke.getExpr()) and explanation = "is too large for the specified type"
+  )
+select invoke.getExpr(), "Integer constant macro value " + explanation
diff --git a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
new file mode 100644
index 0000000000..f4ca73e16c
--- /dev/null
+++ b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
@@ -0,0 +1,29 @@
+/**
+ * @id c/misra/integer-constant-macro-argument-uses-suffix
+ * @name RULE-7-5: The argument of an integer constant macro shall not use literal suffixes u, l, or ul
+ * @description Integer constant macros should be used integer literal values with no u/l suffix.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-7-5
+ *       readability
+ *       maintainability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.IntegerConstantMacro
+import codingstandards.cpp.Literals
+
+predicate usesSuffix(MacroInvocation invoke) {
+  invoke.getUnexpandedArgument(0).regexpMatch(".*[uUlL]")
+}
+
+from MacroInvocation invoke, PossiblyNegativeLiteral argument
+where
+  not isExcluded(invoke, Types2Package::integerConstantMacroArgumentUsesSuffixQuery()) and
+  invoke.getMacro() instanceof IntegerConstantMacro and
+  invoke.getExpr() = argument and
+  usesSuffix(invoke)
+select invoke.getExpr(), "Integer constant macro arguments should not have 'u'/'l' suffix."
diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
index b58f87a5ca..33ec266b51 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -1,8 +1,7 @@
 /**
  * @id c/misra/invalid-integer-constant-macro-argument
- * @name RULE-7-5: The argument of an integer constant macro shall have an appropriate form
- * @description Integer constant macros should be given appropriate values for the size of the
- *              integer type.
+ * @name RULE-7-5: The argument of an integer constant macro shall be a literal
+ * @description Integer constant macros should be given a literal value as an argument
  * @kind problem
  * @precision very-high
  * @problem.severity error
@@ -14,73 +13,29 @@
 import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.IntegerConstantMacro
-import codingstandards.cpp.Cpp14Literal
+import codingstandards.cpp.Literals
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
-abstract class PossiblyNegativeLiteral extends Expr {
-  abstract Cpp14Literal::IntegerLiteral getBaseLiteral();
-
-  predicate isNegative() {
-    this instanceof NegativeLiteral
-  }
-}
-
-class NegativeLiteral extends PossiblyNegativeLiteral, UnaryMinusExpr {
-  Cpp14Literal::IntegerLiteral literal;
-
-  NegativeLiteral() {
-    literal = getOperand()
-  }
-
-  override Cpp14Literal::IntegerLiteral getBaseLiteral() {
-    result = literal
-  }
-}
-
-class PositiveLiteral extends PossiblyNegativeLiteral, Cpp14Literal::IntegerLiteral {
-  PositiveLiteral() {
-    not exists(UnaryMinusExpr l | l.getOperand() = this)
-  }
-
-  override Cpp14Literal::IntegerLiteral getBaseLiteral() {
-    result = this
-  }
-}
-
-predicate validExpr(Expr expr) {
-  expr instanceof PossiblyNegativeLiteral
-}
-
-predicate usesSuffix(MacroInvocation invoke) {
-  invoke.getUnexpandedArgument(0).regexpMatch(".*[uUlL]")
-}
-
-predicate matchedSign(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
-  literal.isNegative() implies macro.isSigned()
-}
-
-predicate validLiteralType(PossiblyNegativeLiteral expr) {
-  expr.getBaseLiteral() instanceof Cpp14Literal::DecimalLiteral or
-  expr.getBaseLiteral() instanceof Cpp14Literal::OctalLiteral or
-  expr.getBaseLiteral() instanceof Cpp14Literal::HexLiteral
-}
-
-predicate matchesSize(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
-  // Note: upperBound should equal lowerBound.
-  upperBound(literal) <= macro.maxValue() and
-  lowerBound(literal) >= macro.minValue() and exists("123".toBigInt())
+/**
+ * The max negative 64 bit signed integer is one less than the negative of the
+ * max positive signed 64 bit integer. The only way to create a "negative"
+ * literal is to use unary- negation of a positive literal. Therefore, clang
+ * (and likely other compilers) rejects `INT64_C(-92233...808)` but accepts
+ * `INT64_C(-92233...807 - 1)`. Therefore, in this case allow non-literal
+ * expressions.
+ */
+predicate specialMaxNegative64Exception(IntegerConstantMacro macro, Expr expr) {
+  macro.getSize() = 64 and
+  macro.isSigned() and
+  // Set a cutoff with precision, fix once BigInt library is available.
+  upperBound(expr) < macro.minValue() * 0.999999999 and
+  upperBound(expr) > macro.minValue() * 1.000000001
 }
 
-from MacroInvocation invoke, IntegerConstantMacro macro, string explanation
+from MacroInvocation invoke, IntegerConstantMacro macro
 where
   not isExcluded(invoke, Types2Package::invalidIntegerConstantMacroArgumentQuery()) and
   invoke.getMacro() = macro and
-  (
-    (not validExpr(invoke.getExpr()) and explanation = "invalid expression") or
-    (validLiteralType(invoke.getExpr()) and explanation = "invalid literal type" + invoke.getExpr().getAQlClass()) or
-    (usesSuffix(invoke) and explanation = "literal suffixes not allowed") or
-    (not matchedSign(macro, invoke.getExpr()) and explanation = "signed/unsigned mismatch") or
-    (not matchesSize(macro, invoke.getExpr()) and explanation  = "invalid size")
-  )
-  
-select invoke.getExpr(), "Invalid integer constant macro: " + explanation
+  not invoke.getExpr() instanceof PossiblyNegativeLiteral and
+  not specialMaxNegative64Exception(macro, invoke.getExpr())
+select invoke.getExpr(), "Integer constant macro argument must be an integer literal."
diff --git a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
new file mode 100644
index 0000000000..2447d82f6f
--- /dev/null
+++ b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
@@ -0,0 +1,47 @@
+/**
+ * @id c/misra/invalid-literal-for-integer-constant-macro-argument
+ * @name RULE-7-5: The argument of an integer constant macro shall be a decimal, hex, or octal literal
+ * @description Integer constant macro arguments should be a decimal, hex, or octal literal
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-7-5
+ *       correctness
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.IntegerConstantMacro
+import codingstandards.cpp.Literals
+
+/**
+ * Floating point literals are not allowed. Neither are char or string
+ * literals, although those are not `NumericLiteral`s and therefore detected in
+ * `InvalidIntegerConstantMacroArgument.ql`.
+ */
+predicate validLiteralType(PossiblyNegativeLiteral literal) {
+  literal.getBaseLiteral() instanceof Cpp14Literal::DecimalLiteral or
+  literal.getBaseLiteral() instanceof Cpp14Literal::OctalLiteral or
+  literal.getBaseLiteral() instanceof Cpp14Literal::HexLiteral
+}
+
+/**
+ * Clang accepts `xINTsize_C(0b01)`, and expands the argument into a decimal
+ * literal. Binary literals are not standard c nor are they allowed by rule 7-5.
+ * Detect this pattern before macro expansion.
+ */
+predicate seemsBinaryLiteral(MacroInvocation invoke) {
+  invoke.getUnexpandedArgument(0).regexpMatch("0[bB][01]+")
+}
+
+from MacroInvocation invoke, PossiblyNegativeLiteral literal
+where
+  not isExcluded(invoke, Types2Package::invalidLiteralForIntegerConstantMacroArgumentQuery()) and
+  invoke.getMacro() instanceof IntegerConstantMacro and
+  literal = invoke.getExpr() and
+  (
+    not validLiteralType(literal) or
+    seemsBinaryLiteral(invoke)
+  )
+select literal, "Integer constant macro arguments must be a decimal, octal, or hex integer literal."
diff --git a/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
new file mode 100644
index 0000000000..9ce9b29e3c
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
@@ -0,0 +1,28 @@
+| test.c:26:13:26:15 | 256 | Integer constant macro value is too large for the specified type |
+| test.c:27:13:27:16 | 256 | Integer constant macro value is too large for the specified type |
+| test.c:28:13:28:17 | 256 | Integer constant macro value is too large for the specified type |
+| test.c:31:13:31:14 | - ... | Integer constant macro value cannot be negative |
+| test.c:32:13:32:15 | - ... | Integer constant macro value cannot be negative |
+| test.c:33:13:33:15 | - ... | Integer constant macro value cannot be negative |
+| test.c:34:13:34:17 | - ... | Integer constant macro value cannot be negative |
+| test.c:55:12:55:14 | 128 | Integer constant macro value is too large for the specified type |
+| test.c:56:12:56:15 | 128 | Integer constant macro value is too large for the specified type |
+| test.c:57:12:57:15 | 128 | Integer constant macro value is too large for the specified type |
+| test.c:61:12:61:15 | - ... | Integer constant macro value is too large for the specified type |
+| test.c:62:12:62:16 | - ... | Integer constant macro value is too large for the specified type |
+| test.c:63:12:63:16 | - ... | Integer constant macro value is too large for the specified type |
+| test.c:76:14:76:18 | 65536 | Integer constant macro value is too large for the specified type |
+| test.c:77:14:77:20 | 65536 | Integer constant macro value is too large for the specified type |
+| test.c:78:14:78:20 | 65536 | Integer constant macro value is too large for the specified type |
+| test.c:91:13:91:17 | 32768 | Integer constant macro value is too large for the specified type |
+| test.c:92:13:92:19 | 32768 | Integer constant macro value is too large for the specified type |
+| test.c:93:13:93:18 | 32768 | Integer constant macro value is too large for the specified type |
+| test.c:97:13:97:18 | - ... | Integer constant macro value is too large for the specified type |
+| test.c:98:13:98:20 | - ... | Integer constant macro value is too large for the specified type |
+| test.c:99:13:99:19 | - ... | Integer constant macro value is too large for the specified type |
+| test.c:109:14:109:24 | 4294967296 | Integer constant macro value is too large for the specified type |
+| test.c:110:14:110:25 | 4294967296 | Integer constant macro value is too large for the specified type |
+| test.c:120:13:120:22 | 2147483648 | Integer constant macro value is too large for the specified type |
+| test.c:121:13:121:22 | 2147483648 | Integer constant macro value is too large for the specified type |
+| test.c:124:13:124:23 | - ... | Integer constant macro value is too large for the specified type |
+| test.c:125:13:125:23 | - ... | Integer constant macro value is too large for the specified type |
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.qlref b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.qlref
new file mode 100644
index 0000000000..ca6959acec
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.qlref
@@ -0,0 +1 @@
+rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
new file mode 100644
index 0000000000..cabe2c5c51
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
@@ -0,0 +1,5 @@
+| test.c:16:13:16:14 | 1 | Integer constant macro arguments should not have 'u'/'l' suffix. |
+| test.c:17:13:17:14 | 2 | Integer constant macro arguments should not have 'u'/'l' suffix. |
+| test.c:18:13:18:14 | 3 | Integer constant macro arguments should not have 'u'/'l' suffix. |
+| test.c:19:13:19:14 | 4 | Integer constant macro arguments should not have 'u'/'l' suffix. |
+| test.c:20:13:20:15 | 5 | Integer constant macro arguments should not have 'u'/'l' suffix. |
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.qlref b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.qlref
new file mode 100644
index 0000000000..afadb6e34b
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.qlref
@@ -0,0 +1 @@
+rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
index b38863eccd..16e28bcd84 100644
--- a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
@@ -1,55 +1,5 @@
-| test.c:12:13:12:15 | 1.0 | Invalid integer constant macro: invalid literal type |
-| test.c:13:13:12:15 | 0b111 | Invalid integer constant macro: invalid literal type |
-| test.c:16:13:16:14 | 1 | Invalid integer constant macro: literal suffixes not allowed |
-| test.c:17:13:17:14 | 2 | Invalid integer constant macro: literal suffixes not allowed |
-| test.c:18:13:18:14 | 3 | Invalid integer constant macro: literal suffixes not allowed |
-| test.c:19:13:19:14 | 4 | Invalid integer constant macro: literal suffixes not allowed |
-| test.c:20:13:20:15 | 5 | Invalid integer constant macro: literal suffixes not allowed |
-| test.c:26:13:26:15 | 256 | Invalid integer constant macro: invalid size |
-| test.c:27:13:27:16 | 256 | Invalid integer constant macro: invalid size |
-| test.c:28:13:28:17 | 256 | Invalid integer constant macro: invalid size |
-| test.c:31:13:31:14 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
-| test.c:32:13:32:15 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
-| test.c:33:13:33:15 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
-| test.c:34:13:34:17 | - ... | Invalid integer constant macro: signed/unsigned mismatch |
-| test.c:37:13:37:17 | ... + ... | Invalid integer constant macro: invalid expression |
-| test.c:38:13:38:18 | access to array | Invalid integer constant macro: invalid expression |
-| test.c:39:13:39:18 | access to array | Invalid integer constant macro: invalid expression |
-| test.c:40:13:39:18 | UINT8_MAX | Invalid integer constant macro: invalid expression |
-| test.c:54:12:54:15 | 191 | Invalid integer constant macro: invalid size |
-| test.c:55:12:55:14 | 255 | Invalid integer constant macro: invalid size |
-| test.c:56:12:56:15 | 192 | Invalid integer constant macro: invalid size |
-| test.c:57:12:57:15 | 128 | Invalid integer constant macro: invalid size |
-| test.c:61:12:57:15 | -129 | Invalid integer constant macro: invalid size |
-| test.c:62:12:57:15 | -129 | Invalid integer constant macro: invalid size |
-| test.c:63:12:57:15 | -201 | Invalid integer constant macro: invalid size |
-| test.c:64:12:57:15 | -0x81 | Invalid integer constant macro: invalid size |
-| test.c:76:14:76:18 | 65536 | Invalid integer constant macro: invalid size |
-| test.c:78:14:78:20 | 65536 | Invalid integer constant macro: invalid size |
-| test.c:91:13:91:17 | 32768 | Invalid integer constant macro: invalid size |
-| test.c:93:13:93:18 | 32768 | Invalid integer constant macro: invalid size |
-| test.c:97:13:93:18 | -32769 | Invalid integer constant macro: invalid size |
-| test.c:98:13:93:18 | -040001 | Invalid integer constant macro: invalid size |
-| test.c:99:13:93:18 | -0x8001 | Invalid integer constant macro: invalid size |
-| test.c:109:14:109:24 | 4294967296 | Invalid integer constant macro: invalid size |
-| test.c:110:14:110:25 | 4294967296 | Invalid integer constant macro: invalid size |
-| test.c:120:13:120:22 | 2147483648 | Invalid integer constant macro: invalid size |
-| test.c:121:13:121:23 | 34359738368 | Invalid integer constant macro: invalid size |
-| test.c:130:14:130:15 | 0 | Invalid integer constant macro: invalid size |
-| test.c:133:14:133:34 | 18446744073709551615 | Invalid integer constant macro: invalid size |
-| test.c:134:14:134:32 | 18446744073709551615 | Invalid integer constant macro: invalid size |
-| test.c:140:13:140:14 | 0 | Invalid integer constant macro: invalid size |
-| test.c:143:13:143:32 | 9223372036854775807 | Invalid integer constant macro: invalid size |
-| test.c:147:13:147:33 | - ... | Invalid integer constant macro: invalid size |
-| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: invalid expression |
-| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: invalid literal type |
-| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: invalid size |
-| test.c:148:13:148:37 | ... - ... | Invalid integer constant macro: signed/unsigned mismatch |
-| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: invalid expression |
-| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: invalid literal type |
-| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: invalid size |
-| test.c:150:13:150:37 | ... - ... | Invalid integer constant macro: signed/unsigned mismatch |
-| test.c:152:13:152:31 | 9223372036854775807 | Invalid integer constant macro: invalid size |
-| test.c:153:13:153:31 | 9223372036854775808 | Invalid integer constant macro: invalid size |
-| test.c:154:13:154:31 | - ... | Invalid integer constant macro: invalid size |
-| test.c:155:13:155:30 | - ... | Invalid integer constant macro: invalid size |
+| test.c:37:13:37:17 | ... + ... | Integer constant macro argument must be an integer literal. |
+| test.c:38:13:38:18 | access to array | Integer constant macro argument must be an integer literal. |
+| test.c:39:13:39:19 | access to array | Integer constant macro argument must be an integer literal. |
+| test.c:152:13:152:37 | ... - ... | Integer constant macro argument must be an integer literal. |
+| test.c:153:13:153:47 | ... - ... | Integer constant macro argument must be an integer literal. |
diff --git a/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
new file mode 100644
index 0000000000..9d8c525527
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
@@ -0,0 +1,2 @@
+| test.c:12:13:12:15 | 1.0 | Integer constant macro arguments must be a decimal, octal, or hex integer literal. |
+| test.c:13:13:13:17 | 7 | Integer constant macro arguments must be a decimal, octal, or hex integer literal. |
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.qlref b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.qlref
new file mode 100644
index 0000000000..5584fe8d46
--- /dev/null
+++ b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.qlref
@@ -0,0 +1 @@
+rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-7-5/test.c b/c/misra/test/rules/RULE-7-5/test.c
index 4412bdf82f..f9650254ca 100644
--- a/c/misra/test/rules/RULE-7-5/test.c
+++ b/c/misra/test/rules/RULE-7-5/test.c
@@ -2,101 +2,101 @@
 
 uint_least8_t g1[] = {
     // Basic valid
-    UINT8_C(0), // COMPLIANT
-    UINT8_C(1), // COMPLIANT
-    UINT8_C(8), // COMPLIANT
+    UINT8_C(0),    // COMPLIANT
+    UINT8_C(1),    // COMPLIANT
+    UINT8_C(8),    // COMPLIANT
     UINT8_C(0x23), // COMPLIANT
-    UINT8_C(034), // COMPLIANT
+    UINT8_C(034),  // COMPLIANT
 
     // Incorrect literal types
-    UINT8_C(1.0), // NON-COMPLIANT
+    UINT8_C(1.0),   // NON-COMPLIANT
     UINT8_C(0b111), // NON-COMPLIANT
 
     // Suffixes disallowed
-    UINT8_C(1u), // NON-COMPLIANT
-    UINT8_C(2U), // NON-COMPLIANT
-    UINT8_C(3l), // NON-COMPLIANT
-    UINT8_C(4L), // NON-COMPLIANT
+    UINT8_C(1u),  // NON-COMPLIANT
+    UINT8_C(2U),  // NON-COMPLIANT
+    UINT8_C(3l),  // NON-COMPLIANT
+    UINT8_C(4L),  // NON-COMPLIANT
     UINT8_C(5ul), // NON-COMPLIANT
 
     // Range tests
-    UINT8_C(255), // COMPLIANT
-    UINT8_C(0xFF), // COMPLIANT
-    UINT8_C(0377), // COMPLIANT
-    UINT8_C(256), // NON-COMPLIANT
-    UINT8_C(0400), // NON-COMPLIANT
+    UINT8_C(255),   // COMPLIANT
+    UINT8_C(0xFF),  // COMPLIANT
+    UINT8_C(0377),  // COMPLIANT
+    UINT8_C(256),   // NON-COMPLIANT
+    UINT8_C(0400),  // NON-COMPLIANT
     UINT8_C(0x100), // NON-COMPLIANT
 
     // Signage tests
-    UINT8_C(-1), // NON-COMPLIANT
-    UINT8_C(-20), // NON-COMPLIANT
-    UINT8_C(-33), // NON-COMPLIANT
+    UINT8_C(-1),    // NON-COMPLIANT
+    UINT8_C(-20),   // NON-COMPLIANT
+    UINT8_C(-33),   // NON-COMPLIANT
     UINT8_C(-0x44), // NON-COMPLIANT
 
     // Invalid nonliteral expressions
-    UINT8_C(0 + 0), // NON-COMPLIANT
-    UINT8_C("a"[0]), // NON-COMPLIANT
-    UINT8_C(0["a"]), // NON-COMPLIANT
-    UINT8_C(UINT8_MAX), // NON-COMPLIANT
+    UINT8_C(0 + 0),     // NON-COMPLIANT
+    UINT8_C("a"[0]),    // NON-COMPLIANT
+    UINT8_C(0 ["a"]),   // NON-COMPLIANT
+    UINT8_C(UINT8_MAX), // COMPLIANT
 };
 
 int_least8_t g2[] = {
     // Basic valid
-    INT8_C(0), // COMPLIANT
-    INT8_C(1), // COMPLIANT
-    INT8_C(8), // COMPLIANT
+    INT8_C(0),    // COMPLIANT
+    INT8_C(1),    // COMPLIANT
+    INT8_C(8),    // COMPLIANT
     INT8_C(0x23), // COMPLIANT
-    INT8_C(034), // COMPLIANT
+    INT8_C(034),  // COMPLIANT
 
     // Range tests
-    INT8_C(127), // COMPLIANT
-    INT8_C(0x79), // COMPLIANT
-    INT8_C(0177), // COMPLIANT
-    INT8_C(128), // NON-COMPLIANT
-    INT8_C(0200), // NON-COMPLIANT
-    INT8_C(0x80), // NON-COMPLIANT
-    INT8_C(-128), // COMPLIANT
+    INT8_C(127),   // COMPLIANT
+    INT8_C(0x79),  // COMPLIANT
+    INT8_C(0177),  // COMPLIANT
+    INT8_C(128),   // NON-COMPLIANT
+    INT8_C(0200),  // NON-COMPLIANT
+    INT8_C(0x80),  // NON-COMPLIANT
+    INT8_C(-128),  // COMPLIANT
     INT8_C(-0x80), // COMPLIANT
     INT8_C(-0200), // COMPLIANT
-    INT8_C(-129), // NON-COMPLIANT
+    INT8_C(-129),  // NON-COMPLIANT
     INT8_C(-0201), // NON-COMPLIANT
     INT8_C(-0x81), // NON-COMPLIANT
 };
 
 uint_least16_t g3[] = {
     // Basic valid
-    UINT16_C(0), // COMPLIANT
+    UINT16_C(0),    // COMPLIANT
     UINT16_C(0x23), // COMPLIANT
-    UINT16_C(034), // COMPLIANT
+    UINT16_C(034),  // COMPLIANT
 
     // Range tests
-    UINT16_C(65535), // COMPLIANT
-    UINT16_C(0xFFFF), // COMPLIANT
+    UINT16_C(65535),   // COMPLIANT
+    UINT16_C(0xFFFF),  // COMPLIANT
     UINT16_C(0177777), // COMPLIANT
-    UINT16_C(65536), // NON-COMPLIANT
+    UINT16_C(65536),   // NON-COMPLIANT
     UINT16_C(0200000), // NON-COMPLIANT
     UINT16_C(0x10000), // NON-COMPLIANT
 };
 
 int_least16_t g4[] = {
     // Basic valid
-    INT16_C(0), // COMPLIANT
+    INT16_C(0),    // COMPLIANT
     INT16_C(0x23), // COMPLIANT
-    INT16_C(034), // COMPLIANT
+    INT16_C(034),  // COMPLIANT
 
     // Range tests
-    INT16_C(32767), // COMPLIANT
-    INT16_C(0x7FFF), // COMPLIANT
-    INT16_C(077777), // COMPLIANT
-    INT16_C(32768), // NON-COMPLIANT
-    INT16_C(0100000), // NON-COMPLIANT
-    INT16_C(0x8000), // NON-COMPLIANT
-    INT16_C(-32768), // COMPLIANT
-    INT16_C(-040000), // COMPLIANT
-    INT16_C(-0x8000), // COMPLIANT
-    INT16_C(-32769), // NON-COMPLIANT
-    INT16_C(-040001), // NON-COMPLIANT
-    INT16_C(-0x8001), // NON-COMPLIANT
+    INT16_C(32767),    // COMPLIANT
+    INT16_C(0x7FFF),   // COMPLIANT
+    INT16_C(077777),   // COMPLIANT
+    INT16_C(32768),    // NON-COMPLIANT
+    INT16_C(0100000),  // NON-COMPLIANT
+    INT16_C(0x8000),   // NON-COMPLIANT
+    INT16_C(-32768),   // COMPLIANT
+    INT16_C(-0100000), // COMPLIANT
+    INT16_C(-0x8000),  // COMPLIANT
+    INT16_C(-32769),   // NON-COMPLIANT
+    INT16_C(-0100001), // NON-COMPLIANT
+    INT16_C(-0x8001),  // NON-COMPLIANT
 };
 
 uint_least32_t g5[] = {
@@ -104,9 +104,9 @@ uint_least32_t g5[] = {
     UINT32_C(0), // COMPLIANT
 
     // Range tests
-    UINT32_C(4294967295), // COMPLIANT
-    UINT32_C(0xFFFFFFFF), // COMPLIANT
-    UINT32_C(4294967296), // NON-COMPLIANT
+    UINT32_C(4294967295),  // COMPLIANT
+    UINT32_C(0xFFFFFFFF),  // COMPLIANT
+    UINT32_C(4294967296),  // NON-COMPLIANT
     UINT32_C(0x100000000), // NON-COMPLIANT
 };
 
@@ -115,14 +115,14 @@ int_least32_t g6[] = {
     INT32_C(0), // COMPLIANT
 
     // Range tests
-    INT32_C(2147483647), // COMPLIANT
-    INT32_C(0x7FFFFFFF), // COMPLIANT
-    INT32_C(2147483648), // NON-COMPLIANT
-    INT32_C(0x800000000), // NON-COMPLIANT
+    INT32_C(2147483647),  // COMPLIANT
+    INT32_C(0x7FFFFFFF),  // COMPLIANT
+    INT32_C(2147483648),  // NON-COMPLIANT
+    INT32_C(0x80000000),  // NON-COMPLIANT
     INT32_C(-2147483648), // COMPLIANT
     INT32_C(-0x80000000), // COMPLIANT
-    INT32_C(-2147483647), // NON-COMPLIANT
-    INT32_C(-0x800000001), // NON-COMPLIANT
+    INT32_C(-2147483649), // NON-COMPLIANT
+    INT32_C(-0x80000001), // NON-COMPLIANT
 };
 
 uint_least64_t g7[] = {
@@ -131,7 +131,7 @@ uint_least64_t g7[] = {
 
     // Range tests
     UINT64_C(18446744073709551615), // COMPLIANT
-    UINT64_C(0xFFFFFFFFFFFFFFFF), // COMPLIANT
+    UINT64_C(0xFFFFFFFFFFFFFFFF),   // COMPLIANT
     // Compile time error if we try to create integer literals beyond this.
 };
 
@@ -143,14 +143,18 @@ int_least64_t g8[] = {
     INT64_C(9223372036854775807), // COMPLIANT
     // INT64_C(9223372036854775808) is a compile-time error
 
-    // -9223372036854775808 allowed, but cannot be created via unary- without compile time errors.
-    INT64_C(-9223372036854775807), // COMPLIANT
+    // -9223372036854775808 allowed, but cannot be created via unary- without
+    // compile time errors.
+    INT64_C(-9223372036854775807),     // COMPLIANT
     INT64_C(-9223372036854775807 - 1), // COMPLIANT
-    // -9223372036854775809 is not allowed, and cannot be created via unary- without compile time errors.
-    INT64_C(-9223372036854775807 - 2), // NON-COMPLIANT
+    // -9223372036854775809 is not allowed, and cannot be created via unary-
+    // without compile time errors.
+    INT64_C(-9223372036854775807 - 2),           // NON-COMPLIANT
+    INT64_C(-9223372036854775807 - 20000000000), // NON-COMPLIANT
 
-    INT64_C(0x7FFFFFFFFFFFFFFF), // COMPLIANT
-    INT64_C(0x8000000000000000), // NON-COMPLIANT
+    INT64_C(0x7FFFFFFFFFFFFFFF),  // COMPLIANT
+    INT64_C(0x8000000000000000),  // NON-COMPLIANT[FALSE NEGATIVE]
     INT64_C(-0x8000000000000000), // COMPLIANT
-    INT64_C(-0x8000000000000001), // NON-COMPLIANT
+    INT64_C(-0x8000000000000001), // NON-COMPLIANT[FALSE NEGATIVE]
+    INT64_C(-0x8001000000000000), // NON-COMPLIANT
 };
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
index 472866fdea..e38293c8cb 100644
--- a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
+++ b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
@@ -1,35 +1,35 @@
 import cpp
 
+/**
+ * The family of macros `xINTsize_C(arg)` (e.g. `UINT16_C(123)`) which are used
+ * to create an integer constant of type `Xint_leastSIZE_t` (e.g.
+ * `uint_least16_t).
+ */
 class IntegerConstantMacro extends Macro {
   boolean signed;
   int size;
+
   IntegerConstantMacro() {
-    (
     signed = true and size = getName().regexpCapture("INT(8|16|32|64)_C", 1).toInt()
-    ) or (
+    or
     signed = false and size = getName().regexpCapture("UINT(8|16|32|64)_C", 1).toInt()
-    )
   }
 
-  predicate isSmall() {
-    size < 32
-  }
+  predicate isSmall() { size < 32 }
 
-  int getSize() {
-    result = size
-  }
+  int getSize() { result = size }
 
-  predicate isSigned() {
-    signed = true
-  }
+  predicate isSigned() { signed = true }
 
-  int maxValue() {
-    (signed = true and result = 2.pow(getSize() - 1) - 1) or
-    (signed = false and result = 2.pow(getSize()) - 1)
+  float maxValue() {
+    signed = true and result = 2.pow(size - 1 * 1.0) - 1
+    or
+    signed = false and result = 2.pow(size) - 1
   }
 
-  int minValue() {
-    (signed = true and result = -(2.0.pow(getSize() - 1))) or
-    (signed = false and result = 0)
+  float minValue() {
+    signed = true and result = -2.pow(size - 1)
+    or
+    signed = false and result = 0
   }
-}
\ No newline at end of file
+}
diff --git a/cpp/common/src/codingstandards/cpp/Literals.qll b/cpp/common/src/codingstandards/cpp/Literals.qll
index 66e15b28dc..cc0d28dec9 100644
--- a/cpp/common/src/codingstandards/cpp/Literals.qll
+++ b/cpp/common/src/codingstandards/cpp/Literals.qll
@@ -4,6 +4,7 @@
 
 import cpp
 import codingstandards.cpp.Cpp14Literal
+import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
 class IntegerLiteral = Cpp14Literal::IntegerLiteral;
 
@@ -70,3 +71,46 @@ class BoolLiteral extends Literal {
     this.getValue() = "0" and this.getValueText() = "false"
   }
 }
+
+/**
+ * Abstract case to handle positive and negative "literal" expressions.
+ *
+ * All numeric literals in c/cpp are positive. To create a negative constant
+ * value in a program means applying the unary- operator to a positive literal.
+ * This class effectively describes positive or negative literals.
+ */
+abstract class PossiblyNegativeLiteral extends Expr {
+  /* The syntactic literal, stripped of potential negation */
+  abstract Cpp14Literal::NumericLiteral getBaseLiteral();
+
+  /* The value as a literal reads, without potential underflows from negation */
+  abstract float getRawValue();
+
+  predicate isNegative() { this instanceof NegativeLiteral }
+}
+
+/**
+ * A negation of a positive literal, creating what can be thought of as a
+ * "negative literal."
+ */
+class NegativeLiteral extends PossiblyNegativeLiteral, UnaryMinusExpr {
+  Cpp14Literal::NumericLiteral literal;
+
+  NegativeLiteral() { literal = getOperand() }
+
+  override Cpp14Literal::NumericLiteral getBaseLiteral() { result = literal }
+
+  override float getRawValue() { result = -lowerBound(literal) }
+}
+
+/**
+ * A literal which is not immediately negated by a parent unary- expression,
+ * which can be thought of as a "positive literal."
+ */
+class PositiveLiteral extends PossiblyNegativeLiteral, Cpp14Literal::NumericLiteral {
+  PositiveLiteral() { not exists(UnaryMinusExpr l | l.getOperand() = this) }
+
+  override Cpp14Literal::NumericLiteral getBaseLiteral() { result = this }
+
+  override float getRawValue() { result = lowerBound(this) }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll
index fbb5d06ee4..3b2d3a4342 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/Types2.qll
@@ -5,6 +5,9 @@ import codingstandards.cpp.exclusions.RuleMetadata
 
 newtype Types2Query =
   TInvalidIntegerConstantMacroArgumentQuery() or
+  TInvalidLiteralForIntegerConstantMacroArgumentQuery() or
+  TIntegerConstantMacroArgumentUsesSuffixQuery() or
+  TIncorrectlySizedIntegerConstantMacroArgumentQuery() or
   TUseOfBannedSmallIntegerConstantMacroQuery()
 
 predicate isTypes2QueryMetadata(Query query, string queryId, string ruleId, string category) {
@@ -17,6 +20,33 @@ predicate isTypes2QueryMetadata(Query query, string queryId, string ruleId, stri
   ruleId = "RULE-7-5" and
   category = "required"
   or
+  query =
+    // `Query` instance for the `invalidLiteralForIntegerConstantMacroArgument` query
+    Types2Package::invalidLiteralForIntegerConstantMacroArgumentQuery() and
+  queryId =
+    // `@id` for the `invalidLiteralForIntegerConstantMacroArgument` query
+    "c/misra/invalid-literal-for-integer-constant-macro-argument" and
+  ruleId = "RULE-7-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `integerConstantMacroArgumentUsesSuffix` query
+    Types2Package::integerConstantMacroArgumentUsesSuffixQuery() and
+  queryId =
+    // `@id` for the `integerConstantMacroArgumentUsesSuffix` query
+    "c/misra/integer-constant-macro-argument-uses-suffix" and
+  ruleId = "RULE-7-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `incorrectlySizedIntegerConstantMacroArgument` query
+    Types2Package::incorrectlySizedIntegerConstantMacroArgumentQuery() and
+  queryId =
+    // `@id` for the `incorrectlySizedIntegerConstantMacroArgument` query
+    "c/misra/incorrectly-sized-integer-constant-macro-argument" and
+  ruleId = "RULE-7-5" and
+  category = "required"
+  or
   query =
     // `Query` instance for the `useOfBannedSmallIntegerConstantMacro` query
     Types2Package::useOfBannedSmallIntegerConstantMacroQuery() and
@@ -35,6 +65,27 @@ module Types2Package {
       TQueryC(TTypes2PackageQuery(TInvalidIntegerConstantMacroArgumentQuery()))
   }
 
+  Query invalidLiteralForIntegerConstantMacroArgumentQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `invalidLiteralForIntegerConstantMacroArgument` query
+      TQueryC(TTypes2PackageQuery(TInvalidLiteralForIntegerConstantMacroArgumentQuery()))
+  }
+
+  Query integerConstantMacroArgumentUsesSuffixQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `integerConstantMacroArgumentUsesSuffix` query
+      TQueryC(TTypes2PackageQuery(TIntegerConstantMacroArgumentUsesSuffixQuery()))
+  }
+
+  Query incorrectlySizedIntegerConstantMacroArgumentQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `incorrectlySizedIntegerConstantMacroArgument` query
+      TQueryC(TTypes2PackageQuery(TIncorrectlySizedIntegerConstantMacroArgumentQuery()))
+  }
+
   Query useOfBannedSmallIntegerConstantMacroQuery() {
     //autogenerate `Query` type
     result =
diff --git a/rule_packages/c/Types2.json b/rule_packages/c/Types2.json
index 9468af278c..6933d3eb63 100644
--- a/rule_packages/c/Types2.json
+++ b/rule_packages/c/Types2.json
@@ -6,15 +6,52 @@
       },
       "queries": [
         {
-          "description": "Integer constant macros should be given appropriate values for the size of the integer type.",
+          "description": "Integer constant macros should be given a literal value as an argument",
           "kind": "problem",
-          "name": "The argument of an integer constant macro shall have an appropriate form",
+          "name": "The argument of an integer constant macro shall be a literal",
           "precision": "very-high",
           "severity": "error",
           "short_name": "InvalidIntegerConstantMacroArgument",
           "tags": [
             "correctness"
           ]
+        },
+        {
+          "description": "Integer constant macro arguments should be a decimal, hex, or octal literal",
+          "kind": "problem",
+          "name": "The argument of an integer constant macro shall be a decimal, hex, or octal literal",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "InvalidLiteralForIntegerConstantMacroArgument",
+          "tags": [
+            "correctness"
+          ]
+        },
+        {
+          "description": "Integer constant macros should be used integer literal values with no u/l suffix.",
+          "kind": "problem",
+          "name": "The argument of an integer constant macro shall not use literal suffixes u, l, or ul",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "IntegerConstantMacroArgumentUsesSuffix",
+          "tags": [
+            "readability",
+            "maintainability"
+          ]
+        },
+        {
+          "description": "Integer constant macros argument values should be values of a compatible size",
+          "kind": "problem",
+          "name": "The argument of an integer constant macro shall have an appropriate size",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "IncorrectlySizedIntegerConstantMacroArgument",
+          "tags": [
+            "correctness"
+          ],
+          "implementation_scope": {
+            "description": "This rule can validate integers sized 32 or smaller. When the CodeQL runtime supports big ints, this will be expanded to include 64 bit integer types."
+          }
         }
       ],
       "title": "The argument of an integer constant macro shall have an appropriate form"

From 67d5426e048f1b84e965a477c283a09421dfd9e1 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 30 Sep 2024 16:51:54 -0700
Subject: [PATCH 251/435] Fix 7-6 formatting

---
 .../RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql   |  8 +++-----
 c/misra/test/rules/RULE-7-6/test.c                     | 10 +++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
index cac7f091a8..9a1844601b 100644
--- a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
+++ b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
@@ -15,11 +15,9 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.IntegerConstantMacro
 
-
 from MacroInvocation macroInvoke, IntegerConstantMacro macro
 where
   not isExcluded(macroInvoke, Types2Package::useOfBannedSmallIntegerConstantMacroQuery()) and
-  macroInvoke.getMacro() = macro
-  and macro.isSmall()
-select
-  macroInvoke, "Usage of small integer constant macro " + macro.getName() + " is not allowed."
+  macroInvoke.getMacro() = macro and
+  macro.isSmall()
+select macroInvoke, "Usage of small integer constant macro " + macro.getName() + " is not allowed."
diff --git a/c/misra/test/rules/RULE-7-6/test.c b/c/misra/test/rules/RULE-7-6/test.c
index f2b783e800..9832cdf251 100644
--- a/c/misra/test/rules/RULE-7-6/test.c
+++ b/c/misra/test/rules/RULE-7-6/test.c
@@ -1,10 +1,10 @@
 #include "stdint.h"
 
-int8_t g1 = INT8_C(0x12); // NON-COMPLIANT
-uint8_t g2 = UINT8_C(0x12); // NON-COMPLIANT
-int16_t g3 = INT16_C(0x1234); // NON-COMPLIANT
+int8_t g1 = INT8_C(0x12);       // NON-COMPLIANT
+uint8_t g2 = UINT8_C(0x12);     // NON-COMPLIANT
+int16_t g3 = INT16_C(0x1234);   // NON-COMPLIANT
 uint16_t g4 = UINT16_C(0x1234); // NON-COMPLIANT
-int32_t g5 = INT32_C(0x1234); // COMPLIANT
+int32_t g5 = INT32_C(0x1234);   // COMPLIANT
 uint32_t g6 = UINT32_C(0x1234); // COMPLIANT
-int64_t g7 = INT64_C(0x1234); // COMPLIANT
+int64_t g7 = INT64_C(0x1234);   // COMPLIANT
 uint64_t g8 = UINT64_C(0x1234); // COMPLIANT
\ No newline at end of file

From 24984097e6e9ac62be452367e1dbe4731fe81f15 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 30 Sep 2024 16:53:50 -0700
Subject: [PATCH 252/435] Add full stops to Types.json

---
 rule_packages/c/Types2.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rule_packages/c/Types2.json b/rule_packages/c/Types2.json
index 6933d3eb63..4c4aaaaa7a 100644
--- a/rule_packages/c/Types2.json
+++ b/rule_packages/c/Types2.json
@@ -6,7 +6,7 @@
       },
       "queries": [
         {
-          "description": "Integer constant macros should be given a literal value as an argument",
+          "description": "Integer constant macros should be given a literal value as an argument.",
           "kind": "problem",
           "name": "The argument of an integer constant macro shall be a literal",
           "precision": "very-high",
@@ -17,7 +17,7 @@
           ]
         },
         {
-          "description": "Integer constant macro arguments should be a decimal, hex, or octal literal",
+          "description": "Integer constant macro arguments should be a decimal, hex, or octal literal.",
           "kind": "problem",
           "name": "The argument of an integer constant macro shall be a decimal, hex, or octal literal",
           "precision": "very-high",
@@ -40,7 +40,7 @@
           ]
         },
         {
-          "description": "Integer constant macros argument values should be values of a compatible size",
+          "description": "Integer constant macros argument values should be values of a compatible size.",
           "kind": "problem",
           "name": "The argument of an integer constant macro shall have an appropriate size",
           "precision": "very-high",

From 9696f7b4c7b14abd24773ab9045df5803610cf64 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Mon, 30 Sep 2024 16:55:11 -0700
Subject: [PATCH 253/435] Add full stops to query metadata.

---
 .../RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql    | 2 +-
 .../src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql   | 2 +-
 .../RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
index dd1417c2a6..b0ed49f9cc 100644
--- a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
@@ -1,7 +1,7 @@
 /**
  * @id c/misra/incorrectly-sized-integer-constant-macro-argument
  * @name RULE-7-5: The argument of an integer constant macro shall have an appropriate size
- * @description Integer constant macros argument values should be values of a compatible size
+ * @description Integer constant macros argument values should be values of a compatible size.
  * @kind problem
  * @precision very-high
  * @problem.severity error
diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
index 33ec266b51..b7516a1ff8 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -1,7 +1,7 @@
 /**
  * @id c/misra/invalid-integer-constant-macro-argument
  * @name RULE-7-5: The argument of an integer constant macro shall be a literal
- * @description Integer constant macros should be given a literal value as an argument
+ * @description Integer constant macros should be given a literal value as an argument.
  * @kind problem
  * @precision very-high
  * @problem.severity error
diff --git a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
index 2447d82f6f..7d102f667b 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
@@ -1,7 +1,7 @@
 /**
  * @id c/misra/invalid-literal-for-integer-constant-macro-argument
  * @name RULE-7-5: The argument of an integer constant macro shall be a decimal, hex, or octal literal
- * @description Integer constant macro arguments should be a decimal, hex, or octal literal
+ * @description Integer constant macro arguments should be a decimal, hex, or octal literal.
  * @kind problem
  * @precision very-high
  * @problem.severity error

From 916ef4dec056d4280505e2b3497222693ff4003c Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Tue, 1 Oct 2024 16:56:18 -0700
Subject: [PATCH 254/435] Handle cases where AST/extractor give us
 incomplete/messy information.

Add a new UnrecognizedNumericLiteral class in Literal.qll which matches literals
that have a numeric value but don't match any regexes for the literal types
(hex, decimal, float, octal, binary). Exclude that from results in
InvalidLiteralForIntegerConstantMacroArgument.ql
---
 ...dLiteralForIntegerConstantMacroArgument.ql |  4 ++-
 c/misra/test/rules/RULE-7-5/test.c            |  9 +++++-
 .../src/codingstandards/cpp/Cpp14Literal.qll  | 30 +++++++++++++++----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
index 7d102f667b..893151f2be 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
@@ -23,7 +23,9 @@ import codingstandards.cpp.Literals
 predicate validLiteralType(PossiblyNegativeLiteral literal) {
   literal.getBaseLiteral() instanceof Cpp14Literal::DecimalLiteral or
   literal.getBaseLiteral() instanceof Cpp14Literal::OctalLiteral or
-  literal.getBaseLiteral() instanceof Cpp14Literal::HexLiteral
+  literal.getBaseLiteral() instanceof Cpp14Literal::HexLiteral or
+  // Ignore cases where the AST/extractor don't give us enough information:
+  literal.getBaseLiteral() instanceof Cpp14Literal::UnrecognizedNumericLiteral
 }
 
 /**
diff --git a/c/misra/test/rules/RULE-7-5/test.c b/c/misra/test/rules/RULE-7-5/test.c
index f9650254ca..027ecb1827 100644
--- a/c/misra/test/rules/RULE-7-5/test.c
+++ b/c/misra/test/rules/RULE-7-5/test.c
@@ -157,4 +157,11 @@ int_least64_t g8[] = {
     INT64_C(-0x8000000000000000), // COMPLIANT
     INT64_C(-0x8000000000000001), // NON-COMPLIANT[FALSE NEGATIVE]
     INT64_C(-0x8001000000000000), // NON-COMPLIANT
-};
\ No newline at end of file
+};
+
+// Other edge cases:
+void f(void) {
+  uint32_t l1 = 1;
+  // `UnrecognizedNumericLiteral` case:
+  int64_t l2 = ((int32_t)UINT64_C(0x1b2) * (l1)); // COMPLIANT
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll b/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll
index c974ec7eb8..b77702fef6 100644
--- a/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll
+++ b/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll
@@ -9,6 +9,9 @@ module Cpp14Literal {
   /** An numeric literal. */
   abstract class NumericLiteral extends StandardLibrary::Literal { }
 
+  /** Convenience for implementing class `UnrecognizedNumericLiteral` */
+  abstract private class RecognizedNumericLiteral extends StandardLibrary::Literal { }
+
   /** An integer literal. */
   abstract class IntegerLiteral extends NumericLiteral {
     predicate isSigned() { not isUnsigned() }
@@ -23,7 +26,7 @@ module Cpp14Literal {
    * ```
    * Octal literals must always start with the digit `0`.
    */
-  class OctalLiteral extends IntegerLiteral {
+  class OctalLiteral extends IntegerLiteral, RecognizedNumericLiteral {
     OctalLiteral() { getValueText().regexpMatch("\\s*0[0-7']*[uUlL]*\\s*") }
 
     override string getAPrimaryQlClass() { result = "OctalLiteral" }
@@ -35,7 +38,7 @@ module Cpp14Literal {
    * unsigned int32_t minus2 = 0xfffffffe;
    * ```
    */
-  class HexLiteral extends IntegerLiteral {
+  class HexLiteral extends IntegerLiteral, RecognizedNumericLiteral {
     HexLiteral() { getValueText().regexpMatch("\\s*0[xX][0-9a-fA-F']+[uUlL]*\\s*") }
 
     override string getAPrimaryQlClass() { result = "HexLiteral" }
@@ -47,7 +50,7 @@ module Cpp14Literal {
    * unsigned int32_t binary = 0b101010;
    * ```
    */
-  class BinaryLiteral extends IntegerLiteral {
+  class BinaryLiteral extends IntegerLiteral, RecognizedNumericLiteral {
     BinaryLiteral() { getValueText().regexpMatch("\\s*0[bB][0-1']*[uUlL]*\\s*") }
 
     override string getAPrimaryQlClass() { result = "BinaryLiteral" }
@@ -59,7 +62,7 @@ module Cpp14Literal {
    * unsigned int32_t decimal = 10340923;
    * ```
    */
-  class DecimalLiteral extends IntegerLiteral {
+  class DecimalLiteral extends IntegerLiteral, RecognizedNumericLiteral {
     DecimalLiteral() { getValueText().regexpMatch("\\s*[1-9][0-9']*[uUlL]*\\s*") }
 
     override string getAPrimaryQlClass() { result = "DecimalLiteral" }
@@ -71,7 +74,7 @@ module Cpp14Literal {
    * double floating = 1.340923e-19;
    * ```
    */
-  class FloatingLiteral extends NumericLiteral {
+  class FloatingLiteral extends RecognizedNumericLiteral {
     FloatingLiteral() {
       getValueText().regexpMatch("\\s*[0-9][0-9']*(\\.[0-9']+)?([eE][\\+\\-]?[0-9']+)?[flFL]?\\s*") and
       // A decimal literal takes precedent
@@ -83,6 +86,23 @@ module Cpp14Literal {
     override string getAPrimaryQlClass() { result = "FloatingLiteral" }
   }
 
+  /**
+   * Literal values with conversions and macros cannot always be trivially
+   * parsed from `Literal.getValueText()`, and have loss of required
+   * information in `Literal.getValue()`. This class covers cases that appear
+   * to be `NumericLiteral`s but cannot be determined to be a hex, decimal,
+   * octal, binary, or float literal, but still are parsed as a Literal with a
+   * number value.
+   */
+  class UnrecognizedNumericLiteral extends NumericLiteral {
+    UnrecognizedNumericLiteral() {
+      this.getValue().regexpMatch("[0-9.e]+") and
+      not this instanceof RecognizedNumericLiteral
+    }
+  }
+
+  predicate test(RecognizedNumericLiteral r, string valueText) { valueText = r.getValueText() }
+
   /**
    * A character literal.  For example:
    * ```

From c9436f9af3d46f6d86bbf06e0f15faec7d854d74 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 09:33:20 -0700
Subject: [PATCH 255/435] Fix broken test, remove debug code

---
 cpp/common/src/codingstandards/cpp/Cpp14Literal.qll | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll b/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll
index b77702fef6..ca3a7fb251 100644
--- a/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll
+++ b/cpp/common/src/codingstandards/cpp/Cpp14Literal.qll
@@ -74,7 +74,7 @@ module Cpp14Literal {
    * double floating = 1.340923e-19;
    * ```
    */
-  class FloatingLiteral extends RecognizedNumericLiteral {
+  class FloatingLiteral extends NumericLiteral, RecognizedNumericLiteral {
     FloatingLiteral() {
       getValueText().regexpMatch("\\s*[0-9][0-9']*(\\.[0-9']+)?([eE][\\+\\-]?[0-9']+)?[flFL]?\\s*") and
       // A decimal literal takes precedent
@@ -101,8 +101,6 @@ module Cpp14Literal {
     }
   }
 
-  predicate test(RecognizedNumericLiteral r, string valueText) { valueText = r.getValueText() }
-
   /**
    * A character literal.  For example:
    * ```

From 581eb32720ac0a86bb4fa94b8b0d068455fe18ab Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 11:33:20 -0700
Subject: [PATCH 256/435] Add more info to query result strings

---
 ...rectlySizedIntegerConstantMacroArgument.ql |  7 ++-
 .../IntegerConstantMacroArgumentUsesSuffix.ql | 12 ++--
 .../InvalidIntegerConstantMacroArgument.ql    |  3 +-
 ...dLiteralForIntegerConstantMacroArgument.ql | 17 +++++-
 ...SizedIntegerConstantMacroArgument.expected | 58 ++++++++++---------
 ...erConstantMacroArgumentUsesSuffix.expected | 12 ++--
 ...validIntegerConstantMacroArgument.expected | 10 ++--
 ...alForIntegerConstantMacroArgument.expected |  5 +-
 c/misra/test/rules/RULE-7-5/test.c            | 18 +++---
 .../cpp/IntegerConstantMacro.qll              |  4 ++
 10 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
index b0ed49f9cc..06a7eb7658 100644
--- a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
@@ -37,8 +37,9 @@ where
   invoke.getMacro() = macro and
   literal = invoke.getExpr() and
   (
-    not matchesSign(macro, invoke.getExpr()) and explanation = "cannot be negative"
+    not matchesSign(macro, invoke.getExpr()) and explanation = " cannot be negative"
     or
-    not matchesSize(macro, invoke.getExpr()) and explanation = "is too large for the specified type"
+    not matchesSize(macro, invoke.getExpr()) and
+    explanation = " is outside of the allowed range " + macro.getRangeString()
   )
-select invoke.getExpr(), "Integer constant macro value " + explanation
+select invoke.getExpr(), "Value provided to integer constant macro " + macro.getName() + explanation
diff --git a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
index f4ca73e16c..15243ecb29 100644
--- a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
+++ b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
@@ -16,14 +16,16 @@ import codingstandards.c.misra
 import codingstandards.cpp.IntegerConstantMacro
 import codingstandards.cpp.Literals
 
-predicate usesSuffix(MacroInvocation invoke) {
-  invoke.getUnexpandedArgument(0).regexpMatch(".*[uUlL]")
+string argumentSuffix(MacroInvocation invoke) {
+  result = invoke.getUnexpandedArgument(0).regexpCapture(".*[^uUlL]([uUlL]+)$", 1)
 }
 
-from MacroInvocation invoke, PossiblyNegativeLiteral argument
+from MacroInvocation invoke, PossiblyNegativeLiteral argument, string suffix
 where
   not isExcluded(invoke, Types2Package::integerConstantMacroArgumentUsesSuffixQuery()) and
   invoke.getMacro() instanceof IntegerConstantMacro and
   invoke.getExpr() = argument and
-  usesSuffix(invoke)
-select invoke.getExpr(), "Integer constant macro arguments should not have 'u'/'l' suffix."
+  suffix = argumentSuffix(invoke)
+select invoke.getExpr(),
+  "Value suffix '" + suffix + "' is not allowed on provided argument to integer constant macro " +
+    invoke.getMacroName() + "."
diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
index b7516a1ff8..7b20159bb0 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -38,4 +38,5 @@ where
   invoke.getMacro() = macro and
   not invoke.getExpr() instanceof PossiblyNegativeLiteral and
   not specialMaxNegative64Exception(macro, invoke.getExpr())
-select invoke.getExpr(), "Integer constant macro argument must be an integer literal."
+select invoke.getExpr(),
+  "Argument to integer constant macro " + macro.getName() + " must be an integer literal."
diff --git a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
index 893151f2be..9d3cd33d00 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
@@ -37,6 +37,18 @@ predicate seemsBinaryLiteral(MacroInvocation invoke) {
   invoke.getUnexpandedArgument(0).regexpMatch("0[bB][01]+")
 }
 
+string explainIncorrectArgument(MacroInvocation invoke) {
+  if seemsBinaryLiteral(invoke)
+  then result = "binary literal"
+  else
+    exists(PossiblyNegativeLiteral literal |
+      literal = invoke.getExpr() and
+      if literal.getBaseLiteral() instanceof Cpp14Literal::FloatingLiteral
+      then result = "floating point literal"
+      else result = "invalid literal"
+    )
+}
+
 from MacroInvocation invoke, PossiblyNegativeLiteral literal
 where
   not isExcluded(invoke, Types2Package::invalidLiteralForIntegerConstantMacroArgumentQuery()) and
@@ -46,4 +58,7 @@ where
     not validLiteralType(literal) or
     seemsBinaryLiteral(invoke)
   )
-select literal, "Integer constant macro arguments must be a decimal, octal, or hex integer literal."
+select literal,
+  "Integer constant macro " + invoke.getMacroName() + " used with " +
+    explainIncorrectArgument(invoke) +
+    " argument, only decimal, octal, or hex integer literal allowed."
diff --git a/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
index 9ce9b29e3c..08816f8351 100644
--- a/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
@@ -1,28 +1,30 @@
-| test.c:26:13:26:15 | 256 | Integer constant macro value is too large for the specified type |
-| test.c:27:13:27:16 | 256 | Integer constant macro value is too large for the specified type |
-| test.c:28:13:28:17 | 256 | Integer constant macro value is too large for the specified type |
-| test.c:31:13:31:14 | - ... | Integer constant macro value cannot be negative |
-| test.c:32:13:32:15 | - ... | Integer constant macro value cannot be negative |
-| test.c:33:13:33:15 | - ... | Integer constant macro value cannot be negative |
-| test.c:34:13:34:17 | - ... | Integer constant macro value cannot be negative |
-| test.c:55:12:55:14 | 128 | Integer constant macro value is too large for the specified type |
-| test.c:56:12:56:15 | 128 | Integer constant macro value is too large for the specified type |
-| test.c:57:12:57:15 | 128 | Integer constant macro value is too large for the specified type |
-| test.c:61:12:61:15 | - ... | Integer constant macro value is too large for the specified type |
-| test.c:62:12:62:16 | - ... | Integer constant macro value is too large for the specified type |
-| test.c:63:12:63:16 | - ... | Integer constant macro value is too large for the specified type |
-| test.c:76:14:76:18 | 65536 | Integer constant macro value is too large for the specified type |
-| test.c:77:14:77:20 | 65536 | Integer constant macro value is too large for the specified type |
-| test.c:78:14:78:20 | 65536 | Integer constant macro value is too large for the specified type |
-| test.c:91:13:91:17 | 32768 | Integer constant macro value is too large for the specified type |
-| test.c:92:13:92:19 | 32768 | Integer constant macro value is too large for the specified type |
-| test.c:93:13:93:18 | 32768 | Integer constant macro value is too large for the specified type |
-| test.c:97:13:97:18 | - ... | Integer constant macro value is too large for the specified type |
-| test.c:98:13:98:20 | - ... | Integer constant macro value is too large for the specified type |
-| test.c:99:13:99:19 | - ... | Integer constant macro value is too large for the specified type |
-| test.c:109:14:109:24 | 4294967296 | Integer constant macro value is too large for the specified type |
-| test.c:110:14:110:25 | 4294967296 | Integer constant macro value is too large for the specified type |
-| test.c:120:13:120:22 | 2147483648 | Integer constant macro value is too large for the specified type |
-| test.c:121:13:121:22 | 2147483648 | Integer constant macro value is too large for the specified type |
-| test.c:124:13:124:23 | - ... | Integer constant macro value is too large for the specified type |
-| test.c:125:13:125:23 | - ... | Integer constant macro value is too large for the specified type |
\ No newline at end of file
+| test.c:13:13:13:16 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:15:13:15:18 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:30:13:30:15 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
+| test.c:31:13:31:16 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
+| test.c:32:13:32:17 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
+| test.c:35:13:35:14 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:36:13:36:15 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:37:13:37:15 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:38:13:38:17 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:59:12:59:14 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:60:12:60:15 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:61:12:61:15 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:65:12:65:15 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:66:12:66:16 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:67:12:67:16 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:80:14:80:18 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
+| test.c:81:14:81:20 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
+| test.c:82:14:82:20 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
+| test.c:95:13:95:17 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:96:13:96:19 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:97:13:97:18 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:101:13:101:18 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:102:13:102:20 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:103:13:103:19 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:113:14:113:24 | 4294967296 | Value provided to integer constant macro UINT32_C is outside of the allowed range 0..4294967295 |
+| test.c:114:14:114:25 | 4294967296 | Value provided to integer constant macro UINT32_C is outside of the allowed range 0..4294967295 |
+| test.c:124:13:124:22 | 2147483648 | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
+| test.c:125:13:125:22 | 2147483648 | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
+| test.c:128:13:128:23 | - ... | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
+| test.c:129:13:129:23 | - ... | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
diff --git a/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
index cabe2c5c51..52adf1233e 100644
--- a/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
+++ b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
@@ -1,5 +1,7 @@
-| test.c:16:13:16:14 | 1 | Integer constant macro arguments should not have 'u'/'l' suffix. |
-| test.c:17:13:17:14 | 2 | Integer constant macro arguments should not have 'u'/'l' suffix. |
-| test.c:18:13:18:14 | 3 | Integer constant macro arguments should not have 'u'/'l' suffix. |
-| test.c:19:13:19:14 | 4 | Integer constant macro arguments should not have 'u'/'l' suffix. |
-| test.c:20:13:20:15 | 5 | Integer constant macro arguments should not have 'u'/'l' suffix. |
\ No newline at end of file
+| test.c:18:13:18:14 | 1 | Value suffix 'u' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:19:13:19:14 | 2 | Value suffix 'U' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:20:13:20:14 | 3 | Value suffix 'l' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:21:13:21:14 | 4 | Value suffix 'L' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:22:13:22:15 | 5 | Value suffix 'ul' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:23:13:23:15 | 5 | Value suffix 'll' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:24:13:24:16 | 5 | Value suffix 'ull' is not allowed on provided argument to integer constant macro UINT8_C. |
diff --git a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
index 16e28bcd84..b3191fa74c 100644
--- a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
@@ -1,5 +1,5 @@
-| test.c:37:13:37:17 | ... + ... | Integer constant macro argument must be an integer literal. |
-| test.c:38:13:38:18 | access to array | Integer constant macro argument must be an integer literal. |
-| test.c:39:13:39:19 | access to array | Integer constant macro argument must be an integer literal. |
-| test.c:152:13:152:37 | ... - ... | Integer constant macro argument must be an integer literal. |
-| test.c:153:13:153:47 | ... - ... | Integer constant macro argument must be an integer literal. |
+| test.c:41:13:41:17 | ... + ... | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:42:13:42:18 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:43:13:43:19 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:156:13:156:37 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
+| test.c:157:13:157:47 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
diff --git a/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
index 9d8c525527..320b6dd208 100644
--- a/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
@@ -1,2 +1,3 @@
-| test.c:12:13:12:15 | 1.0 | Integer constant macro arguments must be a decimal, octal, or hex integer literal. |
-| test.c:13:13:13:17 | 7 | Integer constant macro arguments must be a decimal, octal, or hex integer literal. |
\ No newline at end of file
+| test.c:12:13:12:15 | 1.0 | Integer constant macro UINT8_C used with floating point literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:13:13:13:16 | - ... | Integer constant macro UINT8_C used with floating point literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:14:13:14:17 | 7 | Integer constant macro UINT8_C used with binary literal argument, only decimal, octal, or hex integer literal allowed. |
diff --git a/c/misra/test/rules/RULE-7-5/test.c b/c/misra/test/rules/RULE-7-5/test.c
index 027ecb1827..db145a844b 100644
--- a/c/misra/test/rules/RULE-7-5/test.c
+++ b/c/misra/test/rules/RULE-7-5/test.c
@@ -9,15 +9,19 @@ uint_least8_t g1[] = {
     UINT8_C(034),  // COMPLIANT
 
     // Incorrect literal types
-    UINT8_C(1.0),   // NON-COMPLIANT
-    UINT8_C(0b111), // NON-COMPLIANT
+    UINT8_C(1.0),    // NON-COMPLIANT
+    UINT8_C(-1.0),   // NON-COMPLIANT
+    UINT8_C(0b111),  // NON-COMPLIANT
+    UINT8_C(-0b111), // NON-COMPLIANT
 
     // Suffixes disallowed
-    UINT8_C(1u),  // NON-COMPLIANT
-    UINT8_C(2U),  // NON-COMPLIANT
-    UINT8_C(3l),  // NON-COMPLIANT
-    UINT8_C(4L),  // NON-COMPLIANT
-    UINT8_C(5ul), // NON-COMPLIANT
+    UINT8_C(1u),   // NON-COMPLIANT
+    UINT8_C(2U),   // NON-COMPLIANT
+    UINT8_C(3l),   // NON-COMPLIANT
+    UINT8_C(4L),   // NON-COMPLIANT
+    UINT8_C(5ul),  // NON-COMPLIANT
+    UINT8_C(5ll),  // NON-COMPLIANT
+    UINT8_C(5ull), // NON-COMPLIANT
 
     // Range tests
     UINT8_C(255),   // COMPLIANT
diff --git a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
index e38293c8cb..c82024f2f0 100644
--- a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
+++ b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
@@ -32,4 +32,8 @@ class IntegerConstantMacro extends Macro {
     or
     signed = false and result = 0
   }
+
+  string getRangeString() {
+    result = minValue().toString() + ".." + maxValue().toString()
+  }
 }

From d763b9109aa9f05fda75a2e5fe8ea2fec5f6737d Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 11:40:45 -0700
Subject: [PATCH 257/435] Fix format in IntegerConstantMacro.qll

---
 cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
index c82024f2f0..8f3fff1e1b 100644
--- a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
+++ b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
@@ -33,7 +33,5 @@ class IntegerConstantMacro extends Macro {
     signed = false and result = 0
   }
 
-  string getRangeString() {
-    result = minValue().toString() + ".." + maxValue().toString()
-  }
+  string getRangeString() { result = minValue().toString() + ".." + maxValue().toString() }
 }

From fdaacc76086c38045c3a335c063d782c38a7e31b Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 13:44:39 -0700
Subject: [PATCH 258/435] Reject char literals, add false negatives for macros.

---
 .../IntegerConstantMacroArgumentUsesSuffix.ql |  9 ++-
 .../InvalidIntegerConstantMacroArgument.ql    |  2 +-
 ...dLiteralForIntegerConstantMacroArgument.ql | 28 ++++++---
 ...SizedIntegerConstantMacroArgument.expected | 61 ++++++++++---------
 ...erConstantMacroArgumentUsesSuffix.expected | 14 ++---
 ...validIntegerConstantMacroArgument.expected | 10 +--
 ...alForIntegerConstantMacroArgument.expected | 10 ++-
 c/misra/test/rules/RULE-7-5/test.c            | 11 ++++
 8 files changed, 88 insertions(+), 57 deletions(-)

diff --git a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
index 15243ecb29..3b58cf7a92 100644
--- a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
+++ b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
@@ -3,8 +3,8 @@
  * @name RULE-7-5: The argument of an integer constant macro shall not use literal suffixes u, l, or ul
  * @description Integer constant macros should be used integer literal values with no u/l suffix.
  * @kind problem
- * @precision very-high
- * @problem.severity error
+ * @precision high
+ * @problem.severity warning
  * @tags external/misra/id/rule-7-5
  *       readability
  *       maintainability
@@ -17,7 +17,10 @@ import codingstandards.cpp.IntegerConstantMacro
 import codingstandards.cpp.Literals
 
 string argumentSuffix(MacroInvocation invoke) {
-  result = invoke.getUnexpandedArgument(0).regexpCapture(".*[^uUlL]([uUlL]+)$", 1)
+  // Compiler strips the suffix unless we look at the unexpanded argument text.
+  // Unexpanded argument text can be malformed in all sorts of ways, so make
+  // this match relatively strict, to be safe.
+  result = invoke.getUnexpandedArgument(0).regexpCapture("([0-9]+|0[xX][0-9A-F]+)([uUlL]+)$", 2)
 }
 
 from MacroInvocation invoke, PossiblyNegativeLiteral argument, string suffix
diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
index 7b20159bb0..851569899e 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -4,7 +4,7 @@
  * @description Integer constant macros should be given a literal value as an argument.
  * @kind problem
  * @precision very-high
- * @problem.severity error
+ * @problem.severity warning
  * @tags external/misra/id/rule-7-5
  *       correctness
  *       external/misra/obligation/required
diff --git a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
index 9d3cd33d00..e333adfb7e 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
@@ -34,19 +34,30 @@ predicate validLiteralType(PossiblyNegativeLiteral literal) {
  * Detect this pattern before macro expansion.
  */
 predicate seemsBinaryLiteral(MacroInvocation invoke) {
-  invoke.getUnexpandedArgument(0).regexpMatch("0[bB][01]+")
+  invoke.getUnexpandedArgument(0).regexpMatch("-?0[bB][01]+")
+}
+
+/**
+ * Extractor converts `xINTsize_C('a')` to a decimal literal. Therefore, detect
+ * this pattern before macro expansion.
+ */
+predicate seemsCharLiteral(MacroInvocation invoke) {
+  invoke.getUnexpandedArgument(0).regexpMatch("-?'\\\\?.'")
 }
 
 string explainIncorrectArgument(MacroInvocation invoke) {
   if seemsBinaryLiteral(invoke)
   then result = "binary literal"
   else
-    exists(PossiblyNegativeLiteral literal |
-      literal = invoke.getExpr() and
-      if literal.getBaseLiteral() instanceof Cpp14Literal::FloatingLiteral
-      then result = "floating point literal"
-      else result = "invalid literal"
-    )
+    if seemsCharLiteral(invoke)
+    then result = "char literal"
+    else
+      exists(PossiblyNegativeLiteral literal |
+        literal = invoke.getExpr() and
+        if literal.getBaseLiteral() instanceof Cpp14Literal::FloatingLiteral
+        then result = "floating point literal"
+        else result = "invalid literal"
+      )
 }
 
 from MacroInvocation invoke, PossiblyNegativeLiteral literal
@@ -56,7 +67,8 @@ where
   literal = invoke.getExpr() and
   (
     not validLiteralType(literal) or
-    seemsBinaryLiteral(invoke)
+    seemsBinaryLiteral(invoke) or
+    seemsCharLiteral(invoke)
   )
 select literal,
   "Integer constant macro " + invoke.getMacroName() + " used with " +
diff --git a/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
index 08816f8351..d3724e21a4 100644
--- a/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.expected
@@ -1,30 +1,31 @@
-| test.c:13:13:13:16 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
-| test.c:15:13:15:18 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
-| test.c:30:13:30:15 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
-| test.c:31:13:31:16 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
-| test.c:32:13:32:17 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
-| test.c:35:13:35:14 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
-| test.c:36:13:36:15 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
-| test.c:37:13:37:15 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
-| test.c:38:13:38:17 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
-| test.c:59:12:59:14 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
-| test.c:60:12:60:15 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
-| test.c:61:12:61:15 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
-| test.c:65:12:65:15 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
-| test.c:66:12:66:16 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
-| test.c:67:12:67:16 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
-| test.c:80:14:80:18 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
-| test.c:81:14:81:20 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
-| test.c:82:14:82:20 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
-| test.c:95:13:95:17 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
-| test.c:96:13:96:19 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
-| test.c:97:13:97:18 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
-| test.c:101:13:101:18 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
-| test.c:102:13:102:20 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
-| test.c:103:13:103:19 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
-| test.c:113:14:113:24 | 4294967296 | Value provided to integer constant macro UINT32_C is outside of the allowed range 0..4294967295 |
-| test.c:114:14:114:25 | 4294967296 | Value provided to integer constant macro UINT32_C is outside of the allowed range 0..4294967295 |
-| test.c:124:13:124:22 | 2147483648 | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
-| test.c:125:13:125:22 | 2147483648 | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
-| test.c:128:13:128:23 | - ... | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
-| test.c:129:13:129:23 | - ... | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
+| test.c:17:13:17:16 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:19:13:19:18 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:21:13:21:16 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:37:13:37:15 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
+| test.c:38:13:38:16 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
+| test.c:39:13:39:17 | 256 | Value provided to integer constant macro UINT8_C is outside of the allowed range 0..255 |
+| test.c:42:13:42:14 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:43:13:43:15 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:44:13:44:15 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:45:13:45:17 | - ... | Value provided to integer constant macro UINT8_C cannot be negative |
+| test.c:70:12:70:14 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:71:12:71:15 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:72:12:72:15 | 128 | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:76:12:76:15 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:77:12:77:16 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:78:12:78:16 | - ... | Value provided to integer constant macro INT8_C is outside of the allowed range -128..127 |
+| test.c:91:14:91:18 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
+| test.c:92:14:92:20 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
+| test.c:93:14:93:20 | 65536 | Value provided to integer constant macro UINT16_C is outside of the allowed range 0..65535 |
+| test.c:106:13:106:17 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:107:13:107:19 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:108:13:108:18 | 32768 | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:112:13:112:18 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:113:13:113:20 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:114:13:114:19 | - ... | Value provided to integer constant macro INT16_C is outside of the allowed range -32768..32767 |
+| test.c:124:14:124:24 | 4294967296 | Value provided to integer constant macro UINT32_C is outside of the allowed range 0..4294967295 |
+| test.c:125:14:125:25 | 4294967296 | Value provided to integer constant macro UINT32_C is outside of the allowed range 0..4294967295 |
+| test.c:135:13:135:22 | 2147483648 | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
+| test.c:136:13:136:22 | 2147483648 | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
+| test.c:139:13:139:23 | - ... | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
+| test.c:140:13:140:23 | - ... | Value provided to integer constant macro INT32_C is outside of the allowed range -2147483648..2147483647 |
diff --git a/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
index 52adf1233e..97a35dd977 100644
--- a/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
+++ b/c/misra/test/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.expected
@@ -1,7 +1,7 @@
-| test.c:18:13:18:14 | 1 | Value suffix 'u' is not allowed on provided argument to integer constant macro UINT8_C. |
-| test.c:19:13:19:14 | 2 | Value suffix 'U' is not allowed on provided argument to integer constant macro UINT8_C. |
-| test.c:20:13:20:14 | 3 | Value suffix 'l' is not allowed on provided argument to integer constant macro UINT8_C. |
-| test.c:21:13:21:14 | 4 | Value suffix 'L' is not allowed on provided argument to integer constant macro UINT8_C. |
-| test.c:22:13:22:15 | 5 | Value suffix 'ul' is not allowed on provided argument to integer constant macro UINT8_C. |
-| test.c:23:13:23:15 | 5 | Value suffix 'll' is not allowed on provided argument to integer constant macro UINT8_C. |
-| test.c:24:13:24:16 | 5 | Value suffix 'ull' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:25:13:25:14 | 1 | Value suffix 'u' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:26:13:26:14 | 2 | Value suffix 'U' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:27:13:27:14 | 3 | Value suffix 'l' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:28:13:28:14 | 4 | Value suffix 'L' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:29:13:29:15 | 5 | Value suffix 'ul' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:30:13:30:15 | 5 | Value suffix 'll' is not allowed on provided argument to integer constant macro UINT8_C. |
+| test.c:31:13:31:16 | 5 | Value suffix 'ull' is not allowed on provided argument to integer constant macro UINT8_C. |
diff --git a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
index b3191fa74c..44b5d78994 100644
--- a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
@@ -1,5 +1,5 @@
-| test.c:41:13:41:17 | ... + ... | Argument to integer constant macro UINT8_C must be an integer literal. |
-| test.c:42:13:42:18 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
-| test.c:43:13:43:19 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
-| test.c:156:13:156:37 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
-| test.c:157:13:157:47 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
+| test.c:48:13:48:17 | ... + ... | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:49:13:49:18 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:50:13:50:19 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:167:13:167:37 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
+| test.c:168:13:168:47 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
diff --git a/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
index 320b6dd208..ee5b75cb91 100644
--- a/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.expected
@@ -1,3 +1,7 @@
-| test.c:12:13:12:15 | 1.0 | Integer constant macro UINT8_C used with floating point literal argument, only decimal, octal, or hex integer literal allowed. |
-| test.c:13:13:13:16 | - ... | Integer constant macro UINT8_C used with floating point literal argument, only decimal, octal, or hex integer literal allowed. |
-| test.c:14:13:14:17 | 7 | Integer constant macro UINT8_C used with binary literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:16:13:16:15 | 1.0 | Integer constant macro UINT8_C used with floating point literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:17:13:17:16 | - ... | Integer constant macro UINT8_C used with floating point literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:18:13:18:17 | 7 | Integer constant macro UINT8_C used with binary literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:19:13:19:18 | - ... | Integer constant macro UINT8_C used with binary literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:20:13:20:15 | 97 | Integer constant macro UINT8_C used with char literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:21:13:21:16 | - ... | Integer constant macro UINT8_C used with char literal argument, only decimal, octal, or hex integer literal allowed. |
+| test.c:22:13:22:16 | 10 | Integer constant macro UINT8_C used with char literal argument, only decimal, octal, or hex integer literal allowed. |
diff --git a/c/misra/test/rules/RULE-7-5/test.c b/c/misra/test/rules/RULE-7-5/test.c
index db145a844b..432c6ceed5 100644
--- a/c/misra/test/rules/RULE-7-5/test.c
+++ b/c/misra/test/rules/RULE-7-5/test.c
@@ -1,5 +1,9 @@
+#include "stdbool.h"
 #include "stdint.h"
 
+#define NULL 0
+#define NULLPTR ((void *)NULL)
+
 uint_least8_t g1[] = {
     // Basic valid
     UINT8_C(0),    // COMPLIANT
@@ -13,6 +17,9 @@ uint_least8_t g1[] = {
     UINT8_C(-1.0),   // NON-COMPLIANT
     UINT8_C(0b111),  // NON-COMPLIANT
     UINT8_C(-0b111), // NON-COMPLIANT
+    UINT8_C('a'),    // NON-COMPLIANT
+    UINT8_C(-'$'),   // NON-COMPLIANT
+    UINT8_C('\n'),    // NON-COMPLIANT
 
     // Suffixes disallowed
     UINT8_C(1u),   // NON-COMPLIANT
@@ -42,6 +49,10 @@ uint_least8_t g1[] = {
     UINT8_C("a"[0]),    // NON-COMPLIANT
     UINT8_C(0 ["a"]),   // NON-COMPLIANT
     UINT8_C(UINT8_MAX), // COMPLIANT
+    UINT8_C(true),      // NON-COMPLIANT[False Negative]
+    UINT8_C(false),     // NON-COMPLIANT[False Negative]
+    UINT8_C(NULL),      // NON-COMPLIANT[False Negative]
+    UINT8_C(NULLPTR),   // NON-COMPLIANT[False Negative]
 };
 
 int_least8_t g2[] = {

From 51098868065d90d55b7e83874241de40ea7e81cb Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 13:53:27 -0700
Subject: [PATCH 259/435] Fix types2 package json vs query

---
 rule_packages/c/Types2.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rule_packages/c/Types2.json b/rule_packages/c/Types2.json
index 4c4aaaaa7a..7489a99de5 100644
--- a/rule_packages/c/Types2.json
+++ b/rule_packages/c/Types2.json
@@ -31,8 +31,8 @@
           "description": "Integer constant macros should be used integer literal values with no u/l suffix.",
           "kind": "problem",
           "name": "The argument of an integer constant macro shall not use literal suffixes u, l, or ul",
-          "precision": "very-high",
-          "severity": "error",
+          "precision": "high",
+          "severity": "warning",
           "short_name": "IntegerConstantMacroArgumentUsesSuffix",
           "tags": [
             "readability",

From 3012bfaf3e1d113f3f5d5f9bbfb4b9738c3e2f65 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 14:32:01 -0700
Subject: [PATCH 260/435] Fix package file consistency, c format

---
 c/misra/test/rules/RULE-7-5/test.c | 2 +-
 rule_packages/c/Types2.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/c/misra/test/rules/RULE-7-5/test.c b/c/misra/test/rules/RULE-7-5/test.c
index 432c6ceed5..fad34ac160 100644
--- a/c/misra/test/rules/RULE-7-5/test.c
+++ b/c/misra/test/rules/RULE-7-5/test.c
@@ -19,7 +19,7 @@ uint_least8_t g1[] = {
     UINT8_C(-0b111), // NON-COMPLIANT
     UINT8_C('a'),    // NON-COMPLIANT
     UINT8_C(-'$'),   // NON-COMPLIANT
-    UINT8_C('\n'),    // NON-COMPLIANT
+    UINT8_C('\n'),   // NON-COMPLIANT
 
     // Suffixes disallowed
     UINT8_C(1u),   // NON-COMPLIANT
diff --git a/rule_packages/c/Types2.json b/rule_packages/c/Types2.json
index 7489a99de5..efed56c511 100644
--- a/rule_packages/c/Types2.json
+++ b/rule_packages/c/Types2.json
@@ -10,7 +10,7 @@
           "kind": "problem",
           "name": "The argument of an integer constant macro shall be a literal",
           "precision": "very-high",
-          "severity": "error",
+          "severity": "warning",
           "short_name": "InvalidIntegerConstantMacroArgument",
           "tags": [
             "correctness"

From 3708edfbefdc68ae9a9558ba4f4170b325e5bb55 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 2 Oct 2024 23:41:04 -0700
Subject: [PATCH 261/435] Reject macros inside (u)INT<size>_C macros (eg,
 `1NT8_C(true)`) and remove exception

Added exception to handle INT63_MIN as an addition expression, but that
exception is actually quite dangerous and should be removed.
---
 .../InvalidIntegerConstantMacroArgument.ql    | 24 ++++++------------
 ...validIntegerConstantMacroArgument.expected |  7 ++++--
 c/misra/test/rules/RULE-7-5/test.c            | 25 ++++++++-----------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
index 851569899e..9c35c3c2d6 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -16,27 +16,19 @@ import codingstandards.cpp.IntegerConstantMacro
 import codingstandards.cpp.Literals
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
-/**
- * The max negative 64 bit signed integer is one less than the negative of the
- * max positive signed 64 bit integer. The only way to create a "negative"
- * literal is to use unary- negation of a positive literal. Therefore, clang
- * (and likely other compilers) rejects `INT64_C(-92233...808)` but accepts
- * `INT64_C(-92233...807 - 1)`. Therefore, in this case allow non-literal
- * expressions.
- */
-predicate specialMaxNegative64Exception(IntegerConstantMacro macro, Expr expr) {
-  macro.getSize() = 64 and
-  macro.isSigned() and
-  // Set a cutoff with precision, fix once BigInt library is available.
-  upperBound(expr) < macro.minValue() * 0.999999999 and
-  upperBound(expr) > macro.minValue() * 1.000000001
+predicate containsMacroInvocation(MacroInvocation outer, MacroInvocation inner) {
+  outer.getExpr() = inner.getExpr() and
+  exists(outer.getUnexpandedArgument(0).indexOf(inner.getMacroName()))
 }
 
 from MacroInvocation invoke, IntegerConstantMacro macro
 where
   not isExcluded(invoke, Types2Package::invalidIntegerConstantMacroArgumentQuery()) and
   invoke.getMacro() = macro and
-  not invoke.getExpr() instanceof PossiblyNegativeLiteral and
-  not specialMaxNegative64Exception(macro, invoke.getExpr())
+  (
+    not invoke.getExpr() instanceof PossiblyNegativeLiteral
+    or
+    containsMacroInvocation(invoke, _)
+  )
 select invoke.getExpr(),
   "Argument to integer constant macro " + macro.getName() + " must be an integer literal."
diff --git a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
index 44b5d78994..b29228b6df 100644
--- a/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
+++ b/c/misra/test/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.expected
@@ -1,5 +1,8 @@
 | test.c:48:13:48:17 | ... + ... | Argument to integer constant macro UINT8_C must be an integer literal. |
 | test.c:49:13:49:18 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
 | test.c:50:13:50:19 | access to array | Argument to integer constant macro UINT8_C must be an integer literal. |
-| test.c:167:13:167:37 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
-| test.c:168:13:168:47 | ... - ... | Argument to integer constant macro INT64_C must be an integer literal. |
+| test.c:51:5:51:22 | 255 | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:52:5:52:17 | 1 | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:53:5:53:18 | 0 | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:54:5:54:17 | 0 | Argument to integer constant macro UINT8_C must be an integer literal. |
+| test.c:55:5:55:20 | 0 | Argument to integer constant macro UINT8_C must be an integer literal. |
diff --git a/c/misra/test/rules/RULE-7-5/test.c b/c/misra/test/rules/RULE-7-5/test.c
index fad34ac160..a3fb4b60e4 100644
--- a/c/misra/test/rules/RULE-7-5/test.c
+++ b/c/misra/test/rules/RULE-7-5/test.c
@@ -48,11 +48,11 @@ uint_least8_t g1[] = {
     UINT8_C(0 + 0),     // NON-COMPLIANT
     UINT8_C("a"[0]),    // NON-COMPLIANT
     UINT8_C(0 ["a"]),   // NON-COMPLIANT
-    UINT8_C(UINT8_MAX), // COMPLIANT
-    UINT8_C(true),      // NON-COMPLIANT[False Negative]
-    UINT8_C(false),     // NON-COMPLIANT[False Negative]
-    UINT8_C(NULL),      // NON-COMPLIANT[False Negative]
-    UINT8_C(NULLPTR),   // NON-COMPLIANT[False Negative]
+    UINT8_C(UINT8_MAX), // NON-COMPLIANT
+    UINT8_C(true),      // NON-COMPLIANT
+    UINT8_C(false),     // NON-COMPLIANT
+    UINT8_C(NULL),      // NON-COMPLIANT
+    UINT8_C(NULLPTR),   // NON-COMPLIANT
 };
 
 int_least8_t g2[] = {
@@ -158,20 +158,17 @@ int_least64_t g8[] = {
     INT64_C(9223372036854775807), // COMPLIANT
     // INT64_C(9223372036854775808) is a compile-time error
 
-    // -9223372036854775808 allowed, but cannot be created via unary- without
-    // compile time errors.
-    INT64_C(-9223372036854775807),     // COMPLIANT
-    INT64_C(-9223372036854775807 - 1), // COMPLIANT
-    // -9223372036854775809 is not allowed, and cannot be created via unary-
-    // without compile time errors.
-    INT64_C(-9223372036854775807 - 2),           // NON-COMPLIANT
-    INT64_C(-9223372036854775807 - 20000000000), // NON-COMPLIANT
+    INT64_C(-9223372036854775807), // COMPLIANT
+    // -9223372036854775808 is correctly sized, but not a valid decimal literal
+    // value.
+    // -9223372036854775809 is not correctly sized, and not a valid decimal
+    // literal value.
 
     INT64_C(0x7FFFFFFFFFFFFFFF),  // COMPLIANT
     INT64_C(0x8000000000000000),  // NON-COMPLIANT[FALSE NEGATIVE]
     INT64_C(-0x8000000000000000), // COMPLIANT
     INT64_C(-0x8000000000000001), // NON-COMPLIANT[FALSE NEGATIVE]
-    INT64_C(-0x8001000000000000), // NON-COMPLIANT
+    INT64_C(-0x8001000000000000), // NON-COMPLIANT[FALSE NEGATIVE]
 };
 
 // Other edge cases:

From 445d18e9c9d42b0c399624b655e0480f8b1385ac Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 23:33:39 -0700
Subject: [PATCH 262/435] Add misra c 2012 amendment3 tag

---
 rule_packages/c/Types2.json | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/rule_packages/c/Types2.json b/rule_packages/c/Types2.json
index efed56c511..7e4c0827fe 100644
--- a/rule_packages/c/Types2.json
+++ b/rule_packages/c/Types2.json
@@ -13,7 +13,8 @@
           "severity": "warning",
           "short_name": "InvalidIntegerConstantMacroArgument",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/amendment3"
           ]
         },
         {
@@ -24,7 +25,8 @@
           "severity": "error",
           "short_name": "InvalidLiteralForIntegerConstantMacroArgument",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/amendment3"
           ]
         },
         {
@@ -36,7 +38,8 @@
           "short_name": "IntegerConstantMacroArgumentUsesSuffix",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
+            "external/misra/c/2012/amendment3"
           ]
         },
         {
@@ -47,7 +50,8 @@
           "severity": "error",
           "short_name": "IncorrectlySizedIntegerConstantMacroArgument",
           "tags": [
-            "correctness"
+            "correctness",
+            "external/misra/c/2012/amendment3"
           ],
           "implementation_scope": {
             "description": "This rule can validate integers sized 32 or smaller. When the CodeQL runtime supports big ints, this will be expanded to include 64 bit integer types."
@@ -69,7 +73,8 @@
           "severity": "warning",
           "short_name": "UseOfBannedSmallIntegerConstantMacro",
           "tags": [
-            "readability"
+            "readability",
+            "external/misra/c/2012/amendment3"
           ]
         }
       ],

From 07d28ef432bcd0d51047a6fb14bf8ac3b4b1bb13 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 4 Oct 2024 23:39:46 -0700
Subject: [PATCH 263/435] Regenerate query file tags

---
 .../RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql     | 1 +
 .../src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql | 1 +
 .../src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql    | 1 +
 .../RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql    | 1 +
 .../src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
index 06a7eb7658..ac8cd56a7a 100644
--- a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-7-5
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
index 3b58cf7a92..13e7ee6b7b 100644
--- a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
+++ b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
@@ -8,6 +8,7 @@
  * @tags external/misra/id/rule-7-5
  *       readability
  *       maintainability
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
index 9c35c3c2d6..40b66d0067 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -7,6 +7,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-7-5
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
index e333adfb7e..e4e660c628 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidLiteralForIntegerConstantMacroArgument.ql
@@ -7,6 +7,7 @@
  * @problem.severity error
  * @tags external/misra/id/rule-7-5
  *       correctness
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 
diff --git a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
index 9a1844601b..47e88196d5 100644
--- a/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
+++ b/c/misra/src/rules/RULE-7-6/UseOfBannedSmallIntegerConstantMacro.ql
@@ -8,6 +8,7 @@
  * @problem.severity warning
  * @tags external/misra/id/rule-7-6
  *       readability
+ *       external/misra/c/2012/amendment3
  *       external/misra/obligation/required
  */
 

From 3520d1b9ec0209ed58fe02ba8bd6b885af898f8c Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Sat, 5 Oct 2024 00:08:41 -0700
Subject: [PATCH 264/435] Implement banned2 package, rule 21-24 ban rand() and
 srand().

---
 .../RULE-21-24/CallToBannedRandomFunction.ql  | 23 ++++++++++++++++
 .../CallToBannedRandomFunction.expected       |  2 ++
 .../CallToBannedRandomFunction.qlref          |  1 +
 c/misra/test/rules/RULE-21-24/test.c          | 11 ++++++++
 .../cpp/exclusions/c/Banned2.qll              | 26 +++++++++++++++++++
 .../cpp/exclusions/c/RuleMetadata.qll         |  3 +++
 rule_packages/c/Banned2.json                  | 24 +++++++++++++++++
 7 files changed, 90 insertions(+)
 create mode 100644 c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
 create mode 100644 c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.expected
 create mode 100644 c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.qlref
 create mode 100644 c/misra/test/rules/RULE-21-24/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/Banned2.qll
 create mode 100644 rule_packages/c/Banned2.json

diff --git a/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
new file mode 100644
index 0000000000..dda3dd4b9e
--- /dev/null
+++ b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
@@ -0,0 +1,23 @@
+/**
+ * @id c/misra/call-to-banned-random-function
+ * @name RULE-21-24: The random number generator functions of <stdlib.h> shall not be used
+ * @description The standard functions rand() and srand() will not give high quality random results
+ *              in all implementations and is thus banned.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-21-24
+ *       security
+ *       external/misra/c/2012/amendment3
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from FunctionCall call, string name
+where
+  not isExcluded(call, Banned2Package::callToBannedRandomFunctionQuery()) and
+  name = ["rand", "srand"] and
+  call.getTarget().hasGlobalOrStdName(name)
+select call, "Call to banned random number generation function '" + name + "'."
diff --git a/c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.expected b/c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.expected
new file mode 100644
index 0000000000..b3953d166b
--- /dev/null
+++ b/c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.expected
@@ -0,0 +1,2 @@
+| test.c:5:3:5:7 | call to srand | Call to banned random number generation function 'srand'. |
+| test.c:6:11:6:14 | call to rand | Call to banned random number generation function 'rand'. |
diff --git a/c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.qlref b/c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.qlref
new file mode 100644
index 0000000000..b229c0e84f
--- /dev/null
+++ b/c/misra/test/rules/RULE-21-24/CallToBannedRandomFunction.qlref
@@ -0,0 +1 @@
+rules/RULE-21-24/CallToBannedRandomFunction.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-21-24/test.c b/c/misra/test/rules/RULE-21-24/test.c
new file mode 100644
index 0000000000..56cfae3cb1
--- /dev/null
+++ b/c/misra/test/rules/RULE-21-24/test.c
@@ -0,0 +1,11 @@
+#include "stdlib.h"
+
+void f() {
+  // rand() is banned -- and thus, so is srand().
+  srand(0);       // NON-COMPLIANT
+  int x = rand(); // NON-COMPLIANT
+
+  // Other functions from stdlib are not banned by this rule.
+  x = abs(-4);       // COMPLIANT
+  getenv("ENV_VAR"); // COMPLIANT
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Banned2.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Banned2.qll
new file mode 100644
index 0000000000..024aa9b76c
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/Banned2.qll
@@ -0,0 +1,26 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Banned2Query = TCallToBannedRandomFunctionQuery()
+
+predicate isBanned2QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `callToBannedRandomFunction` query
+    Banned2Package::callToBannedRandomFunctionQuery() and
+  queryId =
+    // `@id` for the `callToBannedRandomFunction` query
+    "c/misra/call-to-banned-random-function" and
+  ruleId = "RULE-21-24" and
+  category = "required"
+}
+
+module Banned2Package {
+  Query callToBannedRandomFunctionQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `callToBannedRandomFunction` query
+      TQueryC(TBanned2PackageQuery(TCallToBannedRandomFunctionQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index b10fbf0a2f..facc8c0420 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -3,6 +3,7 @@ import cpp
 import codingstandards.cpp.exclusions.RuleMetadata
 //** Import packages for this language **/
 import Banned
+import Banned2
 import BitfieldTypes
 import BitfieldTypes2
 import Concurrency1
@@ -76,6 +77,7 @@ import Types1
 /** The TQuery type representing this language * */
 newtype TCQuery =
   TBannedPackageQuery(BannedQuery q) or
+  TBanned2PackageQuery(Banned2Query q) or
   TBitfieldTypesPackageQuery(BitfieldTypesQuery q) or
   TBitfieldTypes2PackageQuery(BitfieldTypes2Query q) or
   TConcurrency1PackageQuery(Concurrency1Query q) or
@@ -149,6 +151,7 @@ newtype TCQuery =
 /** The metadata predicate * */
 predicate isQueryMetadata(Query query, string queryId, string ruleId, string category) {
   isBannedQueryMetadata(query, queryId, ruleId, category) or
+  isBanned2QueryMetadata(query, queryId, ruleId, category) or
   isBitfieldTypesQueryMetadata(query, queryId, ruleId, category) or
   isBitfieldTypes2QueryMetadata(query, queryId, ruleId, category) or
   isConcurrency1QueryMetadata(query, queryId, ruleId, category) or
diff --git a/rule_packages/c/Banned2.json b/rule_packages/c/Banned2.json
new file mode 100644
index 0000000000..461e269413
--- /dev/null
+++ b/rule_packages/c/Banned2.json
@@ -0,0 +1,24 @@
+{
+  "MISRA-C-2012": {
+    "RULE-21-24": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "The standard functions rand() and srand() will not give high quality random results in all implementations and is thus banned.",
+          "kind": "problem",
+          "name": "The random number generator functions of <stdlib.h> shall not be used",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "CallToBannedRandomFunction",
+          "tags": [
+            "security",
+            "external/misra/c/2012/amendment3"
+          ]
+        }
+      ],
+      "title": "The random number generator functions of <stdlib.h> shall not be used"
+    }
+  }
+}
\ No newline at end of file

From cbeb018366a0fce1fa5d246d5299e1de905d1ee8 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Mon, 7 Oct 2024 09:28:24 +0900
Subject: [PATCH 265/435] Add test cases to A0-1-1 useless assignment.

---
 .../test/rules/A0-1-1/UselessAssignment.expected   |  2 ++
 cpp/autosar/test/rules/A0-1-1/test.cpp             | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/cpp/autosar/test/rules/A0-1-1/UselessAssignment.expected b/cpp/autosar/test/rules/A0-1-1/UselessAssignment.expected
index bdd73be2eb..a38f3afddf 100644
--- a/cpp/autosar/test/rules/A0-1-1/UselessAssignment.expected
+++ b/cpp/autosar/test/rules/A0-1-1/UselessAssignment.expected
@@ -12,3 +12,5 @@
 | test.cpp:94:11:94:17 | new | Definition of $@ is unused. | test.cpp:94:6:94:7 | b4 | b4 |
 | test.cpp:95:11:95:17 | 0 | Definition of $@ is unused. | test.cpp:95:6:95:7 | b5 | b5 |
 | test.cpp:103:11:103:17 | 0 | Definition of $@ is unused. | test.cpp:103:6:103:7 | c5 | c5 |
+| test.cpp:132:43:132:45 | {...} | Definition of $@ is unused. | test.cpp:132:7:132:18 | unused_array | unused_array |
+| test.cpp:134:29:134:31 | 0 | Definition of $@ is unused. | test.cpp:134:17:134:26 | unused_int | unused_int |
diff --git a/cpp/autosar/test/rules/A0-1-1/test.cpp b/cpp/autosar/test/rules/A0-1-1/test.cpp
index 021b1bf792..694396406a 100644
--- a/cpp/autosar/test/rules/A0-1-1/test.cpp
+++ b/cpp/autosar/test/rules/A0-1-1/test.cpp
@@ -123,4 +123,16 @@ template <typename T> void test_range_based_for_loop_template() {
                                //             template
     elem;
   }
-}
\ No newline at end of file
+}
+
+#include <cstdint>
+
+std::int32_t test_constexpr_array_size() {
+  constexpr int constexpr_array_size = 7;      // COMPLIANT
+  int unused_array[constexpr_array_size] = {}; // NON_COMPLIANT
+
+  constexpr int unused_int = {}; // NON_COMPLIANT
+
+  std::int32_t used_array[] = {-1, 0, 1}; // COMPLIANT
+  return used_array[1];
+}

From 97bf53af4294acb6afe3a0a794f4840e75c93bb1 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Mon, 7 Oct 2024 10:21:03 +0900
Subject: [PATCH 266/435] Correct exclusion

---
 cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
index 9efa4bdfd1..03ddfbbd43 100644
--- a/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
+++ b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
@@ -20,7 +20,7 @@ import codingstandards.cpp.deadcode.UnusedFunctions
 
 from UnusedFunctions::UnusedSplMemberFunction unusedSplMemFunction, string name
 where
-  not isExcluded(unusedSplMemberFunctionQuery, DeadCodePackage::unusedFunctionQuery()) and
+  not isExcluded(DeadCodePackage::unusedSplMemberFunctionQuery(), DeadCodePackage::unusedFunctionQuery()) and
   (
     if exists(unusedSplMemFunction.getQualifiedName())
     then name = unusedSplMemFunction.getQualifiedName()

From c5cdf0e0b7e40239966e5bfb0127264f0b1e5627 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Mon, 7 Oct 2024 14:21:19 +0900
Subject: [PATCH 267/435] Add GoogleTest stub and test cases

---
 .../M0-1-10/UnusedSplMemberFunction.expected  |  1 +
 cpp/autosar/test/rules/M0-1-10/test.cpp       | 19 ++++++++++++
 .../cpp/EncapsulatingFunctions.qll            |  5 ++--
 .../custom-library/gtest/gtest-internal.h     | 29 +++++++++++++++++++
 .../includes/custom-library/gtest/gtest.h     | 28 ++++++++++++++++++
 cpp/options                                   |  2 +-
 6 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 cpp/common/test/includes/custom-library/gtest/gtest-internal.h
 create mode 100644 cpp/common/test/includes/custom-library/gtest/gtest.h

diff --git a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
index e2bf0acc79..f26e8dfe33 100644
--- a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
+++ b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
@@ -1,2 +1,3 @@
 | test.cpp:71:5:71:16 | ANestedClass | Special member function ANestedClass is never called. |
 | test.cpp:82:5:82:22 | AnotherNestedClass | Special member function AnotherNestedClass is never called from a main function or entry point. |
+| test.cpp:155:1:157:37 | ~sample_test_called_from_google_test_function_Test | Special member function sample_test_called_from_google_test_function_Test::~sample_test_called_from_google_test_function_Test is never called. |
diff --git a/cpp/autosar/test/rules/M0-1-10/test.cpp b/cpp/autosar/test/rules/M0-1-10/test.cpp
index 6e1220be5d..27534590fd 100644
--- a/cpp/autosar/test/rules/M0-1-10/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-10/test.cpp
@@ -142,3 +142,22 @@ class M {
 public:
   M(const M &) = delete; // COMPLIANT - ignore if deleted
 };
+
+#include <gtest/gtest.h>
+int called_from_google_test_function(
+    int a_param) // COMPLIANT - called from TEST
+{
+  int something = a_param;
+  something++;
+  return something;
+}
+
+TEST(
+    sample_test,
+    called_from_google_test_function) // COMPLIANT - False positive!
+                                      // ~sample_test_called_from_google_test_function_Test
+{
+  bool pass = false;
+  if (called_from_google_test_function(0) >= 10)
+    pass = true;
+}
diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
index ad11bea21c..7b2d715d01 100644
--- a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
@@ -39,8 +39,9 @@ class GoogleTestFunction extends MainLikeFunction {
         base.getNamespace().hasName("testing")
       )
       or
-      // or at a location in a file called "gtest.h".
-      base.getDefinitionLocation().getFile().getBaseName() = "gtest.h"
+      // or at a location in a file called gtest.h (or gtest-internal.h,
+      // gtest-typed-test.h etc).
+      base.getDefinitionLocation().getFile().getBaseName().regexpMatch("gtest*.h")
     )
   }
 }
diff --git a/cpp/common/test/includes/custom-library/gtest/gtest-internal.h b/cpp/common/test/includes/custom-library/gtest/gtest-internal.h
new file mode 100644
index 0000000000..31d47b714f
--- /dev/null
+++ b/cpp/common/test/includes/custom-library/gtest/gtest-internal.h
@@ -0,0 +1,29 @@
+#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
+
+#define GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
+  test_suite_name##_##test_name##_Test
+
+#define GTEST_TEST_(test_suite_name, test_name, parent_class)                   \
+ class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                       \
+      : public parent_class {                                                   \
+      public:                                                                   \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() = default;             \
+    ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default;   \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                          \
+    (const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) &) = delete;      \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) & operator=(             \
+        const GTEST_TEST_CLASS_NAME_(test_suite_name,                           \
+                                     test_name) &) = delete; /* NOLINT */       \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)                          \
+    (GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) &&) noexcept = delete;  \
+    GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) & operator=(             \
+        GTEST_TEST_CLASS_NAME_(test_suite_name,                                 \
+                               test_name) &&) noexcept = delete; /* NOLINT */   \
+                                                                                \
+   private:                                                                     \
+    void TestBody() override;                                                            \
+    };                                                                          \
+    void GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)::TestBody()         \
+
+#endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
diff --git a/cpp/common/test/includes/custom-library/gtest/gtest.h b/cpp/common/test/includes/custom-library/gtest/gtest.h
new file mode 100644
index 0000000000..65fce9fc5a
--- /dev/null
+++ b/cpp/common/test/includes/custom-library/gtest/gtest.h
@@ -0,0 +1,28 @@
+#ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_H_
+#define GOOGLETEST_INCLUDE_GTEST_GTEST_H_
+
+#include "gtest/gtest-internal.h"
+
+namespace testing {
+
+class Test
+{
+  public:
+  virtual ~Test();
+  protected:
+  // Creates a Test object.
+  Test();
+  private:
+  virtual void TestBody() = 0;
+  Test(const Test&) = delete;
+  Test& operator=(const Test&) = delete;
+};
+
+#define GTEST_TEST(test_suite_name, test_name)             \
+  GTEST_TEST_(test_suite_name, test_name, ::testing::Test)
+
+#define TEST(test_suite_name, test_name) GTEST_TEST(test_suite_name, test_name)
+
+} // namespace testing
+
+#endif  // GOOGLETEST_INCLUDE_GTEST_GTEST_H_
diff --git a/cpp/options b/cpp/options
index 1f8961ecda..44267e9323 100644
--- a/cpp/options
+++ b/cpp/options
@@ -1 +1 @@
-semmle-extractor-options:--clang -std=c++14 -nostdinc++ -I../../../../common/test/includes/standard-library -I../../../../common/test/includes/custom-library
\ No newline at end of file
+semmle-extractor-options:--clang -std=c++14 -nostdinc++ -I../../../../common/test/includes/standard-library -I../../../../common/test/includes/custom-library

From b3ca674febc91551b08656e02985685701b38305 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 7 Oct 2024 10:19:42 +0100
Subject: [PATCH 268/435] Switch to workflow dispatch for cross repo testing

The PR testing jobs were still using repository dispatch, but the
target workflows had changed to use workflow dispatch.
---
 .github/workflows/dispatch-matrix-check.yml   | 50 -------------------
 .../dispatch-matrix-test-on-comment.yml       | 19 ++++---
 .../dispatch-release-performance-check.yml    | 19 ++++---
 3 files changed, 24 insertions(+), 64 deletions(-)
 delete mode 100644 .github/workflows/dispatch-matrix-check.yml

diff --git a/.github/workflows/dispatch-matrix-check.yml b/.github/workflows/dispatch-matrix-check.yml
deleted file mode 100644
index 845a8fc4ae..0000000000
--- a/.github/workflows/dispatch-matrix-check.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: 🤖 Run Matrix Check
-
-on:
-  pull_request_target:
-    types: [synchronize, opened]
-    branches:
-      - "matrix/**"
-  workflow_dispatch:
-
-jobs:
-  dispatch-matrix-check:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Check permission
-        id: check-write-permission
-        uses: ./.github/actions/check-permissions
-        with:
-          minimum-permission: "write"
-
-      - name: Generate token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ vars.AUTOMATION_APP_ID }}
-          private-key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-          repositories: "codeql-coding-standards-release-engineering"
-
-      - name: Dispatch Matrix Testing Job
-        if: steps.check-write-permission.outputs.has-permission
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          repository: github/codeql-coding-standards-release-engineering
-          event-type: matrix-test
-          client-payload: '{"pr": "${{ github.event.number }}"}'
-
-      - uses: actions/github-script@v6
-        if: steps.check-write-permission.outputs.has-permission
-        with:
-          script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '🤖 Beep Boop! Matrix Testing for this PR has been initiated. Please check back later for results. <br><br> :bulb: If you do not hear back from me please check my status! **I will report even if this PR does not contain files eligible for matrix testing.**'
-            })
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
index 4f9f9a5b1e..297b6fbc7e 100644
--- a/.github/workflows/dispatch-matrix-test-on-comment.yml
+++ b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -26,14 +26,19 @@ jobs:
           owner: ${{ github.repository_owner }}
           repositories: "codeql-coding-standards-release-engineering"
 
-      - name: Dispatch Matrix Testing Job
+      - name: Invoke matrix testing job
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          repository: github/codeql-coding-standards-release-engineering
-          event-type: matrix-test
-          client-payload: '{"pr": "${{ github.event.issue.number }}"}'
+        env:
+          ISSUE_NR: ${{ github.event.issue.number }}
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+        run: |
+          jq -n \
+          --arg issue_nr "$ISSUE_NR" \
+          '{"issue-nr": $issue_nr}' \
+          | \
+          gh workflow run pr-compiler-validation.yml \
+          --json \
+            -R github/codeql-coding-standards-release-engineering
 
       - uses: actions/github-script@v6
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index 7e28a9c4f9..260846185a 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -26,14 +26,19 @@ jobs:
           owner: ${{ github.repository_owner }}
           repositories: "codeql-coding-standards-release-engineering"
 
-      - name: Dispatch Performance Testing Job
+      - name: Invoke performance test
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          repository: github/codeql-coding-standards-release-engineering
-          event-type: performance-test
-          client-payload: '{"pr": "${{ github.event.issue.number }}"}'
+        env:
+          ISSUE_NR: ${{ github.event.issue.number }}
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+        run: |
+          jq -n \
+          --arg issue_nr "$ISSUE_NR" \
+          '{"issue-nr": $issue_nr}' \
+          | \
+          gh workflow run pr-performance-testing.yml \
+          --json \
+          -R github/codeql-coding-standards-release-engineering
 
       - uses: actions/github-script@v6
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}

From 4c17999deb60b01c81f82a704665eee2ddbcf4fd Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 7 Oct 2024 14:00:23 +0100
Subject: [PATCH 269/435] MEM53-CPP: Remove FP introduced by upgrade to 2.15.5

Flow through realloc was added in the standard library, so move
to barrier instead of node filter
---
 cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll | 9 ++++++---
 ...ssingConstructorCallForManuallyManagedObject.expected | 4 ----
 cpp/cert/test/rules/MEM53-CPP/test.cpp                   | 5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll b/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll
index 358a3583fc..54fafc60d7 100644
--- a/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll
+++ b/cpp/cert/src/rules/MEM53-CPP/ManuallyManagedLifetime.qll
@@ -14,12 +14,15 @@ module AllocToStaticCastConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     exists(AllocationExpr ae |
       ae.getType().getUnspecifiedType() instanceof VoidPointerType and
-      source.asExpr() = ae and
-      // Ignore realloc, as that memory may already be partially constructed
-      not ae.(FunctionCall).getTarget().getName().toLowerCase().matches("%realloc%")
+      source.asExpr() = ae
     )
   }
 
+  predicate isBarrier(DataFlow::Node sanitizer) {
+    // Ignore realloc, as that memory may already be partially constructed
+    sanitizer.asExpr().(FunctionCall).getTarget().getName().toLowerCase().matches("%realloc%")
+  }
+
   predicate isSink(DataFlow::Node sink) {
     exists(StaticOrCStyleCast sc, Class nonTrivialClass |
       sc.getExpr() = sink.asExpr() and
diff --git a/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected b/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
index e64315e044..12dcb2d8ff 100644
--- a/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
+++ b/cpp/cert/test/rules/MEM53-CPP/MissingConstructorCallForManuallyManagedObject.expected
@@ -1,5 +1,4 @@
 edges
-| test.cpp:65:21:65:34 | call to operator new | test.cpp:67:26:67:32 | call to realloc |
 nodes
 | test.cpp:16:26:16:31 | call to malloc | semmle.label | call to malloc |
 | test.cpp:17:38:17:43 | call to malloc | semmle.label | call to malloc |
@@ -10,8 +9,6 @@ nodes
 | test.cpp:47:26:47:39 | call to operator new | semmle.label | call to operator new |
 | test.cpp:49:29:49:42 | call to operator new | semmle.label | call to operator new |
 | test.cpp:51:29:51:42 | call to operator new | semmle.label | call to operator new |
-| test.cpp:65:21:65:34 | call to operator new | semmle.label | call to operator new |
-| test.cpp:67:26:67:32 | call to realloc | semmle.label | call to realloc |
 subpaths
 #select
 | test.cpp:16:26:16:31 | call to malloc | test.cpp:16:26:16:31 | call to malloc | test.cpp:16:26:16:31 | call to malloc | Allocation to cast without constructor call |
@@ -23,4 +20,3 @@ subpaths
 | test.cpp:47:26:47:39 | call to operator new | test.cpp:47:26:47:39 | call to operator new | test.cpp:47:26:47:39 | call to operator new | Allocation to cast without constructor call |
 | test.cpp:49:29:49:42 | call to operator new | test.cpp:49:29:49:42 | call to operator new | test.cpp:49:29:49:42 | call to operator new | Allocation to cast without constructor call |
 | test.cpp:51:29:51:42 | call to operator new | test.cpp:51:29:51:42 | call to operator new | test.cpp:51:29:51:42 | call to operator new | Allocation to cast without constructor call |
-| test.cpp:67:26:67:32 | call to realloc | test.cpp:65:21:65:34 | call to operator new | test.cpp:67:26:67:32 | call to realloc | Allocation to cast without constructor call |
diff --git a/cpp/cert/test/rules/MEM53-CPP/test.cpp b/cpp/cert/test/rules/MEM53-CPP/test.cpp
index 82c0953a60..12c6d1ee56 100644
--- a/cpp/cert/test/rules/MEM53-CPP/test.cpp
+++ b/cpp/cert/test/rules/MEM53-CPP/test.cpp
@@ -63,7 +63,6 @@ void test_no_constructor_but_has_destructor() {
 
 void test_realloc() {
   void *goodAlloc = ::operator new(sizeof(ClassA));
-  ClassA *a1 = new (goodAlloc) ClassA{1}; // COMPLIANT
-  ClassA *a2 = (ClassA *)realloc(
-      goodAlloc, sizeof(ClassA) * 2); // COMPLIANT [FALSE_POSITIVE]
+  ClassA *a1 = new (goodAlloc) ClassA{1};                        // COMPLIANT
+  ClassA *a2 = (ClassA *)realloc(goodAlloc, sizeof(ClassA) * 2); // COMPLIANT
 }
\ No newline at end of file

From 12b1c4ee138fcbb56d35247702f0049f6d913c16 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 7 Oct 2024 14:03:05 +0100
Subject: [PATCH 270/435] Add change note

---
 change_notes/2024-10-07-upgrade-to-2.15.5.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 change_notes/2024-10-07-upgrade-to-2.15.5.md

diff --git a/change_notes/2024-10-07-upgrade-to-2.15.5.md b/change_notes/2024-10-07-upgrade-to-2.15.5.md
new file mode 100644
index 0000000000..d3d4151e78
--- /dev/null
+++ b/change_notes/2024-10-07-upgrade-to-2.15.5.md
@@ -0,0 +1 @@
+- Updated the CodeQL version to `2.15.5`.
\ No newline at end of file

From 23574944cb6a31795a28a7a343971f0e76b62294 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 8 Oct 2024 10:44:43 +0900
Subject: [PATCH 271/435] Dont report SpecialMemberFunction

---
 cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql b/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql
index 27306a9fc1..f175cb8992 100644
--- a/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql
+++ b/cpp/autosar/src/rules/M0-1-10/UnusedFunction.ql
@@ -27,5 +27,5 @@ where
     else name = unusedFunction.getName()
   ) and
   not unusedFunction.isDeleted() and
-  not UnusedFunctions::isASpecialMemberFunction(unusedFunction)
+  not unusedFunction instanceof SpecialMemberFunction
 select unusedFunction, "Function " + name + " is " + unusedFunction.getDeadCodeType()

From 0c3a1a50374ac68baed2ef0e6b858338077e8480 Mon Sep 17 00:00:00 2001
From: lcartey <5377966+lcartey@users.noreply.github.com>
Date: Tue, 8 Oct 2024 14:32:43 +0000
Subject: [PATCH 272/435] Upgrading `github/codeql` dependency to 2.16.6

---
 c/cert/src/codeql-pack.lock.yml                    | 14 +++++++-------
 c/cert/src/qlpack.yml                              |  2 +-
 c/cert/test/codeql-pack.lock.yml                   | 14 +++++++-------
 c/common/src/codeql-pack.lock.yml                  | 14 +++++++-------
 c/common/src/qlpack.yml                            |  2 +-
 c/common/test/codeql-pack.lock.yml                 | 14 +++++++-------
 c/misra/src/codeql-pack.lock.yml                   | 14 +++++++-------
 c/misra/src/qlpack.yml                             |  2 +-
 c/misra/test/codeql-pack.lock.yml                  | 14 +++++++-------
 cpp/autosar/src/codeql-pack.lock.yml               | 14 +++++++-------
 cpp/autosar/src/qlpack.yml                         |  2 +-
 cpp/autosar/test/codeql-pack.lock.yml              | 14 +++++++-------
 cpp/cert/src/codeql-pack.lock.yml                  | 14 +++++++-------
 cpp/cert/src/qlpack.yml                            |  2 +-
 cpp/cert/test/codeql-pack.lock.yml                 | 14 +++++++-------
 cpp/common/src/codeql-pack.lock.yml                | 14 +++++++-------
 cpp/common/src/qlpack.yml                          |  2 +-
 cpp/common/test/codeql-pack.lock.yml               | 14 +++++++-------
 cpp/misra/src/codeql-pack.lock.yml                 | 14 +++++++-------
 cpp/misra/src/qlpack.yml                           |  2 +-
 cpp/misra/test/codeql-pack.lock.yml                | 14 +++++++-------
 cpp/report/src/codeql-pack.lock.yml                | 14 +++++++-------
 cpp/report/src/qlpack.yml                          |  2 +-
 .../generate_modules/queries/codeql-pack.lock.yml  | 14 +++++++-------
 scripts/generate_modules/queries/qlpack.yml        |  2 +-
 supported_codeql_configs.json                      |  6 +++---
 26 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/c/cert/src/codeql-pack.lock.yml b/c/cert/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/c/cert/src/codeql-pack.lock.yml
+++ b/c/cert/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index f0daa6334a..a55d7391da 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
diff --git a/c/cert/test/codeql-pack.lock.yml b/c/cert/test/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/c/cert/test/codeql-pack.lock.yml
+++ b/c/cert/test/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/c/common/src/codeql-pack.lock.yml b/c/common/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/c/common/src/codeql-pack.lock.yml
+++ b/c/common/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 5f18365483..f1b5271d74 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -3,4 +3,4 @@ version: 2.36.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
diff --git a/c/common/test/codeql-pack.lock.yml b/c/common/test/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/c/common/test/codeql-pack.lock.yml
+++ b/c/common/test/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/c/misra/src/codeql-pack.lock.yml b/c/misra/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/c/misra/src/codeql-pack.lock.yml
+++ b/c/misra/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 9d0ed62e06..7839b51dd3 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -6,4 +6,4 @@ license: MIT
 default-suite-file: codeql-suites/misra-c-default.qls
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
diff --git a/c/misra/test/codeql-pack.lock.yml b/c/misra/test/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/c/misra/test/codeql-pack.lock.yml
+++ b/c/misra/test/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/autosar/src/codeql-pack.lock.yml b/cpp/autosar/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/autosar/src/codeql-pack.lock.yml
+++ b/cpp/autosar/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 93a0f4bd9a..fede5b3e69 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
diff --git a/cpp/autosar/test/codeql-pack.lock.yml b/cpp/autosar/test/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/autosar/test/codeql-pack.lock.yml
+++ b/cpp/autosar/test/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/cert/src/codeql-pack.lock.yml b/cpp/cert/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/cert/src/codeql-pack.lock.yml
+++ b/cpp/cert/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 3a85e2aa20..f7cd4a0291 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -4,5 +4,5 @@ description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
   codeql/common-cpp-coding-standards: '*'
diff --git a/cpp/cert/test/codeql-pack.lock.yml b/cpp/cert/test/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/cert/test/codeql-pack.lock.yml
+++ b/cpp/cert/test/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/common/src/codeql-pack.lock.yml b/cpp/common/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/common/src/codeql-pack.lock.yml
+++ b/cpp/common/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index b7f90b4cd3..69483ef611 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -2,6 +2,6 @@ name: codeql/common-cpp-coding-standards
 version: 2.36.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
 dataExtensions:
 - ext/*.model.yml
diff --git a/cpp/common/test/codeql-pack.lock.yml b/cpp/common/test/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/common/test/codeql-pack.lock.yml
+++ b/cpp/common/test/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/misra/src/codeql-pack.lock.yml b/cpp/misra/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/misra/src/codeql-pack.lock.yml
+++ b/cpp/misra/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index b713614f68..19a37a8650 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -5,4 +5,4 @@ default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
diff --git a/cpp/misra/test/codeql-pack.lock.yml b/cpp/misra/test/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/misra/test/codeql-pack.lock.yml
+++ b/cpp/misra/test/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/report/src/codeql-pack.lock.yml b/cpp/report/src/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/cpp/report/src/codeql-pack.lock.yml
+++ b/cpp/report/src/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index f90669908d..b37f2ca9ad 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/report-cpp-coding-standards
 version: 2.36.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
diff --git a/scripts/generate_modules/queries/codeql-pack.lock.yml b/scripts/generate_modules/queries/codeql-pack.lock.yml
index 4edf97c6f8..2cbbccee53 100644
--- a/scripts/generate_modules/queries/codeql-pack.lock.yml
+++ b/scripts/generate_modules/queries/codeql-pack.lock.yml
@@ -2,17 +2,17 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.2
+    version: 0.12.9
   codeql/dataflow:
-    version: 0.1.5
+    version: 0.2.3
   codeql/rangeanalysis:
-    version: 0.0.4
+    version: 0.0.11
   codeql/ssa:
-    version: 0.2.5
+    version: 0.2.12
   codeql/tutorial:
-    version: 0.2.5
+    version: 0.2.12
   codeql/typetracking:
-    version: 0.2.5
+    version: 0.2.12
   codeql/util:
-    version: 0.2.5
+    version: 0.2.12
 compiled: false
diff --git a/scripts/generate_modules/queries/qlpack.yml b/scripts/generate_modules/queries/qlpack.yml
index 4ab2483c04..fea871b973 100644
--- a/scripts/generate_modules/queries/qlpack.yml
+++ b/scripts/generate_modules/queries/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/standard-library-extraction-cpp-coding-standards
 version: 0.0.0
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.2
+  codeql/cpp-all: 0.12.9
diff --git a/supported_codeql_configs.json b/supported_codeql_configs.json
index a97c7d83d2..e8b2597100 100644
--- a/supported_codeql_configs.json
+++ b/supported_codeql_configs.json
@@ -1,9 +1,9 @@
 {
   "supported_environment": [
     {
-      "codeql_cli": "2.15.5",
-      "codeql_standard_library": "codeql-cli/v2.15.5",
-      "codeql_cli_bundle": "codeql-bundle-v2.15.5"
+      "codeql_cli": "2.16.6",
+      "codeql_standard_library": "codeql-cli/v2.16.6",
+      "codeql_cli_bundle": "codeql-bundle-v2.16.6"
     }
   ],
   "supported_language": [

From def30fb63abb445c4e27410536f08d06387e8434 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 8 Oct 2024 22:44:30 +0100
Subject: [PATCH 273/435] Update CodeQL dependency change note

---
 ...10-07-upgrade-to-2.15.5.md => 2024-10-08-upgrade-to-2.16.6.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename change_notes/{2024-10-07-upgrade-to-2.15.5.md => 2024-10-08-upgrade-to-2.16.6.md} (100%)

diff --git a/change_notes/2024-10-07-upgrade-to-2.15.5.md b/change_notes/2024-10-08-upgrade-to-2.16.6.md
similarity index 100%
rename from change_notes/2024-10-07-upgrade-to-2.15.5.md
rename to change_notes/2024-10-08-upgrade-to-2.16.6.md

From 896242cf1218e32041f37449a63ec0bcb756a18e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 8 Oct 2024 22:48:06 +0100
Subject: [PATCH 274/435] Update release note

---
 change_notes/2024-10-08-upgrade-to-2.16.6.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/change_notes/2024-10-08-upgrade-to-2.16.6.md b/change_notes/2024-10-08-upgrade-to-2.16.6.md
index d3d4151e78..a087679667 100644
--- a/change_notes/2024-10-08-upgrade-to-2.16.6.md
+++ b/change_notes/2024-10-08-upgrade-to-2.16.6.md
@@ -1 +1 @@
-- Updated the CodeQL version to `2.15.5`.
\ No newline at end of file
+- Updated the CodeQL version to `2.16.6`.
\ No newline at end of file

From 202fb667b2087f32d3c14e6bcd229f3d64a29a15 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Tue, 8 Oct 2024 20:54:23 -0700
Subject: [PATCH 275/435] Address feedback.

---
 ...rectlySizedIntegerConstantMacroArgument.ql | 19 +++++++++----------
 .../IntegerConstantMacroArgumentUsesSuffix.ql |  4 ++--
 .../InvalidIntegerConstantMacroArgument.ql    |  7 +------
 .../cpp/IntegerConstantMacro.qll              |  2 +-
 .../src/codingstandards/cpp/Literals.qll      |  5 ++---
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
index ac8cd56a7a..87c945d6b6 100644
--- a/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql
@@ -21,13 +21,8 @@ predicate matchesSign(IntegerConstantMacro macro, PossiblyNegativeLiteral litera
 }
 
 predicate matchesSize(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
-  // Wait for BigInt support to check 64 bit macro types.
-  (macro.getSize() < 64 and matchesSign(macro, literal))
-  implies
-  (
-    literal.getRawValue() <= macro.maxValue() and
-    literal.getRawValue() >= macro.minValue()
-  )
+  literal.getRawValue() <= macro.maxValue() and
+  literal.getRawValue() >= macro.minValue()
 }
 
 from
@@ -38,9 +33,13 @@ where
   invoke.getMacro() = macro and
   literal = invoke.getExpr() and
   (
-    not matchesSign(macro, invoke.getExpr()) and explanation = " cannot be negative"
+    not matchesSign(macro, literal) and
+    explanation = " cannot be negative"
     or
-    not matchesSize(macro, invoke.getExpr()) and
+    matchesSign(macro, literal) and
+    // Wait for BigInt support to check 64 bit macro types.
+    macro.getSize() < 64 and
+    not matchesSize(macro, literal) and
     explanation = " is outside of the allowed range " + macro.getRangeString()
   )
-select invoke.getExpr(), "Value provided to integer constant macro " + macro.getName() + explanation
+select literal, "Value provided to integer constant macro " + macro.getName() + explanation
diff --git a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
index 13e7ee6b7b..84fb1a9872 100644
--- a/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
+++ b/c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql
@@ -18,7 +18,7 @@ import codingstandards.cpp.IntegerConstantMacro
 import codingstandards.cpp.Literals
 
 string argumentSuffix(MacroInvocation invoke) {
-  // Compiler strips the suffix unless we look at the unexpanded argument text.
+  // Extractor strips the suffix unless we look at the unexpanded argument text.
   // Unexpanded argument text can be malformed in all sorts of ways, so make
   // this match relatively strict, to be safe.
   result = invoke.getUnexpandedArgument(0).regexpCapture("([0-9]+|0[xX][0-9A-F]+)([uUlL]+)$", 2)
@@ -30,6 +30,6 @@ where
   invoke.getMacro() instanceof IntegerConstantMacro and
   invoke.getExpr() = argument and
   suffix = argumentSuffix(invoke)
-select invoke.getExpr(),
+select argument,
   "Value suffix '" + suffix + "' is not allowed on provided argument to integer constant macro " +
     invoke.getMacroName() + "."
diff --git a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
index 40b66d0067..4c750e32d8 100644
--- a/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
+++ b/c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql
@@ -17,11 +17,6 @@ import codingstandards.cpp.IntegerConstantMacro
 import codingstandards.cpp.Literals
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
-predicate containsMacroInvocation(MacroInvocation outer, MacroInvocation inner) {
-  outer.getExpr() = inner.getExpr() and
-  exists(outer.getUnexpandedArgument(0).indexOf(inner.getMacroName()))
-}
-
 from MacroInvocation invoke, IntegerConstantMacro macro
 where
   not isExcluded(invoke, Types2Package::invalidIntegerConstantMacroArgumentQuery()) and
@@ -29,7 +24,7 @@ where
   (
     not invoke.getExpr() instanceof PossiblyNegativeLiteral
     or
-    containsMacroInvocation(invoke, _)
+    any(MacroInvocation inner).getParentInvocation() = invoke
   )
 select invoke.getExpr(),
   "Argument to integer constant macro " + macro.getName() + " must be an integer literal."
diff --git a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
index 8f3fff1e1b..bc4ea3d125 100644
--- a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
+++ b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
@@ -15,7 +15,7 @@ class IntegerConstantMacro extends Macro {
     signed = false and size = getName().regexpCapture("UINT(8|16|32|64)_C", 1).toInt()
   }
 
-  predicate isSmall() { size < 32 }
+  predicate isSmall() { size < any(IntType it | it.isSigned()).getSize() }
 
   int getSize() { result = size }
 
diff --git a/cpp/common/src/codingstandards/cpp/Literals.qll b/cpp/common/src/codingstandards/cpp/Literals.qll
index cc0d28dec9..edec04152e 100644
--- a/cpp/common/src/codingstandards/cpp/Literals.qll
+++ b/cpp/common/src/codingstandards/cpp/Literals.qll
@@ -4,7 +4,6 @@
 
 import cpp
 import codingstandards.cpp.Cpp14Literal
-import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
 class IntegerLiteral = Cpp14Literal::IntegerLiteral;
 
@@ -100,7 +99,7 @@ class NegativeLiteral extends PossiblyNegativeLiteral, UnaryMinusExpr {
 
   override Cpp14Literal::NumericLiteral getBaseLiteral() { result = literal }
 
-  override float getRawValue() { result = -lowerBound(literal) }
+  override float getRawValue() { result = -literal.getValue().toFloat() }
 }
 
 /**
@@ -112,5 +111,5 @@ class PositiveLiteral extends PossiblyNegativeLiteral, Cpp14Literal::NumericLite
 
   override Cpp14Literal::NumericLiteral getBaseLiteral() { result = this }
 
-  override float getRawValue() { result = lowerBound(this) }
+  override float getRawValue() { result = getValue().toFloat() }
 }

From 47a6600a2f8801728b1fa9602b93538c493b6f0d Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Tue, 8 Oct 2024 22:00:36 -0700
Subject: [PATCH 276/435] Fix small integer macro size, bytes not bits.

---
 cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
index bc4ea3d125..ce72033ecc 100644
--- a/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
+++ b/cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll
@@ -15,7 +15,7 @@ class IntegerConstantMacro extends Macro {
     signed = false and size = getName().regexpCapture("UINT(8|16|32|64)_C", 1).toInt()
   }
 
-  predicate isSmall() { size < any(IntType it | it.isSigned()).getSize() }
+  predicate isSmall() { size < any(IntType it | it.isSigned()).getSize() * 8 }
 
   int getSize() { result = size }
 

From 2ffccb0003c382882f6009034fe430e36ad13d77 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:18:34 +0100
Subject: [PATCH 277/435] Fix isExcluded function parameter in query

---
 cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
index 03ddfbbd43..bcbf6f4e1b 100644
--- a/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
+++ b/cpp/autosar/src/rules/M0-1-10/UnusedSplMemberFunction.ql
@@ -20,7 +20,7 @@ import codingstandards.cpp.deadcode.UnusedFunctions
 
 from UnusedFunctions::UnusedSplMemberFunction unusedSplMemFunction, string name
 where
-  not isExcluded(DeadCodePackage::unusedSplMemberFunctionQuery(), DeadCodePackage::unusedFunctionQuery()) and
+  not isExcluded(unusedSplMemFunction, DeadCodePackage::unusedFunctionQuery()) and
   (
     if exists(unusedSplMemFunction.getQualifiedName())
     then name = unusedSplMemFunction.getQualifiedName()

From 4b1429b6bf94bce541c32395eab0529a6d5ce9cb Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Wed, 9 Oct 2024 19:07:52 +0900
Subject: [PATCH 278/435] SpecialMemberFunction from GoogleTest as entry pts

---
 .../M0-1-10/UnusedSplMemberFunction.expected     |  1 -
 cpp/autosar/test/rules/M0-1-10/test.cpp          |  6 ++----
 .../cpp/EncapsulatingFunctions.qll               | 16 ++++++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
index f26e8dfe33..e2bf0acc79 100644
--- a/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
+++ b/cpp/autosar/test/rules/M0-1-10/UnusedSplMemberFunction.expected
@@ -1,3 +1,2 @@
 | test.cpp:71:5:71:16 | ANestedClass | Special member function ANestedClass is never called. |
 | test.cpp:82:5:82:22 | AnotherNestedClass | Special member function AnotherNestedClass is never called from a main function or entry point. |
-| test.cpp:155:1:157:37 | ~sample_test_called_from_google_test_function_Test | Special member function sample_test_called_from_google_test_function_Test::~sample_test_called_from_google_test_function_Test is never called. |
diff --git a/cpp/autosar/test/rules/M0-1-10/test.cpp b/cpp/autosar/test/rules/M0-1-10/test.cpp
index 27534590fd..84b17c4c21 100644
--- a/cpp/autosar/test/rules/M0-1-10/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-10/test.cpp
@@ -152,10 +152,8 @@ int called_from_google_test_function(
   return something;
 }
 
-TEST(
-    sample_test,
-    called_from_google_test_function) // COMPLIANT - False positive!
-                                      // ~sample_test_called_from_google_test_function_Test
+TEST(sample_test,
+     called_from_google_test_function) // COMPLIANT - Google Test function
 {
   bool pass = false;
   if (called_from_google_test_function(0) >= 10)
diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
index 7b2d715d01..8a0d4ffab9 100644
--- a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
@@ -3,6 +3,7 @@
  */
 
 import cpp
+import codingstandards.cpp.Class
 
 /** A function which represents the entry point into a specific thread of execution in the program. */
 abstract class MainLikeFunction extends Function { }
@@ -29,19 +30,22 @@ class MainFunction extends MainLikeFunction {
 class GoogleTestFunction extends MainLikeFunction {
   GoogleTestFunction() {
     // A GoogleTest function is named "TestBody" and
-    this.hasName("TestBody") and
+    (
+      this.hasName("TestBody") or
+      this instanceof SpecialMemberFunction
+    ) and
     // it's parent class inherits a base class
     exists(Class base |
       base = this.getEnclosingAccessHolder().(Class).getABaseClass+() and
-      // with a name "Test" inside a namespace called "testing"
       (
+        // with a name "Test" inside a namespace called "testing"
         base.hasName("Test") and
         base.getNamespace().hasName("testing")
+        or
+        // or at a location in a file called gtest.h (or gtest-internal.h,
+        // gtest-typed-test.h etc).
+        base.getDefinitionLocation().getFile().getBaseName().regexpMatch("gtest*.h")
       )
-      or
-      // or at a location in a file called gtest.h (or gtest-internal.h,
-      // gtest-typed-test.h etc).
-      base.getDefinitionLocation().getFile().getBaseName().regexpMatch("gtest*.h")
     )
   }
 }

From d0540e450382754719c7a0bc0d3010a7a6e88ce6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 9 Oct 2024 23:19:04 +0100
Subject: [PATCH 279/435] M0-1-2: Remove reference to GuardCondition

In the upgrade to 2.16.6 GuardCondition has been modified to use
the IR instead of the AST mode it used before. One of the
consequences of this change is that GuardConditions no longer exist
for uninstantiated templates (because the IR does not apply for
uninstantiated templates).

Instead of using GuardCondition we can use the same logic for
deducing infeasible paths for uninstantiated templates as for non
template code. This avoids the dependency on GuardCondition, and
provides consistency with the rest of the query, while shortening
the query.
---
 change_notes/2024-10-08-upgrade-to-2.16.6.md  |   4 +-
 .../src/rules/M0-1-2/InfeasiblePath.ql        | 185 +-----------------
 2 files changed, 12 insertions(+), 177 deletions(-)

diff --git a/change_notes/2024-10-08-upgrade-to-2.16.6.md b/change_notes/2024-10-08-upgrade-to-2.16.6.md
index a087679667..9f1e11d3d3 100644
--- a/change_notes/2024-10-08-upgrade-to-2.16.6.md
+++ b/change_notes/2024-10-08-upgrade-to-2.16.6.md
@@ -1 +1,3 @@
-- Updated the CodeQL version to `2.16.6`.
\ No newline at end of file
+- Updated the CodeQL version to `2.16.6`.
+- `M0-1-2` - `InfeasiblePath.ql`:
+  - This query may now report additional results within templates where a relational operation is performed which has a constant value given the specified arguments.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql b/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql
index 76ccdead69..83e056472b 100644
--- a/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql
+++ b/cpp/autosar/src/rules/M0-1-2/InfeasiblePath.ql
@@ -151,186 +151,19 @@ predicate isConstantRelationalOperation(
  * Holds if the `ConditionalNode` has an infeasible `path` for the reason given in `explanation`.
  */
 predicate hasInfeasiblePath(ConditionalControlFlowNode node, string message) {
-  //deal with the infeasible in all uninstantiated templates separately
-  node.isFromUninstantiatedTemplate(_) and
-  node instanceof ConditionControllingUnreachable and
-  message = "The path is unreachable in a template."
-  or
   exists(boolean infeasiblePath, string explanation |
-    (
-      not node.isFromUninstantiatedTemplate(_) and
-      not node.isFromTemplateInstantiation(_) and
-      message = "The " + infeasiblePath + " path is infeasible because " + explanation + "."
-    ) and
-    (
-      hasCFGDeducedInfeasiblePath(node, infeasiblePath, explanation) and
-      not isConstantRelationalOperation(node, infeasiblePath, _)
-      or
-      isConstantRelationalOperation(node, infeasiblePath, explanation)
-    )
+    not node.isFromTemplateInstantiation(_) and
+    if node.isFromUninstantiatedTemplate(_)
+    then message = "The path is unreachable in a template."
+    else message = "The " + infeasiblePath + " path is infeasible because " + explanation + "."
+  |
+    hasCFGDeducedInfeasiblePath(node, infeasiblePath, explanation) and
+    not isConstantRelationalOperation(node, infeasiblePath, _)
+    or
+    isConstantRelationalOperation(node, infeasiblePath, explanation)
   )
 }
 
-/**
- * A newtype representing "unreachable" blocks in the program. We use a newtype here to avoid
- * reporting the same block in multiple `Function` instances created from one function in a template.
- */
-private newtype TUnreachableBasicBlock =
-  TUnreachableNonTemplateBlock(BasicBlock bb) {
-    bb.isUnreachable() and
-    // Exclude anything template related from this case
-    not bb.getEnclosingFunction().isFromTemplateInstantiation(_) and
-    not bb.getEnclosingFunction().isFromUninstantiatedTemplate(_) and
-    // Exclude compiler generated basic blocks
-    not isCompilerGenerated(bb)
-  } or
-  /**
-   * A `BasicBlock` that occurs in at least one `Function` instance for a template. `BasicBlock`s
-   * are matched up across templates by location.
-   */
-  TUnreachableTemplateBlock(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn,
-    GuardCondition uninstantiatedGuardCondition
-  ) {
-    exists(BasicBlock bb |
-      // BasicBlock occurs in this location
-      bb.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      // And is contained in the `uninstantiatedFunction` only
-      // not from anything constructed from it
-      // because we want infeasible paths independent of parameters
-      exists(Function enclosing | enclosing = bb.getEnclosingFunction() |
-        //guard is in the template function
-        (
-          enclosing.getBlock().getAChild*() = uninstantiatedGuardCondition and
-          //function template
-          enclosing.isFromUninstantiatedTemplate(_) and
-          uninstantiatedGuardCondition.isFromUninstantiatedTemplate(_) and
-          //true condition is unreachable: basic block starts on same line as guard
-          (
-            not exists(uninstantiatedGuardCondition.getATrueSuccessor()) and
-            bb.hasLocationInfo(filepath, uninstantiatedGuardCondition.getLocation().getStartLine(),
-              startcolumn, endline, endcolumn)
-            or
-            //false condition is unreachable: false basic block starts on one line after its true basic block
-            not exists(uninstantiatedGuardCondition.getAFalseSuccessor()) and
-            bb.hasLocationInfo(filepath,
-              uninstantiatedGuardCondition.getATrueSuccessor().getLocation().getEndLine() + 1,
-              startcolumn, endline, endcolumn)
-          )
-        )
-      ) and
-      // And is unreachable
-      bb.isUnreachable() and
-      // //Exclude compiler generated control flow nodes
-      not isCompilerGenerated(bb) and
-      //Exclude nodes affected by macros, because our find-the-same-basic-block-by-location doesn't
-      //work in that case
-      not bb.(ControlFlowNode).isAffectedByMacro()
-    )
-  }
-
-/**
- * An unreachable basic block.
- */
-class UnreachableBasicBlock extends TUnreachableBasicBlock {
-  /** Gets a `BasicBlock` which is represented by this set of unreachable basic blocks. */
-  BasicBlock getABasicBlock() { none() }
-
-  /** Gets a `GuardCondition` instance which we treat as the original GuardCondition. */
-  GuardCondition getGuardCondition() { none() }
-
-  predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    none()
-  }
-
-  string toString() { result = "default" }
-}
-
-/**
- * A non-templated unreachable basic block.
- */
-class UnreachableNonTemplateBlock extends UnreachableBasicBlock, TUnreachableNonTemplateBlock {
-  BasicBlock getBasicBlock() { this = TUnreachableNonTemplateBlock(result) }
-
-  override BasicBlock getABasicBlock() { result = getBasicBlock() }
-
-  override GuardCondition getGuardCondition() { result.controls(getBasicBlock(), true) }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    getBasicBlock().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  override string toString() { result = getBasicBlock().toString() }
-}
-
-/**
- * A templated unreachable basic block.
- */
-class UnreachableTemplateBlock extends UnreachableBasicBlock, TUnreachableTemplateBlock {
-  override BasicBlock getABasicBlock() {
-    exists(
-      string filepath, int startline, int startcolumn, int endline, int endcolumn,
-      GuardCondition uninstantiatedGuardCondition
-    |
-      this =
-        TUnreachableTemplateBlock(filepath, startline, startcolumn, endline, endcolumn,
-          uninstantiatedGuardCondition) and
-      result.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      exists(Function enclosing |
-        //guard is in the template function
-        (
-          enclosing.getBlock().getAChild*() = uninstantiatedGuardCondition and
-          //function template
-          enclosing.isFromUninstantiatedTemplate(_) and
-          uninstantiatedGuardCondition.isFromUninstantiatedTemplate(_) and
-          //true condition is unreachable: basic block starts on same line as guard
-          (
-            not exists(uninstantiatedGuardCondition.getATrueSuccessor()) and
-            this.hasLocationInfo(filepath,
-              uninstantiatedGuardCondition.getLocation().getStartLine(), startcolumn, endline,
-              endcolumn)
-            or
-            //false condition is unreachable: false basic block starts on one line after its true basic block
-            not exists(uninstantiatedGuardCondition.getAFalseSuccessor()) and
-            this.hasLocationInfo(filepath,
-              uninstantiatedGuardCondition.getATrueSuccessor().getLocation().getEndLine() + 1,
-              startcolumn, endline, endcolumn)
-          )
-        )
-      )
-    |
-      result.isUnreachable() and
-      // Exclude compiler generated control flow nodes
-      not isCompilerGenerated(result) and
-      // Exclude nodes affected by macros, because our find-the-same-basic-block-by-location doesn't
-      // work in that case
-      not result.(ControlFlowNode).isAffectedByMacro()
-    )
-  }
-
-  override GuardCondition getGuardCondition() {
-    this = TUnreachableTemplateBlock(_, _, _, _, _, result)
-  }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this = TUnreachableTemplateBlock(filepath, startline, startcolumn, endline, endcolumn, _)
-  }
-
-  override string toString() { result = getABasicBlock().toString() }
-}
-
-class ConditionControllingUnreachable extends GuardCondition {
-  ConditionControllingUnreachable() {
-    exists(UnreachableTemplateBlock b | this = b.getGuardCondition())
-  }
-}
-
 from ConditionalControlFlowNode cond, string explanation
 where
   not isExcluded(cond, DeadCodePackage::infeasiblePathQuery()) and

From b715dba7f675b687025e81a90d7788efab0630bf Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 9 Oct 2024 23:55:49 +0100
Subject: [PATCH 280/435] Generate qlpack bundles when generating artifacts

---
 .github/workflows/code-scanning-pack-gen.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 7b187b2980..02d57bd18b 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -102,11 +102,21 @@ jobs:
           codeql query compile --precompile --threads 0 cpp
           codeql query compile --precompile --threads 0 c
 
+          codeql pack bundle --output=misra-c-coding-standards.tgz c/misra/src
+          codeql pack bundle --output=cert-c-coding-standards.tgz c/cert/src
+          codeql pack bundle --output=cert-cpp-coding-standards.tgz cpp/cert/src
+          codeql pack bundle --output=autosar-cpp-coding-standards.tgz cpp/autosar/src
+
           cd ..
           zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/schemas
 
       - name: Upload GHAS Query Pack
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: code-scanning-cpp-query-pack.zip
           path: code-scanning-cpp-query-pack.zip
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: coding-standards-qlpacks
+          path: *-cp?p?-coding-standards.tgz
\ No newline at end of file

From 3bedebb4df2dc52cf1e1a587e0e007adef78b1e1 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Thu, 10 Oct 2024 11:06:15 +0900
Subject: [PATCH 281/435] Minor improvement

---
 cpp/autosar/test/rules/M0-1-10/test.cpp                    | 7 +++++++
 .../src/codingstandards/cpp/EncapsulatingFunctions.qll     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cpp/autosar/test/rules/M0-1-10/test.cpp b/cpp/autosar/test/rules/M0-1-10/test.cpp
index 84b17c4c21..e1a19abf24 100644
--- a/cpp/autosar/test/rules/M0-1-10/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-10/test.cpp
@@ -158,4 +158,11 @@ TEST(sample_test,
   bool pass = false;
   if (called_from_google_test_function(0) >= 10)
     pass = true;
+  struct a_nested_class_in_gtest {
+    a_nested_class_in_gtest() noexcept(false) {
+      static_cast<void>(0);
+    } // COMPLIANT
+  };
+  static_assert(std::is_trivially_copy_constructible<a_nested_class_in_gtest>(),
+                "assert");
 }
diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
index 8a0d4ffab9..559c04ce98 100644
--- a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
+++ b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
@@ -36,7 +36,7 @@ class GoogleTestFunction extends MainLikeFunction {
     ) and
     // it's parent class inherits a base class
     exists(Class base |
-      base = this.getEnclosingAccessHolder().(Class).getABaseClass+() and
+      base = this.getEnclosingAccessHolder+().(Class).getABaseClass+() and
       (
         // with a name "Test" inside a namespace called "testing"
         base.hasName("Test") and

From f41d71de0cc57ea62e7952e1d421327dc5c1856a Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 10 Oct 2024 09:29:31 +0100
Subject: [PATCH 282/435] Remove spurious line break

---
 .github/workflows/code-scanning-pack-gen.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 02d57bd18b..97b24f917a 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -8,7 +8,6 @@ on:
       - main
       - next
       - "rc/**"
-
   push:
     branches:
       - main

From 29881baf5f4637fd0c554a7fcb2b3bd04df984a3 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 10 Oct 2024 09:29:45 +0100
Subject: [PATCH 283/435] Run codeql pack bundle after zipping up the existing
 pack

---
 .github/workflows/code-scanning-pack-gen.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 97b24f917a..12350e4855 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -101,14 +101,14 @@ jobs:
           codeql query compile --precompile --threads 0 cpp
           codeql query compile --precompile --threads 0 c
 
-          codeql pack bundle --output=misra-c-coding-standards.tgz c/misra/src
-          codeql pack bundle --output=cert-c-coding-standards.tgz c/cert/src
-          codeql pack bundle --output=cert-cpp-coding-standards.tgz cpp/cert/src
-          codeql pack bundle --output=autosar-cpp-coding-standards.tgz cpp/autosar/src
-
           cd ..
           zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/schemas
 
+          codeql pack bundle --output=misra-c-coding-standards.tgz codeql-coding-standards/c/misra/src
+          codeql pack bundle --output=cert-c-coding-standards.tgz codeql-coding-standards/c/cert/src
+          codeql pack bundle --output=cert-cpp-coding-standards.tgz codeql-coding-standards/cpp/cert/src
+          codeql pack bundle --output=autosar-cpp-coding-standards.tgz codeql-coding-standards/cpp/autosar/src
+
       - name: Upload GHAS Query Pack
         uses: actions/upload-artifact@v4
         with:

From c669f45c40d2dcdc7b3bd74e4a7f35ea2d95d16e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 10 Oct 2024 09:30:12 +0100
Subject: [PATCH 284/435] Correctly quote the path pattern for upload-artifact

---
 .github/workflows/code-scanning-pack-gen.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 12350e4855..dab56addae 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -115,7 +115,8 @@ jobs:
           name: code-scanning-cpp-query-pack.zip
           path: code-scanning-cpp-query-pack.zip
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload qlpacks
+        uses: actions/upload-artifact@v4
         with:
           name: coding-standards-qlpacks
-          path: *-cp?p?-coding-standards.tgz
\ No newline at end of file
+          path: '*-cp?p?-coding-standards.tgz'
\ No newline at end of file

From 147725dc1dff3df864d7c22033f1a8d1ffa5d16a Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 10 Oct 2024 23:30:24 +0100
Subject: [PATCH 285/435] Expand set of packs created, separate step

---
 .github/workflows/code-scanning-pack-gen.yml | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index dab56addae..3166f0dc64 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -104,18 +104,27 @@ jobs:
           cd ..
           zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/schemas
 
-          codeql pack bundle --output=misra-c-coding-standards.tgz codeql-coding-standards/c/misra/src
-          codeql pack bundle --output=cert-c-coding-standards.tgz codeql-coding-standards/c/cert/src
-          codeql pack bundle --output=cert-cpp-coding-standards.tgz codeql-coding-standards/cpp/cert/src
-          codeql pack bundle --output=autosar-cpp-coding-standards.tgz codeql-coding-standards/cpp/autosar/src
-
       - name: Upload GHAS Query Pack
         uses: actions/upload-artifact@v4
         with:
           name: code-scanning-cpp-query-pack.zip
           path: code-scanning-cpp-query-pack.zip
 
-      - name: Upload qlpacks
+      - name: Create qlpack bundles
+        env:
+          CODEQL_HOME: ${{ github.workspace }}/codeql_home
+        run: |
+          PATH=$PATH:$CODEQL_HOME/codeql
+
+          codeql pack bundle --output=common-cpp-coding-standards.tgz cpp/common/src
+          codeql pack bundle --output=common-c-coding-standards.tgz c/common/src
+          codeql pack bundle --output=misra-c-coding-standards.tgz c/misra/src
+          codeql pack bundle --output=cert-c-coding-standards.tgz c/cert/src
+          codeql pack bundle --output=cert-cpp-coding-standards.tgz cpp/cert/src
+          codeql pack bundle --output=autosar-cpp-coding-standards.tgz -vvv cpp/autosar/src
+          codeql pack bundle --output=report-cpp-coding-standards.tgz cpp/report/src
+
+      - name: Upload qlpack bundles
         uses: actions/upload-artifact@v4
         with:
           name: coding-standards-qlpacks

From 9ddbe53a50bddbdd0c4ede338b8833180a5e4693 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Fri, 11 Oct 2024 09:13:04 +0100
Subject: [PATCH 286/435] Address workflow issues

 - Update pattern to capture .tgz qlpack files.
 - Add extra verbosity to the cert-cpp call to see what discrepancies occur with the autosar-cpp (as we see the autosar pack bundling retrigger compilation)
 - Combine the query compile calls in the earlier step to try to promote retaining all the cache.
---
 .github/workflows/code-scanning-pack-gen.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 3166f0dc64..3965e7d26d 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -98,8 +98,7 @@ jobs:
         run: |
           PATH=$PATH:$CODEQL_HOME/codeql
 
-          codeql query compile --precompile --threads 0 cpp
-          codeql query compile --precompile --threads 0 c
+          codeql query compile --precompile --threads 0 cpp c
 
           cd ..
           zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/schemas
@@ -120,7 +119,7 @@ jobs:
           codeql pack bundle --output=common-c-coding-standards.tgz c/common/src
           codeql pack bundle --output=misra-c-coding-standards.tgz c/misra/src
           codeql pack bundle --output=cert-c-coding-standards.tgz c/cert/src
-          codeql pack bundle --output=cert-cpp-coding-standards.tgz cpp/cert/src
+          codeql pack bundle --output=cert-cpp-coding-standards.tgz -vvv cpp/cert/src
           codeql pack bundle --output=autosar-cpp-coding-standards.tgz -vvv cpp/autosar/src
           codeql pack bundle --output=report-cpp-coding-standards.tgz cpp/report/src
 
@@ -128,4 +127,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: coding-standards-qlpacks
-          path: '*-cp?p?-coding-standards.tgz'
\ No newline at end of file
+          path: '*-coding-standards.tgz'
\ No newline at end of file

From c353b289d4d23b7e4495b22073f3774a94e9792e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 11 Oct 2024 09:43:11 +0100
Subject: [PATCH 287/435] RULE-11-*: Handle pointers to specified void types

MISRA does not consider void* to be a _pointer-to-object_. However,
we did not correctly strip specifiers on the base type when
considering whether to exclude void* types, which incorrectly lead
us to consider `const void*` as a pointer-to-object type.
---
 c/misra/test/rules/RULE-11-3/test.c                       | 4 ++++
 ...onversionBetweenPointerToObjectAndIntegerType.expected | 6 +++---
 c/misra/test/rules/RULE-11-4/test.c                       | 3 +++
 c/misra/test/rules/RULE-11-5/test.c                       | 4 ++++
 c/misra/test/rules/RULE-11-7/test.c                       | 8 ++++++++
 change_notes/2024-10-11-specifiers-rule-11-misra-c.md     | 2 ++
 cpp/common/src/codingstandards/cpp/Pointers.qll           | 6 +++---
 7 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 change_notes/2024-10-11-specifiers-rule-11-misra-c.md

diff --git a/c/misra/test/rules/RULE-11-3/test.c b/c/misra/test/rules/RULE-11-3/test.c
index 64ae688993..1f13899638 100644
--- a/c/misra/test/rules/RULE-11-3/test.c
+++ b/c/misra/test/rules/RULE-11-3/test.c
@@ -13,4 +13,8 @@ void f1(void) {
   int *v8 = (int *)0;         // COMPLIANT
   v8 = v2;                    // NON_COMPLIANT
   v8 = (int *)(short *)v2;    // NON_COMPLIANT
+  (const void *)v1;           // COMPLIANT
+  const void *v9 = v1;        // COMPLIANT
+  (int *)v9;                  // COMPLIANT - cast from void*
+  (const void *)v2;           // COMPLIANT
 }
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected b/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
index 44d5ca5943..17a2fa223f 100644
--- a/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
+++ b/c/misra/test/rules/RULE-11-4/ConversionBetweenPointerToObjectAndIntegerType.expected
@@ -1,6 +1,6 @@
 | test.c:6:21:6:37 | (unsigned int)... | Cast from pointer to object type 'unsigned int *' to integer type 'unsigned int'. | test.c:6:21:6:37 | (unsigned int)... |  |
 | test.c:8:8:8:24 | (unsigned int)... | Cast from pointer to object type 'unsigned int *' to integer type 'unsigned int'. | test.c:8:8:8:24 | (unsigned int)... |  |
 | test.c:12:22:12:39 | (unsigned int *)... | Cast from integer type 'unsigned int' to pointer to object type 'unsigned int *'. | test.c:12:22:12:39 | (unsigned int *)... |  |
-| test.c:15:1:15:24 | #define FOO (int *)0x200 | Cast from integer type 'int' to pointer to object type 'int *'. | test.c:15:1:15:24 | #define FOO (int *)0x200 |  |
-| test.c:23:3:23:22 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:17:1:17:34 | #define FOO_FUNCTIONAL(x) (int *)x | FOO_FUNCTIONAL |
-| test.c:24:14:24:25 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:18:1:18:23 | #define FOO_INSERT(x) x | FOO_INSERT |
+| test.c:18:1:18:24 | #define FOO (int *)0x200 | Cast from integer type 'int' to pointer to object type 'int *'. | test.c:18:1:18:24 | #define FOO (int *)0x200 |  |
+| test.c:26:3:26:22 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:20:1:20:34 | #define FOO_FUNCTIONAL(x) (int *)x | FOO_FUNCTIONAL |
+| test.c:27:14:27:25 | (int *)... | Cast from integer type 'int' to pointer to object type 'int *' from expansion of macro $@. | test.c:21:1:21:23 | #define FOO_INSERT(x) x | FOO_INSERT |
diff --git a/c/misra/test/rules/RULE-11-4/test.c b/c/misra/test/rules/RULE-11-4/test.c
index 5a78387247..283af5e560 100644
--- a/c/misra/test/rules/RULE-11-4/test.c
+++ b/c/misra/test/rules/RULE-11-4/test.c
@@ -10,6 +10,9 @@ void f1(void) {
   unsigned int *v4 = 0;                      // COMPLIANT
   unsigned int *v5 = NULL;                   // COMPLIANT
   unsigned int *v6 = (unsigned int *)v2;     // NON_COMPLIANT
+  const void *v7 = 0;
+  (unsigned int)v7; // COMPLIANT - cast const void to int
+  (const void *)v1; // COMPLIANT - casting int to const void
 }
 
 #define FOO (int *)0x200 // NON_COMPLIANT
diff --git a/c/misra/test/rules/RULE-11-5/test.c b/c/misra/test/rules/RULE-11-5/test.c
index a7ffa4822e..b14333e536 100644
--- a/c/misra/test/rules/RULE-11-5/test.c
+++ b/c/misra/test/rules/RULE-11-5/test.c
@@ -7,4 +7,8 @@ void f1(void) {
   v2 = NULL;             // COMPLIANT
   void *v3 = (void *)v1; // COMPLIANT
   v3 = (void *)v2;       // COMPLIANT
+  const void *v4 = 0;
+  (int *)v4; // NON_COMPLIANT[FALSE_NEGATIVE] - const in type is irrelevant
+  (const void *)v1; // COMPLIANT - casting is from void to void, const addition
+                    // should be irrelevant
 }
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-11-7/test.c b/c/misra/test/rules/RULE-11-7/test.c
index b7dd989b00..4891aaae85 100644
--- a/c/misra/test/rules/RULE-11-7/test.c
+++ b/c/misra/test/rules/RULE-11-7/test.c
@@ -7,4 +7,12 @@ void f1(void) {
   float v4 = (float)(bool)v1; // NON_COMPLIANT
   v1 = (int *)v2;             // NON_COMPLIANT
   v4 = (float)v3;             // COMPLIANT
+  void *v5 = 0;
+  const void *v6 = 0;
+  // void pointers (regardless of specifier) are not pointers to object, so all
+  // these examples are compliant according to this rule
+  (bool)v5;         // COMPLIANT
+  (bool)v6;         // COMPLIANT
+  (void *)v2;       // COMPLIANT
+  (const void *)v2; // COMPLIANT
 }
\ No newline at end of file
diff --git a/change_notes/2024-10-11-specifiers-rule-11-misra-c.md b/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
new file mode 100644
index 0000000000..910a66ec71
--- /dev/null
+++ b/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
@@ -0,0 +1,2 @@
+- `RULE-11-3`, `RULE-11-4`, `RULE-11-5`, `RULE-11-7` - `CastBetweenObjectPointerAndDifferentObjectType.ql`, `ConversionBetweenPointerToObjectAndIntegerType.ql`, `ConversionFromPointerToVoidIntoPointerToObject.ql`, `CastBetweenPointerToObjectAndNonIntArithmeticType.ql`:
+  - Removed false positives where casts involved a specified void type pointer, e.g. `const void*`, which should not be considered as a pointer to object.
diff --git a/cpp/common/src/codingstandards/cpp/Pointers.qll b/cpp/common/src/codingstandards/cpp/Pointers.qll
index 22dcbd187b..8ed55b2bc0 100644
--- a/cpp/common/src/codingstandards/cpp/Pointers.qll
+++ b/cpp/common/src/codingstandards/cpp/Pointers.qll
@@ -80,9 +80,9 @@ predicate isCastNullPointerConstant(Cast c) {
 class PointerToObjectType extends PointerType {
   PointerToObjectType() {
     not (
-      this.getUnderlyingType() instanceof FunctionPointerType or
-      this.getUnderlyingType() instanceof VoidPointerType or
-      this.getBaseType().getUnderlyingType() instanceof IncompleteType
+      this.getUnspecifiedType() instanceof FunctionPointerType or
+      this.getUnspecifiedType() instanceof VoidPointerType or
+      this.getBaseType().getUnspecifiedType() instanceof IncompleteType
     )
   }
 }

From d4ed99e93049a6eefb5bb2635a5bbe39fdcf24c0 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 11 Oct 2024 10:46:15 +0100
Subject: [PATCH 288/435]       // Ignore realloc, as that memory may already
 be partially constructed RULE-11-5: Handle const pointers

---
 .../RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql | 2 +-
 .../ConversionFromPointerToVoidIntoPointerToObject.expected     | 1 +
 c/misra/test/rules/RULE-11-5/test.c                             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql b/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
index bdaebcbf54..0363c28c19 100644
--- a/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
+++ b/c/misra/src/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.ql
@@ -19,7 +19,7 @@ import codingstandards.cpp.Pointers
 from Cast cast, VoidPointerType type, PointerToObjectType newType
 where
   not isExcluded(cast, Pointers1Package::conversionFromPointerToVoidIntoPointerToObjectQuery()) and
-  type = cast.getExpr().getUnderlyingType() and
+  type = cast.getExpr().getUnspecifiedType() and
   newType = cast.getUnderlyingType() and
   not isNullPointerConstant(cast.getExpr())
 select cast,
diff --git a/c/misra/test/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.expected b/c/misra/test/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.expected
index 5b4eec8d15..42cf288b34 100644
--- a/c/misra/test/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.expected
+++ b/c/misra/test/rules/RULE-11-5/ConversionFromPointerToVoidIntoPointerToObject.expected
@@ -1 +1,2 @@
 | test.c:6:13:6:21 | (int *)... | Cast performed from a void pointer into a pointer to an object (int *). |
+| test.c:11:3:11:11 | (int *)... | Cast performed from a void pointer into a pointer to an object (int *). |
diff --git a/c/misra/test/rules/RULE-11-5/test.c b/c/misra/test/rules/RULE-11-5/test.c
index b14333e536..5b5a5b3a52 100644
--- a/c/misra/test/rules/RULE-11-5/test.c
+++ b/c/misra/test/rules/RULE-11-5/test.c
@@ -8,7 +8,7 @@ void f1(void) {
   void *v3 = (void *)v1; // COMPLIANT
   v3 = (void *)v2;       // COMPLIANT
   const void *v4 = 0;
-  (int *)v4; // NON_COMPLIANT[FALSE_NEGATIVE] - const in type is irrelevant
+  (int *)v4;        // NON_COMPLIANT - const in type is irrelevant
   (const void *)v1; // COMPLIANT - casting is from void to void, const addition
                     // should be irrelevant
 }
\ No newline at end of file

From 7504a96d6cfc098b187da4265d1fef302a5058bd Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 11 Oct 2024 10:47:31 +0100
Subject: [PATCH 289/435] Add extra test cases, update release note

---
 .../CastBetweenObjectPointerAndDifferentObjectType.expected   | 4 ++++
 c/misra/test/rules/RULE-11-3/test.c                           | 4 ++++
 change_notes/2024-10-11-specifiers-rule-11-misra-c.md         | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/c/misra/test/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.expected b/c/misra/test/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.expected
index 91fd9f274a..94cf6ee635 100644
--- a/c/misra/test/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.expected
+++ b/c/misra/test/rules/RULE-11-3/CastBetweenObjectPointerAndDifferentObjectType.expected
@@ -2,3 +2,7 @@
 | test.c:14:8:14:9 | (int *)... | Cast performed between a pointer to object type (char) and a pointer to a different object type (int). |
 | test.c:15:8:15:25 | (int *)... | Cast performed between a pointer to object type (short) and a pointer to a different object type (int). |
 | test.c:15:15:15:25 | (short *)... | Cast performed between a pointer to object type (char) and a pointer to a different object type (short). |
+| test.c:20:3:20:17 | (const int *)... | Cast performed between a pointer to object type (char) and a pointer to a different object type (const int). |
+| test.c:21:3:21:16 | (int *)... | Cast performed between a pointer to object type (char) and a pointer to a different object type (int). |
+| test.c:22:20:22:21 | (int *)... | Cast performed between a pointer to object type (char) and a pointer to a different object type (int). |
+| test.c:23:3:23:18 | (long long *)... | Cast performed between a pointer to object type (int) and a pointer to a different object type (long long). |
diff --git a/c/misra/test/rules/RULE-11-3/test.c b/c/misra/test/rules/RULE-11-3/test.c
index 1f13899638..4730aeac03 100644
--- a/c/misra/test/rules/RULE-11-3/test.c
+++ b/c/misra/test/rules/RULE-11-3/test.c
@@ -17,4 +17,8 @@ void f1(void) {
   const void *v9 = v1;        // COMPLIANT
   (int *)v9;                  // COMPLIANT - cast from void*
   (const void *)v2;           // COMPLIANT
+  (const int *)v2;            // NON_COMPLIANT
+  (int *const)v2;             // NON_COMPLIANT
+  int *const v10 = v2;        // NON_COMPLIANT
+  (long long *)v10;           // NON_COMPLIANT
 }
\ No newline at end of file
diff --git a/change_notes/2024-10-11-specifiers-rule-11-misra-c.md b/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
index 910a66ec71..bde621f220 100644
--- a/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
+++ b/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
@@ -1,2 +1,2 @@
 - `RULE-11-3`, `RULE-11-4`, `RULE-11-5`, `RULE-11-7` - `CastBetweenObjectPointerAndDifferentObjectType.ql`, `ConversionBetweenPointerToObjectAndIntegerType.ql`, `ConversionFromPointerToVoidIntoPointerToObject.ql`, `CastBetweenPointerToObjectAndNonIntArithmeticType.ql`:
-  - Removed false positives where casts involved a specified void type pointer, e.g. `const void*`, which should not be considered as a pointer to object.
+  - Removed false positives where casts involved a specified void type pointer, e.g. `const void*`, which should not be considered as a pointer to object, but should be considered a pointer-to-void.
\ No newline at end of file

From 6e930255395323629061b5a0f684869e011d773b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 11 Oct 2024 10:56:30 +0100
Subject: [PATCH 290/435] Update release notes

---
 change_notes/2024-10-11-specifiers-rule-11-misra-c.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/change_notes/2024-10-11-specifiers-rule-11-misra-c.md b/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
index bde621f220..5f74dc6b3f 100644
--- a/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
+++ b/change_notes/2024-10-11-specifiers-rule-11-misra-c.md
@@ -1,2 +1,4 @@
 - `RULE-11-3`, `RULE-11-4`, `RULE-11-5`, `RULE-11-7` - `CastBetweenObjectPointerAndDifferentObjectType.ql`, `ConversionBetweenPointerToObjectAndIntegerType.ql`, `ConversionFromPointerToVoidIntoPointerToObject.ql`, `CastBetweenPointerToObjectAndNonIntArithmeticType.ql`:
-  - Removed false positives where casts involved a specified void type pointer, e.g. `const void*`, which should not be considered as a pointer to object, but should be considered a pointer-to-void.
\ No newline at end of file
+  - Removed false positives where casts involved a specified void type pointer, e.g. `const void*`, which should not be considered as a pointer to object.
+- `RULE-11-5` - `ConversionFromPointerToVoidIntoPointerToObject.ql`:
+  - Addressed false negatives where the pointer-to-void was specified.
\ No newline at end of file

From f4626971076b1168253c0e77afbe1f89d4cfaa7c Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Mon, 14 Oct 2024 10:30:29 +0900
Subject: [PATCH 291/435] feat(a14-5-2): do not consider type members declared
 with using aliases.

---
 .../src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql | 4 +++-
 .../A14-5-2/NonTemplateMemberDefinedInTemplate.expected     | 2 --
 cpp/autosar/test/rules/A14-5-2/test.cpp                     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql b/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
index 4a81e32b0f..b8dff92ca6 100644
--- a/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
+++ b/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
@@ -167,7 +167,9 @@ where
         mf = c.getAMemberFunction() and not mf.isCompilerGenerated() and not exists(mf.getBlock())
       )
     )
-  )
+  ) and
+  // Omit using alias (cf. https://github.com/github/codeql-coding-standards/issues/739)
+  not d instanceof UsingAliasTypedefType
 select d,
   "Member " + d.getName() + " template class does not use any of template arguments of its $@.",
   d.getDeclaringType(), "declaring type"
diff --git a/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected b/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected
index d45a3c6871..454a1c6b83 100644
--- a/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected
+++ b/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected
@@ -1,5 +1,3 @@
-| test.cpp:10:9:10:10 | T1 | Member T1 template class does not use any of template arguments of its $@. | test.cpp:6:29:6:30 | C1<T> | declaring type |
-| test.cpp:11:9:11:10 | T2 | Member T2 template class does not use any of template arguments of its $@. | test.cpp:6:29:6:30 | C1<T> | declaring type |
 | test.cpp:28:31:28:33 | C12<N> | Member C12<N> template class does not use any of template arguments of its $@. | test.cpp:6:29:6:30 | C1<T> | declaring type |
 | test.cpp:45:7:45:8 | a1 | Member a1 template class does not use any of template arguments of its $@. | test.cpp:37:31:37:33 | C22<N> | declaring type |
 | test.cpp:46:9:46:10 | a2 | Member a2 template class does not use any of template arguments of its $@. | test.cpp:37:31:37:33 | C22<N> | declaring type |
diff --git a/cpp/autosar/test/rules/A14-5-2/test.cpp b/cpp/autosar/test/rules/A14-5-2/test.cpp
index e60a955c68..236f3beb7a 100644
--- a/cpp/autosar/test/rules/A14-5-2/test.cpp
+++ b/cpp/autosar/test/rules/A14-5-2/test.cpp
@@ -7,8 +7,8 @@ template <typename T> class C1 {
 public:
   enum E1 : T { e1, e2 }; // COMPLIANT
 
-  using T1 = typename template_base<T>::type;   // COMPLIANT[FALSE_POSITIVE]
-  using T2 = typename template_base<int>::type; // NON_COMPLIANT
+  using T1 = typename template_base<T>::type;   // COMPLIANT
+  using T2 = typename template_base<int>::type; // NON_COMPLIANT[FALSE_NEGATIVE]
 
   class C11 { // COMPLIANT
     enum E2 {
@@ -156,4 +156,4 @@ template <J::Type t> class V {
 void f4() {
   V<J::Type::A> v;
   v.type();
-}
\ No newline at end of file
+}

From 006e4a1d464573e48e7fdfd866549d2939e09a7a Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 00:00:10 +0100
Subject: [PATCH 292/435] EssentialTypes: Correctly handle enumerations

---
 .../c/misra/EssentialTypes.qll                | 42 ++++++++++++++++++-
 c/misra/test/c/misra/EssentialTypes.expected  | 14 +++++++
 c/misra/test/c/misra/test.c                   | 21 ++++++++++
 3 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
index d01bc81038..c92b6403c7 100644
--- a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
+++ b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
@@ -130,12 +130,17 @@ EssentialTypeCategory getEssentialTypeCategory(Type type) {
     essentialType.(IntegralType).isSigned() and
     not essentialType instanceof PlainCharType
     or
+    // Anonymous enums are considered to be signed
+    result = EssentiallySignedType() and
+    essentialType instanceof AnonymousEnumType and
+    not essentialType instanceof MisraBoolType
+    or
     result = EssentiallyUnsignedType() and
     essentialType.(IntegralType).isUnsigned() and
     not essentialType instanceof PlainCharType
     or
     result = EssentiallyEnumType() and
-    essentialType instanceof Enum and
+    essentialType instanceof NamedEnumType and
     not essentialType instanceof MisraBoolType
     or
     result = EssentiallyFloatingType() and
@@ -348,8 +353,41 @@ class EssentialBinaryArithmeticExpr extends EssentialExpr, BinaryArithmeticOpera
   }
 }
 
+/**
+ * A named Enum type, as per D.5.
+ */
+class NamedEnumType extends Enum {
+  NamedEnumType() {
+    not isAnonymous()
+    or
+    exists(Type useOfEnum | this = useOfEnum.stripType() |
+      exists(TypedefType t | t.getBaseType() = useOfEnum)
+      or
+      exists(Function f | f.getType() = useOfEnum or f.getAParameter().getType() = useOfEnum)
+      or
+      exists(Struct s | s.getAField().getType() = useOfEnum)
+      or
+      exists(Variable v | v.getType() = useOfEnum)
+    )
+  }
+}
+
+/**
+ * An anonymous Enum type, as per D.5.
+ */
+class AnonymousEnumType extends Enum {
+  AnonymousEnumType() { not this instanceof NamedEnumType }
+}
+
+/**
+ * The EssentialType of an EnumConstantAccess, which may be essentially enum or essentially signed.
+ */
 class EssentialEnumConstantAccess extends EssentialExpr, EnumConstantAccess {
-  override Type getEssentialType() { result = getTarget().getDeclaringEnum() }
+  override Type getEssentialType() {
+    exists(Enum e | e = getTarget().getDeclaringEnum() |
+      if e instanceof NamedEnumType then result = e else result = stlr(this)
+    )
+  }
 }
 
 class EssentialLiteral extends EssentialExpr, Literal {
diff --git a/c/misra/test/c/misra/EssentialTypes.expected b/c/misra/test/c/misra/EssentialTypes.expected
index 8b6b45a2f0..f7f8aed9c8 100644
--- a/c/misra/test/c/misra/EssentialTypes.expected
+++ b/c/misra/test/c/misra/EssentialTypes.expected
@@ -1,3 +1,9 @@
+| file://:0:0:0:0 | 0 | signed char | signed char | essentially Signed type |
+| file://:0:0:0:0 | 0 | signed char | signed char | essentially Signed type |
+| file://:0:0:0:0 | 0 | signed char | signed char | essentially Signed type |
+| file://:0:0:0:0 | 0 | signed char | signed char | essentially Signed type |
+| file://:0:0:0:0 | 0 | signed char | signed char | essentially Signed type |
+| file://:0:0:0:0 | 0 | signed char | signed char | essentially Signed type |
 | test.c:4:20:4:20 | 1 | signed char | signed char | essentially Signed type |
 | test.c:4:20:4:20 | (unsigned int)... | unsigned int | unsigned int | essentially Unsigned type |
 | test.c:5:23:5:23 | 1 | signed char | signed char | essentially Signed type |
@@ -73,3 +79,11 @@
 | test.c:54:3:54:5 | ~ ... | int | int | essentially Signed type |
 | test.c:54:4:54:5 | (int)... | int | int | essentially Signed type |
 | test.c:54:4:54:5 | ss | signed short | signed short | essentially Signed type |
+| test.c:63:30:63:32 | ((unnamed enum))... | (unnamed enum) | (unnamed enum) | essentially Enum Type |
+| test.c:63:30:63:32 | EC5 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
+| test.c:70:3:70:5 | EC1 | signed char | signed char | essentially Signed type |
+| test.c:71:3:71:5 | EC2 | E1 | E1 | essentially Enum Type |
+| test.c:72:3:72:5 | EC3 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
+| test.c:73:3:73:5 | EC4 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
+| test.c:74:3:74:5 | EC5 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
+| test.c:75:3:75:5 | EC6 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
diff --git a/c/misra/test/c/misra/test.c b/c/misra/test/c/misra/test.c
index 6156e9440e..64546f410c 100644
--- a/c/misra/test/c/misra/test.c
+++ b/c/misra/test/c/misra/test.c
@@ -52,4 +52,25 @@ void testUnary() {
   ~us; // Should be essentially unsigned
   ~s;  // Should be essentially signed
   ~ss; // Should be essentially signed
+}
+
+enum { EC1 };
+enum E1 { EC2 };
+typedef enum { EC3 } E2;
+
+enum { EC4 } g;
+
+enum { EC5 } test() { return EC5; }
+
+struct S1 {
+  enum { EC6 } m;
+};
+
+void testEnums() {
+  EC1; // Should be essentially signed
+  EC2; // Should be essentially enum
+  EC3; // Should be essentially enum
+  EC4; // Should be essentially enum
+  EC5; // Should be essentially enum
+  EC6; // Should be essentially enum
 }
\ No newline at end of file

From 352f778af08e8d7eae2c071bd62c495bb6cc5351 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 00:02:48 +0100
Subject: [PATCH 293/435] Handle non-zero length characters

---
 c/misra/src/codingstandards/c/misra/EssentialTypes.qll | 6 ++++--
 c/misra/test/c/misra/EssentialTypes.expected           | 3 +++
 c/misra/test/c/misra/test.c                            | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
index c92b6403c7..4783547ed2 100644
--- a/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
+++ b/c/misra/src/codingstandards/c/misra/EssentialTypes.qll
@@ -393,9 +393,11 @@ class EssentialEnumConstantAccess extends EssentialExpr, EnumConstantAccess {
 class EssentialLiteral extends EssentialExpr, Literal {
   override Type getEssentialType() {
     if this instanceof BooleanLiteral
-    then result instanceof MisraBoolType
+    then
+      // This returns a multitude of types - not sure if we really want that
+      result instanceof MisraBoolType
     else (
-      if this.(CharLiteral).getCharacter().length() = 1
+      if this instanceof CharLiteral
       then result instanceof PlainCharType
       else
         exists(Type underlyingStandardType |
diff --git a/c/misra/test/c/misra/EssentialTypes.expected b/c/misra/test/c/misra/EssentialTypes.expected
index f7f8aed9c8..c0e010b8e4 100644
--- a/c/misra/test/c/misra/EssentialTypes.expected
+++ b/c/misra/test/c/misra/EssentialTypes.expected
@@ -87,3 +87,6 @@
 | test.c:73:3:73:5 | EC4 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
 | test.c:74:3:74:5 | EC5 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
 | test.c:75:3:75:5 | EC6 | (unnamed enum) | (unnamed enum) | essentially Enum Type |
+| test.c:79:3:79:5 | 97 | char | char | essentially Character type |
+| test.c:80:3:80:6 | 10 | char | char | essentially Character type |
+| test.c:81:3:81:6 | 0 | char | char | essentially Character type |
diff --git a/c/misra/test/c/misra/test.c b/c/misra/test/c/misra/test.c
index 64546f410c..b3fdddd591 100644
--- a/c/misra/test/c/misra/test.c
+++ b/c/misra/test/c/misra/test.c
@@ -73,4 +73,10 @@ void testEnums() {
   EC4; // Should be essentially enum
   EC5; // Should be essentially enum
   EC6; // Should be essentially enum
+}
+
+void testControlChar() {
+  'a';  // Essentially char
+  '\n'; // Essentially char
+  '\0'; // Essentially char
 }
\ No newline at end of file

From b5377b402bb0f15575cfb7afb8412c6907c021b2 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 00:05:16 +0100
Subject: [PATCH 294/435] Rule 10.4: Update to reflect EssentialType
 improvements

---
 c/misra/test/rules/RULE-10-4/test.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/c/misra/test/rules/RULE-10-4/test.c b/c/misra/test/rules/RULE-10-4/test.c
index 666590a2d5..b803d487a0 100644
--- a/c/misra/test/rules/RULE-10-4/test.c
+++ b/c/misra/test/rules/RULE-10-4/test.c
@@ -33,4 +33,8 @@ void testOps() {
   A < A;     // COMPLIANT
   e1a < e2a; // NON_COMPLIANT
   A < D;     // NON_COMPLIANT
+
+  enum { G };
+  s32 + G;   // COMPLIANT
+  c == '\n'; // COMPLIANT
 }
\ No newline at end of file

From 54f724e76885a05605fb9a5bb4439f2dfa17cb38 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 00:07:03 +0100
Subject: [PATCH 295/435] Rule 10.4: Resolve typedefs before determining if
 enums are equal

---
 .../RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql | 2 +-
 c/misra/test/rules/RULE-10-4/test.c                          | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql b/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql
index cc4c860d7d..d1fed06319 100644
--- a/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql
+++ b/c/misra/src/rules/RULE-10-4/OperandsWithMismatchedEssentialTypeCategory.ql
@@ -38,7 +38,7 @@ where
     // be reported as non-compliant.
     leftOpTypeCategory = EssentiallyEnumType() and
     rightOpTypeCategory = EssentiallyEnumType() and
-    not leftOpEssentialType = rightOpEssentialType and
+    not leftOpEssentialType.getUnspecifiedType() = rightOpEssentialType.getUnspecifiedType() and
     message =
       "The operands of this operator with usual arithmetic conversions have mismatched essentially Enum types (left operand: "
         + leftOpEssentialType + ", right operand: " + rightOpEssentialType + ")."
diff --git a/c/misra/test/rules/RULE-10-4/test.c b/c/misra/test/rules/RULE-10-4/test.c
index b803d487a0..cbcb7191f6 100644
--- a/c/misra/test/rules/RULE-10-4/test.c
+++ b/c/misra/test/rules/RULE-10-4/test.c
@@ -37,4 +37,9 @@ void testOps() {
   enum { G };
   s32 + G;   // COMPLIANT
   c == '\n'; // COMPLIANT
+
+  typedef enum { H } E3;
+
+  E3 e3a = H;
+  e3a < H; // COMPLIANT
 }
\ No newline at end of file

From 2ae343c294b5ec893677b289f63cadf57a1fc8ac Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 00:11:02 +0100
Subject: [PATCH 296/435] Add change note

---
 change_notes/2024-10-15-lits-and-constants-10-4.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 change_notes/2024-10-15-lits-and-constants-10-4.md

diff --git a/change_notes/2024-10-15-lits-and-constants-10-4.md b/change_notes/2024-10-15-lits-and-constants-10-4.md
new file mode 100644
index 0000000000..cfcb309204
--- /dev/null
+++ b/change_notes/2024-10-15-lits-and-constants-10-4.md
@@ -0,0 +1,5 @@
+ - `RULE-10-4` - `OperandswithMismatchedEssentialTypeCategory.ql`:
+   - Removed false positives where a specified or typedef'd enum type was compared to an enum constant type.
+ - `EssentialType` - for all queries related to essential types:
+   - `\n` and other control characters are now correctly deduced as essentially char type, instead of an essentially integer type.
+   - Enum constants for anonymous enums are now correctly deduced as an essentially signed integer type instead of essentially enum.
\ No newline at end of file

From 7e8d2a13dba6d7097f3362899f1aee5548ee55bd Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Tue, 15 Oct 2024 09:47:52 +0900
Subject: [PATCH 297/435] Add change note.

---
 change_notes/2024-10-15-fix-fp-739-a14-5-2.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-10-15-fix-fp-739-a14-5-2.md

diff --git a/change_notes/2024-10-15-fix-fp-739-a14-5-2.md b/change_notes/2024-10-15-fix-fp-739-a14-5-2.md
new file mode 100644
index 0000000000..39cb00e3ae
--- /dev/null
+++ b/change_notes/2024-10-15-fix-fp-739-a14-5-2.md
@@ -0,0 +1,2 @@
+- `A14-5-2` - `NonTemplateMemberDefinedInTemplate.ql`
+  - Fixes #739. Omit type members declared with using aliases.

From 3842b4cd3e2a8ba9121e9b6b441f105c7c50265f Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 11:23:05 +0100
Subject: [PATCH 298/435] A7-1-3: Fix #601.

We did not correctly constrain the type mention for the type to
be before the variable declaration itself.
---
 change_notes/2024-10-15-a7-1-3-multi-refs.md  |  2 ++
 ...CvQualifiersNotPlacedOnTheRightHandSide.ql | 22 +++++++++----------
 ...ifiersNotPlacedOnTheRightHandSide.expected |  1 +
 cpp/autosar/test/rules/A7-1-3/test.cpp        | 12 ++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 change_notes/2024-10-15-a7-1-3-multi-refs.md

diff --git a/change_notes/2024-10-15-a7-1-3-multi-refs.md b/change_notes/2024-10-15-a7-1-3-multi-refs.md
new file mode 100644
index 0000000000..39e00495cb
--- /dev/null
+++ b/change_notes/2024-10-15-a7-1-3-multi-refs.md
@@ -0,0 +1,2 @@
+- `A7-1-3` - `CvQualifiersNotPlacedOnTheRightHandSide.ql`:
+  - Removed false positives where a correctly CV-qualified typedef variable type was also referenced in the initializer.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql b/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql
index 54968dc223..f60fcd51de 100644
--- a/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql
+++ b/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql
@@ -20,14 +20,12 @@ import cpp
 import codingstandards.cpp.autosar
 
 /**
- * Holds if declaration `e` using a `TypedefType` is CV-qualified
- *
- * For example, given `using intconstptr = int * const`:
- * the predicate holds for `const/volatile intconstptr ptr1`, but not for `intconstptr ptr2`
+ * Unwrap layers of indirection that occur on the right side of the type.
  */
-predicate containsExtraSpecifiers(VariableDeclarationEntry e) {
-  e.getType().toString().matches("const %") or
-  e.getType().toString().matches("volatile %")
+Type unwrapIndirection(Type type) {
+  if type instanceof DerivedType and not type instanceof SpecifiedType
+  then result = unwrapIndirection(type.(DerivedType).getBaseType())
+  else result = type
 }
 
 // DeclStmts that have a TypedefType name use (ie TypeMention) in them
@@ -36,19 +34,19 @@ predicate containsExtraSpecifiers(VariableDeclarationEntry e) {
 from VariableDeclarationEntry e, TypedefType t, TypeMention tm
 where
   not isExcluded(e, ConstPackage::cvQualifiersNotPlacedOnTheRightHandSideQuery()) and
-  containsExtraSpecifiers(e) and
+  // Variable type is specified, and has the typedef type as a base type
+  unwrapIndirection(e.getType()).(SpecifiedType).getBaseType() = t and
   exists(string filepath, int startline |
     e.getLocation().hasLocationInfo(filepath, startline, _, _, _) and
     tm.getLocation().hasLocationInfo(filepath, startline, _, _, _) and
     e = t.getATypeNameUse() and
     tm.getMentionedType() = t and
+    // TypeMention occurs before the variable declaration
+    tm.getLocation().getStartColumn() < e.getLocation().getStartColumn() and
     exists(DeclStmt s |
       s.getDeclarationEntry(_) = e and
-      //const could fit in there
+      // TypeMention occurs after the start of the StmtDecl, with enough space for const/volatile
       tm.getLocation().getStartColumn() - s.getLocation().getStartColumn() > 5
-      //volatile could fit in there
-      //but the above condition subsumes this one
-      //l.getStartColumn() - tm.getLocation().getStartColumn() > 8
     )
   )
 select e,
diff --git a/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected b/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected
index 9d6a710449..7eea341903 100644
--- a/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected
+++ b/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected
@@ -1,3 +1,4 @@
 | test.cpp:9:16:9:19 | definition of ptr1 | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | test.cpp:1:7:1:12 | intptr | intptr |
 | test.cpp:10:19:10:22 | definition of ptr2 | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | test.cpp:1:7:1:12 | intptr | intptr |
 | test.cpp:19:21:19:24 | definition of ptr8 | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | test.cpp:3:7:3:17 | constintptr | constintptr |
+| test.cpp:32:23:32:26 | definition of u32d | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | file:///Users/luke/git/codeql-coding-standards/cpp/common/test/includes/standard-library/cstdint.h:9:22:9:29 | uint32_t | uint32_t |
diff --git a/cpp/autosar/test/rules/A7-1-3/test.cpp b/cpp/autosar/test/rules/A7-1-3/test.cpp
index 621a64115d..39f53b8623 100644
--- a/cpp/autosar/test/rules/A7-1-3/test.cpp
+++ b/cpp/autosar/test/rules/A7-1-3/test.cpp
@@ -18,4 +18,16 @@ void f() {
   constintptr const ptr7 = &l; // COMPLIANT
   const constintptr ptr8 = &l; // NON_COMPLIANT
   inttypedef ptr9 = l;         // COMPLIANT
+}
+
+#include <cstdint>
+
+void false_positive() {
+  std::uint8_t u8{0};
+
+  auto const u32 = static_cast<std::uint32_t>(u8); // COMPLIANT - auto ignored
+  std::uint32_t const u32b = static_cast<std::uint32_t>(u8); // COMPLIANT
+
+  const auto u32c = static_cast<std::uint32_t>(u8); // COMPLIANT - auto ignored
+  const std::uint32_t u32d = static_cast<std::uint32_t>(u8); // NON_COMPLIANT
 }
\ No newline at end of file

From 2a17ba73405d5a76d126173d597490a4f20df2e9 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 11:40:02 +0100
Subject: [PATCH 299/435] Address review comments

 * Rename HoldsForAllInstances to HoldsForAllCopies
 * Improve documentation
---
 c/misra/src/rules/RULE-2-2/DeadCode.ql        |  4 ++--
 ...AllInstances.qll => HoldsForAllCopies.qll} | 23 +++++++++++--------
 .../cpp/rules/deadcode/DeadCode.qll           |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)
 rename cpp/common/src/codingstandards/cpp/alertreporting/{HoldsForAllInstances.qll => HoldsForAllCopies.qll} (82%)

diff --git a/c/misra/src/rules/RULE-2-2/DeadCode.ql b/c/misra/src/rules/RULE-2-2/DeadCode.ql
index 03a6e7d36a..97c3808607 100644
--- a/c/misra/src/rules/RULE-2-2/DeadCode.ql
+++ b/c/misra/src/rules/RULE-2-2/DeadCode.ql
@@ -15,7 +15,7 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.alertreporting.HoldsForAllInstances
+import codingstandards.cpp.alertreporting.HoldsForAllCopies
 import codingstandards.cpp.deadcode.UselessAssignments
 
 /**
@@ -75,7 +75,7 @@ class DeadOperationInstance extends Expr {
   string getDescription() { result = description }
 }
 
-class DeadOperation = HoldsForAllInstances<DeadOperationInstance, Expr>::LogicalResultElement;
+class DeadOperation = HoldsForAllCopies<DeadOperationInstance, Expr>::LogicalResultElement;
 
 from
   DeadOperation deadOperation, DeadOperationInstance instance, string message, Element explainer,
diff --git a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
similarity index 82%
rename from cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
rename to cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
index 1ea8787c22..634c1bf610 100644
--- a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllInstances.qll
+++ b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
@@ -1,8 +1,7 @@
 /**
- * A module for considering whether a result occurs in all instances (e.g. copies) of the code at a
- * given location.
+ * A module for considering whether a result occurs in all copies of the code at a given location.
  *
- * Multiple instances of an element at the same location can occur for two main reasons:
+ * Multiple copies of an element at the same location can occur for two main reasons:
  *  1. Instantiations of a template
  *  2. Re-compilation of a file under a different context
  * This module helps ensure that a particular condition holds for all copies of a particular logical
@@ -37,17 +36,21 @@ predicate isNotWithinMacroExpansion(Element e) {
   )
 }
 
-/** A candidate set of elements. */
+/**
+ * A type representing a set of Element's in the program that satisfy some condition.
+ *
+ * `HoldsForAllCopies<T>::LogicalResultElement` will represent an element in this set
+ * iff all copies of that element satisfy the condition.
+ */
 signature class CandidateElementSig extends Element;
 
 /** The super set of relevant elements. */
 signature class ElementSetSig extends Element;
 
 /**
- * A module for considering whether a result occurs in all instances (e.g. copies) of the code at a
- * given location.
+ * A module for considering whether a result occurs in all copies of the code at a given location.
  */
-module HoldsForAllInstances<CandidateElementSig CandidateElement, ElementSetSig ElementSet> {
+module HoldsForAllCopies<CandidateElementSig CandidateElement, ElementSetSig ElementSet> {
   private predicate hasLocation(
     ElementSet s, string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
@@ -93,8 +96,8 @@ module HoldsForAllInstances<CandidateElementSig CandidateElement, ElementSetSig
     }
 
   /**
-   * A logical result element, representing all instances of a element that occur at the same
-   * location.
+   * A logical result element representing all copies of an element that occur at the same
+   * location, iff they all belong to the `CandidateElement` set.
    */
   class LogicalResultElement extends TLogicalResultElement {
     predicate hasLocationInfo(
@@ -103,7 +106,7 @@ module HoldsForAllInstances<CandidateElementSig CandidateElement, ElementSetSig
       this = TLogicalResultElement(filepath, startline, startcolumn, endline, endcolumn)
     }
 
-    /** Gets an instance of this logical result element. */
+    /** Gets a copy instance of this logical result element. */
     CandidateElement getAnElementInstance() {
       exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
         this = TLogicalResultElement(filepath, startline, startcolumn, endline, endcolumn) and
diff --git a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
index 5023b8ae14..fb0bd772a2 100644
--- a/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/deadcode/DeadCode.qll
@@ -12,7 +12,7 @@
  */
 
 import cpp
-import codingstandards.cpp.alertreporting.HoldsForAllInstances
+import codingstandards.cpp.alertreporting.HoldsForAllCopies
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.deadcode.UselessAssignments
@@ -122,7 +122,7 @@ class DeadStmtInstance extends Stmt {
   }
 }
 
-class DeadStmt = HoldsForAllInstances<DeadStmtInstance, Stmt>::LogicalResultElement;
+class DeadStmt = HoldsForAllCopies<DeadStmtInstance, Stmt>::LogicalResultElement;
 
 query predicate problems(DeadStmt s, string message) {
   not isExcluded(s.getAnElementInstance(), getQuery()) and

From b9474d55fd6a57589440e962d5bb92183aeb69b7 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Tue, 15 Oct 2024 12:04:40 +0100
Subject: [PATCH 300/435] Update rule_packages/c/Banned2.json

Reword description.
---
 rule_packages/c/Banned2.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rule_packages/c/Banned2.json b/rule_packages/c/Banned2.json
index 461e269413..3898125d73 100644
--- a/rule_packages/c/Banned2.json
+++ b/rule_packages/c/Banned2.json
@@ -6,7 +6,7 @@
       },
       "queries": [
         {
-          "description": "The standard functions rand() and srand() will not give high quality random results in all implementations and is thus banned.",
+          "description": "The standard functions rand() and srand() will not give high quality random results in all implementations and are therefore banned.",
           "kind": "problem",
           "name": "The random number generator functions of <stdlib.h> shall not be used",
           "precision": "very-high",

From 917bb45c82c9ee1e5f97698b306bb8d0f9548dfe Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 15:57:42 +0100
Subject: [PATCH 301/435] A7-1-3: Avoid producing machine specific locations

Modify the alert message to only report a link if the target is
within the source root of the database.
---
 ...CvQualifiersNotPlacedOnTheRightHandSide.ql | 23 +++++++++++++++----
 ...ifiersNotPlacedOnTheRightHandSide.expected |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql b/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql
index f60fcd51de..5d34f89c7d 100644
--- a/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql
+++ b/cpp/autosar/src/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.ql
@@ -31,7 +31,9 @@ Type unwrapIndirection(Type type) {
 // DeclStmts that have a TypedefType name use (ie TypeMention) in them
 //AND TypeMention.getStartColumn() - DeclStmt.getStartColumn() > len(const)
 //AND the declared thing contains one of these "extra" specifiers in the DeclarationEntry Location
-from VariableDeclarationEntry e, TypedefType t, TypeMention tm
+from
+  VariableDeclarationEntry e, TypedefType t, TypeMention tm, string message, Element explainer,
+  string explainerMessage
 where
   not isExcluded(e, ConstPackage::cvQualifiersNotPlacedOnTheRightHandSideQuery()) and
   // Variable type is specified, and has the typedef type as a base type
@@ -48,7 +50,20 @@ where
       // TypeMention occurs after the start of the StmtDecl, with enough space for const/volatile
       tm.getLocation().getStartColumn() - s.getLocation().getStartColumn() > 5
     )
+  ) and
+  if exists(t.getFile().getRelativePath())
+  then
+    message =
+      "There is possibly a const or volatile specifier on the left hand side of typedef name $@." and
+    explainer = t and
+    explainerMessage = t.getName()
+  else (
+    // Type occurs outside source root, so don't link
+    message =
+      "There is possibly a const or volatile specifier on the left hand side of typedef name " +
+        t.getName() + "." and
+    // explainer not used in this case
+    explainer = e and
+    explainerMessage = ""
   )
-select e,
-  "There is possibly a const or volatile specifier on the left hand side of typedef name $@.", t,
-  t.getName()
+select e, message, explainer, explainerMessage
diff --git a/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected b/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected
index 7eea341903..d845df142d 100644
--- a/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected
+++ b/cpp/autosar/test/rules/A7-1-3/CvQualifiersNotPlacedOnTheRightHandSide.expected
@@ -1,4 +1,4 @@
 | test.cpp:9:16:9:19 | definition of ptr1 | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | test.cpp:1:7:1:12 | intptr | intptr |
 | test.cpp:10:19:10:22 | definition of ptr2 | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | test.cpp:1:7:1:12 | intptr | intptr |
 | test.cpp:19:21:19:24 | definition of ptr8 | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | test.cpp:3:7:3:17 | constintptr | constintptr |
-| test.cpp:32:23:32:26 | definition of u32d | There is possibly a const or volatile specifier on the left hand side of typedef name $@. | file:///Users/luke/git/codeql-coding-standards/cpp/common/test/includes/standard-library/cstdint.h:9:22:9:29 | uint32_t | uint32_t |
+| test.cpp:32:23:32:26 | definition of u32d | There is possibly a const or volatile specifier on the left hand side of typedef name uint32_t. | test.cpp:32:23:32:26 | definition of u32d |  |

From 43bf6f87ded8e77ced5838009fdcee705d67f8e8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 15 Oct 2024 17:49:46 +0100
Subject: [PATCH 302/435] Fix DeadCode.json syntax error introduced on merge

---
 rule_packages/c/DeadCode.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rule_packages/c/DeadCode.json b/rule_packages/c/DeadCode.json
index fbcdfe2976..d8e80d14d1 100644
--- a/rule_packages/c/DeadCode.json
+++ b/rule_packages/c/DeadCode.json
@@ -39,7 +39,7 @@
           "short_name": "DeadCode",
           "tags": [
             "readability",
-            "maintainability"
+            "maintainability",
             "external/misra/c/2012/third-edition-first-revision"
           ]
         }

From 327436ce43a632b60edc02a37868cb9a9df30ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jos=C3=A9=20=7C=20=EF=BE=8C=EF=BD=AA=EF=BE=99?=
 =?UTF-8?q?=EF=BE=85=EF=BE=9D=EF=BE=84=EF=BE=9E=20=EF=BE=8E=EF=BD=BE?=
 <fernando.jose@woven.toyota>
Date: Wed, 16 Oct 2024 12:29:34 +0900
Subject: [PATCH 303/435] Update change_notes/2024-10-15-fix-fp-739-a14-5-2.md

Co-authored-by: Luke Cartey <5377966+lcartey@users.noreply.github.com>
---
 change_notes/2024-10-15-fix-fp-739-a14-5-2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/change_notes/2024-10-15-fix-fp-739-a14-5-2.md b/change_notes/2024-10-15-fix-fp-739-a14-5-2.md
index 39cb00e3ae..6e3f422718 100644
--- a/change_notes/2024-10-15-fix-fp-739-a14-5-2.md
+++ b/change_notes/2024-10-15-fix-fp-739-a14-5-2.md
@@ -1,2 +1,2 @@
 - `A14-5-2` - `NonTemplateMemberDefinedInTemplate.ql`
-  - Fixes #739. Omit type members declared with using aliases.
+  - Fixes #739. Correctly detect template parameters specified in using alias base types, e.g. `using T1 = some_type<T>::Type;`.

From 5609f092dd4151d6464ea70e5c7d826d43d3d91f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jos=C3=A9=20=7C=20=EF=BE=8C=EF=BD=AA=EF=BE=99?=
 =?UTF-8?q?=EF=BE=85=EF=BE=9D=EF=BE=84=EF=BE=9E=20=EF=BE=8E=EF=BD=BE?=
 <fernando.jose@woven.toyota>
Date: Wed, 16 Oct 2024 12:30:10 +0900
Subject: [PATCH 304/435] Apply suggestions from code review

Co-authored-by: Luke Cartey <5377966+lcartey@users.noreply.github.com>
---
 .../src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql    | 3 ++-
 cpp/autosar/test/rules/A14-5-2/test.cpp                        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql b/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
index b8dff92ca6..7f9ced9909 100644
--- a/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
+++ b/cpp/autosar/src/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.ql
@@ -169,7 +169,8 @@ where
     )
   ) and
   // Omit using alias (cf. https://github.com/github/codeql-coding-standards/issues/739)
-  not d instanceof UsingAliasTypedefType
+  // Exclude Using alias which refer directly to a TypeParameter
+  not d.(UsingAliasTypedefType).getBaseType() instanceof TemplateParameter
 select d,
   "Member " + d.getName() + " template class does not use any of template arguments of its $@.",
   d.getDeclaringType(), "declaring type"
diff --git a/cpp/autosar/test/rules/A14-5-2/test.cpp b/cpp/autosar/test/rules/A14-5-2/test.cpp
index 236f3beb7a..260ff5b4b2 100644
--- a/cpp/autosar/test/rules/A14-5-2/test.cpp
+++ b/cpp/autosar/test/rules/A14-5-2/test.cpp
@@ -8,7 +8,7 @@ template <typename T> class C1 {
   enum E1 : T { e1, e2 }; // COMPLIANT
 
   using T1 = typename template_base<T>::type;   // COMPLIANT
-  using T2 = typename template_base<int>::type; // NON_COMPLIANT[FALSE_NEGATIVE]
+  using T2 = typename template_base<int>::type; // NON_COMPLIANT
 
   class C11 { // COMPLIANT
     enum E2 {

From e0b581ae432312715a0341bb99adafd5d7f670b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jos=C3=A9=20=7C=20=EF=BE=8C=EF=BD=AA=EF=BE=99?=
 =?UTF-8?q?=EF=BE=85=EF=BE=9D=EF=BE=84=EF=BE=9E=20=EF=BE=8E=EF=BD=BE?=
 <fernando.jose@woven.toyota>
Date: Wed, 16 Oct 2024 12:33:18 +0900
Subject: [PATCH 305/435] Update NonTemplateMemberDefinedInTemplate.expected

---
 .../rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected b/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected
index 454a1c6b83..f0c78e2af1 100644
--- a/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected
+++ b/cpp/autosar/test/rules/A14-5-2/NonTemplateMemberDefinedInTemplate.expected
@@ -1,3 +1,4 @@
+| test.cpp:11:9:11:10 | T2 | Member T2 template class does not use any of template arguments of its $@. | test.cpp:6:29:6:30 | C1<T> | declaring type |
 | test.cpp:28:31:28:33 | C12<N> | Member C12<N> template class does not use any of template arguments of its $@. | test.cpp:6:29:6:30 | C1<T> | declaring type |
 | test.cpp:45:7:45:8 | a1 | Member a1 template class does not use any of template arguments of its $@. | test.cpp:37:31:37:33 | C22<N> | declaring type |
 | test.cpp:46:9:46:10 | a2 | Member a2 template class does not use any of template arguments of its $@. | test.cpp:37:31:37:33 | C22<N> | declaring type |

From dd475bef82a8d41d74bcfed2d2515dd64f921859 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 16 Oct 2024 16:51:21 -0700
Subject: [PATCH 306/435] Implement InvalidMemory, Rule 18-8 amendment.

---
 amendments.csv                                |   2 +-
 ...DoNotModifyObjectsWithTemporaryLifetime.ql |  13 +-
 ...ointersToVariablyModifiedArrayTypesUsed.ql | 123 ++++++++++++++
 .../RULE-18-8/VariableLengthArrayTypesUsed.ql |  39 ++---
 ...rayToPointerConversionOfTemporaryObject.ql |  86 ++++++++++
 ...eLValueSubscriptedWithTemporaryLifetime.ql |  60 +++++++
 ...sToVariablyModifiedArrayTypesUsed.expected |  17 ++
 ...tersToVariablyModifiedArrayTypesUsed.qlref |   1 +
 c/misra/test/rules/RULE-18-10/test.c          |  95 +++++++++++
 .../VariableLengthArrayTypesUsed.expected     |  10 +-
 c/misra/test/rules/RULE-18-8/test.c           |  30 +++-
 ...ointerConversionOfTemporaryObject.expected |  30 ++++
 ...ToPointerConversionOfTemporaryObject.qlref |   1 +
 ...eSubscriptedWithTemporaryLifetime.expected |  15 ++
 ...alueSubscriptedWithTemporaryLifetime.qlref |   1 +
 c/misra/test/rules/RULE-18-9/test.c           | 151 ++++++++++++++++++
 ...0-rule-18-8-vla-rule-changes-amendment4.md |   4 +
 .../src/codingstandards/cpp/Clvalues.qll      |  17 ++
 .../cpp/VariablyModifiedTypes.qll             | 143 +++++++++++++++++
 .../cpp/exclusions/c/InvalidMemory3.qll       |  61 +++++++
 .../cpp/exclusions/c/RuleMetadata.qll         |   3 +
 .../cpp/lifetimes/CLifetimes.qll              |  48 ++++++
 rule_packages/c/InvalidMemory3.json           |  59 +++++++
 23 files changed, 958 insertions(+), 51 deletions(-)
 create mode 100644 c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
 create mode 100644 c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
 create mode 100644 c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
 create mode 100644 c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected
 create mode 100644 c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-18-10/test.c
 create mode 100644 c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected
 create mode 100644 c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.qlref
 create mode 100644 c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.expected
 create mode 100644 c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.qlref
 create mode 100644 c/misra/test/rules/RULE-18-9/test.c
 create mode 100644 change_notes/2024-10-10-rule-18-8-vla-rule-changes-amendment4.md
 create mode 100644 cpp/common/src/codingstandards/cpp/Clvalues.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/InvalidMemory3.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll
 create mode 100644 rule_packages/c/InvalidMemory3.json

diff --git a/amendments.csv b/amendments.csv
index cd0085493e..ce285a29ba 100644
--- a/amendments.csv
+++ b/amendments.csv
@@ -15,7 +15,7 @@ c,MISRA-C-2012,Amendment4,RULE-11-3,Yes,Expand,No,Easy
 c,MISRA-C-2012,Amendment4,RULE-11-8,Yes,Expand,No,Easy
 c,MISRA-C-2012,Amendment4,RULE-13-2,Yes,Expand,No,Very Hard
 c,MISRA-C-2012,Amendment4,RULE-18-6,Yes,Expand,No,Medium
-c,MISRA-C-2012,Amendment4,RULE-18-8,Yes,Split,No,Easy
+c,MISRA-C-2012,Amendment4,RULE-18-8,Yes,Split,Yes,Easy
 c,MISRA-C-2012,Corrigendum2,RULE-2-2,Yes,Clarification,No,Import
 c,MISRA-C-2012,Corrigendum2,RULE-2-7,Yes,Clarification,No,Import
 c,MISRA-C-2012,Corrigendum2,RULE-3-1,Yes,Refine,No,Easy
diff --git a/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql b/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
index 2d66b8643c..6a018ed8c4 100644
--- a/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
+++ b/c/cert/src/rules/EXP35-C/DoNotModifyObjectsWithTemporaryLifetime.ql
@@ -13,18 +13,7 @@
 
 import cpp
 import codingstandards.c.cert
-
-/**
- * A struct or union type that contains an array type
- */
-class StructOrUnionTypeWithArrayField extends Struct {
-  StructOrUnionTypeWithArrayField() {
-    this.getAField().getUnspecifiedType() instanceof ArrayType
-    or
-    // nested struct or union containing an array type
-    this.getAField().getUnspecifiedType().(Struct) instanceof StructOrUnionTypeWithArrayField
-  }
-}
+import codingstandards.cpp.lifetimes.CLifetimes
 
 // Note: Undefined behavior is possible regardless of whether the accessed field from the returned
 // struct is an array or a scalar (i.e. arithmetic and pointer types) member, according to the standard.
diff --git a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
new file mode 100644
index 0000000000..5a4edb4a98
--- /dev/null
+++ b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
@@ -0,0 +1,123 @@
+/**
+ * @id c/misra/pointers-to-variably-modified-array-types-used
+ * @name RULE-18-10: Pointers to variably-modified array types shall not be used
+ * @description Pointers to variably-modified array types shall not be used, as these pointer types
+ *              are frequently incompatible with other fixed or variably sized arrays, resulting in
+ *              undefined behavior.
+ * @kind problem
+ * @precision high
+ * @problem.severity error
+ * @tags external/misra/id/rule-18-10
+ *       external/misra/c/2012/amendment4
+ *       correctness
+ *       security
+ *       external/misra/obligation/mandatory
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.VariablyModifiedTypes
+
+/**
+ * Check that the declaration entry, which may be a parameter or a variable
+ * etc., seems to subsume the location of `inner`, including the declaration
+ * type text.
+ * 
+ * The location of the `DeclarationEntry` itself points to the _identifier_
+ * that is declared. This range will not include the type of the declaration.
+ * 
+ * For parameters, the `before` and `end` `Location` objects will be
+ * constrained to the closest earlier element (parameter or function body),
+ * these values can therefore be captured and inspected for debugging.
+ * 
+ * For declarations which occur in statements, the `before` and `end`
+ * `Location` objects will be both constrained to be equal, and equal to,
+ * the `Location` of the containing `DeclStmt`.
+ */
+predicate declarationSubsumes(
+  DeclarationEntry entry, Location inner, Location before, Location after
+) {
+  inner.getFile() = entry.getLocation().getFile() and
+  (
+    exists(ParameterDeclarationEntry param, FunctionDeclarationEntry func, int i |
+      param = entry and
+      func = param.getFunctionDeclarationEntry() and
+      func.getParameterDeclarationEntry(i) = param and
+      before = entry.getLocation() and
+      (
+        after = func.getParameterDeclarationEntry(i + 1).getLocation()
+        or
+        not exists(ParameterDeclarationEntry afterParam |
+          afterParam = func.getParameterDeclarationEntry(i + 1)
+        ) and
+        after = func.getBlock().getLocation()
+      )
+    ) and
+    before.isBefore(inner, _) and
+    inner.isBefore(after, _)
+    or
+    exists(DeclStmt s |
+      s.getADeclaration() = entry.getDeclaration() and
+      before = s.getLocation() and
+      after = before and
+      before.subsumes(inner)
+    )
+  )
+}
+
+/**
+ * A declaration involving a pointer to a variably-modified type.
+ */
+class InvalidDeclaration extends DeclarationEntry {
+  Expr sizeExpr;
+  CandidateVlaType vlaType;
+
+  // `before` and `after` are captured for debugging, see doc comment for
+  // `declarationSubsumes`.
+  Location before;
+  Location after;
+
+  InvalidDeclaration() {
+    sizeExpr = any(VlaDimensionStmt vla).getDimensionExpr() and
+    declarationSubsumes(this, sizeExpr.getLocation(), before, after) and
+    (
+      if this instanceof ParameterDeclarationEntry
+      then vlaType = this.getType().(VariablyModifiedTypeIfAdjusted).getInnerVlaType()
+      else vlaType = this.getType().(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
+    )
+    // Capture only pointers to VLA types, not raw VLA types.
+    and not vlaType = this.getType()
+  }
+
+  Expr getSizeExpr() { result = sizeExpr }
+
+  CandidateVlaType getVlaType() { result = vlaType }
+}
+
+from InvalidDeclaration v, string declstr, string adjuststr, string relationstr
+where
+  not isExcluded(v, InvalidMemory3Package::pointersToVariablyModifiedArrayTypesUsedQuery()) and
+  (
+    if v instanceof ParameterDeclarationEntry
+    then declstr = "Parameter "
+    else
+      if v instanceof VariableDeclarationEntry
+      then declstr = "Variable "
+      else declstr = "Declaration "
+  ) and
+  (
+    if
+      v instanceof ParameterDeclarationEntry and
+      v.getType() instanceof ParameterAdjustedVariablyModifiedType
+    then adjuststr = "adjusted to"
+    else adjuststr = "declared with"
+  ) and
+  (
+    if v.getType().(PointerType).getBaseType() instanceof CandidateVlaType
+    then relationstr = "pointer to"
+    else relationstr = "with inner"
+  )
+select v,
+  declstr + v.getName() + " is " + adjuststr + " variably-modified type, " + relationstr +
+    " variable length array of non constant size $@ and element type '" +
+    v.getVlaType().getVariableBaseType() + "'", v.getSizeExpr(), v.getSizeExpr().toString()
diff --git a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
index a7c25ed35e..96fbf697af 100644
--- a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
@@ -15,34 +15,15 @@
 import cpp
 import codingstandards.c.misra
 
-/**
- * A variable length array (VLA)
- * ie an array where the size
- * is not an integer constant expression
- */
-class VariableLengthArray extends VariableDeclarationEntry {
-  VariableLengthArray() {
-    //VLAs will not have: static/extern specifiers (compilation error)
-    not this.hasSpecifier("static") and
-    not this.hasSpecifier("extern") and
-    //VLAs are not allowed to be initialized
-    not this.getDeclaration().hasInitializer() and
-    exists(ArrayType a |
-      //a.hasArraySize() does not catch multidimensional VLAs like a[1][]
-      a.toString().matches("%[]%") and
-      this.getUnspecifiedType() = a and
-      //variable length array is one declared in block or function prototype
-      (
-        this.getDeclaration().getParentScope() instanceof Function or
-        this.getDeclaration().getParentScope() instanceof BlockStmt
-      )
-    )
-  }
-}
-
-from VariableLengthArray v
+from VlaDeclStmt v, Expr size, ArrayType arrayType, string typeStr
 where
   not isExcluded(v, Declarations7Package::variableLengthArrayTypesUsedQuery()) and
-  //an exception, argv in : int main(int argc, char *argv[])
-  not v.getDeclaration().getParentScope().(Function).hasName("main")
-select v, "Variable length array declared."
+  size = v.getVlaDimensionStmt(0).getDimensionExpr() and
+  (
+    arrayType = v.getVariable().getType()
+    or
+    arrayType = v.getType().getUnspecifiedType()
+  ) and
+  typeStr = arrayType.getBaseType().toString()
+select v, "Variable length array of element type '" + typeStr + "' with non-constant size $@.",
+  size, size.toString()
diff --git a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
new file mode 100644
index 0000000000..7df4e5371c
--- /dev/null
+++ b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
@@ -0,0 +1,86 @@
+/**
+ * @id c/misra/array-to-pointer-conversion-of-temporary-object
+ * @name RULE-18-9: An object with temporary lifetime shall not undergo array to pointer conversion
+ * @description Modifying or accessing elements of an array with temporary lifetime that has been
+ *              converted to a pointer will result in undefined behavior.
+ * @kind problem
+ * @precision high
+ * @problem.severity error
+ * @tags external/misra/id/rule-18-9
+ *       external/misra/c/2012/amendment3
+ *       correctness
+ *       security
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.lifetimes.CLifetimes
+
+/**
+ * Get the expression(s) whose value is "used" by this expression.
+ *
+ * For instance, `(x)` does not use any values, but `x + y` uses `x` and `y`.
+ *
+ * A pointer-to-array conversion does not need to be flagged if the result of
+ * that conversion is not used or stored.
+ */
+Expr usedValuesOf(Expr expr) {
+  result = expr.(BinaryOperation).getLeftOperand()
+  or
+  result = expr.(BinaryOperation).getRightOperand()
+  or
+  result = expr.(UnaryOperation).getOperand()
+  or
+  result = expr.(ConditionalExpr).getCondition()
+  or
+  result = expr.(Call).getAnArgument()
+}
+
+/**
+ * Get the expression(s) whose value is stored by this declaration.
+ *
+ * A pointer-to-array conversion does not need to be flagged if the result of
+ * that conversion is not used or stored.
+ */
+predicate isStored(Expr e) {
+  e = any(VariableDeclarationEntry d).getDeclaration().getInitializer().getExpr()
+  or
+  e = any(ClassAggregateLiteral l).getAFieldExpr(_)
+}
+
+/**
+ * Find expressions that defer their value directly to an inner expression
+ * value.
+ *
+ * When an array is on the rhs of a comma expr, or in the then/else branch of a
+ * ternary expr, and the result us used as a pointer, then the ArrayToPointer
+ * conversion is marked inside comma expr/ternary expr, on the operands. These
+ * conversions are only non-compliant if they flow into an operation or store.
+ *
+ * Full flow analysis with localFlowStep should not be necessary, and may cast a
+ * wider net than needed for some queries, potentially resulting in false
+ * positives.
+ */
+Expr temporaryObjectFlowStep(Expr e) {
+  e = result.(CommaExpr).getRightOperand()
+  or
+  e = result.(ConditionalExpr).getThen()
+  or
+  e = result.(ConditionalExpr).getElse()
+}
+
+from
+  TemporaryLifetimeArrayAccess fa, TemporaryLifetimeExpr temporary,
+  ArrayToPointerConversion conversion
+where
+  not isExcluded(conversion, InvalidMemory3Package::arrayToPointerConversionOfTemporaryObjectQuery()) and
+  fa.getTemporary() = temporary and
+  conversion.getExpr() = fa and
+  (
+    temporaryObjectFlowStep*(conversion.getExpr()) = usedValuesOf(any(Expr e))
+    or
+    isStored(temporaryObjectFlowStep*(conversion.getExpr()))
+  )
+select conversion, "Array to pointer conversion of array $@ from temporary object $@",
+  fa.getTarget(), fa.getTarget().getName(), temporary, temporary.toString()
diff --git a/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
new file mode 100644
index 0000000000..468e44f3bb
--- /dev/null
+++ b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
@@ -0,0 +1,60 @@
+/**
+ * @id c/misra/modifiable-l-value-subscripted-with-temporary-lifetime
+ * @name RULE-18-9: Usage of the subscript operator on an object with temporary lifetime shall not return a modifiable value
+ * @description Modifying elements of an array with temporary lifetime will result in undefined
+ *              behavior.
+ * @kind problem
+ * @precision high
+ * @problem.severity error
+ * @tags external/misra/id/rule-18-9
+ *       external/misra/c/2012/amendment3
+ *       correctness
+ *       security
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.lifetimes.CLifetimes
+
+class TemporaryLifetimeArrayExpr extends ArrayExpr {
+  TemporaryLifetimeArrayAccess member;
+  Type elementType;
+
+  TemporaryLifetimeArrayExpr() {
+    member = getArrayBase() and
+    elementType = member.getType().(ArrayType).getBaseType()
+    or
+    exists(TemporaryLifetimeArrayExpr inner |
+      inner = getArrayBase() and
+      member = inner.getMember() and
+      elementType = inner.getElementType().(ArrayType).getBaseType()
+    )
+  }
+
+  TemporaryLifetimeArrayAccess getMember() { result = member }
+
+  Type getElementType() { result = elementType }
+}
+
+predicate usedAsModifiableLvalue(Expr expr) {
+  exists(Assignment parent | parent.getLValue() = expr)
+  or
+  exists(CrementOperation parent | parent.getOperand() = expr)
+  or
+  exists(AddressOfExpr parent | parent.getOperand() = expr)
+  or
+  exists(FieldAccess parent | parent.getQualifier() = expr and usedAsModifiableLvalue(parent))
+
+}
+
+from TemporaryLifetimeArrayExpr expr, TemporaryLifetimeArrayAccess member
+where
+  not isExcluded(expr,
+    InvalidMemory3Package::modifiableLValueSubscriptedWithTemporaryLifetimeQuery()) and
+  member = expr.getMember() and
+  not expr.isUnevaluated() and
+  usedAsModifiableLvalue(expr)
+select expr,
+  "Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@ ",
+  member, member.getTarget().getName(), member.getTemporary(), member.getTemporary().toString()
diff --git a/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected b/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected
new file mode 100644
index 0000000000..87cb3de5c7
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected
@@ -0,0 +1,17 @@
+| test.c:17:11:17:12 | definition of p5 | Parameter p5 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int' | test.c:17:15:17:16 | p0 | p0 |
+| test.c:18:11:18:12 | definition of p6 | Parameter p6 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:18:18:18:19 | p0 | p0 |
+| test.c:19:11:19:12 | definition of p7 | Parameter p7 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int[2]' | test.c:19:15:19:16 | p0 | p0 |
+| test.c:20:11:20:12 | definition of p8 | Parameter p8 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int[]' | test.c:20:15:20:16 | p0 | p0 |
+| test.c:20:11:20:12 | definition of p8 | Parameter p8 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int[]' | test.c:20:19:20:20 | p0 | p0 |
+| test.c:24:12:24:13 | definition of p9 | Parameter p9 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int *' | test.c:24:16:24:17 | p0 | p0 |
+| test.c:25:13:25:15 | definition of p10 | Parameter p10 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int *' | test.c:25:18:25:19 | p0 | p0 |
+| test.c:28:12:28:14 | definition of p11 | Parameter p11 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:28:21:28:22 | p0 | p0 |
+| test.c:32:17:32:19 | definition of p13 | Parameter p13 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'const int' | test.c:32:22:32:23 | p0 | p0 |
+| test.c:33:18:33:20 | definition of p14 | Parameter p14 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:33:23:33:24 | p0 | p0 |
+| test.c:40:12:40:14 | definition of p17 | Parameter p17 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:40:24:40:25 | p0 | p0 |
+| test.c:41:14:41:16 | definition of p18 | Parameter p18 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:41:27:41:28 | p0 | p0 |
+| test.c:68:9:68:11 | definition of p27 | Parameter p27 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:68:13:68:14 | p0 | p0 |
+| test.c:68:9:68:11 | definition of p27 | Parameter p27 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:68:17:68:18 | p0 | p0 |
+| test.c:74:8:74:9 | definition of l3 | Variable l3 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int' | test.c:74:12:74:13 | p0 | p0 |
+| test.c:79:15:79:16 | definition of l4 | Variable l4 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int' | test.c:79:19:79:20 | p0 | p0 |
+| test.c:84:17:84:19 | declaration of td3 | Declaration td3 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:84:22:84:23 | p0 | p0 |
diff --git a/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.qlref b/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.qlref
new file mode 100644
index 0000000000..1a60cfacca
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.qlref
@@ -0,0 +1 @@
+rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-18-10/test.c b/c/misra/test/rules/RULE-18-10/test.c
new file mode 100644
index 0000000000..cf90e256e7
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-10/test.c
@@ -0,0 +1,95 @@
+#define CONSTANT 1
+
+int g1[3];           // COMPLIANT
+int (*g2)[3];        // COMPLIANT
+int (*g3)[CONSTANT]; // COMPLIANT
+
+void f1(
+    int p0,
+
+    // Basic fixed length array types:
+    int p1[3],           // COMPLIANT
+    int (*p2)[3],        // COMPLIANT
+    int (*p3)[2][3],     // COMPLIANT
+    int (*p4)[CONSTANT], // COMPLIANT
+
+    // Basic pointers to VMTs:
+    int (*p5)[p0],     // NON-COMPLIANT
+    int (*p6)[2][p0],  // NON-COMPLIANT
+    int (*p7)[p0][2],  // NON-COMPLIANT
+    int (*p8)[p0][p0], // NON-COMPLIANT
+
+    // Types referring to pointers to VMTs:
+    // - pointer to pointer to VMT
+    int(*(*p9)[p0]), // NON-COMPLIANT
+    int(*(**p10)[p0]), // NON-COMPLIANT
+
+    // - array of pointers to VMT
+    int (*(p11[3]))[p0], // NON-COMPLIANT
+
+    // - const VMTs, const array-to-pointer adjustment
+    const int p12[p0],        // COMPLIANT
+    const int (*p13)[p0],     // NON-COMPLIANT
+    int (* const p14)[p0],    // NON-COMPLIANT
+
+    // - function types with argument that is a pointer to a VMT
+    int p15(int (*inner)[p0]),    // NON-COMPLIANT[FALSE_NEGATIVE]
+    int (*p16)(int (*inner)[p0]), // NON-COMPLIANT[FALSE_NEGATIVE]
+
+    // - function types that returns a pointer to a VMT
+    int (*(p17(void)))[p0],    // NON-COMPLIANT
+    int (*((*p18)(void)))[p0], // NON-COMPLIANT
+
+    // - structs cannot contain a VMT as a member.
+    struct {
+      int g1[3];          // COMPLIANT
+      int(*g2)[3];        // COMPLIANT
+      int(*g3)[CONSTANT]; // COMPLIANT
+                          // Pointer to VMT (`int (*g4)[p0]`) is not allowed.
+    } p19,
+
+    // - unions cannot contain a VMT as a member.
+    union {
+      int g1[3];          // COMPLIANT
+      int(*g2)[3];        // COMPLIANT
+      int(*g3)[CONSTANT]; // COMPLIANT
+                          // Pointer to VMT (`int (*g4)[p0]`) is not allowed.
+    } p20,
+
+    // Unknown array length types:
+    int p21[],       // COMPLIANT
+    int p22[][],       // COMPLIANT
+    int (*p23)[],    // COMPLIANT
+    int (*p24)[2][], // COMPLIANT
+    int (*p25)[][2], // COMPLIANT
+
+    // VLA types that are rewritten as pointers:
+    int p26[p0],    // COMPLIANT
+    int p27[p0][p0] // NON-COMPLIANT
+) {
+  // Local variables may contain pointers to VMTs:
+  int l0[p0]; // COMPLIANT
+  int(*l1)[];   // COMPLIANT
+  int(*l2)[3];  // COMPLIANT
+  int(*l3)[p0]; // NON-COMPLIANT
+
+  int l6[10] = p23;
+
+  // A pointer to a VMT may be declared `static`.
+  static int(*l4)[p0]; // NON-COMPLIANT
+
+  // Block scope typedefs may refer to VMTs
+  typedef int (*td1)[3]; // COMPLIANT
+  typedef int (*td2)[]; // COMPLIANT
+  typedef int (*td3)[p0]; // NON-COMPLIANT
+
+  td3 l5; // NON-COMPLIANT
+}
+
+// Function prototypes may contain VMTs using '*' syntax:
+void f2(int (*p1)[3],    // COMPLIANT
+        int (*p2)[*],    // NON-COMPLIANT[FALSE_NEGATIVE]
+        int (*p3)[2][*], // NON-COMPLIANT[FALSE_NEGATIVE]
+        int (*p4)[*][2], // NON-COMPLIANT[FALSE_NEGATIVE]
+        int (*p5)[*][*]  // NON-COMPLIANT[FALSE_NEGATIVE]
+);
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected b/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected
index e9721ce642..24856619bf 100644
--- a/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected
+++ b/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected
@@ -1,5 +1,5 @@
-| test.c:3:19:3:20 | definition of pa | Variable length array declared. |
-| test.c:6:7:6:8 | definition of a1 | Variable length array declared. |
-| test.c:7:7:7:8 | definition of a2 | Variable length array declared. |
-| test.c:8:7:8:8 | definition of a3 | Variable length array declared. |
-| test.c:14:20:14:21 | definition of pa | Variable length array declared. |
+| test.c:6:7:6:7 | VLA declaration | Variable length array of element type 'int' with non-constant size $@. | test.c:6:10:6:14 | ... + ... | ... + ... |
+| test.c:7:7:7:7 | VLA declaration | Variable length array of element type 'int' with non-constant size $@. | test.c:7:10:7:10 | n | n |
+| test.c:8:7:8:7 | VLA declaration | Variable length array of element type 'int[]' with non-constant size $@. | test.c:8:13:8:13 | n | n |
+| test.c:12:7:12:7 | VLA declaration | Variable length array of element type 'int[1]' with non-constant size $@. | test.c:12:10:12:10 | n | n |
+| test.c:18:15:18:15 | VLA declaration | Variable length array of element type 'int' with non-constant size $@. | test.c:18:26:18:26 | n | n |
diff --git a/c/misra/test/rules/RULE-18-8/test.c b/c/misra/test/rules/RULE-18-8/test.c
index 3a0a040f6d..c2f6027216 100644
--- a/c/misra/test/rules/RULE-18-8/test.c
+++ b/c/misra/test/rules/RULE-18-8/test.c
@@ -1,7 +1,7 @@
 #define TEST 1
 
-void f(int n, int pa[1][n]) { // NON_COMPLIANT
-  int a[1];                   // COMPLIANT
+void f(int n) {
+  int a[1]; // COMPLIANT
   int x = 1;
   int a1[1 + x];  // NON_COMPLIANT - not integer constant expr
   int a2[n];      // NON_COMPLIANT
@@ -9,7 +9,29 @@ void f(int n, int pa[1][n]) { // NON_COMPLIANT
   int a4[] = {1}; // COMPLIANT - not a VLA
   int a5[TEST];   // COMPLIANT
   int a6[1 + 1];  // COMPLIANT
+  int a7[n][1];   // NON_COMPLIANT
+  int(*a8)[n];    // COMPLIANT - pointer to VLA, see RULE-18-10
+
+  extern int e1[]; // COMPLIANT
+
+  // A typedef is not a VLA. However, `VlaDeclStmt`s match the typedef.
+  typedef int vlaTypedef[n]; // COMPLIANT[FALSE_POSITIVE]
+  vlaTypedef t1;             // NON_COMPLIANT[FALSE_NEGATIVE]
 }
 
-void f1(int n, int pa[n]) { // NON_COMPLIANT
-}
\ No newline at end of file
+void f1(int n,
+        // Parameter array types are adjusted to pointers
+        int p1[n], // COMPLIANT
+        // Pointers to variably-modified types are not VLAs.
+        int p2[n][n],
+        int p3[],  // array of unknown length is converted to pointer
+        int p4[][] // array of unknown length are not VLAs.
+) {}
+
+struct s {
+  // Structs must have at least one non-flexible array member.
+  int foo;
+
+  // Flexible array members are not VLAs.
+  int flexibleArrayMember[]; // COMPLIANT
+};
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected b/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected
new file mode 100644
index 0000000000..7d760dc4a6
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected
@@ -0,0 +1,30 @@
+| test.c:45:3:45:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:45:3:45:8 | call to get_s1 | call to get_s1 |
+| test.c:46:3:46:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:46:3:46:8 | call to get_s1 | call to get_s1 |
+| test.c:47:7:47:24 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:47:7:47:12 | call to get_s1 | call to get_s1 |
+| test.c:48:4:48:21 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:48:4:48:9 | call to get_s1 | call to get_s1 |
+| test.c:49:4:49:21 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:49:4:49:9 | call to get_s1 | call to get_s1 |
+| test.c:50:3:50:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:50:3:50:8 | call to get_s1 | call to get_s1 |
+| test.c:51:3:51:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:51:3:51:8 | call to get_s1 | call to get_s1 |
+| test.c:52:3:52:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:52:3:52:8 | call to get_s1 | call to get_s1 |
+| test.c:53:3:53:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:53:3:53:8 | call to get_s1 | call to get_s1 |
+| test.c:54:3:54:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:54:3:54:8 | call to get_s1 | call to get_s1 |
+| test.c:55:8:55:25 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:55:8:55:13 | call to get_s1 | call to get_s1 |
+| test.c:56:3:56:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:56:3:56:8 | call to get_s1 | call to get_s1 |
+| test.c:57:8:57:25 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:57:8:57:13 | call to get_s1 | call to get_s1 |
+| test.c:58:3:58:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:58:3:58:8 | call to get_s1 | call to get_s1 |
+| test.c:59:3:59:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:59:3:59:8 | call to get_s1 | call to get_s1 |
+| test.c:60:15:60:32 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:60:15:60:20 | call to get_s1 | call to get_s1 |
+| test.c:61:16:61:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:61:16:61:21 | call to get_s1 | call to get_s1 |
+| test.c:62:23:62:40 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:62:23:62:28 | call to get_s1 | call to get_s1 |
+| test.c:63:7:63:24 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:63:7:63:12 | call to get_s1 | call to get_s1 |
+| test.c:64:16:64:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:64:16:64:21 | call to get_s1 | call to get_s1 |
+| test.c:65:15:65:32 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:65:15:65:20 | call to get_s1 | call to get_s1 |
+| test.c:66:16:66:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:66:16:66:21 | call to get_s1 | call to get_s1 |
+| test.c:67:23:67:40 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:67:23:67:28 | call to get_s1 | call to get_s1 |
+| test.c:89:3:89:30 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:89:12:89:20 | member_s1 | member_s1 |
+| test.c:90:3:90:36 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:90:3:90:26 | access to array | access to array |
+| test.c:91:15:91:42 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:91:24:91:32 | member_s1 | member_s1 |
+| test.c:92:15:92:48 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:92:15:92:38 | access to array | access to array |
+| test.c:111:15:111:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:111:16:111:22 | ... = ... | ... = ... |
+| test.c:113:15:113:37 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:113:16:113:26 | ... ? ... : ... | ... ? ... : ... |
+| test.c:114:15:114:31 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:114:16:114:20 | ... , ... | ... , ... |
diff --git a/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.qlref b/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.qlref
new file mode 100644
index 0000000000..d2db40e77c
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.qlref
@@ -0,0 +1 @@
+rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.expected b/c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.expected
new file mode 100644
index 0000000000..ae140dcd59
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.expected
@@ -0,0 +1,15 @@
+| test.c:80:3:80:17 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:80:12:80:14 | arr | arr | test.c:80:3:80:8 | call to get_s1 | call to get_s1 |
+| test.c:81:3:81:17 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:81:12:81:14 | arr | arr | test.c:81:3:81:8 | call to get_s1 | call to get_s1 |
+| test.c:82:3:82:17 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:82:12:82:14 | arr | arr | test.c:82:3:82:8 | call to get_s1 | call to get_s1 |
+| test.c:83:3:83:17 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:83:12:83:14 | arr | arr | test.c:83:3:83:8 | call to get_s1 | call to get_s1 |
+| test.c:84:5:84:19 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:84:14:84:16 | arr | arr | test.c:84:5:84:10 | call to get_s1 | call to get_s1 |
+| test.c:93:3:93:27 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:93:22:93:24 | arr | arr | test.c:93:12:93:20 | member_s1 | member_s1 |
+| test.c:94:3:94:27 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:94:22:94:24 | arr | arr | test.c:94:3:94:20 | access to array | access to array |
+| test.c:137:3:137:23 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:137:12:137:20 | arr_union | arr_union | test.c:137:3:137:8 | call to get_s3 | call to get_s3 |
+| test.c:138:3:138:24 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:138:12:138:21 | arr_struct | arr_struct | test.c:138:3:138:8 | call to get_s3 | call to get_s3 |
+| test.c:139:3:139:24 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:139:12:139:21 | arr_struct | arr_struct | test.c:139:3:139:8 | call to get_s3 | call to get_s3 |
+| test.c:140:3:140:24 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:140:12:140:21 | arr_struct | arr_struct | test.c:140:3:140:8 | call to get_s3 | call to get_s3 |
+| test.c:141:3:141:24 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:141:12:141:21 | arr_struct | arr_struct | test.c:141:3:141:8 | call to get_s3 | call to get_s3 |
+| test.c:142:4:142:25 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:142:13:142:22 | arr_struct | arr_struct | test.c:142:4:142:9 | call to get_s3 | call to get_s3 |
+| test.c:146:3:146:22 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:146:12:146:16 | arr2d | arr2d | test.c:146:3:146:8 | call to get_s3 | call to get_s3 |
+| test.c:147:4:147:20 | access to array | Modifiable lvalue produced by subscripting array member $@ of temporary lifetime object $@  | test.c:147:13:147:17 | arr2d | arr2d | test.c:147:4:147:9 | call to get_s3 | call to get_s3 |
diff --git a/c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.qlref b/c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.qlref
new file mode 100644
index 0000000000..c1fb0bd2d4
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.qlref
@@ -0,0 +1 @@
+rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-18-9/test.c b/c/misra/test/rules/RULE-18-9/test.c
new file mode 100644
index 0000000000..f2fb44fdc9
--- /dev/null
+++ b/c/misra/test/rules/RULE-18-9/test.c
@@ -0,0 +1,151 @@
+struct s1 {
+  int m1;
+  const int const_arr[10];
+  int arr[10];
+};
+
+struct s1 get_s1();
+
+struct s2 {
+  struct s1 member_s1;
+  struct s1 const const_s1_arr[10];
+  struct s1 *s1ptr;
+  struct s1 s1_arr[10];
+};
+
+struct s2 get_s2();
+struct s2 *get_s2_ptr();
+
+void use_int(int x) {}
+void use_int_ptr(int *x) {}
+
+void f(void) {
+  struct s1 l1;
+
+  // Auto lifetime, allowed:
+  l1.const_arr + 1;          // COMPLIANT
+  l1.const_arr - 1;          // COMPLIANT
+  &l1.const_arr;             // COMPLIANT
+  use_int_ptr(l1.const_arr); // COMPLIANT
+  l1.arr[0] = 1;             // COMPLIANT
+
+  // Extern lifetime, allowed:
+  extern struct s1 g1;
+  g1.const_arr + 1;          // COMPLIANT
+  g1.const_arr - 1;          // COMPLIANT
+  &g1.const_arr;             // COMPLIANT
+  use_int_ptr(g1.const_arr); // COMPLIANT
+  g1.arr[0] = 1;             // COMPLIANT
+
+  // Temporary lifetime, no conversion:
+  get_s1().const_arr; // COMPLIANT - not used as a value.
+  get_s1().m1 + 1;    // COMPLIANT - not an array.
+
+  // Temporary lifetime, array to pointer conversions:
+  get_s1().const_arr + 1;                  // NON-COMPLIANT
+  get_s1().const_arr - 1;                  // NON-COMPLIANT
+  1 + get_s1().const_arr;                  // NON-COMPLIANT
+  *get_s1().const_arr;                     // NON-COMPLIANT
+  !get_s1().const_arr;                     // NON-COMPLIANT
+  get_s1().const_arr < 1;                  // NON-COMPLIANT
+  get_s1().const_arr <= 1;                 // NON-COMPLIANT
+  get_s1().const_arr > 1;                  // NON-COMPLIANT
+  get_s1().const_arr >= 1;                 // NON-COMPLIANT
+  get_s1().const_arr == 1;                 // NON-COMPLIANT
+  1 == get_s1().const_arr;                 // NON-COMPLIANT
+  get_s1().const_arr && 1;                 // NON-COMPLIANT
+  1 && get_s1().const_arr;                 // NON-COMPLIANT
+  get_s1().const_arr || 1;                 // NON-COMPLIANT
+  get_s1().const_arr ? 1 : 1;              // NON-COMPLIANT
+  use_int_ptr(get_s1().const_arr);         // NON-COMPLIANT
+  use_int_ptr((get_s1().const_arr));       // NON-COMPLIANT
+  use_int_ptr((void *)get_s1().const_arr); // NON-COMPLIANT
+  (1, get_s1().const_arr) + 1;             // NON-COMPLIANT
+  int *local = get_s1().const_arr;         // NON-COMPLIANT
+  (struct s1){get_s1().const_arr};         // NON-COMPLIANT
+  (struct s2){{get_s1().const_arr}};       // NON-COMPLIANT
+  struct s1 local2 = {get_s1().const_arr}; // NON-COMPLIANT
+
+  // Results are not 'used' as a value.
+  (void *)get_s1().const_arr; // COMPLIANT
+  sizeof(get_s1().const_arr); // COMPLIANT
+  get_s1().const_arr, 1;      // COMPLIANT
+  1, get_s1().const_arr;      // COMPLIANT
+  (get_s1().const_arr);       // COMPLIANT
+
+  get_s1().const_arr[0]; // COMPLIANT - subscripted value not modifiable
+  get_s1().arr[0];       // COMPLIANT - subscripted value not used as modifiable
+  use_int(get_s1().const_arr[0]); // COMPLIANT
+  use_int(get_s1().arr[0]);       // COMPLIANT
+  get_s1().arr[0] = 1;            // NON-COMPLIANT
+  get_s1().arr[0] -= 1;           // NON-COMPLIANT
+  get_s1().arr[0]--;              // NON-COMPLIANT
+  get_s1().arr[0]++;              // NON-COMPLIANT
+  &(get_s1().arr[0]);             // NON-COMPLIANT
+
+  struct s2 l2;
+
+  // Deeper accesses:
+  get_s2().member_s1.const_arr + 1;                // NON-COMPLIANT
+  get_s2().const_s1_arr[0].const_arr + 1;          // NON-COMPLIANT
+  use_int_ptr(get_s2().member_s1.const_arr);       // NON-COMPLIANT
+  use_int_ptr(get_s2().const_s1_arr[0].const_arr); // NON-COMPLIANT
+  get_s2().member_s1.arr[0] = 1;                   // NON-COMPLIANT
+  get_s2().s1_arr[0].arr[0] = 1;                   // NON-COMPLIANT
+  get_s2().member_s1.const_arr[0];                 // COMPLIANT
+  get_s2().const_s1_arr[0].const_arr[0];           // COMPLIANT
+  get_s2().s1_arr[0].const_arr[0];                 // COMPLIANT
+  get_s2().s1ptr->const_arr[0];                    // COMPLIANT
+  use_int(get_s2().member_s1.const_arr[0]);        // COMPLIANT
+  use_int(get_s2().const_s1_arr[0].const_arr[0]);  // COMPLIANT
+  use_int(get_s2().s1ptr->const_arr[0]);           // COMPLIANT
+
+  // Pointer members of a struct don't have temporary lifetime.
+  get_s2().s1ptr->const_arr + 1;          // COMPLIANT
+  use_int_ptr(get_s2().s1ptr->const_arr); // COMPLIANT
+  get_s2().s1ptr->arr[0] = 1;             // COMPLIANT
+  get_s2_ptr()->member_s1.const_arr + 1;  // COMPLIANT
+  get_s2_ptr()->member_s1.arr[0] = 1;     // COMPLIANT
+
+  // Other types of non-lvalue types
+  use_int_ptr((l1 = l1).const_arr);       // NON-COMPLIANT
+  use_int_ptr(((struct s1)l1).const_arr); // NON-COMPLIANT[FALSE_NEGATIVE]
+  use_int_ptr((1 ? l1 : l1).const_arr);   // NON-COMPLIANT
+  use_int_ptr((0, l1).const_arr);         // NON-COMPLIANT
+  use_int_ptr((l2.s1ptr++)->const_arr);   // COMPLIANT
+  use_int_ptr((--l2.s1ptr)->const_arr);   // COMPLIANT
+}
+
+// Additional modifiable lvalue tests
+struct s3 {
+  struct s4 {
+    struct s5 {
+      struct s6 {
+        int x;
+      } m1;
+    } m1;
+  } arr_struct[1];
+
+  union u1 {
+    int x;
+  } arr_union[1];
+
+  int arr2d[1][1];
+} get_s3();
+
+void f2(void) {
+  get_s3().arr_union[0].x = 1;                   // NON_COMPLIANT
+  get_s3().arr_struct[0] = (struct s4){0};       // NON_COMPLIANT
+  get_s3().arr_struct[0].m1 = (struct s5){0};    // NON_COMPLIANT
+  get_s3().arr_struct[0].m1.m1 = (struct s6){0}; // NON_COMPLIANT
+  get_s3().arr_struct[0].m1.m1.x = 1;            // NON_COMPLIANT
+  &get_s3().arr_struct[0].m1.m1.x;               // NON_COMPLIANT
+  get_s3().arr_struct[0].m1.m1.x + 1;            // COMPLIANT
+
+  get_s3().arr2d[1][1] + 1; // COMPLIANT
+  get_s3().arr2d[1][1] = 1; // NON_COMPLIANT
+  &get_s3().arr2d[1];       // NON_COMPLIANT
+  // The following cases are missing an ArrayToPointerConversion
+  use_int_ptr(get_s3().arr2d[1]); // NON_COMPLIANT[FALSE NEGATIVE]
+  get_s3().arr2d[1] + 1;          // NON_COMPLIANT[FALSE NEGATIVE]
+}
\ No newline at end of file
diff --git a/change_notes/2024-10-10-rule-18-8-vla-rule-changes-amendment4.md b/change_notes/2024-10-10-rule-18-8-vla-rule-changes-amendment4.md
new file mode 100644
index 0000000000..f465836052
--- /dev/null
+++ b/change_notes/2024-10-10-rule-18-8-vla-rule-changes-amendment4.md
@@ -0,0 +1,4 @@
+- `RULE-18-8` - `VariableLengthArrayTypesUsed.ql`:
+  - Implement changes declared in MISRA C 2012 Amendment 4. This rule now only bans the use of VLA objects. Rules restricting the use of VLA types -- specifically, pointers to VLA types -- are now implemented in `RULE-18-10`.
+- `EXP-35-C` - `DoNotModifyObjectsWithTemporaryLifetime.ql`
+  - Refactor component into a shared library, should not have any effect on rule results.
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/Clvalues.qll b/cpp/common/src/codingstandards/cpp/Clvalues.qll
new file mode 100644
index 0000000000..2e330e0732
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/Clvalues.qll
@@ -0,0 +1,17 @@
+import cpp
+
+/**
+ * An lvalue in C (as opposed to C++).
+ *
+ * Note that `Expr.isLValue()` matches for C++ lvalues, which is a larger set
+ * than the set of C lvalues.
+ */
+predicate isCLValue(Expr expr) {
+  expr instanceof PointerFieldAccess
+  or
+  expr.isLValue() and
+  not expr instanceof ConditionalExpr and
+  not expr instanceof AssignExpr and
+  not expr instanceof CommaExpr and
+  not exists(Cast c | c = expr.getConversion*())
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll b/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
new file mode 100644
index 0000000000..730a52d763
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
@@ -0,0 +1,143 @@
+import cpp
+
+/**
+ * A candidate to be a variably length array type (VLA).
+ *
+ * This class represents a candidate only, for a few reasons.
+ *
+ * Firstly, the `ArrayType` class does not know when it has variable size, so
+ * this class matches all array types with unknown size, including `x[]` which
+ * is not a VLA. To determine the difference, we must compare locations between
+ * where * these types are declared, and the location of `VlaDecl`s etc.
+ *
+ * Secondly, function parameters of array type are adjusted into pointers. This
+ * means that while a parameter type can be a `CandidateVlaType`, that
+ * parameter is not a VLA.
+ */
+class CandidateVlaType extends ArrayType {
+  CandidateVlaType() { not hasArraySize() }
+
+  Type getVariableBaseType() { result = this.getBaseType() }
+}
+
+/**
+ * A type that is a variably modified type (VMT) if it does not undergo
+ * parameter type adjustment.
+ *
+ * A variably modified type is a VLA type, or a type containing a VMT type, for
+ * instance, a pointer to a VLA or a pointer to a pointer to a VLA.
+ *
+ * Function parameters and function type parameters of type `T[]` are adjusted
+ * to type `T*`, which can turn VMTs into non-VMTs. To check if a parameter
+ * type is a VMT, use `VariablyModifiedTypeIfAdjusted`.
+ */
+class VariablyModifiedTypeIfUnadjusted extends Type {
+  CandidateVlaType innerVlaType;
+
+  VariablyModifiedTypeIfUnadjusted() {
+    // Take care that `int[x][y]` only matches for `innerVlaType = int[y]`.
+    if this instanceof CandidateVlaType
+    then innerVlaType = this
+    else innerVlaType = this.(NoAdjustmentVariablyModifiedType).getInnerVlaType()
+  }
+
+  CandidateVlaType getInnerVlaType() { result = innerVlaType }
+}
+
+/**
+ * A type that is a variably modified type (VMT) if it undergoes parameter type
+ * adjustment.
+ *
+ * A variably modified type is a VLA type, or a type containing a VMT type, for
+ * instance, a pointer to a VLA or a pointer to a pointer to a VLA.
+ *
+ * Function parameters and function type parameters of type `T[]` are adjusted
+ * to type `T*`, which can turn VMTs into non-VMTs. To check if a non-parameter
+ * type (for instance, the type of a local variable) is a VMT, use
+ * `VariablyModifiedTypeIfUnadjusted`.
+ */
+class VariablyModifiedTypeIfAdjusted extends Type {
+  CandidateVlaType innerVlaType;
+
+  VariablyModifiedTypeIfAdjusted() {
+    innerVlaType = this.(ParameterAdjustedVariablyModifiedType).getInnerVlaType()
+    or
+    innerVlaType = this.(NoAdjustmentVariablyModifiedType).getInnerVlaType()
+  }
+
+  CandidateVlaType getInnerVlaType() { result = innerVlaType }
+}
+
+/**
+ * A variably modified type candidate which is unaffected by parameter type
+ * adjustment (from `T[]` to `*T`).
+ *
+ * Parameter adjustment (from `T[]` to `*T`) occurs on all function parameter
+ * types for exactly one level of depth.
+ *
+ * A variably-modified type (VMT) is a type which includes an inner type that is
+ * a VLA type. That is to say, a pointer to a VLA is a VMT, and a pointer to a
+ * VMT is a VMT.
+ *
+ * Note: This class does *not* match all VLA types. While VLA types *are* VMTs,
+ * VMTs can be parameter-adjusted to pointers, which are not VLA types. This
+ * class *will* match multidimensional VLAs, as those are adjusted to pointers
+ * to VLAs, and pointers to VLAs are VMTs.
+ */
+class NoAdjustmentVariablyModifiedType extends Type {
+  CandidateVlaType vlaType;
+
+  NoAdjustmentVariablyModifiedType() {
+    exists(Type innerType |
+      (
+        innerType = this.(PointerType).getBaseType()
+        or
+        innerType = this.(ArrayType).getBaseType()
+        or
+        innerType = this.(RoutineType).getReturnType()
+        or
+        innerType = this.(RoutineType).getAParameterType()
+        or
+        innerType = this.(FunctionPointerType).getReturnType()
+        or
+        innerType = this.(TypedefType).getBaseType()
+        or
+        innerType = this.(SpecifiedType).getBaseType()
+      ) and
+      vlaType = innerType.(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
+    )
+    or
+    vlaType =
+      this.(FunctionPointerType)
+          .getAParameterType()
+          .(VariablyModifiedTypeIfAdjusted)
+          .getInnerVlaType()
+    or
+    vlaType =
+      this.(RoutineType).getAParameterType().(VariablyModifiedTypeIfAdjusted).getInnerVlaType()
+  }
+
+  CandidateVlaType getInnerVlaType() { result = vlaType }
+}
+
+/**
+ * An array type that adjusts to a variably-modified type (a type which is or
+ * contains a VLA type) when it is a parameter type.
+ *
+ * A variably-modified type (VMT) is a VLA type or a type which has an inner type
+ * that is a VMT type, for instance, a pointer to a VLA type.
+ *
+ * Parameter adjustment occurs on all function parameter types, changing type
+ * `T[]` to `*T` for exactly one level of depth. Therefore, a VLA type will not
+ * be a VLA type/VMT after parameter adjustment, unless it is an array of VMTs,
+ * such that it parameter adjustment produces a pointer to a VMT.
+ */
+class ParameterAdjustedVariablyModifiedType extends ArrayType {
+  CandidateVlaType innerVlaType;
+
+  ParameterAdjustedVariablyModifiedType() {
+    innerVlaType = getBaseType().(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
+  }
+
+  CandidateVlaType getInnerVlaType() { result = innerVlaType }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/InvalidMemory3.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/InvalidMemory3.qll
new file mode 100644
index 0000000000..c4e39882ec
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/InvalidMemory3.qll
@@ -0,0 +1,61 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype InvalidMemory3Query =
+  TPointersToVariablyModifiedArrayTypesUsedQuery() or
+  TArrayToPointerConversionOfTemporaryObjectQuery() or
+  TModifiableLValueSubscriptedWithTemporaryLifetimeQuery()
+
+predicate isInvalidMemory3QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `pointersToVariablyModifiedArrayTypesUsed` query
+    InvalidMemory3Package::pointersToVariablyModifiedArrayTypesUsedQuery() and
+  queryId =
+    // `@id` for the `pointersToVariablyModifiedArrayTypesUsed` query
+    "c/misra/pointers-to-variably-modified-array-types-used" and
+  ruleId = "RULE-18-10" and
+  category = "mandatory"
+  or
+  query =
+    // `Query` instance for the `arrayToPointerConversionOfTemporaryObject` query
+    InvalidMemory3Package::arrayToPointerConversionOfTemporaryObjectQuery() and
+  queryId =
+    // `@id` for the `arrayToPointerConversionOfTemporaryObject` query
+    "c/misra/array-to-pointer-conversion-of-temporary-object" and
+  ruleId = "RULE-18-9" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `modifiableLValueSubscriptedWithTemporaryLifetime` query
+    InvalidMemory3Package::modifiableLValueSubscriptedWithTemporaryLifetimeQuery() and
+  queryId =
+    // `@id` for the `modifiableLValueSubscriptedWithTemporaryLifetime` query
+    "c/misra/modifiable-l-value-subscripted-with-temporary-lifetime" and
+  ruleId = "RULE-18-9" and
+  category = "required"
+}
+
+module InvalidMemory3Package {
+  Query pointersToVariablyModifiedArrayTypesUsedQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `pointersToVariablyModifiedArrayTypesUsed` query
+      TQueryC(TInvalidMemory3PackageQuery(TPointersToVariablyModifiedArrayTypesUsedQuery()))
+  }
+
+  Query arrayToPointerConversionOfTemporaryObjectQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `arrayToPointerConversionOfTemporaryObject` query
+      TQueryC(TInvalidMemory3PackageQuery(TArrayToPointerConversionOfTemporaryObjectQuery()))
+  }
+
+  Query modifiableLValueSubscriptedWithTemporaryLifetimeQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `modifiableLValueSubscriptedWithTemporaryLifetime` query
+      TQueryC(TInvalidMemory3PackageQuery(TModifiableLValueSubscriptedWithTemporaryLifetimeQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index 581585da5c..ca2097f073 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -37,6 +37,7 @@ import IO4
 import IntegerOverflow
 import InvalidMemory1
 import InvalidMemory2
+import InvalidMemory3
 import Language1
 import Language2
 import Language3
@@ -111,6 +112,7 @@ newtype TCQuery =
   TIntegerOverflowPackageQuery(IntegerOverflowQuery q) or
   TInvalidMemory1PackageQuery(InvalidMemory1Query q) or
   TInvalidMemory2PackageQuery(InvalidMemory2Query q) or
+  TInvalidMemory3PackageQuery(InvalidMemory3Query q) or
   TLanguage1PackageQuery(Language1Query q) or
   TLanguage2PackageQuery(Language2Query q) or
   TLanguage3PackageQuery(Language3Query q) or
@@ -185,6 +187,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isIntegerOverflowQueryMetadata(query, queryId, ruleId, category) or
   isInvalidMemory1QueryMetadata(query, queryId, ruleId, category) or
   isInvalidMemory2QueryMetadata(query, queryId, ruleId, category) or
+  isInvalidMemory3QueryMetadata(query, queryId, ruleId, category) or
   isLanguage1QueryMetadata(query, queryId, ruleId, category) or
   isLanguage2QueryMetadata(query, queryId, ruleId, category) or
   isLanguage3QueryMetadata(query, queryId, ruleId, category) or
diff --git a/cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll b/cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll
new file mode 100644
index 0000000000..d27034f50d
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll
@@ -0,0 +1,48 @@
+import cpp
+import codingstandards.cpp.Clvalues
+
+/**
+ * A struct or union type that contains an array type.
+ */
+class StructOrUnionTypeWithArrayField extends Struct {
+  StructOrUnionTypeWithArrayField() {
+    this.getAField().getUnspecifiedType() instanceof ArrayType
+    or
+    // nested struct or union containing an array type
+    this.getAField().getUnspecifiedType().(Struct) instanceof StructOrUnionTypeWithArrayField
+  }
+}
+
+/**
+ * A non-lvalue expression with struct or or union type that has a field member
+ * of array type, has a temporary lifetime.
+ *
+ * The array members are also part of that object, and thus also have temporary
+ * lifetime.
+ */
+class TemporaryLifetimeExpr extends Expr {
+  TemporaryLifetimeExpr() {
+    getUnconverted().getUnspecifiedType() instanceof StructOrUnionTypeWithArrayField and
+    not isCLValue(this)
+    or
+    this.(ArrayExpr).getArrayBase() instanceof TemporaryLifetimeArrayAccess
+  }
+}
+
+/**
+ * A field access on a temporary object that returns an array member.
+ */
+class TemporaryLifetimeArrayAccess extends FieldAccess {
+  // The temporary lifetime object which owns the array that is returned.
+  TemporaryLifetimeExpr temporary;
+
+  TemporaryLifetimeArrayAccess() {
+    getQualifier().getUnconverted() = temporary and
+    getUnspecifiedType() instanceof ArrayType
+  }
+
+  /**
+   * Get the temporary lifetime object which own the array that is returned.
+   */
+  Expr getTemporary() { result = temporary }
+}
diff --git a/rule_packages/c/InvalidMemory3.json b/rule_packages/c/InvalidMemory3.json
new file mode 100644
index 0000000000..feeb8b2b47
--- /dev/null
+++ b/rule_packages/c/InvalidMemory3.json
@@ -0,0 +1,59 @@
+{
+  "MISRA-C-2012": {
+    "RULE-18-10": {
+      "properties": {
+        "obligation": "mandatory"
+      },
+      "queries": [
+        {
+          "description": "Pointers to variably-modified array types shall not be used, as these pointer types are frequently incompatible with other fixed or variably sized arrays, resulting in undefined behavior.",
+          "kind": "problem",
+          "name": "Pointers to variably-modified array types shall not be used",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "PointersToVariablyModifiedArrayTypesUsed",
+          "tags": [
+            "external/misra/c/2012/amendment4",
+            "correctness",
+            "security"
+          ]
+        }
+      ],
+      "title": "Pointers to variably-modified array types shall not be used"
+    },
+    "RULE-18-9": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "Modifying or accessing elements of an array with temporary lifetime that has been converted to a pointer will result in undefined behavior.",
+          "kind": "problem",
+          "name": "An object with temporary lifetime shall not undergo array to pointer conversion",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "ArrayToPointerConversionOfTemporaryObject",
+          "tags": [
+            "external/misra/c/2012/amendment3",
+            "correctness",
+            "security"
+          ]
+        },
+        {
+          "description": "Modifying elements of an array with temporary lifetime will result in undefined behavior.",
+          "kind": "problem",
+          "name": "Usage of the subscript operator on an object with temporary lifetime shall not return a modifiable value",
+          "precision": "high",
+          "severity": "error",
+          "short_name": "ModifiableLValueSubscriptedWithTemporaryLifetime",
+          "tags": [
+            "external/misra/c/2012/amendment3",
+            "correctness",
+            "security"
+          ]
+        }
+      ],
+      "title": "An object with temporary lifetime shall not undergo array to pointer conversion"
+    }
+  }
+}
\ No newline at end of file

From ee78b9bd4ca36b9d0897844fd88b0e7747cd07ba Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 16 Oct 2024 17:00:02 -0700
Subject: [PATCH 307/435] Fix query metadata

---
 c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
index dda3dd4b9e..8066cc80cb 100644
--- a/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
+++ b/c/misra/src/rules/RULE-21-24/CallToBannedRandomFunction.ql
@@ -2,7 +2,7 @@
  * @id c/misra/call-to-banned-random-function
  * @name RULE-21-24: The random number generator functions of <stdlib.h> shall not be used
  * @description The standard functions rand() and srand() will not give high quality random results
- *              in all implementations and is thus banned.
+ *              in all implementations and are therefore banned.
  * @kind problem
  * @precision very-high
  * @problem.severity warning

From 5b5777f324fe95090641e5cd8eb922b176377f6a Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Wed, 16 Oct 2024 17:03:59 -0700
Subject: [PATCH 308/435] Fix formatting

---
 ...PointersToVariablyModifiedArrayTypesUsed.ql | 11 +++++------
 ...leLValueSubscriptedWithTemporaryLifetime.ql |  1 -
 ...rsToVariablyModifiedArrayTypesUsed.expected |  4 ++--
 c/misra/test/rules/RULE-18-10/test.c           | 18 +++++++++---------
 .../src/codingstandards/cpp/Clvalues.qll       |  2 +-
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
index 5a4edb4a98..fec8f5d2e1 100644
--- a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
@@ -22,14 +22,14 @@ import codingstandards.cpp.VariablyModifiedTypes
  * Check that the declaration entry, which may be a parameter or a variable
  * etc., seems to subsume the location of `inner`, including the declaration
  * type text.
- * 
+ *
  * The location of the `DeclarationEntry` itself points to the _identifier_
  * that is declared. This range will not include the type of the declaration.
- * 
+ *
  * For parameters, the `before` and `end` `Location` objects will be
  * constrained to the closest earlier element (parameter or function body),
  * these values can therefore be captured and inspected for debugging.
- * 
+ *
  * For declarations which occur in statements, the `before` and `end`
  * `Location` objects will be both constrained to be equal, and equal to,
  * the `Location` of the containing `DeclStmt`.
@@ -71,7 +71,6 @@ predicate declarationSubsumes(
 class InvalidDeclaration extends DeclarationEntry {
   Expr sizeExpr;
   CandidateVlaType vlaType;
-
   // `before` and `after` are captured for debugging, see doc comment for
   // `declarationSubsumes`.
   Location before;
@@ -84,9 +83,9 @@ class InvalidDeclaration extends DeclarationEntry {
       if this instanceof ParameterDeclarationEntry
       then vlaType = this.getType().(VariablyModifiedTypeIfAdjusted).getInnerVlaType()
       else vlaType = this.getType().(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
-    )
+    ) and
     // Capture only pointers to VLA types, not raw VLA types.
-    and not vlaType = this.getType()
+    not vlaType = this.getType()
   }
 
   Expr getSizeExpr() { result = sizeExpr }
diff --git a/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
index 468e44f3bb..f8a341b9bd 100644
--- a/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
+++ b/c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql
@@ -45,7 +45,6 @@ predicate usedAsModifiableLvalue(Expr expr) {
   exists(AddressOfExpr parent | parent.getOperand() = expr)
   or
   exists(FieldAccess parent | parent.getQualifier() = expr and usedAsModifiableLvalue(parent))
-
 }
 
 from TemporaryLifetimeArrayExpr expr, TemporaryLifetimeArrayAccess member
diff --git a/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected b/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected
index 87cb3de5c7..76b3da5eb0 100644
--- a/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected
+++ b/c/misra/test/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.expected
@@ -7,11 +7,11 @@
 | test.c:25:13:25:15 | definition of p10 | Parameter p10 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int *' | test.c:25:18:25:19 | p0 | p0 |
 | test.c:28:12:28:14 | definition of p11 | Parameter p11 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:28:21:28:22 | p0 | p0 |
 | test.c:32:17:32:19 | definition of p13 | Parameter p13 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'const int' | test.c:32:22:32:23 | p0 | p0 |
-| test.c:33:18:33:20 | definition of p14 | Parameter p14 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:33:23:33:24 | p0 | p0 |
+| test.c:33:17:33:19 | definition of p14 | Parameter p14 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:33:22:33:23 | p0 | p0 |
 | test.c:40:12:40:14 | definition of p17 | Parameter p17 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:40:24:40:25 | p0 | p0 |
 | test.c:41:14:41:16 | definition of p18 | Parameter p18 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:41:27:41:28 | p0 | p0 |
 | test.c:68:9:68:11 | definition of p27 | Parameter p27 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:68:13:68:14 | p0 | p0 |
 | test.c:68:9:68:11 | definition of p27 | Parameter p27 is adjusted to variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:68:17:68:18 | p0 | p0 |
 | test.c:74:8:74:9 | definition of l3 | Variable l3 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int' | test.c:74:12:74:13 | p0 | p0 |
 | test.c:79:15:79:16 | definition of l4 | Variable l4 is declared with variably-modified type, pointer to variable length array of non constant size $@ and element type 'int' | test.c:79:19:79:20 | p0 | p0 |
-| test.c:84:17:84:19 | declaration of td3 | Declaration td3 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:84:22:84:23 | p0 | p0 |
+| test.c:84:16:84:18 | declaration of td3 | Declaration td3 is declared with variably-modified type, with inner variable length array of non constant size $@ and element type 'int' | test.c:84:21:84:22 | p0 | p0 |
diff --git a/c/misra/test/rules/RULE-18-10/test.c b/c/misra/test/rules/RULE-18-10/test.c
index cf90e256e7..dbddbecec8 100644
--- a/c/misra/test/rules/RULE-18-10/test.c
+++ b/c/misra/test/rules/RULE-18-10/test.c
@@ -21,16 +21,16 @@ void f1(
 
     // Types referring to pointers to VMTs:
     // - pointer to pointer to VMT
-    int(*(*p9)[p0]), // NON-COMPLIANT
+    int(*(*p9)[p0]),   // NON-COMPLIANT
     int(*(**p10)[p0]), // NON-COMPLIANT
 
     // - array of pointers to VMT
     int (*(p11[3]))[p0], // NON-COMPLIANT
 
     // - const VMTs, const array-to-pointer adjustment
-    const int p12[p0],        // COMPLIANT
-    const int (*p13)[p0],     // NON-COMPLIANT
-    int (* const p14)[p0],    // NON-COMPLIANT
+    const int p12[p0],    // COMPLIANT
+    const int (*p13)[p0], // NON-COMPLIANT
+    int (*const p14)[p0], // NON-COMPLIANT
 
     // - function types with argument that is a pointer to a VMT
     int p15(int (*inner)[p0]),    // NON-COMPLIANT[FALSE_NEGATIVE]
@@ -58,7 +58,7 @@ void f1(
 
     // Unknown array length types:
     int p21[],       // COMPLIANT
-    int p22[][],       // COMPLIANT
+    int p22[][],     // COMPLIANT
     int (*p23)[],    // COMPLIANT
     int (*p24)[2][], // COMPLIANT
     int (*p25)[][2], // COMPLIANT
@@ -68,7 +68,7 @@ void f1(
     int p27[p0][p0] // NON-COMPLIANT
 ) {
   // Local variables may contain pointers to VMTs:
-  int l0[p0]; // COMPLIANT
+  int l0[p0];   // COMPLIANT
   int(*l1)[];   // COMPLIANT
   int(*l2)[3];  // COMPLIANT
   int(*l3)[p0]; // NON-COMPLIANT
@@ -79,9 +79,9 @@ void f1(
   static int(*l4)[p0]; // NON-COMPLIANT
 
   // Block scope typedefs may refer to VMTs
-  typedef int (*td1)[3]; // COMPLIANT
-  typedef int (*td2)[]; // COMPLIANT
-  typedef int (*td3)[p0]; // NON-COMPLIANT
+  typedef int(*td1)[3];  // COMPLIANT
+  typedef int(*td2)[];   // COMPLIANT
+  typedef int(*td3)[p0]; // NON-COMPLIANT
 
   td3 l5; // NON-COMPLIANT
 }
diff --git a/cpp/common/src/codingstandards/cpp/Clvalues.qll b/cpp/common/src/codingstandards/cpp/Clvalues.qll
index 2e330e0732..73fcd65eb1 100644
--- a/cpp/common/src/codingstandards/cpp/Clvalues.qll
+++ b/cpp/common/src/codingstandards/cpp/Clvalues.qll
@@ -14,4 +14,4 @@ predicate isCLValue(Expr expr) {
   not expr instanceof AssignExpr and
   not expr instanceof CommaExpr and
   not exists(Cast c | c = expr.getConversion*())
-}
\ No newline at end of file
+}

From b7783606813a27a79cfec71e6fc1de62a980f5df Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 17 Oct 2024 15:05:20 -0700
Subject: [PATCH 309/435] Use shared queries / generally report obsolescent
 features even if redundant.

Redundant reports should not be a common user issue; these features are
obsolescent and likely rarely used and less often to be excepted.

Implement ungetc() on a zero-offset stream and specific banning of gets(), as
the redundant rules for those obsolescent features report a far wider set of
issues than banned by RULE-1-5.

Implementation of banning ungetc() on a zero-offset stream is not thorough or
comprehensive. This should be fine. False positives should not create any user
issues because the call of the function overall is banned. And false negatives
should not be an issue, for the same reason.
---
 ...tionTypesNotInPrototypeFormShared.expected |  4 +
 ...esNotInPrototypeFormShared.expected.clang} |  0
 .../FunctionTypesNotInPrototypeFormShared.ql  |  4 +
 .../test.c                                    |  5 --
 .../test.c.clang                              |  0
 ...pecifierObjectRedeclarationShared.expected |  1 +
 ...taticSpecifierObjectRedeclarationShared.ql |  5 ++
 .../test.c                                    |  8 ++
 .../RULE-1-5/CallToObsolescentFunctionGets.ql | 22 +++++
 ...FunctionTypesNotInPrototypeFormObsolete.ql | 23 +++++
 ...taticSpecifierFuncRedeclarationObsolete.ql | 23 +++++
 ...ticSpecifierObjectRedeclarationObsolete.ql | 23 +++++
 .../UngetcCallOnStreamPositionZero.ql         | 69 +++++++++++++++
 .../FunctionTypesNotInPrototypeForm.ql        | 46 ++--------
 ...singStaticSpecifierObjectRedeclarationC.ql | 17 ++--
 .../CallToObsolescentFunctionGets.expected    |  1 +
 .../CallToObsolescentFunctionGets.qlref       |  1 +
 .../FunctionTypesNotInPrototypeForm.expected  |  2 -
 .../FunctionTypesNotInPrototypeForm.qlref     |  1 -
 ...ionTypesNotInPrototypeFormObsolete.testref |  1 +
 ...llocDeallocFunctionsOfStdlibhUsed.expected |  3 -
 ...ryAllocDeallocFunctionsOfStdlibhUsed.qlref |  1 -
 ...SpecifierFuncRedeclarationObsolete.testref |  1 +
 ...aticSpecifierObjectRedeclarationC.expected |  1 -
 ...gStaticSpecifierObjectRedeclarationC.qlref |  1 -
 ...ecifierObjectRedeclarationObsolete.testref |  1 +
 ...rdLibraryInputoutputFunctionsUsed.expected |  3 -
 ...ndardLibraryInputoutputFunctionsUsed.qlref |  1 -
 .../UngetcCallOnStreamPositionZero.expected   |  1 +
 .../UngetcCallOnStreamPositionZero.qlref      |  1 +
 c/misra/test/rules/RULE-1-5/test.c            | 27 ++----
 .../FunctionTypesNotInPrototypeForm.expected  |  4 -
 .../FunctionTypesNotInPrototypeForm.qlref     |  1 -
 .../FunctionTypesNotInPrototypeForm.testref   |  1 +
 ...aticSpecifierObjectRedeclarationC.expected |  1 -
 ...gStaticSpecifierObjectRedeclarationC.qlref |  1 -
 ...taticSpecifierObjectRedeclarationC.testref |  1 +
 c/misra/test/rules/RULE-8-8/test.c            | 13 ---
 .../cpp/exclusions/c/Language4.qll            | 85 +++++++++++++++++++
 .../FunctionTypesNotInPrototypeFormShared.qll | 54 ++++++++++++
 ...aticSpecifierObjectRedeclarationShared.qll | 27 ++++++
 rule_packages/c/Declarations4.json            |  1 +
 rule_packages/c/Declarations5.json            |  1 +
 rule_packages/c/Language4.json                | 77 ++++++++++++++++-
 44 files changed, 450 insertions(+), 114 deletions(-)
 create mode 100644 c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.expected
 rename c/{misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected.clang => common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.expected.clang} (100%)
 create mode 100644 c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.ql
 rename c/{misra/test/rules/RULE-8-2 => common/test/rules/functiontypesnotinprototypeformshared}/test.c (50%)
 rename c/{misra/test/rules/RULE-8-2 => common/test/rules/functiontypesnotinprototypeformshared}/test.c.clang (100%)
 create mode 100644 c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.expected
 create mode 100644 c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.ql
 create mode 100644 c/common/test/rules/missingstaticspecifierobjectredeclarationshared/test.c
 create mode 100644 c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
 create mode 100644 c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
 create mode 100644 c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
 create mode 100644 c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
 create mode 100644 c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
 create mode 100644 c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.qlref
 delete mode 100644 c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
 delete mode 100644 c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.testref
 delete mode 100644 c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
 delete mode 100644 c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.testref
 delete mode 100644 c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
 delete mode 100644 c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.testref
 delete mode 100644 c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
 delete mode 100644 c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.qlref
 delete mode 100644 c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected
 delete mode 100644 c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.qlref
 create mode 100644 c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.testref
 delete mode 100644 c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected
 delete mode 100644 c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.qlref
 create mode 100644 c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.testref
 delete mode 100644 c/misra/test/rules/RULE-8-8/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.qll
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.qll

diff --git a/c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.expected b/c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.expected
new file mode 100644
index 0000000000..f2c08897b8
--- /dev/null
+++ b/c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.expected
@@ -0,0 +1,4 @@
+| test.c:3:6:3:7 | f1 | Function f1 declares parameter that is unnamed. |
+| test.c:4:6:4:7 | f2 | Function f2 does not specify void for no parameters present. |
+| test.c:5:6:5:7 | f3 | Function f3 does not specify void for no parameters present. |
+| test.c:7:5:7:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
diff --git a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected.clang b/c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.expected.clang
similarity index 100%
rename from c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected.clang
rename to c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.expected.clang
diff --git a/c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.ql b/c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.ql
new file mode 100644
index 0000000000..25d273354d
--- /dev/null
+++ b/c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functiontypesnotinprototypeformshared.FunctionTypesNotInPrototypeFormShared
+
+class TestFileQuery extends FunctionTypesNotInPrototypeFormSharedSharedQuery, TestQuery { }
diff --git a/c/misra/test/rules/RULE-8-2/test.c b/c/common/test/rules/functiontypesnotinprototypeformshared/test.c
similarity index 50%
rename from c/misra/test/rules/RULE-8-2/test.c
rename to c/common/test/rules/functiontypesnotinprototypeformshared/test.c
index 1ed64c0011..c254a221d9 100644
--- a/c/misra/test/rules/RULE-8-2/test.c
+++ b/c/common/test/rules/functiontypesnotinprototypeformshared/test.c
@@ -1,8 +1,3 @@
-// Note: A subset of these cases are also tested in c/misra/test/rules/RULE-1-5
-// via a FunctionTypesNotInPrototypeForm.qlref and .expected file in that
-// directory. Changes to these tests may require updating the test code or
-// expectations in that directory as well.
-
 void f(int x);    // COMPLIANT
 void f0(void);    // COMPLIANT
 void f1(int);     // NON_COMPLIANT
diff --git a/c/misra/test/rules/RULE-8-2/test.c.clang b/c/common/test/rules/functiontypesnotinprototypeformshared/test.c.clang
similarity index 100%
rename from c/misra/test/rules/RULE-8-2/test.c.clang
rename to c/common/test/rules/functiontypesnotinprototypeformshared/test.c.clang
diff --git a/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.expected b/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.expected
new file mode 100644
index 0000000000..34a7723bcd
--- /dev/null
+++ b/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.expected
@@ -0,0 +1 @@
+| test.c:2:12:2:12 | declaration of g | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:1:12:1:12 | definition of g | g |
diff --git a/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.ql b/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.ql
new file mode 100644
index 0000000000..3d6d2019fb
--- /dev/null
+++ b/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.ql
@@ -0,0 +1,5 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.missingstaticspecifierobjectredeclarationshared.MissingStaticSpecifierObjectRedeclarationShared
+
+class TestFileQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery, TestQuery {
+}
diff --git a/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/test.c b/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/test.c
new file mode 100644
index 0000000000..d98d71c6f0
--- /dev/null
+++ b/c/common/test/rules/missingstaticspecifierobjectredeclarationshared/test.c
@@ -0,0 +1,8 @@
+static int g = 0;
+extern int g; // NON_COMPLIANT
+
+static int g1;
+static int g1 = 0; // COMPLIANT
+
+int g2;
+int g2 = 0; // COMPLIANT
diff --git a/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql b/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
new file mode 100644
index 0000000000..4994c4ea6e
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/CallToObsolescentFunctionGets.ql
@@ -0,0 +1,22 @@
+/**
+ * @id c/misra/call-to-obsolescent-function-gets
+ * @name RULE-1-5: Disallowed usage of obsolescent function 'gets'
+ * @description The function 'gets' is an obsolescent language feature which was removed in C11.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-1-5
+ *       external/misra/c/2012/amendment3
+ *       security
+ *       maintainability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from FunctionCall fc
+where
+  not isExcluded(fc, Language4Package::callToObsolescentFunctionGetsQuery()) and
+  fc.getTarget().hasGlobalOrStdName("gets")
+select fc, "Call to obsolescent function 'gets'."
diff --git a/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
new file mode 100644
index 0000000000..8f0e626bc8
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
@@ -0,0 +1,23 @@
+/**
+ * @id c/misra/function-types-not-in-prototype-form-obsolete
+ * @name RULE-1-5: Function types shall be in prototype form with named parameters
+ * @description The use of non-prototype format parameter type declarators is an obsolescent
+ *              language feature.
+ * @kind problem
+ * @precision medium
+ * @problem.severity error
+ * @tags external/misra/id/rule-1-5
+ *       correctness
+ *       external/misra/c/2012/amendment3
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.rules.functiontypesnotinprototypeformshared.FunctionTypesNotInPrototypeFormShared
+
+class FunctionTypesNotInPrototypeFormObsoleteQuery extends FunctionTypesNotInPrototypeFormSharedSharedQuery {
+  FunctionTypesNotInPrototypeFormObsoleteQuery() {
+    this = Language4Package::functionTypesNotInPrototypeFormObsoleteQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
new file mode 100644
index 0000000000..5a70e0287a
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
@@ -0,0 +1,23 @@
+/**
+ * @id c/misra/missing-static-specifier-func-redeclaration-obsolete
+ * @name RULE-1-5: If a function has internal linkage then all re-declarations shall include the static storage class
+ * @description Declaring a function with internal linkage without the static storage class
+ *              specifier is an obselescent feature.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-1-5
+ *       readability
+ *       external/misra/c/2012/amendment3
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.rules.missingstaticspecifierfunctionredeclarationshared.MissingStaticSpecifierFunctionRedeclarationShared
+
+class MissingStaticSpecifierFuncRedeclarationObsoleteQuery extends MissingStaticSpecifierFunctionRedeclarationSharedSharedQuery {
+  MissingStaticSpecifierFuncRedeclarationObsoleteQuery() {
+    this = Language4Package::missingStaticSpecifierFuncRedeclarationObsoleteQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
new file mode 100644
index 0000000000..5e32d57c6a
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
@@ -0,0 +1,23 @@
+/**
+ * @id c/misra/missing-static-specifier-object-redeclaration-obsolete
+ * @name RULE-1-5: If an object has internal linkage then all re-declarations shall include the static storage class
+ * @description Declaring an identifier with internal linkage without the static storage class
+ *              specifier is an obselescent feature.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-1-5
+ *       readability
+ *       external/misra/c/2012/amendment3
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.rules.missingstaticspecifierobjectredeclarationshared.MissingStaticSpecifierObjectRedeclarationShared
+
+class MissingStaticSpecifierObjectRedeclarationObsoleteQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery {
+  MissingStaticSpecifierObjectRedeclarationObsoleteQuery() {
+    this = Language4Package::missingStaticSpecifierObjectRedeclarationObsoleteQuery()
+  }
+}
diff --git a/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql b/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
new file mode 100644
index 0000000000..a973442203
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
@@ -0,0 +1,69 @@
+/**
+ * @id c/misra/ungetc-call-on-stream-position-zero
+ * @name RULE-1-5: Disallowed obsolescent usage of 'ungetc' on a file stream at position zero
+ * @description Calling the function 'ungetc' on a file stream with a position of zero is an
+ *              obsolescent language feature.
+ * @kind problem
+ * @precision medium
+ * @problem.severity error
+ * @tags external/misra/id/rule-1-5
+ *       external/misra/c/2012/amendment3
+ *       security
+ *       maintainability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import semmle.code.cpp.dataflow.new.DataFlow
+import semmle.code.cpp.controlflow.Dominance
+import codingstandards.c.misra
+
+/**
+ * This is an inconclusive list, which is adequate, as RULE-21-3 provides
+ * assurance we won't have false negatives, or care too much about false
+ * positives.
+ */
+class MoveStreamPositionCall extends FunctionCall {
+  Expr streamArgument;
+
+  MoveStreamPositionCall() {
+    getTarget().hasGlobalOrStdName("fgetc") and
+    streamArgument = getArgument(0)
+    or
+    getTarget().hasGlobalOrStdName("getc") and
+    streamArgument = getArgument(0)
+    or
+    getTarget().hasGlobalOrStdName("fget") and
+    streamArgument = getArgument(2)
+    or
+    getTarget().hasGlobalOrStdName("fscanf") and
+    streamArgument = getArgument(0)
+    or
+    getTarget().hasGlobalOrStdName("fsetpos") and
+    streamArgument = getArgument(0)
+    or
+    getTarget().hasGlobalOrStdName("fseek") and
+    streamArgument = getArgument(0)
+    or
+    getTarget().hasGlobalOrStdName("fread") and
+    streamArgument = getArgument(3)
+  }
+
+  Expr getStreamArgument() { result = streamArgument }
+}
+
+from FunctionCall ungetc, DataFlow::Node file
+where
+  not isExcluded(ungetc, Language4Package::ungetcCallOnStreamPositionZeroQuery()) and
+  // ungetc() called on file stream
+  ungetc.getTarget().hasGlobalOrStdName("ungetc") and
+  DataFlow::localFlow(file, DataFlow::exprNode(ungetc.getArgument(1))) and
+  // ungetc() is not dominated by a fread() etc to that file stream
+  not exists(MoveStreamPositionCall moveStreamCall |
+    DataFlow::localFlow(file, DataFlow::exprNode(moveStreamCall.getStreamArgument())) and
+    dominates(moveStreamCall, ungetc)
+  )
+  // the file stream is the root of the local data flow
+  and not DataFlow::localFlow(any(DataFlow::Node n | not n = file), file)
+select ungetc, "Obsolescent call to ungetc on file stream $@ at position zero.", file,
+  file.toString()
diff --git a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
index 73294d776b..1136dd714e 100644
--- a/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
+++ b/c/misra/src/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
@@ -14,46 +14,10 @@
 
 import cpp
 import codingstandards.c.misra
-import codingstandards.cpp.Identifiers
+import codingstandards.cpp.rules.functiontypesnotinprototypeformshared.FunctionTypesNotInPrototypeFormShared
 
-/**
- * `Parameter`s without names
- */
-class UnnamedParameter extends Parameter {
-  UnnamedParameter() { not this.isNamed() }
+class FunctionTypesNotInPrototypeFormQuery extends FunctionTypesNotInPrototypeFormSharedSharedQuery {
+  FunctionTypesNotInPrototypeFormQuery() {
+    this = Declarations4Package::functionTypesNotInPrototypeFormQuery()
+  }
 }
-
-/*
- * This is a copy of the private `hasZeroParamDecl` predicate from the standard set of
- * queries as of the `codeql-cli/2.11.2` tag in `github/codeql`.
- */
-
-predicate hasZeroParamDecl(Function f) {
-  exists(FunctionDeclarationEntry fde | fde = f.getADeclarationEntry() |
-    not fde.isImplicit() and
-    not fde.hasVoidParamList() and
-    fde.getNumberOfParameters() = 0 and
-    not fde.isDefinition()
-  )
-}
-
-from Function f, string msg
-where
-  not isExcluded(f, Declarations4Package::functionTypesNotInPrototypeFormQuery()) and
-  f instanceof InterestingIdentifiers and
-  (
-    f.getAParameter() instanceof UnnamedParameter and
-    msg = "Function " + f + " declares parameter that is unnamed."
-    or
-    hasZeroParamDecl(f) and
-    msg = "Function " + f + " does not specify void for no parameters present."
-    or
-    //parameters declared in declaration list (not in function signature)
-    //have placeholder file location associated only
-    exists(Parameter p |
-      p.getFunction() = f and
-      not p.getFile() = f.getFile() and
-      msg = "Function " + f + " declares parameter in unsupported declaration list."
-    )
-  )
-select f, msg
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
index 65c878e883..6f731c636f 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
@@ -14,15 +14,10 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.rules.missingstaticspecifierobjectredeclarationshared.MissingStaticSpecifierObjectRedeclarationShared
 
-from VariableDeclarationEntry redeclaration, VariableDeclarationEntry de
-where
-  not isExcluded(redeclaration,
-    Declarations5Package::missingStaticSpecifierObjectRedeclarationCQuery()) and
-  //following implies de != redeclaration
-  de.hasSpecifier("static") and
-  not redeclaration.hasSpecifier("static") and
-  de.getDeclaration().isTopLevel() and
-  redeclaration.getDeclaration() = de.getDeclaration()
-select redeclaration, "The redeclaration of $@ with internal linkage misses the static specifier.",
-  de, de.getName()
+class MissingStaticSpecifierObjectRedeclarationCQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery {
+  MissingStaticSpecifierObjectRedeclarationCQuery() {
+    this = Declarations5Package::missingStaticSpecifierObjectRedeclarationCQuery()
+  }
+}
diff --git a/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected b/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected
new file mode 100644
index 0000000000..6e0088f4ac
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected
@@ -0,0 +1 @@
+| test.c:36:3:36:6 | call to gets | Call to obsolescent function 'gets'. |
diff --git a/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.qlref b/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.qlref
new file mode 100644
index 0000000000..1a2ec096cf
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.qlref
@@ -0,0 +1 @@
+rules/RULE-1-5/CallToObsolescentFunctionGets.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
deleted file mode 100644
index 29faec8b55..0000000000
--- a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| test.c:38:6:38:7 | f2 | Function f2 does not specify void for no parameters present. |
-| test.c:42:5:42:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref
deleted file mode 100644
index 0a6121b324..0000000000
--- a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeForm.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.testref b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.testref
new file mode 100644
index 0000000000..1a6a69fc24
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.testref
@@ -0,0 +1 @@
+c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
deleted file mode 100644
index de87fc8542..0000000000
--- a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| test.c:8:12:8:17 | call to malloc | Use of banned dynamic memory allocation. |
-| test.c:11:3:11:9 | call to realloc | Use of banned dynamic memory allocation. |
-| test.c:14:3:14:9 | call to realloc | Use of banned dynamic memory allocation. |
diff --git a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref b/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref
deleted file mode 100644
index 8f64b81ced..0000000000
--- a/c/misra/test/rules/RULE-1-5/MemoryAllocDeallocFunctionsOfStdlibhUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-21-3/MemoryAllocDeallocFunctionsOfStdlibhUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.testref b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.testref
new file mode 100644
index 0000000000..7d9f2ebc04
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.testref
@@ -0,0 +1 @@
+c/common/test/rules/missingstaticspecifierfunctionredeclarationshared/MissingStaticSpecifierFunctionRedeclarationShared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
deleted file mode 100644
index 48275eb504..0000000000
--- a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.c:35:12:35:13 | declaration of g5 | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:34:12:34:13 | definition of g5 | g5 |
diff --git a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref
deleted file mode 100644
index 70b6073e14..0000000000
--- a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationC.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.testref b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.testref
new file mode 100644
index 0000000000..23ed7c9fc5
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.testref
@@ -0,0 +1 @@
+c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
deleted file mode 100644
index 396b181150..0000000000
--- a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| test.c:53:3:53:8 | call to ungetc | Call to banned function ungetc. |
-| test.c:56:3:56:7 | call to fread | Call to banned function fread. |
-| test.c:58:3:58:8 | call to ungetc | Call to banned function ungetc. |
diff --git a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref b/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref
deleted file mode 100644
index 0a8cd754ef..0000000000
--- a/c/misra/test/rules/RULE-1-5/StandardLibraryInputoutputFunctionsUsed.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-21-6/StandardLibraryInputoutputFunctionsUsed.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
new file mode 100644
index 0000000000..4dd298197f
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
@@ -0,0 +1 @@
+| test.c:40:3:40:8 | call to ungetc | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:38:16:38:20 | call to fopen | call to fopen |
diff --git a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.qlref b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.qlref
new file mode 100644
index 0000000000..8c28919dcb
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.qlref
@@ -0,0 +1 @@
+rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/test.c b/c/misra/test/rules/RULE-1-5/test.c
index 4709381898..7632e0a727 100644
--- a/c/misra/test/rules/RULE-1-5/test.c
+++ b/c/misra/test/rules/RULE-1-5/test.c
@@ -4,8 +4,8 @@
 #include "stdlib.h"
 
 void f1(void) {
-  // malloc() is not obsolete, but banned by Rule 21.3
-  int *t = malloc(10); // COMPLIANT[False Negative]
+  // malloc() is not obsolete, though it is banned by Rule 21.3
+  int *t = malloc(10); // COMPLIANT
 
   // Obsolete usage of realloc.
   realloc(t, 0); // NON-COMPLIANT
@@ -28,25 +28,12 @@ const extern int g2; // NON-COMPLIANT
 _Atomic int g3 = ATOMIC_VAR_INIT(18); // NON-COMPLIANT
 _Atomic int g4 = 18;                  // COMPLIANT
 
-// The following cases are already covered by other rules:
-
-// Rule 8.8:
-static int g5 = 3; // COMPLIANT
-extern int g5;     // NON-COMPLIANT
-
-// Rule 8.2:
-void f2();     // NON-COMPLIANT
-void f3(void); // COMPLIANT
-
-void f4(int p1){}; // COMPLIANT
-int f5(x)          // NON_COMPLIANT
-int x;
-{ return 1; }
+// `gets` was removed from C11.
+extern char* gets(FILE *stream);
 
 // Rule 21.6 covers the below cases:
 void f6(void) {
-  // `gets` was removed from C11.
-  // gets(stdin); // NON_COMPLIANT
+  gets(stdin); // NON_COMPLIANT
 
   FILE *file = fopen("", 0);
   // Obsolete usage of ungetc.
@@ -54,6 +41,6 @@ void f6(void) {
 
   char buf[10];
   fread(buf, sizeof(buf), 10, file);
-  // This is not an obsolete usage of ungetc, but ungetc isn't allowed.
-  ungetc('c', file); // NON-COMPLIANT[FALSE NEGATIVE]
+  // This is not an obsolete usage of ungetc, though ungetc isn't allowed by 21-3.
+  ungetc('c', file); // COMPLIANT
 }
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected b/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected
deleted file mode 100644
index 1264797088..0000000000
--- a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| test.c:8:6:8:7 | f1 | Function f1 declares parameter that is unnamed. |
-| test.c:9:6:9:7 | f2 | Function f2 does not specify void for no parameters present. |
-| test.c:10:6:10:7 | f3 | Function f3 does not specify void for no parameters present. |
-| test.c:12:5:12:6 | f5 | Function f5 declares parameter in unsupported declaration list. |
diff --git a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.qlref b/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.qlref
deleted file mode 100644
index 0a6121b324..0000000000
--- a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-8-2/FunctionTypesNotInPrototypeForm.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.testref b/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.testref
new file mode 100644
index 0000000000..1a6a69fc24
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-2/FunctionTypesNotInPrototypeForm.testref
@@ -0,0 +1 @@
+c/common/test/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected b/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected
deleted file mode 100644
index 9c357cf38f..0000000000
--- a/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.c:7:12:7:12 | declaration of g | The redeclaration of $@ with internal linkage misses the static specifier. | test.c:6:12:6:12 | definition of g | g |
diff --git a/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.qlref b/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.qlref
deleted file mode 100644
index 70b6073e14..0000000000
--- a/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.testref b/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.testref
new file mode 100644
index 0000000000..23ed7c9fc5
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.testref
@@ -0,0 +1 @@
+c/common/test/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-8/test.c b/c/misra/test/rules/RULE-8-8/test.c
deleted file mode 100644
index ba78432a40..0000000000
--- a/c/misra/test/rules/RULE-8-8/test.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// Note: A subset of these cases are also tested in c/misra/test/rules/RULE-1-5
-// via a MissingStaticSpecifierObjectRedeclarationC.qlref and .expected file in
-// that directory. Changes to these tests may require updating the test code or
-// expectations in that directory as well.
-
-static int g = 0;
-extern int g; // NON_COMPLIANT
-
-static int g1;
-static int g1 = 0; // COMPLIANT
-
-int g2;
-int g2 = 0; // COMPLIANT
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
index f26cae3e9a..7bca9feefc 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
@@ -4,11 +4,43 @@ import RuleMetadata
 import codingstandards.cpp.exclusions.RuleMetadata
 
 newtype Language4Query =
+  TMissingStaticSpecifierFuncRedeclarationObsoleteQuery() or
+  TMissingStaticSpecifierObjectRedeclarationObsoleteQuery() or
+  TFunctionTypesNotInPrototypeFormObsoleteQuery() or
   TUseOfObsoleteMacroAtomicVarInitQuery() or
   TInvalidDefineOrUndefOfStdBoolMacroQuery() or
+  TCallToObsolescentFunctionGetsQuery() or
+  TUngetcCallOnStreamPositionZeroQuery() or
   TCallToReallocWithSizeZeroQuery()
 
 predicate isLanguage4QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `missingStaticSpecifierFuncRedeclarationObsolete` query
+    Language4Package::missingStaticSpecifierFuncRedeclarationObsoleteQuery() and
+  queryId =
+    // `@id` for the `missingStaticSpecifierFuncRedeclarationObsolete` query
+    "c/misra/missing-static-specifier-func-redeclaration-obsolete" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `missingStaticSpecifierObjectRedeclarationObsolete` query
+    Language4Package::missingStaticSpecifierObjectRedeclarationObsoleteQuery() and
+  queryId =
+    // `@id` for the `missingStaticSpecifierObjectRedeclarationObsolete` query
+    "c/misra/missing-static-specifier-object-redeclaration-obsolete" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `functionTypesNotInPrototypeFormObsolete` query
+    Language4Package::functionTypesNotInPrototypeFormObsoleteQuery() and
+  queryId =
+    // `@id` for the `functionTypesNotInPrototypeFormObsolete` query
+    "c/misra/function-types-not-in-prototype-form-obsolete" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
   query =
     // `Query` instance for the `useOfObsoleteMacroAtomicVarInit` query
     Language4Package::useOfObsoleteMacroAtomicVarInitQuery() and
@@ -27,6 +59,24 @@ predicate isLanguage4QueryMetadata(Query query, string queryId, string ruleId, s
   ruleId = "RULE-1-5" and
   category = "required"
   or
+  query =
+    // `Query` instance for the `callToObsolescentFunctionGets` query
+    Language4Package::callToObsolescentFunctionGetsQuery() and
+  queryId =
+    // `@id` for the `callToObsolescentFunctionGets` query
+    "c/misra/call-to-obsolescent-function-gets" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `ungetcCallOnStreamPositionZero` query
+    Language4Package::ungetcCallOnStreamPositionZeroQuery() and
+  queryId =
+    // `@id` for the `ungetcCallOnStreamPositionZero` query
+    "c/misra/ungetc-call-on-stream-position-zero" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
   query =
     // `Query` instance for the `callToReallocWithSizeZero` query
     Language4Package::callToReallocWithSizeZeroQuery() and
@@ -38,6 +88,27 @@ predicate isLanguage4QueryMetadata(Query query, string queryId, string ruleId, s
 }
 
 module Language4Package {
+  Query missingStaticSpecifierFuncRedeclarationObsoleteQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `missingStaticSpecifierFuncRedeclarationObsolete` query
+      TQueryC(TLanguage4PackageQuery(TMissingStaticSpecifierFuncRedeclarationObsoleteQuery()))
+  }
+
+  Query missingStaticSpecifierObjectRedeclarationObsoleteQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `missingStaticSpecifierObjectRedeclarationObsolete` query
+      TQueryC(TLanguage4PackageQuery(TMissingStaticSpecifierObjectRedeclarationObsoleteQuery()))
+  }
+
+  Query functionTypesNotInPrototypeFormObsoleteQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `functionTypesNotInPrototypeFormObsolete` query
+      TQueryC(TLanguage4PackageQuery(TFunctionTypesNotInPrototypeFormObsoleteQuery()))
+  }
+
   Query useOfObsoleteMacroAtomicVarInitQuery() {
     //autogenerate `Query` type
     result =
@@ -52,6 +123,20 @@ module Language4Package {
       TQueryC(TLanguage4PackageQuery(TInvalidDefineOrUndefOfStdBoolMacroQuery()))
   }
 
+  Query callToObsolescentFunctionGetsQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `callToObsolescentFunctionGets` query
+      TQueryC(TLanguage4PackageQuery(TCallToObsolescentFunctionGetsQuery()))
+  }
+
+  Query ungetcCallOnStreamPositionZeroQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `ungetcCallOnStreamPositionZero` query
+      TQueryC(TLanguage4PackageQuery(TUngetcCallOnStreamPositionZeroQuery()))
+  }
+
   Query callToReallocWithSizeZeroQuery() {
     //autogenerate `Query` type
     result =
diff --git a/cpp/common/src/codingstandards/cpp/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.qll b/cpp/common/src/codingstandards/cpp/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.qll
new file mode 100644
index 0000000000..ecc84f8651
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/functiontypesnotinprototypeformshared/FunctionTypesNotInPrototypeFormShared.qll
@@ -0,0 +1,54 @@
+/**
+ * Provides a library with a `problems` predicate for the following issue:
+ * The use of non-prototype format parameter type declarators is an obsolescent
+ * language feature.
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+import codingstandards.cpp.Identifiers
+
+abstract class FunctionTypesNotInPrototypeFormSharedSharedQuery extends Query { }
+
+/**
+ * `Parameter`s without names
+ */
+class UnnamedParameter extends Parameter {
+  UnnamedParameter() { not this.isNamed() }
+}
+
+/*
+ * This is a copy of the private `hasZeroParamDecl` predicate from the standard set of
+ * queries as of the `codeql-cli/2.11.2` tag in `github/codeql`.
+ */
+predicate hasZeroParamDecl(Function f) {
+  exists(FunctionDeclarationEntry fde | fde = f.getADeclarationEntry() |
+    not fde.isImplicit() and
+    not fde.hasVoidParamList() and
+    fde.getNumberOfParameters() = 0 and
+    not fde.isDefinition()
+  )
+}
+
+Query getQuery() { result instanceof FunctionTypesNotInPrototypeFormSharedSharedQuery }
+
+query predicate problems(Function f, string msg) {
+not isExcluded(f, getQuery()) and
+  f instanceof InterestingIdentifiers and
+  (
+    f.getAParameter() instanceof UnnamedParameter and
+    msg = "Function " + f + " declares parameter that is unnamed."
+    or
+    hasZeroParamDecl(f) and
+    msg = "Function " + f + " does not specify void for no parameters present."
+    or
+    //parameters declared in declaration list (not in function signature)
+    //have placeholder file location associated only
+    exists(Parameter p |
+      p.getFunction() = f and
+      not p.getFile() = f.getFile() and
+      msg = "Function " + f + " declares parameter in unsupported declaration list."
+    )
+  )
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.qll b/cpp/common/src/codingstandards/cpp/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.qll
new file mode 100644
index 0000000000..90f28e6cc8
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/missingstaticspecifierobjectredeclarationshared/MissingStaticSpecifierObjectRedeclarationShared.qll
@@ -0,0 +1,27 @@
+/**
+ * Provides a library with a `problems` predicate for the following issue:
+ * Declaring an identifier with internal linkage without the static storage class
+ * specifier is an obselescent feature.
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class MissingStaticSpecifierObjectRedeclarationSharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof MissingStaticSpecifierObjectRedeclarationSharedSharedQuery }
+
+query predicate problems(
+  VariableDeclarationEntry redeclaration, string message, VariableDeclarationEntry de,
+  string deString
+) {
+  not isExcluded(redeclaration, getQuery()) and
+  //following implies de != redeclaration
+  de.hasSpecifier("static") and
+  not redeclaration.hasSpecifier("static") and
+  de.getDeclaration().isTopLevel() and
+  redeclaration.getDeclaration() = de.getDeclaration() and
+  message = "The redeclaration of $@ with internal linkage misses the static specifier." and
+  deString = de.getName()
+}
diff --git a/rule_packages/c/Declarations4.json b/rule_packages/c/Declarations4.json
index 06475706f4..dedc6a73d4 100644
--- a/rule_packages/c/Declarations4.json
+++ b/rule_packages/c/Declarations4.json
@@ -12,6 +12,7 @@
           "precision": "medium",
           "severity": "error",
           "short_name": "FunctionTypesNotInPrototypeForm",
+          "shared_implementation_short_name": "FunctionTypesNotInPrototypeFormShared",
           "tags": [
             "correctness",
             "external/misra/c/2012/third-edition-first-revision"
diff --git a/rule_packages/c/Declarations5.json b/rule_packages/c/Declarations5.json
index 1106a1d705..36591e575b 100644
--- a/rule_packages/c/Declarations5.json
+++ b/rule_packages/c/Declarations5.json
@@ -71,6 +71,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "MissingStaticSpecifierObjectRedeclarationC",
+          "shared_implementation_short_name": "MissingStaticSpecifierObjectRedeclarationShared",
           "tags": [
             "readability",
             "external/misra/c/2012/third-edition-first-revision"
diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index 54708d73da..8698407b5f 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -5,6 +5,48 @@
         "obligation": "required"
       },
       "queries": [
+        {
+          "description": "Declaring a function with internal linkage without the static storage class specifier is an obselescent feature.",
+          "kind": "problem",
+          "name": "If a function has internal linkage then all re-declarations shall include the static storage class",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "MissingStaticSpecifierFuncRedeclarationObsolete",
+          "shared_implementation_short_name": "MissingStaticSpecifierFunctionRedeclarationShared",
+          "tags": [
+            "readability",
+            "external/misra/c/2012/amendment3"
+          ]
+        },
+        {
+          "description": "Declaring an identifier with internal linkage without the static storage class specifier is an obselescent feature.",
+          "kind": "problem",
+          "name": "If an object has internal linkage then all re-declarations shall include the static storage class",
+          "precision": "very-high",
+          "severity": "warning",
+          "short_name": "MissingStaticSpecifierObjectRedeclarationObsolete",
+          "shared_implementation_short_name": "MissingStaticSpecifierObjectRedeclarationShared",
+          "tags": [
+            "readability",
+            "external/misra/c/2012/amendment3"
+          ]
+        },
+        {
+          "description": "The use of non-prototype format parameter type declarators is an obsolescent language feature.",
+          "kind": "problem",
+          "name": "Function types shall be in prototype form with named parameters",
+          "precision": "medium",
+          "severity": "error",
+          "short_name": "FunctionTypesNotInPrototypeFormObsolete",
+          "shared_implementation_short_name": "FunctionTypesNotInPrototypeFormShared",
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/amendment3"
+          ],
+          "implementation_scope": {
+            "description": "This query does not check for implicitly typed parameters and checks function declarations and definitions but not function pointer types."
+          }
+        },
         {
           "description": "The macro ATOMIC_VAR_INIT is has been declared an obsolescent language feature since C18.",
           "kind": "problem",
@@ -31,6 +73,32 @@
             "external/misra/c/2012/amendment3"
           ]
         },
+        {
+          "description": "The function 'gets' is an obsolescent language feature which was removed in C11.",
+          "kind": "problem",
+          "name": "Disallowed usage of obsolescent function 'gets'",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "CallToObsolescentFunctionGets",
+          "tags": [
+            "external/misra/c/2012/amendment3",
+            "security",
+            "maintainability"
+          ]
+        },
+        {
+          "description": "Calling the function 'ungetc' on a file stream with a position of zero is an obsolescent language feature.",
+          "kind": "problem",
+          "name": "Disallowed obsolescent usage of 'ungetc' on a file stream at position zero",
+          "precision": "medium",
+          "severity": "error",
+          "short_name": "UngetcCallOnStreamPositionZero",
+          "tags": [
+            "external/misra/c/2012/amendment3",
+            "security",
+            "maintainability"
+          ]
+        },
         {
           "description": "Invoking realloc with a size argument set to zero is implementation-defined behavior and declared as an obsolete feature in C18.",
           "kind": "problem",
@@ -48,13 +116,14 @@
       "implementation_scope": {
         "description": "Not all items from Appendix F are covered by this rule. Some are not supportable and some are covered already by other rules.",
         "items": [
-          "Appendix F, item ID 1 is covered by Rule 8.8 and not reported as part of this implementation of Rule 1.5.",
+          "Appendix F, item ID 1 is reported by both Rule 8.8 and by this implementation of Rule 1.5.",
           "Appendix F, item ID 2 refers to compiler behavior which cannot be statically analyzed.",
           "Appendix F, item ID 3, which states that storage-class specifiers may not be used except in the beginning of a declaration, is not supportable without additional changes to the CodeQL CLI.",
+          "Appendix F, item IDs 4 and 5 are reported by both Rule 8.2 and by this implementation of Rule 1.5.",
           "Appendix F, item ID 6 is reported for all C versions, though the macro ATOMIC_VAR_INIT was not officially declared obsolescent until C18.",
-          "Appendix F, item IDs 4 and 5 are covered by Rule 8.2 and not reported as part of this implementation of Rule 1.5.",
-          "Appendix F, item IDs 8 and 9 is covered by Rule 21.6 and not reported as part of this implementation of Rule 1.5.",
-          "Appendix F, item ID 10 is checked by this implementation of 1.5, though it is a redundant subset of cases reported by Rule 21.3.",
+          "Appendix F, item ID 8 is reported by both Rule 21.6 and by this implementation of Rule 1.5.",
+          "Appendix F, item ID 9 is reported by this implementation of 1.5, though all uses of ungetc() are also reported by Rule 21.3.",
+          "Appendix F, item ID 10 is reported by this implementation of 1.5, though all uses of realloc() are also reported by Rule 21.3.",
           "Appendix F, item ID 10 is reported for all C versions, as realloc() with a size argument of zero was implementation-defined behavior in C99 and C11."
         ]
       }

From 061efb7cbe520ab022b5effb6a46f40f3a5fd0ca Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 17 Oct 2024 23:25:14 +0100
Subject: [PATCH 310/435] Rule 7.2: Add test for octal literals

---
 ...rUSuffixRepresentedInUnsignedType.expected |  6 ++
 c/misra/test/rules/RULE-7-2/test.c            | 88 +++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected b/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
index 07cd56b3d9..0b460bb4bc 100644
--- a/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
+++ b/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
@@ -4,3 +4,9 @@
 | test.c:162:3:162:21 | 9223372036854775808 | Unsigned literal 0x8000000000000000L does not explicitly express sign with a 'U' or 'u' suffix. |
 | test.c:185:3:185:22 | 9223372036854775808 | Unsigned literal 0x8000000000000000ll does not explicitly express sign with a 'U' or 'u' suffix. |
 | test.c:208:3:208:22 | 9223372036854775808 | Unsigned literal 0x8000000000000000LL does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:227:3:227:14 | 2147483648 | Unsigned literal 020000000000 does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:232:3:232:25 | 9223372036854775808 | Unsigned literal 01000000000000000000000 does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:249:3:249:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000l does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:266:3:266:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000L does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:283:3:283:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000l does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:300:3:300:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000L does not explicitly express sign with a 'U' or 'u' suffix. |
diff --git a/c/misra/test/rules/RULE-7-2/test.c b/c/misra/test/rules/RULE-7-2/test.c
index b95d2b1e02..b31957d1be 100644
--- a/c/misra/test/rules/RULE-7-2/test.c
+++ b/c/misra/test/rules/RULE-7-2/test.c
@@ -221,6 +221,94 @@ void test_hexadecimal_constants() {
   0x8000000000000000LLu; // COMPLIANT - unsigned, but uses the suffix correctly
 }
 
+void test_octal_constants() {
+  00;           // COMPLIANT - uses signed int
+  017777777777; // COMPLIANT - max value held by signed int
+  020000000000; // NON_COMPLIANT - larger than max signed int, so will be
+                // unsigned int
+  040000000000; // COMPLIANT - larger than unsigned int, but smaller than long
+                // int
+  0777777777777777777777;  // COMPLIANT - max long int
+  01000000000000000000000; // NON_COMPLIANT - larger than long int, so will be
+                           // unsigned long int
+  00U;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777U; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000U; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000U; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777U;  // COMPLIANT - unsigned, but uses the suffix
+                            // correctly
+  01000000000000000000000U; // COMPLIANT - unsigned, but uses the suffix
+                            // correctly
+
+  // Use of the `l` suffix
+  00l;                      // COMPLIANT - uses signed long
+  017777777777l;            // COMPLIANT - uses signed long
+  020000000000l;            // COMPLIANT - uses signed long
+  040000000000l;            // COMPLIANT - uses signed long
+  0777777777777777777777l;  // COMPLIANT - max long int
+  01000000000000000000000l; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00Ul;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777Ul;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000Ul; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+
+  // Use of the `L` suffix
+  00L;                      // COMPLIANT - uses signed long
+  017777777777L;            // COMPLIANT - uses signed long
+  020000000000L;            // COMPLIANT - uses signed long
+  040000000000L;            // COMPLIANT - uses signed long
+  0777777777777777777777L;  // COMPLIANT - COMPLIANT - uses signed long
+  01000000000000000000000L; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00UL;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777UL;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000UL; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+
+  // Use of the `ll` suffix
+  00ll;                     // COMPLIANT - uses signed long long
+  017777777777l;            // COMPLIANT - uses signed long long
+  020000000000l;            // COMPLIANT - uses signed long long
+  040000000000l;            // COMPLIANT - uses signed long long
+  0777777777777777777777l;  // COMPLIANT - max long int
+  01000000000000000000000l; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00Ul;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777Ul;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000Ul; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+
+  // Use of the `LL` suffix
+  00L;                      // COMPLIANT - uses signed long long
+  017777777777L;            // COMPLIANT - uses signed long long
+  020000000000L;            // COMPLIANT - uses signed long long
+  040000000000L;            // COMPLIANT - uses signed long long
+  0777777777777777777777L;  // COMPLIANT - max long int
+  01000000000000000000000L; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00UL;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777UL;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000UL; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+}
+
 #define COMPLIANT_VAL 0x80000000U
 #define NON_COMPLIANT_VAL 0x80000000
 

From b05afcaac10100bc56a429400192d41d3d425d99 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 17 Oct 2024 23:27:08 +0100
Subject: [PATCH 311/435] UnsignedIntegerLiterals: Add testing for octals

---
 ...rLiteralsNotAppropriatelySuffixed.expected |  13 +-
 .../test.cpp                                  | 322 +++++++++++++++++-
 2 files changed, 330 insertions(+), 5 deletions(-)

diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
index 56dce901dd..31579f857a 100644
--- a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
@@ -1 +1,12 @@
-| test.cpp:3:3:3:12 | 4294967295 | Hex literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:111:3:111:12 | 2147483648 | Hex literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:116:3:116:20 | 9223372036854775808 | Hex literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:139:3:139:21 | 9223372036854775808 | Hex literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:162:3:162:21 | 9223372036854775808 | Hex literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:185:3:185:22 | 9223372036854775808 | Hex literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:208:3:208:22 | 9223372036854775808 | Hex literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:227:3:227:14 | 2147483648 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:232:3:232:25 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:249:3:249:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:266:3:266:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:283:3:283:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:300:3:300:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
index e5b3abfa47..b31957d1be 100644
--- a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
@@ -1,5 +1,319 @@
-void test_unsigned_literals_without_suffix() {
-  0xFFFFFFFFU; // COMPLIANT - literal explicitly marked as unsigned
-  0xFFFFFFFF;  // NON_COMPLIANT - literal is too large for a signed int, so has
-               // type unsigned int
+// Assumed platform in qltest is linux_x86_64, so
+// int, long, long long sizes are assumed to be 32, 64, 64 bits respectively
+
+// The type of an integer constant is determined by "6.4.4.1 Integer constants"
+// in the C11 Standard. The principle is that any decimal integer constant will
+// be signed, unless it has the `U` or `u` suffix. Any hexadecimal integer will
+// depend on whether it is larger than the maximum value of the smallest signed
+// integer value that can hold the value. So the signedness depends on the
+// magnitude of the constant.
+
+void test_decimal_constants() {
+  0;          // COMPLIANT
+  2147483648; // COMPLIANT - larger than int, but decimal constants never use
+              // unsigned without the suffix, so will be `long`
+  4294967296; // COMPLIANT - larger than unsigned int, still `long`
+  9223372036854775807; // COMPLIANT - max long int
+  // 9223372036854775808; Not a valid integer constant, out of signed range
+  0U;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648U;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296U;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807U; // COMPLIANT - max long int
+  9223372036854775808U; // COMPLIANT - explicitly unsigned, so can go large than
+                        // max long int
+  0u;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648u;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296u;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807u; // COMPLIANT - max long int
+  9223372036854775808u; // COMPLIANT - explicitly unsigned, so can go large than
+                        // max long int
+
+  // l suffix
+  0l;                   // COMPLIANT
+  2147483648l;          // COMPLIANT - within the range of long int
+  4294967296l;          // COMPLIANT - within the range of long int
+  9223372036854775807l; // COMPLIANT - max long int
+  // 9223372036854775808l; Not a valid integer constant, out of signed range
+  0lU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648lU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296lU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807lU; // COMPLIANT - max long int
+  9223372036854775808lU; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+  0lu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807lu; // COMPLIANT - max long int
+  9223372036854775808lu; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+
+  // L suffix
+  0L;                   // COMPLIANT
+  2147483648L;          // COMPLIANT - within the range of long int
+  4294967296L;          // COMPLIANT - within the range of long int
+  9223372036854775807L; // COMPLIANT - max long int
+  // 9223372036854775808L; Not a valid integer constant, out of signed range
+  0LU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648LU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296LU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807LU; // COMPLIANT - max long int
+  9223372036854775808LU; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+  0Lu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648Lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296Lu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807Lu; // COMPLIANT - max long int
+  9223372036854775808Lu; // COMPLIANT - explicitly unsigned, so can go large
+                         // than max long int
+
+  // ll suffix
+  0ll;                   // COMPLIANT
+  2147483648ll;          // COMPLIANT - within the range of long long int
+  4294967296ll;          // COMPLIANT - within the range of long long int
+  9223372036854775807ll; // COMPLIANT - max long long int
+  // 9223372036854775808ll; Not a valid integer constant, out of signed range
+  0llU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648llU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296llU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807llU; // COMPLIANT - max long long int
+  9223372036854775808llU; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
+  0llu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648llu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296llu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807llu; // COMPLIANT - max long long int
+  9223372036854775808llu; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
+
+  // LL suffix
+  0LL;                   // COMPLIANT
+  2147483648LL;          // COMPLIANT - within the range of long long int
+  4294967296LL;          // COMPLIANT - within the range of long long int
+  9223372036854775807LL; // COMPLIANT - max long long int
+  // 9223372036854775808LL; Not a valid integer constant, out of signed range
+  0LLU;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648LLU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296LLU;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807LLU; // COMPLIANT - max long long int
+  9223372036854775808LLU; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
+  0LLu;                   // COMPLIANT - unsigned, but uses the suffix correctly
+  2147483648LLu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  4294967296LLu;          // COMPLIANT - unsigned, but uses the suffix correctly
+  9223372036854775807LLu; // COMPLIANT - max long long int
+  9223372036854775808LLu; // COMPLIANT - explicitly unsigned, so can go large
+                          // than max long long int
+}
+
+void test_hexadecimal_constants() {
+  0x0;        // COMPLIANT - uses signed int
+  0x7FFFFFFF; // COMPLIANT - max value held by signed int
+  0x80000000; // NON_COMPLIANT - larger than max signed int, so will be unsigned
+              // int
+  0x100000000; // COMPLIANT - larger than unsigned int, but smaller than long
+               // int
+  0x7FFFFFFFFFFFFFFF;  // COMPLIANT - max long int
+  0x8000000000000000;  // NON_COMPLIANT - larger than long int, so will be
+                       // unsigned long int
+  0x0U;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000U;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000U;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000U; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0u;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000u;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000u;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000u; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `l` suffix
+  0x0l;         // COMPLIANT - uses signed int
+  0x7FFFFFFFl;  // COMPLIANT - max value held by signed int
+  0x80000000l;  // COMPLIANT - larger than max signed int, but smaller than long
+                // int
+  0x100000000l; // COMPLIANT - larger than unsigned int, but smaller than long
+                // int
+  0x7FFFFFFFFFFFFFFFl;  // COMPLIANT - max long int
+  0x8000000000000000l;  // NON_COMPLIANT - larger than long int, so will be
+                        // unsigned long int
+  0x0lU;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFlU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000lU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000lU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFlU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000lU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0lu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFlu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000lu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000lu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFlu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000lu; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `L` suffix
+  0x0L;         // COMPLIANT - uses signed int
+  0x7FFFFFFFL;  // COMPLIANT - max value held by signed int
+  0x80000000L;  // COMPLIANT - larger than max signed int, but smaller than long
+                // int
+  0x100000000L; // COMPLIANT - larger than unsigned int, but smaller than long
+                // int
+  0x7FFFFFFFFFFFFFFFL;  // COMPLIANT - max long int
+  0x8000000000000000L;  // NON_COMPLIANT - larger than long int, so will be
+                        // unsigned long int
+  0x0LU;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000LU;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000LU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000LU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0Lu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000Lu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000Lu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000Lu; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `ll` suffix
+  0x0ll;        // COMPLIANT - uses signed int
+  0x7FFFFFFFll; // COMPLIANT - max value held by signed int
+  0x80000000ll; // COMPLIANT - larger than max signed int, but smaller than long
+                // long int
+  0x100000000ll; // COMPLIANT - larger than unsigned int, but smaller than long
+                 // long int
+  0x7FFFFFFFFFFFFFFFll; // COMPLIANT - max long long int
+  0x8000000000000000ll; // NON_COMPLIANT - larger than long long int, so will be
+                        // unsigned long long int
+  0x0llU;               // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFllU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000llU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000llU;       // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFllU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000llU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0llu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFllu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000llu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000llu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFllu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000llu; // COMPLIANT - unsigned, but uses the suffix correctly
+
+  // Use of the `LL` suffix
+  0x0LL;        // COMPLIANT - uses signed int
+  0x7FFFFFFFLL; // COMPLIANT - max value held by signed int
+  0x80000000LL; // COMPLIANT - larger than max signed int, but smaller than long
+                // long int
+  0x100000000LL; // COMPLIANT - larger than unsigned int, but smaller than long
+                 // long int
+  0x7FFFFFFFFFFFFFFFLL; // COMPLIANT - max long long int
+  0x8000000000000000LL; // NON_COMPLIANT - larger than long long int, so will be
+                        // unsigned long long int
+  0x0LLU;               // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLLU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000LLU;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000LLU;       // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLLU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000LLU; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x0LLu;                // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFLLu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x80000000LLu;         // COMPLIANT - unsigned, but uses the suffix correctly
+  0x100000000LLu;        // COMPLIANT - unsigned, but uses the suffix correctly
+  0x7FFFFFFFFFFFFFFFLLu; // COMPLIANT - unsigned, but uses the suffix correctly
+  0x8000000000000000LLu; // COMPLIANT - unsigned, but uses the suffix correctly
+}
+
+void test_octal_constants() {
+  00;           // COMPLIANT - uses signed int
+  017777777777; // COMPLIANT - max value held by signed int
+  020000000000; // NON_COMPLIANT - larger than max signed int, so will be
+                // unsigned int
+  040000000000; // COMPLIANT - larger than unsigned int, but smaller than long
+                // int
+  0777777777777777777777;  // COMPLIANT - max long int
+  01000000000000000000000; // NON_COMPLIANT - larger than long int, so will be
+                           // unsigned long int
+  00U;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777U; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000U; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000U; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777U;  // COMPLIANT - unsigned, but uses the suffix
+                            // correctly
+  01000000000000000000000U; // COMPLIANT - unsigned, but uses the suffix
+                            // correctly
+
+  // Use of the `l` suffix
+  00l;                      // COMPLIANT - uses signed long
+  017777777777l;            // COMPLIANT - uses signed long
+  020000000000l;            // COMPLIANT - uses signed long
+  040000000000l;            // COMPLIANT - uses signed long
+  0777777777777777777777l;  // COMPLIANT - max long int
+  01000000000000000000000l; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00Ul;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777Ul;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000Ul; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+
+  // Use of the `L` suffix
+  00L;                      // COMPLIANT - uses signed long
+  017777777777L;            // COMPLIANT - uses signed long
+  020000000000L;            // COMPLIANT - uses signed long
+  040000000000L;            // COMPLIANT - uses signed long
+  0777777777777777777777L;  // COMPLIANT - COMPLIANT - uses signed long
+  01000000000000000000000L; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00UL;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777UL;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000UL; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+
+  // Use of the `ll` suffix
+  00ll;                     // COMPLIANT - uses signed long long
+  017777777777l;            // COMPLIANT - uses signed long long
+  020000000000l;            // COMPLIANT - uses signed long long
+  040000000000l;            // COMPLIANT - uses signed long long
+  0777777777777777777777l;  // COMPLIANT - max long int
+  01000000000000000000000l; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00Ul;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777Ul;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000Ul; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+
+  // Use of the `LL` suffix
+  00L;                      // COMPLIANT - uses signed long long
+  017777777777L;            // COMPLIANT - uses signed long long
+  020000000000L;            // COMPLIANT - uses signed long long
+  040000000000L;            // COMPLIANT - uses signed long long
+  0777777777777777777777L;  // COMPLIANT - max long int
+  01000000000000000000000L; // NON_COMPLIANT - larger than long int, so will be
+                            // unsigned long int
+  00UL;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777UL;  // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+  01000000000000000000000UL; // COMPLIANT - unsigned, but uses the suffix
+                             // correctly
+}
+
+#define COMPLIANT_VAL 0x80000000U
+#define NON_COMPLIANT_VAL 0x80000000
+
+void test_macro() {
+  COMPLIANT_VAL;     // COMPLIANT
+  NON_COMPLIANT_VAL; // NON_COMPLIANT[FALSE_NEGATIVE] - cannot determine suffix
+                     // in macro expansions
 }
\ No newline at end of file

From 6c24820757e215f3f9be09e0b19916ba43155f1a Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 17 Oct 2024 23:37:45 +0100
Subject: [PATCH 312/435] Fix ll suffixes on tests

---
 ...rUSuffixRepresentedInUnsignedType.expected |  4 +-
 c/misra/test/rules/RULE-7-2/test.c            | 60 +++++++++----------
 ...rLiteralsNotAppropriatelySuffixed.expected |  4 +-
 .../test.cpp                                  | 60 +++++++++----------
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected b/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
index 0b460bb4bc..0d5504ba03 100644
--- a/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
+++ b/c/misra/test/rules/RULE-7-2/UOrUSuffixRepresentedInUnsignedType.expected
@@ -8,5 +8,5 @@
 | test.c:232:3:232:25 | 9223372036854775808 | Unsigned literal 01000000000000000000000 does not explicitly express sign with a 'U' or 'u' suffix. |
 | test.c:249:3:249:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000l does not explicitly express sign with a 'U' or 'u' suffix. |
 | test.c:266:3:266:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000L does not explicitly express sign with a 'U' or 'u' suffix. |
-| test.c:283:3:283:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000l does not explicitly express sign with a 'U' or 'u' suffix. |
-| test.c:300:3:300:26 | 9223372036854775808 | Unsigned literal 01000000000000000000000L does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:283:3:283:27 | 9223372036854775808 | Unsigned literal 01000000000000000000000ll does not explicitly express sign with a 'U' or 'u' suffix. |
+| test.c:300:3:300:27 | 9223372036854775808 | Unsigned literal 01000000000000000000000LL does not explicitly express sign with a 'U' or 'u' suffix. |
diff --git a/c/misra/test/rules/RULE-7-2/test.c b/c/misra/test/rules/RULE-7-2/test.c
index b31957d1be..170e822023 100644
--- a/c/misra/test/rules/RULE-7-2/test.c
+++ b/c/misra/test/rules/RULE-7-2/test.c
@@ -275,38 +275,38 @@ void test_octal_constants() {
                              // correctly
 
   // Use of the `ll` suffix
-  00ll;                     // COMPLIANT - uses signed long long
-  017777777777l;            // COMPLIANT - uses signed long long
-  020000000000l;            // COMPLIANT - uses signed long long
-  040000000000l;            // COMPLIANT - uses signed long long
-  0777777777777777777777l;  // COMPLIANT - max long int
-  01000000000000000000000l; // NON_COMPLIANT - larger than long int, so will be
-                            // unsigned long int
-  00Ul;           // COMPLIANT - unsigned, but uses the suffix correctly
-  017777777777Ul; // COMPLIANT - unsigned, but uses the suffix correctly
-  020000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
-  040000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
-  0777777777777777777777Ul;  // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
-  01000000000000000000000Ul; // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
+  00ll;                      // COMPLIANT - uses signed long long
+  017777777777ll;            // COMPLIANT - uses signed long long
+  020000000000ll;            // COMPLIANT - uses signed long long
+  040000000000ll;            // COMPLIANT - uses signed long long
+  0777777777777777777777ll;  // COMPLIANT - max long int
+  01000000000000000000000ll; // NON_COMPLIANT - larger than long int, so will be
+                             // unsigned long int
+  00Ull;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777Ull; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000Ull; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000Ull; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777Ull;  // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
+  01000000000000000000000Ull; // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
 
   // Use of the `LL` suffix
-  00L;                      // COMPLIANT - uses signed long long
-  017777777777L;            // COMPLIANT - uses signed long long
-  020000000000L;            // COMPLIANT - uses signed long long
-  040000000000L;            // COMPLIANT - uses signed long long
-  0777777777777777777777L;  // COMPLIANT - max long int
-  01000000000000000000000L; // NON_COMPLIANT - larger than long int, so will be
-                            // unsigned long int
-  00UL;           // COMPLIANT - unsigned, but uses the suffix correctly
-  017777777777UL; // COMPLIANT - unsigned, but uses the suffix correctly
-  020000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
-  040000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
-  0777777777777777777777UL;  // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
-  01000000000000000000000UL; // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
+  00LL;                      // COMPLIANT - uses signed long long
+  017777777777LL;            // COMPLIANT - uses signed long long
+  020000000000LL;            // COMPLIANT - uses signed long long
+  040000000000LL;            // COMPLIANT - uses signed long long
+  0777777777777777777777LL;  // COMPLIANT - max long int
+  01000000000000000000000LL; // NON_COMPLIANT - larger than long int, so will be
+                             // unsigned long int
+  00ULL;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777ULL; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000ULL; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000ULL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777ULL;  // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
+  01000000000000000000000ULL; // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
 }
 
 #define COMPLIANT_VAL 0x80000000U
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
index 31579f857a..5987f8ca45 100644
--- a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
@@ -8,5 +8,5 @@
 | test.cpp:232:3:232:25 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
 | test.cpp:249:3:249:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
 | test.cpp:266:3:266:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
-| test.cpp:283:3:283:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
-| test.cpp:300:3:300:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:283:3:283:27 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:300:3:300:27 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
index b31957d1be..170e822023 100644
--- a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
@@ -275,38 +275,38 @@ void test_octal_constants() {
                              // correctly
 
   // Use of the `ll` suffix
-  00ll;                     // COMPLIANT - uses signed long long
-  017777777777l;            // COMPLIANT - uses signed long long
-  020000000000l;            // COMPLIANT - uses signed long long
-  040000000000l;            // COMPLIANT - uses signed long long
-  0777777777777777777777l;  // COMPLIANT - max long int
-  01000000000000000000000l; // NON_COMPLIANT - larger than long int, so will be
-                            // unsigned long int
-  00Ul;           // COMPLIANT - unsigned, but uses the suffix correctly
-  017777777777Ul; // COMPLIANT - unsigned, but uses the suffix correctly
-  020000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
-  040000000000Ul; // COMPLIANT - unsigned, but uses the suffix correctly
-  0777777777777777777777Ul;  // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
-  01000000000000000000000Ul; // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
+  00ll;                      // COMPLIANT - uses signed long long
+  017777777777ll;            // COMPLIANT - uses signed long long
+  020000000000ll;            // COMPLIANT - uses signed long long
+  040000000000ll;            // COMPLIANT - uses signed long long
+  0777777777777777777777ll;  // COMPLIANT - max long int
+  01000000000000000000000ll; // NON_COMPLIANT - larger than long int, so will be
+                             // unsigned long int
+  00Ull;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777Ull; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000Ull; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000Ull; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777Ull;  // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
+  01000000000000000000000Ull; // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
 
   // Use of the `LL` suffix
-  00L;                      // COMPLIANT - uses signed long long
-  017777777777L;            // COMPLIANT - uses signed long long
-  020000000000L;            // COMPLIANT - uses signed long long
-  040000000000L;            // COMPLIANT - uses signed long long
-  0777777777777777777777L;  // COMPLIANT - max long int
-  01000000000000000000000L; // NON_COMPLIANT - larger than long int, so will be
-                            // unsigned long int
-  00UL;           // COMPLIANT - unsigned, but uses the suffix correctly
-  017777777777UL; // COMPLIANT - unsigned, but uses the suffix correctly
-  020000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
-  040000000000UL; // COMPLIANT - unsigned, but uses the suffix correctly
-  0777777777777777777777UL;  // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
-  01000000000000000000000UL; // COMPLIANT - unsigned, but uses the suffix
-                             // correctly
+  00LL;                      // COMPLIANT - uses signed long long
+  017777777777LL;            // COMPLIANT - uses signed long long
+  020000000000LL;            // COMPLIANT - uses signed long long
+  040000000000LL;            // COMPLIANT - uses signed long long
+  0777777777777777777777LL;  // COMPLIANT - max long int
+  01000000000000000000000LL; // NON_COMPLIANT - larger than long int, so will be
+                             // unsigned long int
+  00ULL;           // COMPLIANT - unsigned, but uses the suffix correctly
+  017777777777ULL; // COMPLIANT - unsigned, but uses the suffix correctly
+  020000000000ULL; // COMPLIANT - unsigned, but uses the suffix correctly
+  040000000000ULL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0777777777777777777777ULL;  // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
+  01000000000000000000000ULL; // COMPLIANT - unsigned, but uses the suffix
+                              // correctly
 }
 
 #define COMPLIANT_VAL 0x80000000U

From 8760c3c6663819343f8ca5450ed026f79b137d90 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 17 Oct 2024 23:43:33 +0100
Subject: [PATCH 313/435] Add change note

---
 change_notes/2024-10-17-suffixes.md           |   4 +
 ...ntegerLiteralsNotAppropriatelySuffixed.qll |   2 +
 ...rLiteralsNotAppropriatelySuffixed.expected |   6 +
 .../test.cpp                                  | 227 ++++++++++++++++++
 4 files changed, 239 insertions(+)
 create mode 100644 change_notes/2024-10-17-suffixes.md

diff --git a/change_notes/2024-10-17-suffixes.md b/change_notes/2024-10-17-suffixes.md
new file mode 100644
index 0000000000..16d8ca4cda
--- /dev/null
+++ b/change_notes/2024-10-17-suffixes.md
@@ -0,0 +1,4 @@
+ - `5.13.4` - `UnsignedLiteralsNotAppropriatelySuffixed.ql`:
+   - Expand detection to binary literals.
+ - `M2-13-3` - `MissingUSuffix.ql`:
+   - Expand detection to binary literals.
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
index 0b9ccb17f1..a9535d9bfc 100644
--- a/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.qll
@@ -19,6 +19,8 @@ query predicate problems(Cpp14Literal::NumericLiteral nl, string message) {
       nl instanceof Cpp14Literal::OctalLiteral and literalKind = "Octal"
       or
       nl instanceof Cpp14Literal::HexLiteral and literalKind = "Hex"
+      or
+      nl instanceof Cpp14Literal::BinaryLiteral and literalKind = "Binary"
     ) and
     // This either directly has an unsigned integer type, or it is converted to an unsigned integer type
     nl.getType().getUnspecifiedType().(IntegralType).isUnsigned() and
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
index 5987f8ca45..3326ede548 100644
--- a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/UnsignedIntegerLiteralsNotAppropriatelySuffixed.expected
@@ -10,3 +10,9 @@
 | test.cpp:266:3:266:26 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
 | test.cpp:283:3:283:27 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
 | test.cpp:300:3:300:27 | 9223372036854775808 | Octal literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:315:3:315:36 | 2147483648 | Binary literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:322:3:322:68 | 9223372036854775808 | Binary literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:365:3:365:69 | 9223372036854775808 | Binary literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:412:3:412:69 | 9223372036854775808 | Binary literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:457:3:457:70 | 9223372036854775808 | Binary literal is an unsigned integer but does not include a 'U' suffix. |
+| test.cpp:502:3:502:70 | 9223372036854775808 | Binary literal is an unsigned integer but does not include a 'U' suffix. |
diff --git a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
index 170e822023..fcbd51b3de 100644
--- a/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
+++ b/cpp/common/test/rules/unsignedintegerliteralsnotappropriatelysuffixed/test.cpp
@@ -309,6 +309,233 @@ void test_octal_constants() {
                               // correctly
 }
 
+void test_binary_constants() {
+  0b0;                               // COMPLIANT - uses signed int
+  0b1111111111111111111111111111111; // COMPLIANT - max value held by signed int
+  0b10000000000000000000000000000000;  // NON_COMPLIANT - larger than max signed
+                                       // int, so will be unsigned int
+  0b100000000000000000000000000000000; // COMPLIANT - larger than unsigned int,
+                                       // but smaller than long int
+  0b111111111111111111111111111111111111111111111111111111111111111; // COMPLIANT
+                                                                     // - max
+                                                                     // long int
+  0b1000000000000000000000000000000000000000000000000000000000000000; // NON_COMPLIANT
+                                                                      // -
+                                                                      // larger
+                                                                      // than
+                                                                      // long
+                                                                      // int, so
+                                                                      // will be
+                                                                      // unsigned
+                                                                      // long
+                                                                      // int
+  0b0U; // COMPLIANT - unsigned, but uses the suffix correctly
+  0b1111111111111111111111111111111U;   // COMPLIANT - unsigned, but uses the
+                                        // suffix correctly
+  0b10000000000000000000000000000000U;  // COMPLIANT - unsigned, but uses the
+                                        // suffix correctly
+  0b100000000000000000000000000000000U; // COMPLIANT - unsigned, but uses the
+                                        // suffix correctly
+  0b111111111111111111111111111111111111111111111111111111111111111U; // COMPLIANT
+                                                                      // -
+                                                                      // unsigned,
+                                                                      // but
+                                                                      // uses
+                                                                      // the
+                                                                      // suffix
+                                                                      // correctly
+  0b1000000000000000000000000000000000000000000000000000000000000000U; // COMPLIANT
+                                                                       // -
+                                                                       // unsigned,
+                                                                       // but
+                                                                       // uses
+                                                                       // the
+                                                                       // suffix
+                                                                       // correctly
+
+  // Use of the `l` suffix
+  0b0l;                                 // COMPLIANT - uses signed long
+  0b1111111111111111111111111111111l;   // COMPLIANT - uses signed long
+  0b10000000000000000000000000000000l;  // COMPLIANT - uses signed long
+  0b100000000000000000000000000000000l; // COMPLIANT - uses signed long
+  0b111111111111111111111111111111111111111111111111111111111111111l; // COMPLIANT
+                                                                      // - max
+                                                                      // long
+                                                                      // int
+  0b1000000000000000000000000000000000000000000000000000000000000000l; // NON_COMPLIANT
+                                                                       // -
+                                                                       // larger
+                                                                       // than
+                                                                       // long
+                                                                       // int,
+                                                                       // so
+                                                                       // will
+                                                                       // be
+                                                                       // unsigned
+                                                                       // long
+                                                                       // int
+  0b0Ul; // COMPLIANT - unsigned, but uses the suffix correctly
+  0b1111111111111111111111111111111Ul;   // COMPLIANT - unsigned, but uses the
+                                         // suffix correctly
+  0b10000000000000000000000000000000Ul;  // COMPLIANT - unsigned, but uses the
+                                         // suffix correctly
+  0b100000000000000000000000000000000Ul; // COMPLIANT - unsigned, but uses the
+                                         // suffix correctly
+  0b111111111111111111111111111111111111111111111111111111111111111Ul; // COMPLIANT
+                                                                       // -
+                                                                       // unsigned,
+                                                                       // but
+                                                                       // uses
+                                                                       // the
+                                                                       // suffix
+                                                                       // correctly
+  0b1000000000000000000000000000000000000000000000000000000000000000Ul; // COMPLIANT
+                                                                        // -
+                                                                        // unsigned,
+                                                                        // but
+                                                                        // uses
+                                                                        // the
+                                                                        // suffix
+                                                                        // correctly
+
+  // Use of the `L` suffix
+  0b0L;                                 // COMPLIANT - uses signed long
+  0b1111111111111111111111111111111L;   // COMPLIANT - uses signed long
+  0b10000000000000000000000000000000L;  // COMPLIANT - uses signed long
+  0b100000000000000000000000000000000L; // COMPLIANT - uses signed long
+  0b111111111111111111111111111111111111111111111111111111111111111L; // COMPLIANT
+                                                                      // -
+                                                                      // COMPLIANT
+                                                                      // - uses
+                                                                      // signed
+                                                                      // long
+  0b1000000000000000000000000000000000000000000000000000000000000000L; // NON_COMPLIANT
+                                                                       // -
+                                                                       // larger
+                                                                       // than
+                                                                       // long
+                                                                       // int,
+                                                                       // so
+                                                                       // will
+                                                                       // be
+                                                                       // unsigned
+                                                                       // long
+                                                                       // int
+  0b0UL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0b1111111111111111111111111111111UL;   // COMPLIANT - unsigned, but uses the
+                                         // suffix correctly
+  0b10000000000000000000000000000000UL;  // COMPLIANT - unsigned, but uses the
+                                         // suffix correctly
+  0b100000000000000000000000000000000UL; // COMPLIANT - unsigned, but uses the
+                                         // suffix correctly
+  0b111111111111111111111111111111111111111111111111111111111111111UL; // COMPLIANT
+                                                                       // -
+                                                                       // unsigned,
+                                                                       // but
+                                                                       // uses
+                                                                       // the
+                                                                       // suffix
+                                                                       // correctly
+  0b1000000000000000000000000000000000000000000000000000000000000000UL; // COMPLIANT
+                                                                        // -
+                                                                        // unsigned,
+                                                                        // but
+                                                                        // uses
+                                                                        // the
+                                                                        // suffix
+                                                                        // correctly
+
+  // Use of the `ll` suffix
+  0b0ll;                                 // COMPLIANT - uses signed long long
+  0b1111111111111111111111111111111ll;   // COMPLIANT - uses signed long long
+  0b10000000000000000000000000000000ll;  // COMPLIANT - uses signed long long
+  0b100000000000000000000000000000000ll; // COMPLIANT - uses signed long long
+  0b111111111111111111111111111111111111111111111111111111111111111ll; // COMPLIANT
+                                                                       // - max
+                                                                       // long
+                                                                       // int
+  0b1000000000000000000000000000000000000000000000000000000000000000ll; // NON_COMPLIANT
+                                                                        // -
+                                                                        // larger
+                                                                        // than
+                                                                        // long
+                                                                        // int,
+                                                                        // so
+                                                                        // will
+                                                                        // be
+                                                                        // unsigned
+                                                                        // long
+                                                                        // int
+  0b0Ull; // COMPLIANT - unsigned, but uses the suffix correctly
+  0b1111111111111111111111111111111Ull;   // COMPLIANT - unsigned, but uses the
+                                          // suffix correctly
+  0b10000000000000000000000000000000Ull;  // COMPLIANT - unsigned, but uses the
+                                          // suffix correctly
+  0b100000000000000000000000000000000Ull; // COMPLIANT - unsigned, but uses the
+                                          // suffix correctly
+  0b111111111111111111111111111111111111111111111111111111111111111Ull; // COMPLIANT
+                                                                        // -
+                                                                        // unsigned,
+                                                                        // but
+                                                                        // uses
+                                                                        // the
+                                                                        // suffix
+                                                                        // correctly
+  0b1000000000000000000000000000000000000000000000000000000000000000Ull; // COMPLIANT
+                                                                         // -
+                                                                         // unsigned,
+                                                                         // but
+                                                                         // uses
+                                                                         // the
+                                                                         // suffix
+                                                                         // correctly
+
+  // Use of the `LL` suffix
+  00LL;                                  // COMPLIANT - uses signed long long
+  0b1111111111111111111111111111111LL;   // COMPLIANT - uses signed long long
+  0b10000000000000000000000000000000LL;  // COMPLIANT - uses signed long long
+  0b100000000000000000000000000000000LL; // COMPLIANT - uses signed long long
+  0b111111111111111111111111111111111111111111111111111111111111111LL; // COMPLIANT
+                                                                       // - max
+                                                                       // long
+                                                                       // int
+  0b1000000000000000000000000000000000000000000000000000000000000000LL; // NON_COMPLIANT
+                                                                        // -
+                                                                        // larger
+                                                                        // than
+                                                                        // long
+                                                                        // int,
+                                                                        // so
+                                                                        // will
+                                                                        // be
+                                                                        // unsigned
+                                                                        // long
+                                                                        // int
+  00ULL; // COMPLIANT - unsigned, but uses the suffix correctly
+  0b1111111111111111111111111111111ULL;   // COMPLIANT - unsigned, but uses the
+                                          // suffix correctly
+  0b10000000000000000000000000000000ULL;  // COMPLIANT - unsigned, but uses the
+                                          // suffix correctly
+  0b100000000000000000000000000000000ULL; // COMPLIANT - unsigned, but uses the
+                                          // suffix correctly
+  0b111111111111111111111111111111111111111111111111111111111111111ULL; // COMPLIANT
+                                                                        // -
+                                                                        // unsigned,
+                                                                        // but
+                                                                        // uses
+                                                                        // the
+                                                                        // suffix
+                                                                        // correctly
+  0b1000000000000000000000000000000000000000000000000000000000000000ULL; // COMPLIANT
+                                                                         // -
+                                                                         // unsigned,
+                                                                         // but
+                                                                         // uses
+                                                                         // the
+                                                                         // suffix
+                                                                         // correctly
+}
+
 #define COMPLIANT_VAL 0x80000000U
 #define NON_COMPLIANT_VAL 0x80000000
 

From 2b909fb32128c8457b0f0ce2640ccb6531071a85 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 17 Oct 2024 23:59:44 +0100
Subject: [PATCH 314/435] A5-2-6: Avoid reporting cases with the same operator

---
 change_notes/2024-10-17-a5-2-6-no-ambiguity.md                  | 2 ++
 .../src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql | 2 ++
 cpp/autosar/test/rules/A5-2-6/test.cpp                          | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 change_notes/2024-10-17-a5-2-6-no-ambiguity.md

diff --git a/change_notes/2024-10-17-a5-2-6-no-ambiguity.md b/change_notes/2024-10-17-a5-2-6-no-ambiguity.md
new file mode 100644
index 0000000000..661c1c7ab7
--- /dev/null
+++ b/change_notes/2024-10-17-a5-2-6-no-ambiguity.md
@@ -0,0 +1,2 @@
+ - `A5-2-6` - `OperandsOfAlogicalAndOrNotParenthesized.ql`:
+   - Remove false positives where the operator is identical.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql b/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql
index dd63288587..b35c4c96ea 100644
--- a/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql
+++ b/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql
@@ -21,6 +21,8 @@ from BinaryLogicalOperation op, BinaryOperation binop
 where
   not isExcluded(op, OrderOfEvaluationPackage::operandsOfALogicalAndOrNotParenthesizedQuery()) and
   op.getAnOperand() = binop and
+  // Ignore cases with the same operator
+  not op.getOperator() = binop.getOperator() and
   not exists(ParenthesisExpr p | p = binop.getFullyConverted()) and
   // Exclude binary operations expanded by a macro.
   not binop.isInMacroExpansion()
diff --git a/cpp/autosar/test/rules/A5-2-6/test.cpp b/cpp/autosar/test/rules/A5-2-6/test.cpp
index 0649f7dbc9..961eef3b36 100644
--- a/cpp/autosar/test/rules/A5-2-6/test.cpp
+++ b/cpp/autosar/test/rules/A5-2-6/test.cpp
@@ -25,6 +25,8 @@ void f2(int p1, int p2) {
     f1();
   }
 
+  (p1 > 0) && (p2 > 0) && (p1 > p2); // COMPLIANT - no ambiguity
+
   Sample *sample_ptr = &sample;
 
   if ((p1 > 0) || sample_ptr->x) { // COMPLIANT: struct member accessors with

From 5235b0b0bec377d7887ff76fd4609147c8ef2724 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 18 Oct 2024 00:04:16 +0100
Subject: [PATCH 315/435] A5-2-6: Improve alert message

Attempt to clarify which expression is to be parenthesized
---
 change_notes/2024-10-17-a5-2-6-no-ambiguity.md      |  3 ++-
 .../OperandsOfALogicalAndOrNotParenthesized.ql      | 13 ++++++++++---
 ...OperandsOfALogicalAndOrNotParenthesized.expected |  6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/change_notes/2024-10-17-a5-2-6-no-ambiguity.md b/change_notes/2024-10-17-a5-2-6-no-ambiguity.md
index 661c1c7ab7..6e00b3bbaf 100644
--- a/change_notes/2024-10-17-a5-2-6-no-ambiguity.md
+++ b/change_notes/2024-10-17-a5-2-6-no-ambiguity.md
@@ -1,2 +1,3 @@
  - `A5-2-6` - `OperandsOfAlogicalAndOrNotParenthesized.ql`:
-   - Remove false positives where the operator is identical.
\ No newline at end of file
+   - Remove false positives where the operator is identical.
+   - Improve alert message to clarify which expression needs to be parenthesized.
\ No newline at end of file
diff --git a/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql b/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql
index b35c4c96ea..b2c3120556 100644
--- a/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql
+++ b/cpp/autosar/src/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.ql
@@ -17,13 +17,20 @@
 import cpp
 import codingstandards.cpp.autosar
 
-from BinaryLogicalOperation op, BinaryOperation binop
+from BinaryLogicalOperation op, BinaryOperation binop, string leftOrRight
 where
   not isExcluded(op, OrderOfEvaluationPackage::operandsOfALogicalAndOrNotParenthesizedQuery()) and
-  op.getAnOperand() = binop and
+  (
+    op.getLeftOperand() = binop and
+    leftOrRight = "Left"
+    or
+    op.getRightOperand() = binop and
+    leftOrRight = "Right"
+  ) and
   // Ignore cases with the same operator
   not op.getOperator() = binop.getOperator() and
   not exists(ParenthesisExpr p | p = binop.getFullyConverted()) and
   // Exclude binary operations expanded by a macro.
   not binop.isInMacroExpansion()
-select op, "Binary $@ operand of logical operation is not parenthesized.", binop, "operator"
+select op, "$@ of logical operation " + op.getOperator() + " is not parenthesized.", binop,
+  leftOrRight + " operand " + binop.getOperator()
diff --git a/cpp/autosar/test/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.expected b/cpp/autosar/test/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.expected
index 90516e6d96..34dbb0db4d 100644
--- a/cpp/autosar/test/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.expected
+++ b/cpp/autosar/test/rules/A5-2-6/OperandsOfALogicalAndOrNotParenthesized.expected
@@ -1,3 +1,3 @@
-| test.cpp:3:7:3:23 | ... && ... | Binary $@ operand of logical operation is not parenthesized. | test.cpp:3:7:3:12 | ... > ... | operator |
-| test.cpp:3:7:3:23 | ... && ... | Binary $@ operand of logical operation is not parenthesized. | test.cpp:3:17:3:23 | ... < ... | operator |
-| test.cpp:7:7:7:24 | ... \|\| ... | Binary $@ operand of logical operation is not parenthesized. | test.cpp:7:19:7:24 | ... > ... | operator |
+| test.cpp:3:7:3:23 | ... && ... | $@ of logical operation && is not parenthesized. | test.cpp:3:7:3:12 | ... > ... | Left operand > |
+| test.cpp:3:7:3:23 | ... && ... | $@ of logical operation && is not parenthesized. | test.cpp:3:17:3:23 | ... < ... | Right operand < |
+| test.cpp:7:7:7:24 | ... \|\| ... | $@ of logical operation \|\| is not parenthesized. | test.cpp:7:19:7:24 | ... > ... | Right operand > |

From 1908bbf71887d9a1e118f36276cdc6ffadeb1ffc Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 17 Oct 2024 16:25:08 -0700
Subject: [PATCH 316/435] Format queries and tests

---
 .../RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql  | 3 ++-
 .../MissingStaticSpecifierFuncRedeclarationObsolete.ql   | 3 ++-
 .../MissingStaticSpecifierObjectRedeclarationObsolete.ql | 3 ++-
 .../MissingStaticSpecifierObjectRedeclarationC.ql        | 3 ++-
 .../RULE-1-5/UngetcCallOnStreamPositionZero.expected     | 9 ++++++++-
 c/misra/test/rules/RULE-1-5/test.c                       | 5 +++--
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
index 8f0e626bc8..645285f438 100644
--- a/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.functiontypesnotinprototypeformshared.FunctionTypesNotInPrototypeFormShared
 
-class FunctionTypesNotInPrototypeFormObsoleteQuery extends FunctionTypesNotInPrototypeFormSharedSharedQuery {
+class FunctionTypesNotInPrototypeFormObsoleteQuery extends FunctionTypesNotInPrototypeFormSharedSharedQuery
+{
   FunctionTypesNotInPrototypeFormObsoleteQuery() {
     this = Language4Package::functionTypesNotInPrototypeFormObsoleteQuery()
   }
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
index 5a70e0287a..ba800885ef 100644
--- a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.missingstaticspecifierfunctionredeclarationshared.MissingStaticSpecifierFunctionRedeclarationShared
 
-class MissingStaticSpecifierFuncRedeclarationObsoleteQuery extends MissingStaticSpecifierFunctionRedeclarationSharedSharedQuery {
+class MissingStaticSpecifierFuncRedeclarationObsoleteQuery extends MissingStaticSpecifierFunctionRedeclarationSharedSharedQuery
+{
   MissingStaticSpecifierFuncRedeclarationObsoleteQuery() {
     this = Language4Package::missingStaticSpecifierFuncRedeclarationObsoleteQuery()
   }
diff --git a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
index 5e32d57c6a..9f9953aa6f 100644
--- a/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
+++ b/c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.missingstaticspecifierobjectredeclarationshared.MissingStaticSpecifierObjectRedeclarationShared
 
-class MissingStaticSpecifierObjectRedeclarationObsoleteQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery {
+class MissingStaticSpecifierObjectRedeclarationObsoleteQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery
+{
   MissingStaticSpecifierObjectRedeclarationObsoleteQuery() {
     this = Language4Package::missingStaticSpecifierObjectRedeclarationObsoleteQuery()
   }
diff --git a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
index 6f731c636f..877ef19d2a 100644
--- a/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
+++ b/c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql
@@ -16,7 +16,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.missingstaticspecifierobjectredeclarationshared.MissingStaticSpecifierObjectRedeclarationShared
 
-class MissingStaticSpecifierObjectRedeclarationCQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery {
+class MissingStaticSpecifierObjectRedeclarationCQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery
+{
   MissingStaticSpecifierObjectRedeclarationCQuery() {
     this = Declarations5Package::missingStaticSpecifierObjectRedeclarationCQuery()
   }
diff --git a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
index 4dd298197f..3a6f6bc821 100644
--- a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
+++ b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
@@ -1 +1,8 @@
-| test.c:40:3:40:8 | call to ungetc | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:38:16:38:20 | call to fopen | call to fopen |
+edges
+| test.c:38:16:38:20 | call to fopen indirection | test.c:40:15:40:18 | file indirection |
+nodes
+| test.c:38:16:38:20 | call to fopen indirection | semmle.label | call to fopen indirection |
+| test.c:40:15:40:18 | file indirection | semmle.label | file indirection |
+subpaths
+#select
+| test.c:40:15:40:18 | file indirection | test.c:38:16:38:20 | call to fopen indirection | test.c:40:15:40:18 | file indirection | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:38:16:38:20 | call to fopen indirection | call to fopen indirection |
diff --git a/c/misra/test/rules/RULE-1-5/test.c b/c/misra/test/rules/RULE-1-5/test.c
index 7632e0a727..38d701c44b 100644
--- a/c/misra/test/rules/RULE-1-5/test.c
+++ b/c/misra/test/rules/RULE-1-5/test.c
@@ -29,7 +29,7 @@ _Atomic int g3 = ATOMIC_VAR_INIT(18); // NON-COMPLIANT
 _Atomic int g4 = 18;                  // COMPLIANT
 
 // `gets` was removed from C11.
-extern char* gets(FILE *stream);
+extern char *gets(FILE *stream);
 
 // Rule 21.6 covers the below cases:
 void f6(void) {
@@ -41,6 +41,7 @@ void f6(void) {
 
   char buf[10];
   fread(buf, sizeof(buf), 10, file);
-  // This is not an obsolete usage of ungetc, though ungetc isn't allowed by 21-3.
+  // This is not an obsolete usage of ungetc, though ungetc isn't allowed by
+  // 21-3.
   ungetc('c', file); // COMPLIANT
 }
\ No newline at end of file

From fd9eb8a0ee86cd53ec1c82c202756aba71c9140a Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 17 Oct 2024 16:25:30 -0700
Subject: [PATCH 317/435] Remodel ungetc() query as a sanitization/path problem

---
 .../UngetcCallOnStreamPositionZero.ql         | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql b/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
index a973442203..8a1615d08c 100644
--- a/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
+++ b/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
@@ -3,7 +3,7 @@
  * @name RULE-1-5: Disallowed obsolescent usage of 'ungetc' on a file stream at position zero
  * @description Calling the function 'ungetc' on a file stream with a position of zero is an
  *              obsolescent language feature.
- * @kind problem
+ * @kind path-problem
  * @precision medium
  * @problem.severity error
  * @tags external/misra/id/rule-1-5
@@ -52,18 +52,30 @@ class MoveStreamPositionCall extends FunctionCall {
   Expr getStreamArgument() { result = streamArgument }
 }
 
-from FunctionCall ungetc, DataFlow::Node file
+module FilePositionZeroFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) {
+    node.asIndirectExpr().(FunctionCall).getTarget().hasGlobalOrStdName("fopen")
+  }
+
+  predicate isSink(DataFlow::Node node) {
+    exists(FunctionCall fc |
+      fc.getTarget().hasGlobalOrStdName("ungetc") and
+      node.asIndirectExpr() = fc.getArgument(1)
+    )
+  }
+
+  predicate isBarrierIn(DataFlow::Node node) {
+    exists(MoveStreamPositionCall fc | node.asIndirectExpr() = fc.getStreamArgument())
+  }
+}
+
+module FilePositionZeroFlow = DataFlow::Global<FilePositionZeroFlowConfig>;
+
+import FilePositionZeroFlow::PathGraph
+
+from FilePositionZeroFlow::PathNode sink, FilePositionZeroFlow::PathNode source
 where
-  not isExcluded(ungetc, Language4Package::ungetcCallOnStreamPositionZeroQuery()) and
-  // ungetc() called on file stream
-  ungetc.getTarget().hasGlobalOrStdName("ungetc") and
-  DataFlow::localFlow(file, DataFlow::exprNode(ungetc.getArgument(1))) and
-  // ungetc() is not dominated by a fread() etc to that file stream
-  not exists(MoveStreamPositionCall moveStreamCall |
-    DataFlow::localFlow(file, DataFlow::exprNode(moveStreamCall.getStreamArgument())) and
-    dominates(moveStreamCall, ungetc)
-  )
-  // the file stream is the root of the local data flow
-  and not DataFlow::localFlow(any(DataFlow::Node n | not n = file), file)
-select ungetc, "Obsolescent call to ungetc on file stream $@ at position zero.", file,
-  file.toString()
+  not isExcluded(sink.getNode().asExpr(), Language4Package::ungetcCallOnStreamPositionZeroQuery()) and
+  FilePositionZeroFlow::flowPath(source, sink)
+select sink.getNode(), source, sink,
+  "Obsolescent call to ungetc on file stream $@ at position zero.", source, source.toString()

From 46b272ac2833b15984686eb6cb5569d03cfe177b Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 17 Oct 2024 16:30:12 -0700
Subject: [PATCH 318/435] Fix query metadata

---
 c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql | 2 +-
 rule_packages/c/Language4.json                               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql b/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
index 8a1615d08c..6a10c94030 100644
--- a/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
+++ b/c/misra/src/rules/RULE-1-5/UngetcCallOnStreamPositionZero.ql
@@ -4,7 +4,7 @@
  * @description Calling the function 'ungetc' on a file stream with a position of zero is an
  *              obsolescent language feature.
  * @kind path-problem
- * @precision medium
+ * @precision high
  * @problem.severity error
  * @tags external/misra/id/rule-1-5
  *       external/misra/c/2012/amendment3
diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index 8698407b5f..fb448bd8a3 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -88,9 +88,9 @@
         },
         {
           "description": "Calling the function 'ungetc' on a file stream with a position of zero is an obsolescent language feature.",
-          "kind": "problem",
+          "kind": "path-problem",
           "name": "Disallowed obsolescent usage of 'ungetc' on a file stream at position zero",
-          "precision": "medium",
+          "precision": "high",
           "severity": "error",
           "short_name": "UngetcCallOnStreamPositionZero",
           "tags": [

From b94ab828dd73ee41aecce7d7ec01e72bbdae7237 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Fri, 18 Oct 2024 14:44:08 +0900
Subject: [PATCH 319/435] Fix typo and update generation script message.

---
 scripts/generate_rules/generate_package_description.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/generate_rules/generate_package_description.py b/scripts/generate_rules/generate_package_description.py
index bf993af574..843d3bd78f 100644
--- a/scripts/generate_rules/generate_package_description.py
+++ b/scripts/generate_rules/generate_package_description.py
@@ -197,11 +197,10 @@ def generate_short_name(title):
       json.dump(package_description, rule_package_file, indent=2, sort_keys=True)
       print("Rule package file generated at " + str(rule_package_file_path) + ".")
       print("")
-      print("A default query has been generated for each for each rule. Please review each rule in the generated JSON file and:")
+      print("A default query has been generated for each rule. Please review each rule in the generated JSON file and:")
       print(" (1) Add additional queries as required")
       print(" (2) Confirm that the following auto-generated properties are appropriate:")
-      print("    - 'camel_name'.")
       print("    - 'precision'.")
-      print("    - 'query_name'.")
+      print("    - 'short_name'.")
       print("    - 'severity'.")
       print(" (3) Add additional 'tags' as required, particularly 'security' or 'correctness'.")

From bc2aac35e64699819989b9f765dfe5b4ebdaedd6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 18 Oct 2024 09:57:18 +0100
Subject: [PATCH 320/435] Ignore deleted constructors when considering whether
 a base class is initialized

---
 change_notes/2024-10-18-init-base-class-deleted.md       | 2 ++
 .../InitializeAllVirtualBaseClasses.qll                  | 2 ++
 .../test/rules/initializeallvirtualbaseclasses/test.cpp  | 9 +++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 change_notes/2024-10-18-init-base-class-deleted.md

diff --git a/change_notes/2024-10-18-init-base-class-deleted.md b/change_notes/2024-10-18-init-base-class-deleted.md
new file mode 100644
index 0000000000..992e1e88a2
--- /dev/null
+++ b/change_notes/2024-10-18-init-base-class-deleted.md
@@ -0,0 +1,2 @@
+- `A12-1-1`, `RULE-15-1-2` - `InitializeAllVirtualBaseClasses.ql`, `ExplicitConstructorBaseClassInitialization.ql`:
+  - Remove false positives for deleted member functions.
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll b/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll
index b3cfe203ac..ffb08283cd 100644
--- a/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/initializeallvirtualbaseclasses/InitializeAllVirtualBaseClasses.qll
@@ -38,6 +38,8 @@ query predicate problems(
     not c.isCompilerGenerated() and
     // Not a defaulted constructor
     not c.isDefaulted() and
+    // Not a deleted constructor
+    not c.isDeleted() and
     declaringType_string = declaringType.getSimpleName() and
     baseClass_string = baseClass.getSimpleName() and
     message =
diff --git a/cpp/common/test/rules/initializeallvirtualbaseclasses/test.cpp b/cpp/common/test/rules/initializeallvirtualbaseclasses/test.cpp
index 7721da8b01..8e6b318b19 100644
--- a/cpp/common/test/rules/initializeallvirtualbaseclasses/test.cpp
+++ b/cpp/common/test/rules/initializeallvirtualbaseclasses/test.cpp
@@ -61,4 +61,13 @@ class Derived6 : public Base2 {
 
 private:
   Base2 b;
+};
+
+class Base3 {};
+
+class Derived7 final : public Base3 {
+public:
+  Derived7() = delete;                 // COMPLIANT
+  Derived7(const Derived7 &) = delete; // COMPLIANT
+  Derived7(Derived7 &&) = delete;      // COMPLIANT
 };
\ No newline at end of file

From f548ebb56675efe01a44f48cef1c6b7abc99f8a9 Mon Sep 17 00:00:00 2001
From: knewbury01 <knewbury01@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:55:05 +0000
Subject: [PATCH 321/435] Bump version to 2.37.0-dev

---
 c/cert/src/qlpack.yml       |  2 +-
 c/cert/test/qlpack.yml      |  2 +-
 c/common/src/qlpack.yml     |  2 +-
 c/common/test/qlpack.yml    |  2 +-
 c/misra/src/qlpack.yml      |  2 +-
 c/misra/test/qlpack.yml     |  2 +-
 cpp/autosar/src/qlpack.yml  |  2 +-
 cpp/autosar/test/qlpack.yml |  2 +-
 cpp/cert/src/qlpack.yml     |  2 +-
 cpp/cert/test/qlpack.yml    |  2 +-
 cpp/common/src/qlpack.yml   |  2 +-
 cpp/common/test/qlpack.yml  |  2 +-
 cpp/misra/src/qlpack.yml    |  2 +-
 cpp/misra/test/qlpack.yml   |  2 +-
 cpp/report/src/qlpack.yml   |  2 +-
 docs/user_manual.md         | 12 ++++++------
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index f0daa6334a..09d40aed0b 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
index 7a700897b0..b9ae07d6ef 100644
--- a/c/cert/test/qlpack.yml
+++ b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.36.0-dev
+version: 2.37.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 5f18365483..9793da257e 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
index 47b71ea34a..ec8fdff257 100644
--- a/c/common/test/qlpack.yml
+++ b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.36.0-dev
+version: 2.37.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 9d0ed62e06..a7b19e707c 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
index bc2f2e7546..b205f34897 100644
--- a/c/misra/test/qlpack.yml
+++ b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.36.0-dev
+version: 2.37.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 93a0f4bd9a..3b48c14255 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
index 41a02a6afb..d470b12f70 100644
--- a/cpp/autosar/test/qlpack.yml
+++ b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.36.0-dev
+version: 2.37.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 3a85e2aa20..be45e129ad 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
index 2464828aac..ae70b1f71c 100644
--- a/cpp/cert/test/qlpack.yml
+++ b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.36.0-dev
+version: 2.37.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index b7f90b4cd3..ba215c7d20 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.12.2
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
index 249c64696e..de878794a7 100644
--- a/cpp/common/test/qlpack.yml
+++ b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.36.0-dev
+version: 2.37.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index b713614f68..a09da80932 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 description: MISRA C++ 2023
 default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
index 0267a9ec70..e77a784a18 100644
--- a/cpp/misra/test/qlpack.yml
+++ b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.36.0-dev
+version: 2.37.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index f90669908d..5f698e7dd7 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.36.0-dev
+version: 2.37.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.12.2
diff --git a/docs/user_manual.md b/docs/user_manual.md
index db0f836339..2c99421851 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -31,13 +31,13 @@
 
 ## Release information
 
-This user manual documents release `2.36.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
+This user manual documents release `2.37.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
-- `code-scanning-cpp-query-pack-2.36.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `supported_rules_list_2.36.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
-- `supported_rules_list_2.36.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
-- `user_manual_2.36.0-dev.md`: This user manual.
+- `code-scanning-cpp-query-pack-2.37.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `supported_rules_list_2.37.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
+- `supported_rules_list_2.37.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
+- `user_manual_2.37.0-dev.md`: This user manual.
 - `Source Code (zip)`: A zip archive containing the contents of https://github.com/github/codeql-coding-standards
 - `Source Code (tar.gz)`: A GZip compressed tar archive containing the contents of https://github.com/github/codeql-coding-standards
 - `checksums.txt`: A text file containing sha256 checksums for the aforementioned artifacts.
@@ -503,7 +503,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Ouf of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
-|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.36.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
+|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.37.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
 |                              | Incorrect deviation record specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation records with a reason. Ensure that all deviation records are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |

From f59040284efd42e5f59d0996ad4a8dbae8b44341 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 18 Oct 2024 14:45:31 -0700
Subject: [PATCH 322/435] Implement alignment package for MISRA-C 2012
 amendment 3

---
 ...clarationOfObjectWithUnmatchedAlignment.ql | 47 +++++++++
 .../RedeclarationOfObjectWithoutAlignment.ql  | 99 +++++++++++++++++++
 .../rules/RULE-8-16/AlignmentWithSizeZero.ql  | 24 +++++
 ...eThanOneAlignmentSpecifierOnDeclaration.ql | 35 +++++++
 ...ionOfObjectWithUnmatchedAlignment.expected |  8 ++
 ...rationOfObjectWithUnmatchedAlignment.qlref |  1 +
 ...clarationOfObjectWithoutAlignment.expected |  2 +
 ...edeclarationOfObjectWithoutAlignment.qlref |  1 +
 c/misra/test/rules/RULE-8-15/test.c           | 35 +++++++
 .../RULE-8-16/AlignmentWithSizeZero.expected  |  4 +
 .../RULE-8-16/AlignmentWithSizeZero.qlref     |  1 +
 c/misra/test/rules/RULE-8-16/test.c           | 14 +++
 ...neAlignmentSpecifierOnDeclaration.expected |  6 ++
 ...anOneAlignmentSpecifierOnDeclaration.qlref |  1 +
 c/misra/test/rules/RULE-8-17/test.c           | 16 +++
 .../cpp/exclusions/c/Alignment.qll            | 78 +++++++++++++++
 .../cpp/exclusions/c/RuleMetadata.qll         |  3 +
 rule_packages/c/Alignment.json                | 79 +++++++++++++++
 18 files changed, 454 insertions(+)
 create mode 100644 c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
 create mode 100644 c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
 create mode 100644 c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
 create mode 100644 c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
 create mode 100644 c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected
 create mode 100644 c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.qlref
 create mode 100644 c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected
 create mode 100644 c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.qlref
 create mode 100644 c/misra/test/rules/RULE-8-15/test.c
 create mode 100644 c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.expected
 create mode 100644 c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.qlref
 create mode 100644 c/misra/test/rules/RULE-8-16/test.c
 create mode 100644 c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.expected
 create mode 100644 c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.qlref
 create mode 100644 c/misra/test/rules/RULE-8-17/test.c
 create mode 100644 cpp/common/src/codingstandards/cpp/exclusions/c/Alignment.qll
 create mode 100644 rule_packages/c/Alignment.json

diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
new file mode 100644
index 0000000000..74fc68d04d
--- /dev/null
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
@@ -0,0 +1,47 @@
+/**
+ * @id c/misra/redeclaration-of-object-with-unmatched-alignment
+ * @name RULE-8-15: Alignment should match between all declarations of an object
+ * @description All declarations of an object with an explicit alignment specification shall specify
+ *              the same alignment.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-15
+ *       extern/misra/c/2012/amendment3
+ *       readability
+ *       maintainability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+predicate lexicallyEqualExpr(Expr a, Expr b) {
+  a.toString() = b.toString() and
+  a.getNumChild() = b.getNumChild() and
+  forall(Expr aChild, Expr bChild, int i |
+    aChild = a.getChild(i) and
+    bChild = b.getChild(i) and
+    i < a.getNumChild()
+  |
+    lexicallyEqualExpr(aChild, bChild)
+  )
+}
+
+predicate lexicallyEqual(AttributeArgument a, AttributeArgument b) {
+  lexicallyEqualExpr(a.getValueConstant(), b.getValueConstant()) or
+  a.getValueType() = b.getValueType()
+}
+
+from Attribute alignment, Attribute mismatched, string variable
+where
+  not isExcluded(alignment, AlignmentPackage::redeclarationOfObjectWithUnmatchedAlignmentQuery()) and
+  alignment.hasName("_Alignas") and
+  mismatched.hasName("_Alignas") and
+  exists(Variable v |
+    v.getAnAttribute() = alignment and v.getAnAttribute() = mismatched and v.getName() = variable
+  ) and
+  not lexicallyEqual(alignment.getArgument(0), mismatched.getArgument(0))
+select alignment,
+  "Variable " + variable + " declared with lexically different _Alignof() values '$@' and '$@'",
+  alignment, alignment.getArgument(0).toString(), mismatched, mismatched.getArgument(0).toString()
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
new file mode 100644
index 0000000000..9af3839e16
--- /dev/null
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
@@ -0,0 +1,99 @@
+/**
+ * @id c/misra/redeclaration-of-object-without-alignment
+ * @name RULE-8-15: Alignment should match between all declarations of an object
+ * @description An object declared with an explicit alignment shall be explicitly aligned in all
+ *              declarations.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-15
+ *       extern/misra/c/2012/amendment3
+ *       readability
+ *       maintainability
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+
+/**
+ * Performance optimization; start query by joining attributes to declarations
+ * rather than locations.
+ * 
+ * Including the entry location also speeds up search.
+ */
+newtype TAttributeDeclLocation =
+  TAttributeDeclLocationInfo(
+    Attribute attribute, DeclarationEntry entry, Location entryLocation
+  ) {
+    entry.getDeclaration().(Variable).getAnAttribute() = attribute and
+    entryLocation = entry.getLocation()
+  }
+
+/**
+ * Get a DeclarationEntry along with its explicitly declared Attributes.
+ *
+ * DeclarationEntry does not have a method for getting Attributes by default,
+ * because an attribute declared on any DeclarationEntry affects all others,
+ * and attributes really belong to the declared variable rather than the
+ * declaration itself.
+ *
+ * In order to support this rule, we find for each attribute
+ * - A declaration entry which
+ * - corresponds to a variable associated with this attribute
+ * - is in the same file as this attribute
+ * - has identifier location after the attribute declaration
+ * - has no other declaration entry between this one and the attribute.
+ *
+ * This should give us a highly reliable means of finding which attributes are
+ * associated with which `DeclarationEntry`s.
+ *
+ * One note of caution: the associated `Variable` must be treated with caution,
+ * as there are multiple instances of that `Variable` if it is declared
+ * multiple times, they equal each other, and `getLocation()` on each variable
+ * returns every location result. This class must act on `DeclarationEntry`s to
+ * deliver reliable results.
+ */
+class DeclarationEntryAttribute extends Attribute {
+  DeclarationEntry declarationEntry;
+  Location location;
+  Location declLocation;
+  File file;
+  TAttributeDeclLocation locInfo;
+
+  DeclarationEntryAttribute() {
+    locInfo = TAttributeDeclLocationInfo(this, declarationEntry, declLocation) and
+    file = getFile() and
+    location = getLocation() and
+    declLocation = declarationEntry.getLocation() and
+    declarationEntry.getDeclaration().(Variable).getAnAttribute() = this and
+    declarationEntry.getFile() = file and
+    location.isBefore(declLocation, _) and
+    not exists(TAttributeDeclLocation blocInfo, DeclarationEntry betterFit, Location blocation |
+      blocInfo = TAttributeDeclLocationInfo(this, betterFit, blocation) and
+      not betterFit = declarationEntry and
+      blocation = betterFit.getLocation() and
+      betterFit.getFile() = file and
+      betterFit.getDeclaration() = declarationEntry.getDeclaration() and
+      blocation.isBefore(declLocation, _) and
+      location.isBefore(blocation, _)
+    )
+  }
+
+  DeclarationEntry getDeclarationEntry() { result = declarationEntry }
+}
+
+from DeclarationEntry unaligned, DeclarationEntry aligned, DeclarationEntryAttribute attribute
+where
+  not isExcluded(unaligned, AlignmentPackage::redeclarationOfObjectWithoutAlignmentQuery()) and
+  attribute.hasName("_Alignas") and
+  attribute.getDeclarationEntry() = aligned and
+  aligned.getDeclaration() = unaligned.getDeclaration() and
+  not exists(DeclarationEntryAttribute matchingAlignment |
+    matchingAlignment.hasName("_Alignas") and
+    matchingAlignment.getDeclarationEntry() = unaligned
+  )
+select unaligned,
+  "Variable " + unaligned.getName() +
+    " declared without explicit alignment to match $@ with alignment $@", aligned,
+  "other definition", attribute, attribute.toString()
diff --git a/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
new file mode 100644
index 0000000000..52d282c4a2
--- /dev/null
+++ b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
@@ -0,0 +1,24 @@
+/**
+ * @id c/misra/alignment-with-size-zero
+ * @name RULE-8-16: The alignment specification of zero should not appear in an object declaration
+ * @description A declaration shall not have an alignment of size zero.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-16
+ *       extern/misra/c/2012/amendment3
+ *       readability
+ *       maintainability
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from Attribute a, Variable v
+where
+  not isExcluded(a, AlignmentPackage::alignmentWithSizeZeroQuery()) and
+  a.hasName("_Alignas") and
+  a.getArgument(0).getValueInt() = 0 and
+  v.getAnAttribute() = a
+select a.getArgument(0), "Invalid alignof() size set to zero for variable $@.", v, v.getName()
diff --git a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
new file mode 100644
index 0000000000..f7952d1266
--- /dev/null
+++ b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
@@ -0,0 +1,35 @@
+/**
+ * @id c/misra/more-than-one-alignment-specifier-on-declaration
+ * @name RULE-8-17: At most one explicit alignment specifier should appear in an object declaration
+ * @description While C permits the usage of multiple alignment specifiers, doing so reduces
+ *              readability and may obscure the intent of the declaration.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-8-17
+ *       extern/misra/c/2012/amendment3
+ *       readability
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.c.misra
+
+from Variable v, Attribute first, Attribute last
+where
+  not isExcluded(v, AlignmentPackage::moreThanOneAlignmentSpecifierOnDeclarationQuery()) and
+  first = v.getAnAttribute() and
+  last = v.getAnAttribute() and
+  first != last and
+  first.hasName("_Alignas") and
+  last.hasName("_Alignas") and
+  not exists(Attribute beforeFirst |
+    beforeFirst.getLocation().isBefore(first.getLocation(), _) and
+    v.getAnAttribute() = beforeFirst
+  ) and
+  not exists(Attribute afterLast |
+    last.getLocation().isBefore(afterLast.getLocation(), _) and
+    v.getAnAttribute() = afterLast
+  )
+select v, "Variable " + v.getName() + " contains more than one alignment specifier, $@ and $@",
+  first, first.toString(), last, last.toString()
diff --git a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected
new file mode 100644
index 0000000000..83a27f9074
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected
@@ -0,0 +1,8 @@
+| test.c:18:8:18:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@' | test.c:18:8:18:15 | alignas(...) | int | test.c:19:8:19:15 | alignas(...) | 4 |
+| test.c:19:8:19:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@' | test.c:19:8:19:15 | alignas(...) | 4 | test.c:18:8:18:15 | alignas(...) | int |
+| test.c:22:8:22:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@' | test.c:22:8:22:15 | alignas(...) | ... * ... | test.c:23:8:23:15 | alignas(...) | 32 |
+| test.c:23:8:23:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@' | test.c:23:8:23:15 | alignas(...) | 32 | test.c:22:8:22:15 | alignas(...) | ... * ... |
+| test.c:28:8:28:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@' | test.c:28:8:28:15 | alignas(...) | ... * ... | test.c:29:8:29:15 | alignas(...) | ... * ... |
+| test.c:29:8:29:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@' | test.c:29:8:29:15 | alignas(...) | ... * ... | test.c:28:8:28:15 | alignas(...) | ... * ... |
+| test.c:34:8:34:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@' | test.c:34:8:34:15 | alignas(...) | signed int | test.c:35:8:35:15 | alignas(...) | unsigned int |
+| test.c:35:8:35:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@' | test.c:35:8:35:15 | alignas(...) | unsigned int | test.c:34:8:34:15 | alignas(...) | signed int |
diff --git a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.qlref b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.qlref
new file mode 100644
index 0000000000..08648fd168
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.qlref
@@ -0,0 +1 @@
+rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected
new file mode 100644
index 0000000000..e9b91d33a4
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected
@@ -0,0 +1,2 @@
+| test.c:5:12:5:13 | declaration of g2 | Variable g2 declared without explicit alignment to match $@ with alignment $@ | test.c:4:25:4:26 | declaration of g2 | other definition | test.c:4:8:4:15 | alignas(...) | alignas(...) |
+| test.c:7:12:7:13 | declaration of g3 | Variable g3 declared without explicit alignment to match $@ with alignment $@ | test.c:8:25:8:26 | declaration of g3 | other definition | test.c:8:8:8:15 | alignas(...) | alignas(...) |
diff --git a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.qlref b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.qlref
new file mode 100644
index 0000000000..f5f13e2125
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.qlref
@@ -0,0 +1 @@
+rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-15/test.c b/c/misra/test/rules/RULE-8-15/test.c
new file mode 100644
index 0000000000..f97a79d5b6
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-15/test.c
@@ -0,0 +1,35 @@
+extern _Alignas(16) int g1; // COMPLIANT
+extern _Alignas(16) int g1; // COMPLIANT
+
+extern _Alignas(16) int g2;
+extern int g2; // NON_COMPLIANT
+
+extern int g3; // NON_COMPLIANT
+extern _Alignas(16) int g3;
+
+// Does not compile on clang:
+// extern _Alignas(16) int g4; // COMPLIANT
+// extern _Alignas(32) int g4; // COMPLIANT
+
+extern int g5; // COMPLIANT
+extern int g5; // COMPLIANT
+
+// Spec says elements must be lexically identical after macro expansion
+extern _Alignas(int) int g6; // NON_COMPLIANT
+extern _Alignas(4) int g6;   // NON_COMPLIANT
+
+#define THIRTY_TWO 32
+extern _Alignas(16 * 2) int g7; // NON_COMPLIANT
+extern _Alignas(32) int g7;     // NON_COMPLIANT
+
+extern _Alignas(THIRTY_TWO) int g8; // COMPLIANT
+extern _Alignas(32) int g8;         // COMPLIANT
+
+extern _Alignas(16 * 2) int g9; // NON_COMPLIANT
+extern _Alignas(2 * 16) int g9; // NON_COMPLIANT
+
+extern _Alignas(int) int g10; // COMPLIANT
+extern _Alignas(int) int g10; // COMPLIANT
+
+extern _Alignas(signed int) int g11;   // NON_COMPLIANT
+extern _Alignas(unsigned int) int g11; // NON_COMPLIANT
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.expected b/c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.expected
new file mode 100644
index 0000000000..4daa3475ed
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.expected
@@ -0,0 +1,4 @@
+| test.c:2:10:2:10 | 0 | Invalid alignof() size set to zero for variable $@. | test.c:2:17:2:18 | g2 | g2 |
+| test.c:3:10:3:14 | ... - ... | Invalid alignof() size set to zero for variable $@. | test.c:3:21:3:22 | g3 | g3 |
+| test.c:8:12:8:12 | 0 | Invalid alignof() size set to zero for variable $@. | test.c:8:19:8:20 | m2 | m2 |
+| test.c:13:12:13:12 | 0 | Invalid alignof() size set to zero for variable $@. | test.c:13:19:13:20 | l2 | l2 |
diff --git a/c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.qlref b/c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.qlref
new file mode 100644
index 0000000000..c8e19d1fe5
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-16/AlignmentWithSizeZero.qlref
@@ -0,0 +1 @@
+rules/RULE-8-16/AlignmentWithSizeZero.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-16/test.c b/c/misra/test/rules/RULE-8-16/test.c
new file mode 100644
index 0000000000..3e96b7b8cc
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-16/test.c
@@ -0,0 +1,14 @@
+_Alignas(8) int g1;     // COMPLIANT
+_Alignas(0) int g2;     // NON-COMPLIANT
+_Alignas(8 - 8) int g3; // NON-COMPLIANT
+_Alignas(float) int g4; // COMPLIANT
+
+struct s {
+  _Alignas(64) int m1; // COMPLIANT
+  _Alignas(0) int m2;  // NON_COMPLIANT
+};
+
+void f() {
+  _Alignas(8) int l1; // COMPLIANT
+  _Alignas(0) int l2; // NON-COMPLIANT
+}
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.expected b/c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.expected
new file mode 100644
index 0000000000..24707ca457
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.expected
@@ -0,0 +1,6 @@
+| test.c:2:30:2:31 | g2 | Variable g2 contains more than one alignment specifier, $@ and $@ | test.c:2:1:2:8 | alignas(...) | alignas(...) | test.c:2:13:2:20 | alignas(...) | alignas(...) |
+| test.c:3:29:3:30 | g3 | Variable g3 contains more than one alignment specifier, $@ and $@ | test.c:3:1:3:8 | alignas(...) | alignas(...) | test.c:3:13:3:20 | alignas(...) | alignas(...) |
+| test.c:4:35:4:36 | g4 | Variable g4 contains more than one alignment specifier, $@ and $@ | test.c:4:1:4:8 | alignas(...) | alignas(...) | test.c:4:17:4:24 | alignas(...) | alignas(...) |
+| test.c:6:53:6:54 | g5 | Variable g5 contains more than one alignment specifier, $@ and $@ | test.c:5:1:5:8 | alignas(...) | alignas(...) | test.c:6:33:6:40 | alignas(...) | alignas(...) |
+| test.c:10:35:10:36 | m2 | Variable m2 contains more than one alignment specifier, $@ and $@ | test.c:10:3:10:10 | alignas(...) | alignas(...) | test.c:10:18:10:25 | alignas(...) | alignas(...) |
+| test.c:15:35:15:36 | l2 | Variable l2 contains more than one alignment specifier, $@ and $@ | test.c:15:3:15:10 | alignas(...) | alignas(...) | test.c:15:18:15:25 | alignas(...) | alignas(...) |
diff --git a/c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.qlref b/c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.qlref
new file mode 100644
index 0000000000..7ff11e8a61
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.qlref
@@ -0,0 +1 @@
+rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-8-17/test.c b/c/misra/test/rules/RULE-8-17/test.c
new file mode 100644
index 0000000000..e2f8b2b44f
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-17/test.c
@@ -0,0 +1,16 @@
+_Alignas(8) int g1;                                     // COMPLIANT
+_Alignas(8) _Alignas(16) int g2;                        // NON-COMPLIANT
+_Alignas(8) _Alignas(8) int g3;                         // NON-COMPLIANT
+_Alignas(float) _Alignas(int) int g4;                   // NON-COMPLIANT
+_Alignas(float) _Alignas(float) int g5;                 // NON-COMPLIANT
+_Alignas(float) _Alignas(float) _Alignas(float) int g5; // NON-COMPLIANT
+
+struct s {
+  _Alignas(64) int m1;                // COMPLIANT
+  _Alignas(long) _Alignas(16) int m2; // NON_COMPLIANT
+};
+
+void f() {
+  _Alignas(8) int l1;                 // COMPLIANT
+  _Alignas(long) _Alignas(16) int l2; // NON_COMPLIANT
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Alignment.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Alignment.qll
new file mode 100644
index 0000000000..9447abf636
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/Alignment.qll
@@ -0,0 +1,78 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype AlignmentQuery =
+  TRedeclarationOfObjectWithoutAlignmentQuery() or
+  TRedeclarationOfObjectWithUnmatchedAlignmentQuery() or
+  TAlignmentWithSizeZeroQuery() or
+  TMoreThanOneAlignmentSpecifierOnDeclarationQuery()
+
+predicate isAlignmentQueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `redeclarationOfObjectWithoutAlignment` query
+    AlignmentPackage::redeclarationOfObjectWithoutAlignmentQuery() and
+  queryId =
+    // `@id` for the `redeclarationOfObjectWithoutAlignment` query
+    "c/misra/redeclaration-of-object-without-alignment" and
+  ruleId = "RULE-8-15" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `redeclarationOfObjectWithUnmatchedAlignment` query
+    AlignmentPackage::redeclarationOfObjectWithUnmatchedAlignmentQuery() and
+  queryId =
+    // `@id` for the `redeclarationOfObjectWithUnmatchedAlignment` query
+    "c/misra/redeclaration-of-object-with-unmatched-alignment" and
+  ruleId = "RULE-8-15" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `alignmentWithSizeZero` query
+    AlignmentPackage::alignmentWithSizeZeroQuery() and
+  queryId =
+    // `@id` for the `alignmentWithSizeZero` query
+    "c/misra/alignment-with-size-zero" and
+  ruleId = "RULE-8-16" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `moreThanOneAlignmentSpecifierOnDeclaration` query
+    AlignmentPackage::moreThanOneAlignmentSpecifierOnDeclarationQuery() and
+  queryId =
+    // `@id` for the `moreThanOneAlignmentSpecifierOnDeclaration` query
+    "c/misra/more-than-one-alignment-specifier-on-declaration" and
+  ruleId = "RULE-8-17" and
+  category = "advisory"
+}
+
+module AlignmentPackage {
+  Query redeclarationOfObjectWithoutAlignmentQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `redeclarationOfObjectWithoutAlignment` query
+      TQueryC(TAlignmentPackageQuery(TRedeclarationOfObjectWithoutAlignmentQuery()))
+  }
+
+  Query redeclarationOfObjectWithUnmatchedAlignmentQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `redeclarationOfObjectWithUnmatchedAlignment` query
+      TQueryC(TAlignmentPackageQuery(TRedeclarationOfObjectWithUnmatchedAlignmentQuery()))
+  }
+
+  Query alignmentWithSizeZeroQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `alignmentWithSizeZero` query
+      TQueryC(TAlignmentPackageQuery(TAlignmentWithSizeZeroQuery()))
+  }
+
+  Query moreThanOneAlignmentSpecifierOnDeclarationQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `moreThanOneAlignmentSpecifierOnDeclaration` query
+      TQueryC(TAlignmentPackageQuery(TMoreThanOneAlignmentSpecifierOnDeclarationQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
index 3833533d50..51fe53cf6f 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll
@@ -2,6 +2,7 @@
 import cpp
 import codingstandards.cpp.exclusions.RuleMetadata
 //** Import packages for this language **/
+import Alignment
 import Banned
 import Banned2
 import BitfieldTypes
@@ -78,6 +79,7 @@ import Types2
 
 /** The TQuery type representing this language * */
 newtype TCQuery =
+  TAlignmentPackageQuery(AlignmentQuery q) or
   TBannedPackageQuery(BannedQuery q) or
   TBanned2PackageQuery(Banned2Query q) or
   TBitfieldTypesPackageQuery(BitfieldTypesQuery q) or
@@ -154,6 +156,7 @@ newtype TCQuery =
 
 /** The metadata predicate * */
 predicate isQueryMetadata(Query query, string queryId, string ruleId, string category) {
+  isAlignmentQueryMetadata(query, queryId, ruleId, category) or
   isBannedQueryMetadata(query, queryId, ruleId, category) or
   isBanned2QueryMetadata(query, queryId, ruleId, category) or
   isBitfieldTypesQueryMetadata(query, queryId, ruleId, category) or
diff --git a/rule_packages/c/Alignment.json b/rule_packages/c/Alignment.json
new file mode 100644
index 0000000000..1cbdf279fb
--- /dev/null
+++ b/rule_packages/c/Alignment.json
@@ -0,0 +1,79 @@
+{
+  "MISRA-C-2012": {
+    "RULE-8-15": {
+      "properties": {
+        "obligation": "required"
+      },
+      "queries": [
+        {
+          "description": "An object declared with an explicit alignment shall be explicitly aligned in all declarations.",
+          "kind": "problem",
+          "name": "Alignment should match between all declarations of an object",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "RedeclarationOfObjectWithoutAlignment",
+          "tags": [
+            "extern/misra/c/2012/amendment3",
+            "readability",
+            "maintainability"
+          ]
+        },
+        {
+          "description": "All declarations of an object with an explicit alignment specification shall specify the same alignment.",
+          "kind": "problem",
+          "name": "Alignment should match between all declarations of an object",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "RedeclarationOfObjectWithUnmatchedAlignment",
+          "tags": [
+            "extern/misra/c/2012/amendment3",
+            "readability",
+            "maintainability"
+          ]
+        }
+      ],
+      "title": "All declarations of an object with an explicit alignment specification shall specify the same alignment"
+    },
+    "RULE-8-16": {
+      "properties": {
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "A declaration shall not have an alignment of size zero.",
+          "kind": "problem",
+          "name": "The alignment specification of zero should not appear in an object declaration",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "AlignmentWithSizeZero",
+          "tags": [
+            "extern/misra/c/2012/amendment3",
+            "readability",
+            "maintainability"
+          ]
+        }
+      ],
+      "title": "The alignment specification of zero should not appear in an object declaration"
+    },
+    "RULE-8-17": {
+      "properties": {
+        "obligation": "advisory"
+      },
+      "queries": [
+        {
+          "description": "While C permits the usage of multiple alignment specifiers, doing so reduces readability and may obscure the intent of the declaration.",
+          "kind": "problem",
+          "name": "At most one explicit alignment specifier should appear in an object declaration",
+          "precision": "very-high",
+          "severity": "error",
+          "short_name": "MoreThanOneAlignmentSpecifierOnDeclaration",
+          "tags": [
+            "extern/misra/c/2012/amendment3",
+            "readability"
+          ]
+        }
+      ],
+      "title": "At most one explicit alignment specifier should appear in an object declaration"
+    }
+  }
+}
\ No newline at end of file

From 7ae79abf9955cd785571cb83b3e59a6bfc201e9f Mon Sep 17 00:00:00 2001
From: Michael R Fairhurst <MichaelRFairhurst@github.com>
Date: Fri, 18 Oct 2024 22:11:30 +0000
Subject: [PATCH 323/435] Add test for mismatched alignments on gcc

---
 ...fObjectWithUnmatchedAlignment.expected.gcc | 10 ++++++
 c/misra/test/rules/RULE-8-15/test.c.gcc       | 35 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected.gcc
 create mode 100644 c/misra/test/rules/RULE-8-15/test.c.gcc

diff --git a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected.gcc b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected.gcc
new file mode 100644
index 0000000000..f1054946a7
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected.gcc
@@ -0,0 +1,10 @@
+| test.c:11:8:11:15 | alignas(...) | Variable g4 declared with lexically different _Alignof() values '$@' and '$@' | test.c:11:8:11:15 | alignas(...) | 16 | test.c:12:8:12:15 | alignas(...) | 32 |
+| test.c:12:8:12:15 | alignas(...) | Variable g4 declared with lexically different _Alignof() values '$@' and '$@' | test.c:12:8:12:15 | alignas(...) | 32 | test.c:11:8:11:15 | alignas(...) | 16 |
+| test.c:18:8:18:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@' | test.c:18:8:18:15 | alignas(...) | int | test.c:19:8:19:15 | alignas(...) | 4 |
+| test.c:19:8:19:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@' | test.c:19:8:19:15 | alignas(...) | 4 | test.c:18:8:18:15 | alignas(...) | int |
+| test.c:22:8:22:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@' | test.c:22:8:22:15 | alignas(...) | ... * ... | test.c:23:8:23:15 | alignas(...) | 32 |
+| test.c:23:8:23:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@' | test.c:23:8:23:15 | alignas(...) | 32 | test.c:22:8:22:15 | alignas(...) | ... * ... |
+| test.c:28:8:28:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@' | test.c:28:8:28:15 | alignas(...) | ... * ... | test.c:29:8:29:15 | alignas(...) | ... * ... |
+| test.c:29:8:29:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@' | test.c:29:8:29:15 | alignas(...) | ... * ... | test.c:28:8:28:15 | alignas(...) | ... * ... |
+| test.c:34:8:34:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@' | test.c:34:8:34:15 | alignas(...) | signed int | test.c:35:8:35:15 | alignas(...) | unsigned int |
+| test.c:35:8:35:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@' | test.c:35:8:35:15 | alignas(...) | unsigned int | test.c:34:8:34:15 | alignas(...) | signed int |
diff --git a/c/misra/test/rules/RULE-8-15/test.c.gcc b/c/misra/test/rules/RULE-8-15/test.c.gcc
new file mode 100644
index 0000000000..d0f53bf89a
--- /dev/null
+++ b/c/misra/test/rules/RULE-8-15/test.c.gcc
@@ -0,0 +1,35 @@
+extern _Alignas(16) int g1; // COMPLIANT
+extern _Alignas(16) int g1; // COMPLIANT
+
+extern _Alignas(16) int g2;
+extern int g2; // NON_COMPLIANT
+
+extern int g3; // NON_COMPLIANT
+extern _Alignas(16) int g3;
+
+// Does not compile on clang:
+extern _Alignas(16) int g4; // COMPLIANT
+extern _Alignas(32) int g4; // COMPLIANT
+
+extern int g5; // COMPLIANT
+extern int g5; // COMPLIANT
+
+// Spec says elements must be lexically identical after macro expansion
+extern _Alignas(int) int g6; // NON_COMPLIANT
+extern _Alignas(4) int g6;   // NON_COMPLIANT
+
+#define THIRTY_TWO 32
+extern _Alignas(16 * 2) int g7; // NON_COMPLIANT
+extern _Alignas(32) int g7;     // NON_COMPLIANT
+
+extern _Alignas(THIRTY_TWO) int g8; // COMPLIANT
+extern _Alignas(32) int g8;         // COMPLIANT
+
+extern _Alignas(16 * 2) int g9; // NON_COMPLIANT
+extern _Alignas(2 * 16) int g9; // NON_COMPLIANT
+
+extern _Alignas(int) int g10; // COMPLIANT
+extern _Alignas(int) int g10; // COMPLIANT
+
+extern _Alignas(signed int) int g11;   // NON_COMPLIANT
+extern _Alignas(unsigned int) int g11; // NON_COMPLIANT
\ No newline at end of file

From 9b325f63887e509063666d7e2b040df383f57d41 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 18 Oct 2024 15:20:25 -0700
Subject: [PATCH 324/435] Fix misra c amendment tag

---
 rule_packages/c/Alignment.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rule_packages/c/Alignment.json b/rule_packages/c/Alignment.json
index 1cbdf279fb..edf06a09ca 100644
--- a/rule_packages/c/Alignment.json
+++ b/rule_packages/c/Alignment.json
@@ -13,7 +13,7 @@
           "severity": "error",
           "short_name": "RedeclarationOfObjectWithoutAlignment",
           "tags": [
-            "extern/misra/c/2012/amendment3",
+            "external/misra/c/2012/amendment3",
             "readability",
             "maintainability"
           ]
@@ -26,7 +26,7 @@
           "severity": "error",
           "short_name": "RedeclarationOfObjectWithUnmatchedAlignment",
           "tags": [
-            "extern/misra/c/2012/amendment3",
+            "external/misra/c/2012/amendment3",
             "readability",
             "maintainability"
           ]
@@ -47,7 +47,7 @@
           "severity": "error",
           "short_name": "AlignmentWithSizeZero",
           "tags": [
-            "extern/misra/c/2012/amendment3",
+            "external/misra/c/2012/amendment3",
             "readability",
             "maintainability"
           ]
@@ -68,7 +68,7 @@
           "severity": "error",
           "short_name": "MoreThanOneAlignmentSpecifierOnDeclaration",
           "tags": [
-            "extern/misra/c/2012/amendment3",
+            "external/misra/c/2012/amendment3",
             "readability"
           ]
         }

From feea1e4d97c0d9105e8355fb39eb94ea382e4c6c Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 18 Oct 2024 15:21:16 -0700
Subject: [PATCH 325/435] Fix query format

---
 .../RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
index 9af3839e16..9161c74a38 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
@@ -19,13 +19,11 @@ import codingstandards.c.misra
 /**
  * Performance optimization; start query by joining attributes to declarations
  * rather than locations.
- * 
+ *
  * Including the entry location also speeds up search.
  */
 newtype TAttributeDeclLocation =
-  TAttributeDeclLocationInfo(
-    Attribute attribute, DeclarationEntry entry, Location entryLocation
-  ) {
+  TAttributeDeclLocationInfo(Attribute attribute, DeclarationEntry entry, Location entryLocation) {
     entry.getDeclaration().(Variable).getAnAttribute() = attribute and
     entryLocation = entry.getLocation()
   }

From d214ba7b19415b80b36d3b5c01e9b1ff60c3b134 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 18 Oct 2024 15:28:52 -0700
Subject: [PATCH 326/435] Regenerate queries with updated metadata

---
 .../RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql    | 2 +-
 .../rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql    | 2 +-
 c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql            | 2 +-
 .../RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
index 74fc68d04d..b17c1ef6c1 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
@@ -7,7 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-8-15
- *       extern/misra/c/2012/amendment3
+ *       external/misra/c/2012/amendment3
  *       readability
  *       maintainability
  *       external/misra/obligation/required
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
index 9161c74a38..986ab92f5a 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
@@ -7,7 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-8-15
- *       extern/misra/c/2012/amendment3
+ *       external/misra/c/2012/amendment3
  *       readability
  *       maintainability
  *       external/misra/obligation/required
diff --git a/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
index 52d282c4a2..4a0cd9d50b 100644
--- a/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
+++ b/c/misra/src/rules/RULE-8-16/AlignmentWithSizeZero.ql
@@ -6,7 +6,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-8-16
- *       extern/misra/c/2012/amendment3
+ *       external/misra/c/2012/amendment3
  *       readability
  *       maintainability
  *       external/misra/obligation/advisory
diff --git a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
index f7952d1266..3c89a190ec 100644
--- a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
+++ b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
@@ -7,7 +7,7 @@
  * @precision very-high
  * @problem.severity error
  * @tags external/misra/id/rule-8-17
- *       extern/misra/c/2012/amendment3
+ *       external/misra/c/2012/amendment3
  *       readability
  *       external/misra/obligation/advisory
  */

From 9dc3c2a154d70f7171ed204907ed5173b95389b4 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 18 Oct 2024 18:15:06 -0700
Subject: [PATCH 327/435] Use range analysis to detect realloc() where size may
 be zero, vs, is exactly zero.

---
 ...SizeZero.ql => SizeInReallocCallIsZero.ql} | 17 +++++-----
 .../RULE-1-5/SizeInReallocCallMayBeZero.ql    | 26 +++++++++++++++
 .../CallToObsolescentFunctionGets.expected    |  2 +-
 .../CallToReallocWithSizeZero.expected        |  1 -
 .../RULE-1-5/CallToReallocWithSizeZero.qlref  |  1 -
 ...nvalidDefineOrUndefOfStdBoolMacro.expected | 12 +++----
 .../RULE-1-5/SizeInReallocCallIsZero.expected |  1 +
 .../RULE-1-5/SizeInReallocCallIsZero.qlref    |  1 +
 .../SizeInReallocCallMayBeZero.expected       |  1 +
 .../RULE-1-5/SizeInReallocCallMayBeZero.qlref |  1 +
 .../UngetcCallOnStreamPositionZero.expected   |  8 ++---
 .../UseOfObsoleteMacroAtomicVarInit.expected  |  2 +-
 c/misra/test/rules/RULE-1-5/test.c            |  9 ++---
 .../src/codingstandards/cpp/Realloc.qll       | 18 ++++++++++
 .../cpp/exclusions/c/Language4.qll            | 33 ++++++++++++++-----
 rule_packages/c/Language4.json                | 16 +++++++--
 16 files changed, 113 insertions(+), 36 deletions(-)
 rename c/misra/src/rules/RULE-1-5/{CallToReallocWithSizeZero.ql => SizeInReallocCallIsZero.ql} (50%)
 create mode 100644 c/misra/src/rules/RULE-1-5/SizeInReallocCallMayBeZero.ql
 delete mode 100644 c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
 delete mode 100644 c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.qlref
 create mode 100644 c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.expected
 create mode 100644 c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.qlref
 create mode 100644 cpp/common/src/codingstandards/cpp/Realloc.qll

diff --git a/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql b/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
similarity index 50%
rename from c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
rename to c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
index 2ea90e8b12..2b5cdaa851 100644
--- a/c/misra/src/rules/RULE-1-5/CallToReallocWithSizeZero.ql
+++ b/c/misra/src/rules/RULE-1-5/SizeInReallocCallIsZero.ql
@@ -1,6 +1,6 @@
 /**
- * @id c/misra/call-to-realloc-with-size-zero
- * @name RULE-1-5: Disallowed size argument value equal to zero in call to realloc
+ * @id c/misra/size-in-realloc-call-is-zero
+ * @name RULE-1-5: Size argument value in realloc call is equal zero
  * @description Invoking realloc with a size argument set to zero is implementation-defined behavior
  *              and declared as an obsolete feature in C18.
  * @kind problem
@@ -15,11 +15,12 @@
 import cpp
 import codingstandards.c.misra
 import semmle.code.cpp.rangeanalysis.new.RangeAnalysis
+import codingstandards.cpp.Realloc
 
-from FunctionCall call, Expr arg
+from ReallocCall call
 where
-  not isExcluded(call, Language4Package::callToReallocWithSizeZeroQuery()) and
-  call.getTarget().hasGlobalOrStdName("realloc") and
-  arg = call.getArgument(1) and
-  upperBound(arg) = 0
-select arg, "Calling realloc with size zero results in implementation-defined behavior."
+  not isExcluded(call, Language4Package::sizeInReallocCallIsZeroQuery()) and
+  call.sizeIsExactlyZero()
+select call,
+  "Size argument '$@' may equal zero in realloc call, resulting in obsolescent and/or implementation-defined behavior.",
+  call.getSizeArgument(), call.getSizeArgument().toString()
diff --git a/c/misra/src/rules/RULE-1-5/SizeInReallocCallMayBeZero.ql b/c/misra/src/rules/RULE-1-5/SizeInReallocCallMayBeZero.ql
new file mode 100644
index 0000000000..3e883e45f4
--- /dev/null
+++ b/c/misra/src/rules/RULE-1-5/SizeInReallocCallMayBeZero.ql
@@ -0,0 +1,26 @@
+/**
+ * @id c/misra/size-in-realloc-call-may-be-zero
+ * @name RULE-1-5: Size argument value in realloc call may equal zero
+ * @description Invoking realloc with a size argument set to zero is implementation-defined behavior
+ *              and declared as an obsolete feature in C18.
+ * @kind problem
+ * @precision medium
+ * @problem.severity error
+ * @tags external/misra/id/rule-1-5
+ *       correctness
+ *       external/misra/c/2012/amendment3
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.c.misra
+import codingstandards.cpp.Realloc
+
+from ReallocCall call
+where
+  not isExcluded(call, Language4Package::sizeInReallocCallMayBeZeroQuery()) and
+  call.sizeMayBeZero() and
+  not call.sizeIsExactlyZero()
+select call,
+  "Size argument '$@' equals zero in realloc call, resulting in obsolescent and/or implementation-defined behavior.",
+  call.getSizeArgument(), call.getSizeArgument().toString()
diff --git a/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected b/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected
index 6e0088f4ac..4c8fdc27cf 100644
--- a/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected
+++ b/c/misra/test/rules/RULE-1-5/CallToObsolescentFunctionGets.expected
@@ -1 +1 @@
-| test.c:36:3:36:6 | call to gets | Call to obsolescent function 'gets'. |
+| test.c:37:3:37:6 | call to gets | Call to obsolescent function 'gets'. |
diff --git a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
deleted file mode 100644
index 89e54a38c2..0000000000
--- a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.c:11:14:11:14 | 0 | Calling realloc with size zero results in implementation-defined behavior. |
diff --git a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref b/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref
deleted file mode 100644
index 218be6b3ef..0000000000
--- a/c/misra/test/rules/RULE-1-5/CallToReallocWithSizeZero.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/RULE-1-5/CallToReallocWithSizeZero.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
index 7a6ca9824e..854b200553 100644
--- a/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
+++ b/c/misra/test/rules/RULE-1-5/InvalidDefineOrUndefOfStdBoolMacro.expected
@@ -1,6 +1,6 @@
-| test.c:21:1:21:14 | #define true 3 | Invalid define of boolean standard macro 'true'. |
-| test.c:22:1:22:15 | #define false 3 | Invalid define of boolean standard macro 'false'. |
-| test.c:23:1:23:18 | #define bool int * | Invalid define of boolean standard macro 'bool'. |
-| test.c:24:1:24:11 | #undef true | Invalid undefine of boolean standard macro 'true'. |
-| test.c:25:1:25:12 | #undef false | Invalid undefine of boolean standard macro 'false'. |
-| test.c:26:1:26:11 | #undef bool | Invalid undefine of boolean standard macro 'bool'. |
+| test.c:22:1:22:14 | #define true 3 | Invalid define of boolean standard macro 'true'. |
+| test.c:23:1:23:15 | #define false 3 | Invalid define of boolean standard macro 'false'. |
+| test.c:24:1:24:18 | #define bool int * | Invalid define of boolean standard macro 'bool'. |
+| test.c:25:1:25:11 | #undef true | Invalid undefine of boolean standard macro 'true'. |
+| test.c:26:1:26:12 | #undef false | Invalid undefine of boolean standard macro 'false'. |
+| test.c:27:1:27:11 | #undef bool | Invalid undefine of boolean standard macro 'bool'. |
diff --git a/c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.expected b/c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.expected
new file mode 100644
index 0000000000..7b05a5fc0a
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.expected
@@ -0,0 +1 @@
+| test.c:14:3:14:9 | call to realloc | Size argument '$@' may equal zero in realloc call, resulting in obsolescent and/or implementation-defined behavior. | test.c:14:14:14:14 | 0 | 0 |
diff --git a/c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.qlref b/c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.qlref
new file mode 100644
index 0000000000..cef5e76d54
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/SizeInReallocCallIsZero.qlref
@@ -0,0 +1 @@
+rules/RULE-1-5/SizeInReallocCallIsZero.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.expected b/c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.expected
new file mode 100644
index 0000000000..f86ad4c57c
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.expected
@@ -0,0 +1 @@
+| test.c:15:3:15:9 | call to realloc | Size argument '$@' equals zero in realloc call, resulting in obsolescent and/or implementation-defined behavior. | test.c:15:14:15:15 | p0 | p0 |
diff --git a/c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.qlref b/c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.qlref
new file mode 100644
index 0000000000..1287327c5d
--- /dev/null
+++ b/c/misra/test/rules/RULE-1-5/SizeInReallocCallMayBeZero.qlref
@@ -0,0 +1 @@
+rules/RULE-1-5/SizeInReallocCallMayBeZero.ql
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
index 3a6f6bc821..98e7b34fbe 100644
--- a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
+++ b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
@@ -1,8 +1,8 @@
 edges
-| test.c:38:16:38:20 | call to fopen indirection | test.c:40:15:40:18 | file indirection |
+| test.c:39:16:39:20 | call to fopen indirection | test.c:41:15:41:18 | file indirection |
 nodes
-| test.c:38:16:38:20 | call to fopen indirection | semmle.label | call to fopen indirection |
-| test.c:40:15:40:18 | file indirection | semmle.label | file indirection |
+| test.c:39:16:39:20 | call to fopen indirection | semmle.label | call to fopen indirection |
+| test.c:41:15:41:18 | file indirection | semmle.label | file indirection |
 subpaths
 #select
-| test.c:40:15:40:18 | file indirection | test.c:38:16:38:20 | call to fopen indirection | test.c:40:15:40:18 | file indirection | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:38:16:38:20 | call to fopen indirection | call to fopen indirection |
+| test.c:41:15:41:18 | file indirection | test.c:39:16:39:20 | call to fopen indirection | test.c:41:15:41:18 | file indirection | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:39:16:39:20 | call to fopen indirection | call to fopen indirection |
diff --git a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
index bc903de094..edd607c52f 100644
--- a/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
+++ b/c/misra/test/rules/RULE-1-5/UseOfObsoleteMacroAtomicVarInit.expected
@@ -1 +1 @@
-| test.c:28:18:28:36 | ATOMIC_VAR_INIT(value) | Usage of macro ATOMIC_VAR_INIT() is declared obscelescent in C18, and discouraged in earlier C versions. |
+| test.c:29:18:29:36 | ATOMIC_VAR_INIT(value) | Usage of macro ATOMIC_VAR_INIT() is declared obscelescent in C18, and discouraged in earlier C versions. |
diff --git a/c/misra/test/rules/RULE-1-5/test.c b/c/misra/test/rules/RULE-1-5/test.c
index 38d701c44b..52144bad13 100644
--- a/c/misra/test/rules/RULE-1-5/test.c
+++ b/c/misra/test/rules/RULE-1-5/test.c
@@ -3,15 +3,16 @@
 #include "stdio.h"
 #include "stdlib.h"
 
-void f1(void) {
+void f1(int p0) {
   // malloc() is not obsolete, though it is banned by Rule 21.3
   int *t = malloc(10); // COMPLIANT
 
-  // Obsolete usage of realloc.
-  realloc(t, 0); // NON-COMPLIANT
-
   // Valid usage of realloc, but all use of realloc is banned by Rule 21.3
   realloc(t, 20); // NON-COMPLIANT
+
+  // Obsolete usage of realloc.
+  realloc(t, 0);  // NON-COMPLIANT
+  realloc(t, p0); // NON-COMPLIANT
 }
 
 extern const int g1; // COMPLIANT
diff --git a/cpp/common/src/codingstandards/cpp/Realloc.qll b/cpp/common/src/codingstandards/cpp/Realloc.qll
new file mode 100644
index 0000000000..71acb7d7b1
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/Realloc.qll
@@ -0,0 +1,18 @@
+import cpp
+import codingstandards.cpp.CodingStandards
+
+class ReallocCall extends FunctionCall {
+  ReallocCall() { getTarget().hasGlobalOrStdName("realloc") }
+
+  Expr getSizeArgument() { result = getArgument(1) }
+
+  predicate sizeIsExactlyZero() {
+    upperBound(getSizeArgument().getConversion()) = 0 and
+    lowerBound(getSizeArgument().getConversion()) = 0
+  }
+
+  predicate sizeMayBeZero() {
+    upperBound(getSizeArgument().getConversion()) >= 0 and
+    lowerBound(getSizeArgument().getConversion()) <= 0
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll b/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
index 7bca9feefc..b4391ff5c2 100644
--- a/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
+++ b/cpp/common/src/codingstandards/cpp/exclusions/c/Language4.qll
@@ -11,7 +11,8 @@ newtype Language4Query =
   TInvalidDefineOrUndefOfStdBoolMacroQuery() or
   TCallToObsolescentFunctionGetsQuery() or
   TUngetcCallOnStreamPositionZeroQuery() or
-  TCallToReallocWithSizeZeroQuery()
+  TSizeInReallocCallMayBeZeroQuery() or
+  TSizeInReallocCallIsZeroQuery()
 
 predicate isLanguage4QueryMetadata(Query query, string queryId, string ruleId, string category) {
   query =
@@ -78,11 +79,20 @@ predicate isLanguage4QueryMetadata(Query query, string queryId, string ruleId, s
   category = "required"
   or
   query =
-    // `Query` instance for the `callToReallocWithSizeZero` query
-    Language4Package::callToReallocWithSizeZeroQuery() and
+    // `Query` instance for the `sizeInReallocCallMayBeZero` query
+    Language4Package::sizeInReallocCallMayBeZeroQuery() and
   queryId =
-    // `@id` for the `callToReallocWithSizeZero` query
-    "c/misra/call-to-realloc-with-size-zero" and
+    // `@id` for the `sizeInReallocCallMayBeZero` query
+    "c/misra/size-in-realloc-call-may-be-zero" and
+  ruleId = "RULE-1-5" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `sizeInReallocCallIsZero` query
+    Language4Package::sizeInReallocCallIsZeroQuery() and
+  queryId =
+    // `@id` for the `sizeInReallocCallIsZero` query
+    "c/misra/size-in-realloc-call-is-zero" and
   ruleId = "RULE-1-5" and
   category = "required"
 }
@@ -137,10 +147,17 @@ module Language4Package {
       TQueryC(TLanguage4PackageQuery(TUngetcCallOnStreamPositionZeroQuery()))
   }
 
-  Query callToReallocWithSizeZeroQuery() {
+  Query sizeInReallocCallMayBeZeroQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `sizeInReallocCallMayBeZero` query
+      TQueryC(TLanguage4PackageQuery(TSizeInReallocCallMayBeZeroQuery()))
+  }
+
+  Query sizeInReallocCallIsZeroQuery() {
     //autogenerate `Query` type
     result =
-      // `Query` type for `callToReallocWithSizeZero` query
-      TQueryC(TLanguage4PackageQuery(TCallToReallocWithSizeZeroQuery()))
+      // `Query` type for `sizeInReallocCallIsZero` query
+      TQueryC(TLanguage4PackageQuery(TSizeInReallocCallIsZeroQuery()))
   }
 }
diff --git a/rule_packages/c/Language4.json b/rule_packages/c/Language4.json
index fb448bd8a3..fdc11924f4 100644
--- a/rule_packages/c/Language4.json
+++ b/rule_packages/c/Language4.json
@@ -102,10 +102,22 @@
         {
           "description": "Invoking realloc with a size argument set to zero is implementation-defined behavior and declared as an obsolete feature in C18.",
           "kind": "problem",
-          "name": "Disallowed size argument value equal to zero in call to realloc",
+          "name": "Size argument value in realloc call may equal zero",
+          "precision": "medium",
+          "severity": "error",
+          "short_name": "SizeInReallocCallMayBeZero",
+          "tags": [
+            "correctness",
+            "external/misra/c/2012/amendment3"
+          ]
+        },
+        {
+          "description": "Invoking realloc with a size argument set to zero is implementation-defined behavior and declared as an obsolete feature in C18.",
+          "kind": "problem",
+          "name": "Size argument value in realloc call is equal zero",
           "precision": "very-high",
           "severity": "error",
-          "short_name": "CallToReallocWithSizeZero",
+          "short_name": "SizeInReallocCallIsZero",
           "tags": [
             "correctness",
             "external/misra/c/2012/amendment3"

From cb0785575cf7fad87a01d045d37a25cc98c56794 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 20 Oct 2024 22:50:47 +0100
Subject: [PATCH 328/435] Rule 8.13: Handle multiple copies

If the same code is compiled multiple times, variables may be const
in one case but non-const in another. Handle this by requiring all
such copies to be const-able before flagging.
---
 ...interShouldPointToConstTypeWhenPossible.ql | 66 ++++++++++++-------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index 8b405d138c..a9fd7155a4 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -18,29 +18,47 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.Pointers
 import codingstandards.cpp.SideEffect
+import codingstandards.cpp.alertreporting.HoldsForAllCopies
 
-from Variable ptr, PointerOrArrayType type
+class NonConstPointerVariableCandidate extends Variable {
+  NonConstPointerVariableCandidate() {
+    // Avoid elements in macro expansions, as they cannot be equated across copies
+    not this.isInMacroExpansion() and
+    exists(PointerOrArrayType type |
+      // include only pointers which point to a const-qualified type
+      this.getType() = type and
+      not type.isDeeplyConstBelow()
+    ) and
+    // exclude pointers passed as arguments to functions which take a
+    // parameter that points to a non-const-qualified type
+    not exists(FunctionCall fc, int i |
+      fc.getArgument(i) = this.getAnAccess() and
+      not fc.getTarget().getParameter(i).getType().isDeeplyConstBelow()
+    ) and
+    // exclude any pointers which have their underlying data modified
+    not exists(VariableEffect effect |
+      effect.getTarget() = this and
+      // but not pointers that are only themselves modified
+      not effect.(AssignExpr).getLValue() = effect.getAnAccess() and
+      not effect.(CrementOperation).getOperand() = effect.getAnAccess()
+    ) and
+    // exclude pointers assigned to another pointer to a non-const-qualified type
+    not exists(Variable a |
+      a.getAnAssignedValue() = this.getAnAccess() and
+      not a.getType().(PointerOrArrayType).isDeeplyConstBelow()
+    )
+  }
+}
+
+/**
+ * Ensure that all copies of a variable are considered to be missing const qualification to avoid
+ * false positives where a variable is only used/modified in a single copy.
+ */
+class NonConstPointerVariable =
+  HoldsForAllCopies<NonConstPointerVariableCandidate, Variable>::LogicalResultElement;
+
+from NonConstPointerVariable ptr
 where
-  not isExcluded(ptr, Pointers1Package::pointerShouldPointToConstTypeWhenPossibleQuery()) and
-  // include only pointers which point to a const-qualified type
-  ptr.getType() = type and
-  not type.isDeeplyConstBelow() and
-  // exclude pointers passed as arguments to functions which take a
-  // parameter that points to a non-const-qualified type
-  not exists(FunctionCall fc, int i |
-    fc.getArgument(i) = ptr.getAnAccess() and
-    not fc.getTarget().getParameter(i).getType().isDeeplyConstBelow()
-  ) and
-  // exclude any pointers which have their underlying data modified
-  not exists(VariableEffect effect |
-    effect.getTarget() = ptr and
-    // but not pointers that are only themselves modified
-    not effect.(AssignExpr).getLValue() = effect.getAnAccess() and
-    not effect.(CrementOperation).getOperand() = effect.getAnAccess()
-  ) and
-  // exclude pointers assigned to another pointer to a non-const-qualified type
-  not exists(Variable a |
-    a.getAnAssignedValue() = ptr.getAnAccess() and
-    not a.getType().(PointerOrArrayType).isDeeplyConstBelow()
-  )
-select ptr, "$@ points to a non-const-qualified type.", ptr, ptr.getName()
+  not isExcluded(ptr.getAnElementInstance(),
+    Pointers1Package::pointerShouldPointToConstTypeWhenPossibleQuery())
+select ptr, "$@ points to a non-const-qualified type.", ptr, ptr.getAnElementInstance().getName()

From 4aacef197f7ecb0fb149151031997ff2fe3422c5 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 20 Oct 2024 23:03:19 +0100
Subject: [PATCH 329/435] Rule 8.13: Exclude results in ASM functions

---
 .../PointerShouldPointToConstTypeWhenPossible.ql         | 2 ++
 c/misra/test/rules/RULE-8-13/test.c                      | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index a9fd7155a4..312662fe30 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -22,6 +22,8 @@ import codingstandards.cpp.alertreporting.HoldsForAllCopies
 
 class NonConstPointerVariableCandidate extends Variable {
   NonConstPointerVariableCandidate() {
+    // Ignore variables in functions that use ASM commands
+    not exists(AsmStmt a | a.getEnclosingFunction() = this.(LocalScopeVariable).getFunction()) and
     // Avoid elements in macro expansions, as they cannot be equated across copies
     not this.isInMacroExpansion() and
     exists(PointerOrArrayType type |
diff --git a/c/misra/test/rules/RULE-8-13/test.c b/c/misra/test/rules/RULE-8-13/test.c
index 1ac9e5028c..8c469e290c 100644
--- a/c/misra/test/rules/RULE-8-13/test.c
+++ b/c/misra/test/rules/RULE-8-13/test.c
@@ -75,4 +75,13 @@ char *f16(char *p1) { // NON_COMPLIANT
 int f17(char *p1) { // NON_COMPLIANT
   p1++;
   return 0;
+}
+
+#include <stdint.h>
+
+int16_t
+test_r(int16_t *value) { // COMPLIANT - ignored because of the use of ASM
+  int16_t result;
+  __asm__("movb %bh (%eax)");
+  return result;
 }
\ No newline at end of file

From f4f11605c5643d531b8c605a7574ffd160988939 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 20 Oct 2024 23:28:35 +0100
Subject: [PATCH 330/435] Rule 8.13: Correctly handle assignment into structs

---
 .../PointerShouldPointToConstTypeWhenPossible.ql     |  4 ++--
 ...ointerShouldPointToConstTypeWhenPossible.expected |  1 +
 c/misra/test/rules/RULE-8-13/test.c                  | 12 ++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index 312662fe30..0150e39cb3 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -41,8 +41,8 @@ class NonConstPointerVariableCandidate extends Variable {
     not exists(VariableEffect effect |
       effect.getTarget() = this and
       // but not pointers that are only themselves modified
-      not effect.(AssignExpr).getLValue() = effect.getAnAccess() and
-      not effect.(CrementOperation).getOperand() = effect.getAnAccess()
+      not effect.(AssignExpr).getLValue() = this.getAnAccess() and
+      not effect.(CrementOperation).getOperand() = this.getAnAccess()
     ) and
     // exclude pointers assigned to another pointer to a non-const-qualified type
     not exists(Variable a |
diff --git a/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected b/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected
index 39dbf04763..23ab0828b2 100644
--- a/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected
+++ b/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected
@@ -12,3 +12,4 @@
 | test.c:66:23:66:24 | p1 | $@ points to a non-const-qualified type. | test.c:66:23:66:24 | p1 | p1 |
 | test.c:71:17:71:18 | p1 | $@ points to a non-const-qualified type. | test.c:71:17:71:18 | p1 | p1 |
 | test.c:75:15:75:16 | p1 | $@ points to a non-const-qualified type. | test.c:75:15:75:16 | p1 | p1 |
+| test.c:97:30:97:30 | s | $@ points to a non-const-qualified type. | test.c:97:30:97:30 | s | s |
diff --git a/c/misra/test/rules/RULE-8-13/test.c b/c/misra/test/rules/RULE-8-13/test.c
index 8c469e290c..7bd42a1d98 100644
--- a/c/misra/test/rules/RULE-8-13/test.c
+++ b/c/misra/test/rules/RULE-8-13/test.c
@@ -84,4 +84,16 @@ test_r(int16_t *value) { // COMPLIANT - ignored because of the use of ASM
   int16_t result;
   __asm__("movb %bh (%eax)");
   return result;
+}
+
+struct S {
+  int x;
+};
+
+void test_struct(struct S *s) { // COMPLIANT
+  s->x = 1;
+}
+
+void test_struct_2(struct S *s) { // NON_COMPLIANT - could be const
+  s = 0;
 }
\ No newline at end of file

From 2976916569a0716880d28a47e59f1050027c0819 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 20 Oct 2024 23:34:45 +0100
Subject: [PATCH 331/435] Rule 8.13: Remove results in functions without bodies

---
 .../RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql   | 2 ++
 c/misra/test/rules/RULE-8-13/test.c                          | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index 0150e39cb3..23579965a8 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -22,6 +22,8 @@ import codingstandards.cpp.alertreporting.HoldsForAllCopies
 
 class NonConstPointerVariableCandidate extends Variable {
   NonConstPointerVariableCandidate() {
+    // Ignore parameters in functions without bodies
+    (this instanceof Parameter implies exists(this.(Parameter).getFunction().getBlock())) and
     // Ignore variables in functions that use ASM commands
     not exists(AsmStmt a | a.getEnclosingFunction() = this.(LocalScopeVariable).getFunction()) and
     // Avoid elements in macro expansions, as they cannot be equated across copies
diff --git a/c/misra/test/rules/RULE-8-13/test.c b/c/misra/test/rules/RULE-8-13/test.c
index 7bd42a1d98..75ec2febc3 100644
--- a/c/misra/test/rules/RULE-8-13/test.c
+++ b/c/misra/test/rules/RULE-8-13/test.c
@@ -96,4 +96,7 @@ void test_struct(struct S *s) { // COMPLIANT
 
 void test_struct_2(struct S *s) { // NON_COMPLIANT - could be const
   s = 0;
-}
\ No newline at end of file
+}
+
+void test_no_body(int *p); // COMPLIANT - no body, so cannot evaluate whether it
+                           // should be const
\ No newline at end of file

From 808554e093df1054ff8e521d4dede66a702525f6 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 20 Oct 2024 23:42:48 +0100
Subject: [PATCH 332/435] Rule 8.13: Expand ASM test

---
 .../RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql | 7 ++++++-
 .../PointerShouldPointToConstTypeWhenPossible.expected     | 2 +-
 c/misra/test/rules/RULE-8-13/test.c                        | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index 23579965a8..f5cf07f8fc 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -25,7 +25,12 @@ class NonConstPointerVariableCandidate extends Variable {
     // Ignore parameters in functions without bodies
     (this instanceof Parameter implies exists(this.(Parameter).getFunction().getBlock())) and
     // Ignore variables in functions that use ASM commands
-    not exists(AsmStmt a | a.getEnclosingFunction() = this.(LocalScopeVariable).getFunction()) and
+    not exists(AsmStmt a |
+      a.getEnclosingFunction() = this.(LocalScopeVariable).getFunction()
+      or
+      // In a type declared locally
+      this.(Field).getDeclaringType+().getEnclosingFunction() = a.getEnclosingFunction()
+    ) and
     // Avoid elements in macro expansions, as they cannot be equated across copies
     not this.isInMacroExpansion() and
     exists(PointerOrArrayType type |
diff --git a/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected b/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected
index 23ab0828b2..e3e0963087 100644
--- a/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected
+++ b/c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected
@@ -12,4 +12,4 @@
 | test.c:66:23:66:24 | p1 | $@ points to a non-const-qualified type. | test.c:66:23:66:24 | p1 | p1 |
 | test.c:71:17:71:18 | p1 | $@ points to a non-const-qualified type. | test.c:71:17:71:18 | p1 | p1 |
 | test.c:75:15:75:16 | p1 | $@ points to a non-const-qualified type. | test.c:75:15:75:16 | p1 | p1 |
-| test.c:97:30:97:30 | s | $@ points to a non-const-qualified type. | test.c:97:30:97:30 | s | s |
+| test.c:103:30:103:30 | s | $@ points to a non-const-qualified type. | test.c:103:30:103:30 | s | s |
diff --git a/c/misra/test/rules/RULE-8-13/test.c b/c/misra/test/rules/RULE-8-13/test.c
index 75ec2febc3..7739f3aa77 100644
--- a/c/misra/test/rules/RULE-8-13/test.c
+++ b/c/misra/test/rules/RULE-8-13/test.c
@@ -82,6 +82,12 @@ int f17(char *p1) { // NON_COMPLIANT
 int16_t
 test_r(int16_t *value) { // COMPLIANT - ignored because of the use of ASM
   int16_t result;
+  struct S {
+    int *x; // COMPLIANT - ignored because of the use of ASM
+    struct S2 {
+      int *y; // COMPLIANT - ignored because of the use of ASM
+    } s2;
+  };
   __asm__("movb %bh (%eax)");
   return result;
 }

From ccb20d5210c59be23a3f56ce37656fb0160b0f69 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 00:00:58 +0100
Subject: [PATCH 333/435] Rule 8.13: Support crement operatios.

---
 c/misra/test/rules/RULE-8-13/test.c               | 6 +++++-
 cpp/common/src/codingstandards/cpp/SideEffect.qll | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/c/misra/test/rules/RULE-8-13/test.c b/c/misra/test/rules/RULE-8-13/test.c
index 7739f3aa77..a2333d2a3d 100644
--- a/c/misra/test/rules/RULE-8-13/test.c
+++ b/c/misra/test/rules/RULE-8-13/test.c
@@ -105,4 +105,8 @@ void test_struct_2(struct S *s) { // NON_COMPLIANT - could be const
 }
 
 void test_no_body(int *p); // COMPLIANT - no body, so cannot evaluate whether it
-                           // should be const
\ No newline at end of file
+                           // should be const
+
+void increment(int *p) { // COMPLIANT
+  *p++ = 1;
+}
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/SideEffect.qll b/cpp/common/src/codingstandards/cpp/SideEffect.qll
index 08cd9394d3..68fe2cd0cd 100644
--- a/cpp/common/src/codingstandards/cpp/SideEffect.qll
+++ b/cpp/common/src/codingstandards/cpp/SideEffect.qll
@@ -190,6 +190,8 @@ Expr getAnEffect(Expr base) {
   or
   exists(PointerDereferenceExpr e | e.getOperand() = base | result = getAnEffect(e))
   or
+  exists(CrementOperation c | c.getOperand() = base | result = getAnEffect(c))
+  or
   // local alias analysis, assume alias when data flows to derived type (pointer/reference)
   // auto ptr = &base;
   exists(VariableAccess va, AddressOfExpr addressOf |

From e90a13397b5c79817dfd2ac293174abc4ba6822e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 00:01:13 +0100
Subject: [PATCH 334/435] Add change note.

---
 change_notes/2024-10-20-8-13-fixes.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 change_notes/2024-10-20-8-13-fixes.md

diff --git a/change_notes/2024-10-20-8-13-fixes.md b/change_notes/2024-10-20-8-13-fixes.md
new file mode 100644
index 0000000000..8b58ca821f
--- /dev/null
+++ b/change_notes/2024-10-20-8-13-fixes.md
@@ -0,0 +1,5 @@
+ - `RULE-8-13` - `PointerShouldPointToConstTypeWhenPossible.ql`
+   - Exclude false positives where a variable occurs in a file compiled multiple times, but where it may only be const in some of those scenarios.
+   - Exclude results for local scope variables in functions that use assembly code, as CodeQL cannot determine the impact of the assembly.
+   - Exclude false positives when an assignment is made to a struct field.
+   - Exclude false positives where the object pointed to by the variable is modified using `*p++ = ...`.
\ No newline at end of file

From 3dbdc9cb144b6f0b569b7e36117b79ece2844d82 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 09:43:45 +0100
Subject: [PATCH 335/435] Update release note

---
 change_notes/2024-10-20-8-13-fixes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/change_notes/2024-10-20-8-13-fixes.md b/change_notes/2024-10-20-8-13-fixes.md
index 8b58ca821f..d771023456 100644
--- a/change_notes/2024-10-20-8-13-fixes.md
+++ b/change_notes/2024-10-20-8-13-fixes.md
@@ -2,4 +2,5 @@
    - Exclude false positives where a variable occurs in a file compiled multiple times, but where it may only be const in some of those scenarios.
    - Exclude results for local scope variables in functions that use assembly code, as CodeQL cannot determine the impact of the assembly.
    - Exclude false positives when an assignment is made to a struct field.
-   - Exclude false positives where the object pointed to by the variable is modified using `*p++ = ...`.
\ No newline at end of file
+   - Exclude false positives where the object pointed to by the variable is modified using `*p++ = ...`.
+   - Exclude false positives for functions without bodies.
\ No newline at end of file

From a02baeb18d5343d10570f2b8ca78a0b60c116e2d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 09:52:50 +0100
Subject: [PATCH 336/435] Update release note.

---
 change_notes/2024-10-20-8-13-fixes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/change_notes/2024-10-20-8-13-fixes.md b/change_notes/2024-10-20-8-13-fixes.md
index d771023456..6ee8e3a32c 100644
--- a/change_notes/2024-10-20-8-13-fixes.md
+++ b/change_notes/2024-10-20-8-13-fixes.md
@@ -3,4 +3,5 @@
    - Exclude results for local scope variables in functions that use assembly code, as CodeQL cannot determine the impact of the assembly.
    - Exclude false positives when an assignment is made to a struct field.
    - Exclude false positives where the object pointed to by the variable is modified using `*p++ = ...`.
-   - Exclude false positives for functions without bodies.
\ No newline at end of file
+   - Exclude false positives for functions without bodies.
+ - Rules that rely on the determination of side-effects of an expression may change as a result of considering `*p++ = ...` as having a side-effect on `p`.
\ No newline at end of file

From 7fb44731ccb32b740f4616e899293312f1d9f34a Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Mon, 21 Oct 2024 10:04:29 +0100
Subject: [PATCH 337/435] User manual: add assembly language as a hazard

---
 docs/user_manual.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/user_manual.md b/docs/user_manual.md
index db0f836339..949e2bb51a 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -26,8 +26,9 @@
 | 0.18.0  | 2024-01-30 | Luke Cartey     | Update product description and coverage table.                                                                          |
 | 0.19.0  | 2024-02-23 | Remco Vermeulen | Clarify the required use of Python version 3.9.                                                                         |
 | 0.20.0  | 2024-02-23 | Remco Vermeulen | Add table describing the permitted guideline re-categorizations.                                                        |
-| 0.21.0  | 2024-05-01 | Luke Cartey | Add MISRA C++ 2023 as under development, and clarify MISRA C 2012 coverage.                                                        |
-| 0.22.0  | 2024-10-02 | Luke Cartey | Add MISRA C 2023 as under development, and clarify MISRA C 2012 coverage.
+| 0.21.0  | 2024-05-01 | Luke Cartey     | Add MISRA C++ 2023 as under development, and clarify MISRA C 2012 coverage.                                             |
+| 0.22.0  | 2024-10-02 | Luke Cartey     | Add MISRA C 2023 as under development, and clarify MISRA C 2012 coverage.                                               |
+| 0.23.0  | 2024-10-21 | Luke Cartey     | Add assembly as a hazard.                                                                                               |
 
 ## Release information
 
@@ -500,7 +501,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Use of incorrect build command                                                                                                                                     | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Analysis integrity report lists all analyzed files, and must be crossed referenced with the list of files that are expected to be analyzed.                                                                                                                                                                                          | Ensure the build command corresponds to the build command that is used to build the release artifacts.                                                                                                                                                                                                                                                                     |
 |                              | Incorrect build environment (e.g., concurrent builds writing to same file, overwriting translation unit/object file with different content)                        | Less or more output. Results are reported that are not violations of the guidelines or guideline violations are not reported                              | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Ensure the build environment is configured to not use shared resources such as caches or artifact providers that can introduce race conditions. Report inconsistent results via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                       |
 |                              | Source root misspecification                                                                                                                                       | Less output. The results cannot be correctly correlated to source files when viewing the resulting Sarif file in a Sarif viewer.                          | Verify that the reported results are display on the correct files in the Sarif viewer                                                                                                                                                                                                                                                | Ensure the CodeQL CLI configured to use the correct source root that correspond to the root of the repository under consideration.                                                                                                                                                                                                                                         |
-|                              | Ouf of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
+|                              | Out of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.36.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
@@ -508,6 +509,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |
 |                              | Incorrect database. The information extracted by the CodeQL extractor deviates from what the compiler extracts resulting in an incorrect model of the source-code. | More or less output. Incorrect extraction can result in false positives or false negatives.                                                               | Combinations of supported compilers and CodeQL CLIs are tested against a [provided](https://github.com/github/codeql/tree/main/cpp/ql/test/library-tests) suite of test cases and a coding standards specific test suite to determine if the extracted information deviates from the expected information.                           | Report incorrect database issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                  |
+|                              | Use of assembly language instructions, which are not inspected by CodeQL. | More or less output. Can result in false positives or false negatives.                                                               | Avoid the use of assembly language instructions where possible. Where unavoidable, encapasulate and isolate the use of assembly language in separate functions to limit impact. Careful manual review of all functions that use assembly language. | Ensure that all functions which use assembly language instructions are manually reviewed for compliance.                                                                                                                                                                                                                                  |
 
 ## Reporting bugs
 

From f5437d2d8c38e2fd8711c8db912713cdba1d35a8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 13:51:23 +0100
Subject: [PATCH 338/435] Add an "Includes" library for detecting conditional
 includes

---
 .../src/codingstandards/cpp/Includes.qll      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 cpp/common/src/codingstandards/cpp/Includes.qll

diff --git a/cpp/common/src/codingstandards/cpp/Includes.qll b/cpp/common/src/codingstandards/cpp/Includes.qll
new file mode 100644
index 0000000000..bb72dafeda
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/Includes.qll
@@ -0,0 +1,31 @@
+/** A library which supports analysis of includes. */
+
+import cpp
+import semmle.code.cpp.headers.MultipleInclusion
+
+/**
+ * Holds if `include` is included conditionally based on the branch directive `b1`.
+ */
+predicate conditionallyIncluded(PreprocessorBranchDirective b1, Include include) {
+  exists(File f, int include1StartLine |
+    not b1 = any(CorrectIncludeGuard c).getIfndef() and
+    not b1.getHead().regexpMatch(".*_H(_.*)?") and
+    include.getLocation().hasLocationInfo(f.getAbsolutePath(), include1StartLine, _, _, _) and
+    f.getAbsolutePath() = b1.getFile().getAbsolutePath()
+  |
+    b1.getLocation().getStartLine() < include1StartLine and
+    b1.getNext().getLocation().getStartLine() > include1StartLine
+  )
+}
+
+/**
+ * Gets a file which is directly included from `fromFile` unconditionally.
+ */
+File getAnUnconditionallyIncludedFile(File fromFile) {
+  // Find an include which isn't conditional
+  exists(Include i |
+    i.getFile() = fromFile and
+    not conditionallyIncluded(_, i) and
+    result = i.getIncludedFile()
+  )
+}

From 650842bce1e1a1245913fdcd15db95c8248d46ea Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 13:51:58 +0100
Subject: [PATCH 339/435] PreprocessDirectives: Add detection for conditionally
 defined macros

Add helper predicates for identifying macros defined in conditional
blocks, and pairs of macros which are mutually exclusive.
---
 .../cpp/PreprocessorDirective.qll             | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll b/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
index fe619e5317..5f360e4d31 100644
--- a/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
+++ b/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
@@ -40,3 +40,70 @@ class PreprocessorIfOrElif extends PreprocessorBranch {
     this instanceof PreprocessorElif
   }
 }
+
+/**
+ * Holds if the preprocessor directive `m` is located at `filepath` and `startline`.
+ */
+private predicate hasPreprocessorLocation(PreprocessorDirective m, string filepath, int startline) {
+  m.getLocation().hasLocationInfo(filepath, startline, _, _, _)
+}
+
+/**
+ * Holds if `first` and `second` are a pair of branch directives in the same file, such that they
+ * share the same root if condition.
+ */
+pragma[noinline]
+private predicate isBranchDirectivePair(
+  PreprocessorBranchDirective first, PreprocessorBranchDirective second, string filepath,
+  int b1StartLocation, int b2StartLocation
+) {
+  first.getIf() = second.getIf() and
+  not first = second and
+  hasPreprocessorLocation(first, filepath, b1StartLocation) and
+  hasPreprocessorLocation(second, filepath, b2StartLocation) and
+  b1StartLocation < b2StartLocation
+}
+
+/**
+ * Holds if `bd` is a branch directive in the range `filepath`, `startline`, `endline`.
+ */
+pragma[noinline]
+predicate isBranchDirectiveRange(
+  PreprocessorBranchDirective bd, string filepath, int startline, int endline
+) {
+  hasPreprocessorLocation(bd, filepath, startline) and
+  exists(PreprocessorBranchDirective next |
+    next = bd.getNext() and
+    // Avoid referencing filepath here, otherwise the optimiser will try to join
+    // on it
+    hasPreprocessorLocation(next, _, endline)
+  )
+}
+
+/**
+ * Holds if the macro `m` is defined within the branch directive `bd`.
+ */
+pragma[noinline]
+predicate isMacroDefinedWithinBranch(PreprocessorBranchDirective bd, Macro m) {
+  exists(string filepath, int startline, int endline, int macroline |
+    isBranchDirectiveRange(bd, filepath, startline, endline) and
+    hasPreprocessorLocation(m, filepath, macroline) and
+    startline < macroline and
+    endline > macroline
+  )
+}
+
+/**
+ * Holds if the pair of macros are "conditional" i.e. only one of the macros is followed in any
+ * particular compilation of the containing file.
+ */
+predicate mutuallyExclusiveMacros(Macro firstMacro, Macro secondMacro) {
+  exists(
+    PreprocessorBranchDirective b1, PreprocessorBranchDirective b2, string filepath,
+    int b1StartLocation, int b2StartLocation
+  |
+    isBranchDirectivePair(b1, b2, filepath, b1StartLocation, b2StartLocation) and
+    isMacroDefinedWithinBranch(b1, firstMacro) and
+    isMacroDefinedWithinBranch(b2, secondMacro)
+  )
+}

From 15430197f9c409cc0e4fb2ca4aacfdac6c43b0c8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 14:14:26 +0100
Subject: [PATCH 340/435] Includes: Improve performance

---
 .../src/codingstandards/cpp/Includes.qll      | 26 ++++++++++++-------
 .../cpp/PreprocessorDirective.qll             |  3 ++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Includes.qll b/cpp/common/src/codingstandards/cpp/Includes.qll
index bb72dafeda..c0c66ae2f5 100644
--- a/cpp/common/src/codingstandards/cpp/Includes.qll
+++ b/cpp/common/src/codingstandards/cpp/Includes.qll
@@ -1,20 +1,26 @@
 /** A library which supports analysis of includes. */
 
 import cpp
+import codingstandards.cpp.PreprocessorDirective
 import semmle.code.cpp.headers.MultipleInclusion
 
+pragma[noinline]
+private predicate hasIncludeLocation(Include include, string filepath, int startline) {
+  include.getLocation().hasLocationInfo(filepath, startline, _, _, _)
+}
+
 /**
  * Holds if `include` is included conditionally based on the branch directive `b1`.
  */
-predicate conditionallyIncluded(PreprocessorBranchDirective b1, Include include) {
-  exists(File f, int include1StartLine |
-    not b1 = any(CorrectIncludeGuard c).getIfndef() and
-    not b1.getHead().regexpMatch(".*_H(_.*)?") and
-    include.getLocation().hasLocationInfo(f.getAbsolutePath(), include1StartLine, _, _, _) and
-    f.getAbsolutePath() = b1.getFile().getAbsolutePath()
-  |
-    b1.getLocation().getStartLine() < include1StartLine and
-    b1.getNext().getLocation().getStartLine() > include1StartLine
+pragma[noinline]
+predicate isConditionallyIncluded(PreprocessorBranchDirective bd, Include include) {
+  not bd = any(CorrectIncludeGuard c).getIfndef() and
+  not bd.getHead().regexpMatch(".*_H(_.*)?") and
+  exists(string filepath, int startline, int endline, int includeline |
+    isBranchDirectiveRange(bd, filepath, startline, endline) and
+    hasIncludeLocation(include, filepath, includeline) and
+    startline < includeline and
+    endline > includeline
   )
 }
 
@@ -25,7 +31,7 @@ File getAnUnconditionallyIncludedFile(File fromFile) {
   // Find an include which isn't conditional
   exists(Include i |
     i.getFile() = fromFile and
-    not conditionallyIncluded(_, i) and
+    not isConditionallyIncluded(_, i) and
     result = i.getIncludedFile()
   )
 }
diff --git a/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll b/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
index 5f360e4d31..1f6cc140d8 100644
--- a/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
+++ b/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
@@ -44,7 +44,8 @@ class PreprocessorIfOrElif extends PreprocessorBranch {
 /**
  * Holds if the preprocessor directive `m` is located at `filepath` and `startline`.
  */
-private predicate hasPreprocessorLocation(PreprocessorDirective m, string filepath, int startline) {
+pragma[noinline]
+predicate hasPreprocessorLocation(PreprocessorDirective m, string filepath, int startline) {
   m.getLocation().hasLocationInfo(filepath, startline, _, _, _)
 }
 

From 34abb425d726de2f6abd9095108620136642121d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 15:23:23 +0100
Subject: [PATCH 341/435] Rule 5.4: Exclude cases where the two macros are
 conditional

 - Macros in #ifndef MACRO_NAME blocks
 - Pairs of macros that exists in different #if/#elif/#else cases
 - Pairs of macros defined in files that are mutually exclusively
   included.
 - If the macros are used, they must be both occur in the same
   link target.
---
 .../RULE-5-4/MacroIdentifiersNotDistinct.ql   | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
index abd22068dd..8399524984 100644
--- a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
@@ -15,6 +15,25 @@
 
 import cpp
 import codingstandards.c.misra
+import codingstandards.cpp.Macro
+import codingstandards.cpp.Includes
+import codingstandards.cpp.PreprocessorDirective
+
+/**
+ * Gets a link target that this macro is expanded in.
+ */
+LinkTarget getALinkTarget(Macro m) {
+  exists(Element e | e = m.getAnInvocation().getAnAffectedElement() |
+    result = e.(Expr).getEnclosingFunction().getALinkTarget()
+    or
+    result = e.(Stmt).getEnclosingFunction().getALinkTarget()
+    or
+    exists(GlobalOrNamespaceVariable g |
+      result = g.getALinkTarget() and
+      g.getInitializer().getExpr().getAChild*() = e
+    )
+  )
+}
 
 from Macro m, Macro m2
 where
@@ -30,7 +49,31 @@ where
     else m.getName() = m2.getName()
   ) and
   //reduce double report since both macros are in alert, arbitrary ordering
-  m.getLocation().getStartLine() >= m2.getLocation().getStartLine()
+  m.getLocation().getStartLine() >= m2.getLocation().getStartLine() and
+  // Not within an #ifndef MACRO_NAME
+  not exists(PreprocessorIfndef ifBranch |
+    m.getAGuard() = ifBranch or
+    m2.getAGuard() = ifBranch
+  |
+    ifBranch.getHead() = m.getName()
+  ) and
+  // Must be included unconditionally from the same file, otherwise m1 may not be defined
+  // when m2 is defined
+  exists(File f |
+    getAnUnconditionallyIncludedFile*(f) = m.getFile() and
+    getAnUnconditionallyIncludedFile*(f) = m2.getFile()
+  ) and
+  // Macros can't be mutually exclusive
+  not mutuallyExclusiveMacros(m, m2) and
+  not mutuallyExclusiveMacros(m2, m) and
+  // If at least one invocation exists for at least one of the macros, then they must share a link
+  // target - i.e. must both be expanded in the same context
+  (
+    (exists(m.getAnInvocation()) and exists(m2.getAnInvocation()))
+    implies
+    // Must share a link target - e.g. must both be expanded in the same context
+    getALinkTarget(m) = getALinkTarget(m2)
+  )
 select m,
   "Macro identifer " + m.getName() + " is nondistinct in first 63 characters, compared to $@.", m2,
   m2.getName()

From 08c0aafd8ba03c62643f046ddcbf3ba41dff8868 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 16:42:30 +0100
Subject: [PATCH 342/435] Rule 5.4: add conditional test cases

---
 .../MacroIdentifiersNotDistinct.expected         |  2 ++
 c/misra/test/rules/RULE-5-4/conditional.h        | 11 +++++++++++
 c/misra/test/rules/RULE-5-4/header1.h            |  1 +
 c/misra/test/rules/RULE-5-4/header2.h            |  1 +
 c/misra/test/rules/RULE-5-4/header3.h            | 16 ++++++++++++++++
 c/misra/test/rules/RULE-5-4/header4.h            | 13 +++++++++++++
 c/misra/test/rules/RULE-5-4/root1.c              |  6 ++++++
 c/misra/test/rules/RULE-5-4/root2.c              |  3 +++
 8 files changed, 53 insertions(+)
 create mode 100644 c/misra/test/rules/RULE-5-4/conditional.h
 create mode 100644 c/misra/test/rules/RULE-5-4/header1.h
 create mode 100644 c/misra/test/rules/RULE-5-4/header2.h
 create mode 100644 c/misra/test/rules/RULE-5-4/header3.h
 create mode 100644 c/misra/test/rules/RULE-5-4/header4.h
 create mode 100644 c/misra/test/rules/RULE-5-4/root1.c
 create mode 100644 c/misra/test/rules/RULE-5-4/root2.c

diff --git a/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected b/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected
index 12507b2d3f..d31f32acb2 100644
--- a/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected
+++ b/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected
@@ -1,2 +1,4 @@
+| header3.h:7:1:7:24 | #define MULTIPLE_INCLUDE | Macro identifer MULTIPLE_INCLUDE is nondistinct in first 63 characters, compared to $@. | header4.h:1:1:1:24 | #define MULTIPLE_INCLUDE | MULTIPLE_INCLUDE |
+| header3.h:14:1:14:21 | #define NOT_PROTECTED | Macro identifer NOT_PROTECTED is nondistinct in first 63 characters, compared to $@. | header4.h:12:1:12:23 | #define NOT_PROTECTED 1 | NOT_PROTECTED |
 | test.c:2:1:2:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB | Macro identifer iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB is nondistinct in first 63 characters, compared to $@. | test.c:1:1:1:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA | iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA |
 | test.c:8:1:8:31 | #define FUNCTION_MACRO(X) X + 1 | Macro identifer FUNCTION_MACRO is nondistinct in first 63 characters, compared to $@. | test.c:7:1:7:57 | #define FUNCTION_MACRO(FUNCTION_MACRO) FUNCTION_MACRO + 1 | FUNCTION_MACRO |
diff --git a/c/misra/test/rules/RULE-5-4/conditional.h b/c/misra/test/rules/RULE-5-4/conditional.h
new file mode 100644
index 0000000000..d30701c8e0
--- /dev/null
+++ b/c/misra/test/rules/RULE-5-4/conditional.h
@@ -0,0 +1,11 @@
+#ifdef FOO
+#include "header1.h"
+#else
+#include "header2.h"
+#endif
+
+#ifdef FOO
+#define A_MACRO 1 // COMPLIANT
+#else
+#define A_MACRO 2 // COMPLIANT
+#endif
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-5-4/header1.h b/c/misra/test/rules/RULE-5-4/header1.h
new file mode 100644
index 0000000000..526f4fa659
--- /dev/null
+++ b/c/misra/test/rules/RULE-5-4/header1.h
@@ -0,0 +1 @@
+#define REPEATED 11 // COMPLIANT
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-5-4/header2.h b/c/misra/test/rules/RULE-5-4/header2.h
new file mode 100644
index 0000000000..bd5dde123d
--- /dev/null
+++ b/c/misra/test/rules/RULE-5-4/header2.h
@@ -0,0 +1 @@
+#define REPEATED 1 // COMPLIANT
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-5-4/header3.h b/c/misra/test/rules/RULE-5-4/header3.h
new file mode 100644
index 0000000000..3aa82f5fd7
--- /dev/null
+++ b/c/misra/test/rules/RULE-5-4/header3.h
@@ -0,0 +1,16 @@
+#ifndef HEADER3_H
+#define HEADER3_H
+
+// We should ignore the header guards in this file
+
+// This is defined unconditionally by both header3.h and header4.h
+#define MULTIPLE_INCLUDE // NON_COMPLIANT
+
+// This is redefined in header3.h, but only if it isn't already defined
+#define PROTECTED // COMPLIANT
+
+// This is redefined in header3.h, but is conditional on some other condition,
+// so this is redefined
+#define NOT_PROTECTED // NON_COMPLIANT
+
+#endif
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-5-4/header4.h b/c/misra/test/rules/RULE-5-4/header4.h
new file mode 100644
index 0000000000..8fa6e8b5e8
--- /dev/null
+++ b/c/misra/test/rules/RULE-5-4/header4.h
@@ -0,0 +1,13 @@
+#define MULTIPLE_INCLUDE // NON_COMPLIANT
+
+// This case is triggered from root2.c
+// because PROTECTED isn't defined in
+// that case
+#ifndef PROTECTED
+#define PROTECTED // COMPLIANT - checked by guard
+#endif
+
+// Always enabled, so conflicts in root1.c case
+#ifdef MULTIPLE_INCLUDE
+#define NOT_PROTECTED 1 // NON_COMPLIANT
+#endif
diff --git a/c/misra/test/rules/RULE-5-4/root1.c b/c/misra/test/rules/RULE-5-4/root1.c
new file mode 100644
index 0000000000..98a94abed5
--- /dev/null
+++ b/c/misra/test/rules/RULE-5-4/root1.c
@@ -0,0 +1,6 @@
+#define FOO 1
+#include "conditional.h"
+
+// Both headers define MULTIPLE_INCLUDE
+#include "header3.h"
+#include "header4.h"
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-5-4/root2.c b/c/misra/test/rules/RULE-5-4/root2.c
new file mode 100644
index 0000000000..39926b9b1e
--- /dev/null
+++ b/c/misra/test/rules/RULE-5-4/root2.c
@@ -0,0 +1,3 @@
+#include "conditional.h"
+
+#include "header4.h"
\ No newline at end of file

From 671620fb96e777fb38c90fb769f6c13190a0929c Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 21:15:02 +0100
Subject: [PATCH 343/435] Rule 5.4: Improve alert message, ensure efficient
 performance

---
 .../RULE-5-4/MacroIdentifiersNotDistinct.ql   | 59 +++++++++++++++----
 .../MacroIdentifiersNotDistinct.expected      |  6 +-
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
index 8399524984..ed124692e5 100644
--- a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
@@ -19,23 +19,52 @@ import codingstandards.cpp.Macro
 import codingstandards.cpp.Includes
 import codingstandards.cpp.PreprocessorDirective
 
+/**
+ * Gets a top level element that this macro is expanded to, e.g. an element which does not also have
+ * an enclosing element in the macro.
+ */
+Element getATopLevelElement(MacroInvocation mi) {
+  result = mi.getAnExpandedElement() and
+  not result.getEnclosingElement() = mi.getAnExpandedElement() and
+  not result instanceof Conversion
+}
+
 /**
  * Gets a link target that this macro is expanded in.
  */
 LinkTarget getALinkTarget(Macro m) {
-  exists(Element e | e = m.getAnInvocation().getAnAffectedElement() |
+  exists(MacroInvocation mi, Element e |
+    mi = m.getAnInvocation() and
+    e = getATopLevelElement(mi)
+  |
     result = e.(Expr).getEnclosingFunction().getALinkTarget()
     or
     result = e.(Stmt).getEnclosingFunction().getALinkTarget()
     or
     exists(GlobalOrNamespaceVariable g |
       result = g.getALinkTarget() and
-      g.getInitializer().getExpr().getAChild*() = e
+      g = e.(Expr).getEnclosingDeclaration()
     )
   )
 }
 
-from Macro m, Macro m2
+/**
+ * Holds if the m1 and m2 are unconditionally included from a common file.
+ *
+ * Extracted out for performance reasons - otherwise the call to determine the file path for the
+ * message was specializing the calls to `getAnUnconditionallyIncludedFile*(..)` and causing
+ * slow performance.
+ */
+bindingset[m1, m2]
+pragma[inline_late]
+private predicate isIncludedUnconditionallyFromCommonFile(Macro m1, Macro m2) {
+  exists(File f |
+    getAnUnconditionallyIncludedFile*(f) = m1.getFile() and
+    getAnUnconditionallyIncludedFile*(f) = m2.getFile()
+  )
+}
+
+from Macro m, Macro m2, string message
 where
   not isExcluded(m, Declarations1Package::macroIdentifiersNotDistinctQuery()) and
   not m = m2 and
@@ -44,9 +73,18 @@ where
     //C90 states the first 31 characters of macro identifiers are significant and is not currently considered by this rule
     //ie an identifier differing on the 32nd character would be indistinct for C90 but distinct for C99
     //and is currently not reported by this rule
-    if m.getName().length() >= 64
-    then m.getName().prefix(63) = m2.getName().prefix(63)
-    else m.getName() = m2.getName()
+    if m.getName().length() >= 64 and not m.getName() = m2.getName()
+    then (
+      m.getName().prefix(63) = m2.getName().prefix(63) and
+      message =
+        "Macro identifer " + m.getName() + " is nondistinct in first 63 characters, compared to $@."
+    ) else (
+      m.getName() = m2.getName() and
+      message =
+        "Definition of macro " + m.getName() +
+          " is not distinct from alternative definition of $@ in " +
+          m2.getLocation().getFile().getRelativePath() + "."
+    )
   ) and
   //reduce double report since both macros are in alert, arbitrary ordering
   m.getLocation().getStartLine() >= m2.getLocation().getStartLine() and
@@ -59,10 +97,7 @@ where
   ) and
   // Must be included unconditionally from the same file, otherwise m1 may not be defined
   // when m2 is defined
-  exists(File f |
-    getAnUnconditionallyIncludedFile*(f) = m.getFile() and
-    getAnUnconditionallyIncludedFile*(f) = m2.getFile()
-  ) and
+  isIncludedUnconditionallyFromCommonFile(m, m2) and
   // Macros can't be mutually exclusive
   not mutuallyExclusiveMacros(m, m2) and
   not mutuallyExclusiveMacros(m2, m) and
@@ -74,6 +109,4 @@ where
     // Must share a link target - e.g. must both be expanded in the same context
     getALinkTarget(m) = getALinkTarget(m2)
   )
-select m,
-  "Macro identifer " + m.getName() + " is nondistinct in first 63 characters, compared to $@.", m2,
-  m2.getName()
+select m, message, m2, m2.getName()
diff --git a/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected b/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected
index d31f32acb2..d44164d116 100644
--- a/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected
+++ b/c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected
@@ -1,4 +1,4 @@
-| header3.h:7:1:7:24 | #define MULTIPLE_INCLUDE | Macro identifer MULTIPLE_INCLUDE is nondistinct in first 63 characters, compared to $@. | header4.h:1:1:1:24 | #define MULTIPLE_INCLUDE | MULTIPLE_INCLUDE |
-| header3.h:14:1:14:21 | #define NOT_PROTECTED | Macro identifer NOT_PROTECTED is nondistinct in first 63 characters, compared to $@. | header4.h:12:1:12:23 | #define NOT_PROTECTED 1 | NOT_PROTECTED |
+| header3.h:7:1:7:24 | #define MULTIPLE_INCLUDE | Definition of macro MULTIPLE_INCLUDE is not distinct from alternative definition of $@ in rules/RULE-5-4/header4.h. | header4.h:1:1:1:24 | #define MULTIPLE_INCLUDE | MULTIPLE_INCLUDE |
+| header3.h:14:1:14:21 | #define NOT_PROTECTED | Definition of macro NOT_PROTECTED is not distinct from alternative definition of $@ in rules/RULE-5-4/header4.h. | header4.h:12:1:12:23 | #define NOT_PROTECTED 1 | NOT_PROTECTED |
 | test.c:2:1:2:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB | Macro identifer iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB is nondistinct in first 63 characters, compared to $@. | test.c:1:1:1:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA | iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA |
-| test.c:8:1:8:31 | #define FUNCTION_MACRO(X) X + 1 | Macro identifer FUNCTION_MACRO is nondistinct in first 63 characters, compared to $@. | test.c:7:1:7:57 | #define FUNCTION_MACRO(FUNCTION_MACRO) FUNCTION_MACRO + 1 | FUNCTION_MACRO |
+| test.c:8:1:8:31 | #define FUNCTION_MACRO(X) X + 1 | Definition of macro FUNCTION_MACRO is not distinct from alternative definition of $@ in rules/RULE-5-4/test.c. | test.c:7:1:7:57 | #define FUNCTION_MACRO(FUNCTION_MACRO) FUNCTION_MACRO + 1 | FUNCTION_MACRO |

From 892cb965e612dbf8c602fadfdea59499e5cf8bf3 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 21:15:30 +0100
Subject: [PATCH 344/435] Add change note

---
 change_notes/2024-10-21-rule-5-4-conditional.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 change_notes/2024-10-21-rule-5-4-conditional.md

diff --git a/change_notes/2024-10-21-rule-5-4-conditional.md b/change_notes/2024-10-21-rule-5-4-conditional.md
new file mode 100644
index 0000000000..cfc22f3642
--- /dev/null
+++ b/change_notes/2024-10-21-rule-5-4-conditional.md
@@ -0,0 +1,3 @@
+ - `RULE-5-4` - `MacroIdentifiersNotDistinct.ql`:
+   - Exclude false positives related to conditional compilation, where a macro may be defined twice, but not within the same compilation.
+   - Improve alert message in the case the 63 char limit is not relevant by using the form "Definition of macro `<MACRO_NAME>` is not distinct from alternative definition of `<MACRO_NAME>` in `<relative_file_path>`.
\ No newline at end of file

From 8e830bc3f5cae97e7169b5d7f7a9c229abd35e26 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 21 Oct 2024 23:00:53 +0100
Subject: [PATCH 345/435] RULE-1-3: Improve detection of standard compliant
 main functions

 - Improve alert message to report the undefined behavior triggered.
 - Address both false positives and false negatives in identifying
   standard compliant main methods. Previously, `void main()` was
   considered permitted and `int main(void)` banned. In addition,
   we now detect main methods as standard compliant if they use
   typedefs, and if arrays are used in the definition of `argv`.
---
 .../codingstandards/c/UndefinedBehavior.qll   | 39 +++++++++++++++----
 .../RULE-1-3/OccurrenceOfUndefinedBehavior.ql |  2 +-
 .../OccurrenceOfUndefinedBehavior.expected    | 13 ++++---
 c/misra/test/rules/RULE-1-3/test.c            | 39 +++++++++++++++----
 change_notes/2024-10-21-rule-1-3-main.md      |  3 ++
 5 files changed, 76 insertions(+), 20 deletions(-)
 create mode 100644 change_notes/2024-10-21-rule-1-3-main.md

diff --git a/c/common/src/codingstandards/c/UndefinedBehavior.qll b/c/common/src/codingstandards/c/UndefinedBehavior.qll
index 5c9dc230d8..bbbb08678b 100644
--- a/c/common/src/codingstandards/c/UndefinedBehavior.qll
+++ b/c/common/src/codingstandards/c/UndefinedBehavior.qll
@@ -6,28 +6,53 @@ import codingstandards.cpp.UndefinedBehavior
  */
 abstract class CUndefinedBehavior extends UndefinedBehavior { }
 
+class PointerOrArrayType extends DerivedType {
+  PointerOrArrayType() {
+    this instanceof PointerType or
+    this instanceof ArrayType
+  }
+}
+
+Type get(Function main) {
+  main.getName() = "main" and
+  main.getNumberOfParameters() = 2 and
+  main.getType().getUnderlyingType() instanceof IntType and
+  main.getParameter(0).getType().getUnderlyingType() instanceof IntType and
+  result = main.getParameter(1).getType().getUnderlyingType().(PointerOrArrayType).getBaseType()
+}
+
+/**
+ * A function which has the signature - but not the name - of a main function.
+ */
 class C99MainFunction extends Function {
   C99MainFunction() {
     this.getNumberOfParameters() = 2 and
-    this.getType() instanceof IntType and
-    this.getParameter(0).getType() instanceof IntType and
-    this.getParameter(1).getType().(PointerType).getBaseType().(PointerType).getBaseType()
-      instanceof CharType
+    this.getType().getUnderlyingType() instanceof IntType and
+    this.getParameter(0).getType().getUnderlyingType() instanceof IntType and
+    this.getParameter(1)
+        .getType()
+        .getUnderlyingType()
+        .(PointerOrArrayType)
+        .getBaseType()
+        .(PointerOrArrayType)
+        .getBaseType() instanceof CharType
     or
     this.getNumberOfParameters() = 0 and
-    this.getType() instanceof VoidType
+    // Must be explicitly declared as `int main(void)`.
+    this.getADeclarationEntry().hasVoidParamList() and
+    this.getType().getUnderlyingType() instanceof IntType
   }
 }
 
 class CUndefinedMainDefinition extends CUndefinedBehavior, Function {
   CUndefinedMainDefinition() {
     // for testing purposes, we use the prefix ____codeql_coding_standards`
-    (this.getName() = "main" or this.getName().indexOf("____codeql_coding_standards") = 0) and
+    (this.getName() = "main" or this.getName().indexOf("____codeql_coding_standards_main") = 0) and
     not this instanceof C99MainFunction
   }
 
   override string getReason() {
     result =
-      "The behavior of the program is undefined because the main function is not defined according to the C standard."
+      "main function may trigger undefined behavior because it is not in one of the formats specified by the C standard."
   }
 }
diff --git a/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql b/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql
index 53f72e6bee..00ef875985 100644
--- a/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql
+++ b/c/misra/src/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.ql
@@ -18,4 +18,4 @@ import codingstandards.c.UndefinedBehavior
 
 from CUndefinedBehavior c
 where not isExcluded(c, Language3Package::occurrenceOfUndefinedBehaviorQuery())
-select c, "May result in undefined behavior."
+select c, c.getReason()
diff --git a/c/misra/test/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.expected b/c/misra/test/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.expected
index 68216d500f..1e57f92e4a 100644
--- a/c/misra/test/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.expected
+++ b/c/misra/test/rules/RULE-1-3/OccurrenceOfUndefinedBehavior.expected
@@ -1,5 +1,8 @@
-| test.c:8:6:8:35 | ____codeql_coding_standards_m2 | May result in undefined behavior. |
-| test.c:11:5:11:34 | ____codeql_coding_standards_m3 | May result in undefined behavior. |
-| test.c:15:5:15:34 | ____codeql_coding_standards_m4 | May result in undefined behavior. |
-| test.c:19:5:19:34 | ____codeql_coding_standards_m5 | May result in undefined behavior. |
-| test.c:23:5:23:34 | ____codeql_coding_standards_m6 | May result in undefined behavior. |
+| test.c:4:6:4:38 | ____codeql_coding_standards_main1 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
+| test.c:8:5:8:37 | ____codeql_coding_standards_main2 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
+| test.c:27:5:27:37 | ____codeql_coding_standards_main6 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
+| test.c:32:6:32:38 | ____codeql_coding_standards_main7 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
+| test.c:36:5:36:37 | ____codeql_coding_standards_main8 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
+| test.c:40:5:40:37 | ____codeql_coding_standards_main9 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
+| test.c:44:5:44:38 | ____codeql_coding_standards_main10 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
+| test.c:48:5:48:38 | ____codeql_coding_standards_main11 | main function may trigger undefined behavior because it is not in one of the formats specified by the C standard. |
diff --git a/c/misra/test/rules/RULE-1-3/test.c b/c/misra/test/rules/RULE-1-3/test.c
index 190cff4000..fd54959f56 100644
--- a/c/misra/test/rules/RULE-1-3/test.c
+++ b/c/misra/test/rules/RULE-1-3/test.c
@@ -1,25 +1,50 @@
-void main(void) { // COMPLIANT
+int main(void) { // COMPLIANT
 }
 
-int ____codeql_coding_standards_m1(int argc, char **argv) { // NON_COMPLIANT
+void ____codeql_coding_standards_main1(void) { // NON_COMPLIANT
   return 0;
 }
 
-void ____codeql_coding_standards_m2(char *argc, char **argv) { // NON_COMPLIANT
+int ____codeql_coding_standards_main2() { // NON_COMPLIANT
+  return 0;
+}
+
+int ____codeql_coding_standards_main3(int argc, char **argv) { // COMPLIANT
+  return 0;
+}
+
+int ____codeql_coding_standards_main4(int argc, char argv[][]) { // COMPLIANT
+  return 0;
+}
+
+int ____codeql_coding_standards_main5(int argc, char *argv[]) { // COMPLIANT
+  return 0;
+}
+
+typedef int MY_INT;
+typedef char *MY_CHAR_PTR;
+
+int ____codeql_coding_standards_main6(MY_INT argc,
+                                      MY_CHAR_PTR argv[]) { // COMPLIANT
+  return 0;
+}
+
+void ____codeql_coding_standards_main7(char *argc,
+                                       char **argv) { // NON_COMPLIANT
 }
 
-int ____codeql_coding_standards_m3(int argc, char *argv) { // NON_COMPLIANT
+int ____codeql_coding_standards_main8(int argc, char *argv) { // NON_COMPLIANT
   return 0;
 }
 
-int ____codeql_coding_standards_m4() { // NON_COMPLIANT
+int ____codeql_coding_standards_main9() { // NON_COMPLIANT
   return 0;
 }
 
-int ____codeql_coding_standards_m5(int argc, int *argv) { // NON_COMPLIANT
+int ____codeql_coding_standards_main10(int argc, int *argv) { // NON_COMPLIANT
   return 0;
 }
 
-int ____codeql_coding_standards_m6(int argc, int **argv) { // NON_COMPLIANT
+int ____codeql_coding_standards_main11(int argc, int **argv) { // NON_COMPLIANT
   return 0;
 }
diff --git a/change_notes/2024-10-21-rule-1-3-main.md b/change_notes/2024-10-21-rule-1-3-main.md
new file mode 100644
index 0000000000..7bd8d4bd54
--- /dev/null
+++ b/change_notes/2024-10-21-rule-1-3-main.md
@@ -0,0 +1,3 @@
+ - `RULE-1-3` - `OccurrenceOfUndefinedBehavior.ql`:
+   - Improve alert message to report the undefined behavior triggered.
+   - Address both false positives and false negatives in identifying standard compliant main methods. Previously, `void main()` was considered permitted and `int main(void)` banned. In addition, we now detect main methods as standard compliant if they use typedefs, and if arrays are used in the definition of `argv`.
\ No newline at end of file

From 9e5aa28e080b6205095fd5e5320b2fbc8ae11f58 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Mon, 21 Oct 2024 23:45:34 +0100
Subject: [PATCH 346/435] Increase CodeQL compilation cache size

---
 .github/workflows/code-scanning-pack-gen.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 3965e7d26d..5a37353f19 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -97,8 +97,9 @@ jobs:
           CODEQL_HOME: ${{ github.workspace }}/codeql_home
         run: |
           PATH=$PATH:$CODEQL_HOME/codeql
-
-          codeql query compile --precompile --threads 0 cpp c
+          # Precompile all queries, and use a compilation cache larger than default
+          # to ensure we cache all the queries for later steps
+          codeql query compile --precompile --threads 0 --compilation-cache-size=1024 cpp c
 
           cd ..
           zip -r codeql-coding-standards/code-scanning-cpp-query-pack.zip codeql-coding-standards/c/ codeql-coding-standards/cpp/ codeql-coding-standards/.codeqlmanifest.json codeql-coding-standards/supported_codeql_configs.json codeql-coding-standards/scripts/configuration codeql-coding-standards/scripts/reports codeql-coding-standards/scripts/shared codeql-coding-standards/scripts/guideline_recategorization codeql-coding-standards/schemas

From 66b4267e37592389e7f60510bf852abe4b0a7915 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Tue, 22 Oct 2024 15:12:51 +0900
Subject: [PATCH 347/435] Fix #755.

---
 change_notes/2024-10-22-fix-fp-m6-5-3.md     | 2 ++
 cpp/common/src/codingstandards/cpp/Loops.qll | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 change_notes/2024-10-22-fix-fp-m6-5-3.md

diff --git a/change_notes/2024-10-22-fix-fp-m6-5-3.md b/change_notes/2024-10-22-fix-fp-m6-5-3.md
new file mode 100644
index 0000000000..0d8ca573d9
--- /dev/null
+++ b/change_notes/2024-10-22-fix-fp-m6-5-3.md
@@ -0,0 +1,2 @@
+- `M6-5-3` - `Loops.qll`:
+  - Fixes #755. Specifies that the access to the loop counter must be via non-const address.
diff --git a/cpp/common/src/codingstandards/cpp/Loops.qll b/cpp/common/src/codingstandards/cpp/Loops.qll
index bfd68c49a0..aa3dc64ea5 100644
--- a/cpp/common/src/codingstandards/cpp/Loops.qll
+++ b/cpp/common/src/codingstandards/cpp/Loops.qll
@@ -204,7 +204,7 @@ predicate isLoopCounterModifiedInCondition(ForStmt forLoop, VariableAccess loopC
   loopCounterAccess = getAnIterationVariable(forLoop).getAnAccess() and
   (
     loopCounterAccess.isModified() or
-    loopCounterAccess.isAddressOfAccess()
+    loopCounterAccess.isAddressOfAccessNonConst()
   )
 }
 
@@ -219,7 +219,7 @@ predicate isLoopCounterModifiedInStatement(
   loopCounterAccess = loopCounter.getAnAccess() and
   (
     loopCounterAccess.isModified() or
-    loopCounterAccess.isAddressOfAccess()
+    loopCounterAccess.isAddressOfAccessNonConst()
   ) and
   forLoop.getStmt().getChildStmt*() = loopCounterAccess.getEnclosingStmt()
 }

From 92427e6161f563a67c751b0bfcd1f5b44e86a13c Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Tue, 22 Oct 2024 15:15:37 +0900
Subject: [PATCH 348/435] Fix sneaky typo in A18-1-1 test.

---
 cpp/autosar/test/rules/A18-1-1/test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/autosar/test/rules/A18-1-1/test.cpp b/cpp/autosar/test/rules/A18-1-1/test.cpp
index 90596780d9..0e9bffa3d7 100644
--- a/cpp/autosar/test/rules/A18-1-1/test.cpp
+++ b/cpp/autosar/test/rules/A18-1-1/test.cpp
@@ -11,6 +11,6 @@ int test_c_arrays() {
   int x[100];                 // NON_COMPLIANT
   constexpr int a[]{0, 1, 2}; // NON_COMPLIANT
 
-  __func__; // COMPLAINT
+  __func__; // COMPLIANT
   return 0;
-}
\ No newline at end of file
+}

From c7f04f531f08de27ab4f1f49543654bd2d408709 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 10:24:04 +0100
Subject: [PATCH 349/435] Add coding-standards-qlpacks as a release artifact

---
 scripts/release/release-layout.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/release/release-layout.yml b/scripts/release/release-layout.yml
index 5e496120f2..32ba2b63d9 100644
--- a/scripts/release/release-layout.yml
+++ b/scripts/release/release-layout.yml
@@ -10,6 +10,10 @@ layout:
     - workflow-artifact:
         name: "Code Scanning Query Pack Generation"
         artifact: code-scanning-cpp-query-pack.zip
+  coding-standards-qlpacks.zip:
+    - workflow-artifact:
+        name: "Code Scanning Query Pack Generation"
+        artifact: coding-standards-qlpacks.zip
   supported_rules_list.csv:
     - shell: |
         python ${{ coding-standards.root }}/scripts/release/create_supported_rules_list.py --csv > supported_rules_list.csv

From d238d2e0753a34b9297e772231c25b2bb2d9518c Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 11:05:56 +0100
Subject: [PATCH 350/435] Fix name

---
 scripts/release/release-layout.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/release/release-layout.yml b/scripts/release/release-layout.yml
index 32ba2b63d9..357b7a56fc 100644
--- a/scripts/release/release-layout.yml
+++ b/scripts/release/release-layout.yml
@@ -13,7 +13,7 @@ layout:
   coding-standards-qlpacks.zip:
     - workflow-artifact:
         name: "Code Scanning Query Pack Generation"
-        artifact: coding-standards-qlpacks.zip
+        artifact: coding-standards-qlpacks
   supported_rules_list.csv:
     - shell: |
         python ${{ coding-standards.root }}/scripts/release/create_supported_rules_list.py --csv > supported_rules_list.csv

From 0266e46e26a2a96bae92b2ae833c1e420be94106 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 11:14:48 +0100
Subject: [PATCH 351/435] Move the action to a more discoverable location,
 improve isolation

---
 .../action.yml                                              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename {.github/actions/apply-coding-standards-configuration => apply-configuration}/action.yml (54%)

diff --git a/.github/actions/apply-coding-standards-configuration/action.yml b/apply-configuration/action.yml
similarity index 54%
rename from .github/actions/apply-coding-standards-configuration/action.yml
rename to apply-configuration/action.yml
index c5c58ebc3c..ea4e48cb8d 100644
--- a/.github/actions/apply-coding-standards-configuration/action.yml
+++ b/apply-configuration/action.yml
@@ -6,12 +6,14 @@ runs:
   using: composite
   steps:
     - name: Install Python
+      id: cs-install-python
       uses: actions/setup-python@v5
       with:
         python-version: 3.9
+        update-environment: false
     - name: Install dependencies
       shell: bash
-      run: python -m pip install -r ${GITHUB_ACTION_PATH}/../../../scripts/configuration/requirements.txt
+      run: ${{ steps.cs-install-python.outputs.python-path }} -m pip install -r ${GITHUB_ACTION_PATH}/../scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
-      run: python ${GITHUB_ACTION_PATH}/../../../scripts/configuration/process_coding_standards_config.py
+      run: ${{ steps.cs-install-python.outputs.python-path }} ${GITHUB_ACTION_PATH}/../scripts/configuration/process_coding_standards_config.py

From c94e7189cb599098653ecb1444e143056dba1034 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 13:01:39 +0100
Subject: [PATCH 352/435] Address LD_LIBRARY_PATH issue

---
 apply-configuration/action.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apply-configuration/action.yml b/apply-configuration/action.yml
index ea4e48cb8d..bc12db4f60 100644
--- a/apply-configuration/action.yml
+++ b/apply-configuration/action.yml
@@ -13,7 +13,14 @@ runs:
         update-environment: false
     - name: Install dependencies
       shell: bash
-      run: ${{ steps.cs-install-python.outputs.python-path }} -m pip install -r ${GITHUB_ACTION_PATH}/../scripts/configuration/requirements.txt
+      run: |
+        install_dir=$(dirname $(dirname "${{ steps.cs-install-python.outputs.python-path }}"))
+        if [[ -z "$LD_LIBRARY_PATH" ]]; then
+          export LD_LIBRARY_PATH="$install_dir/lib"
+        else
+          export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$install_dir/lib"
+        fi
+        ${{ steps.cs-install-python.outputs.python-path }} -m pip install -r ${GITHUB_ACTION_PATH}/../scripts/configuration/requirements.txt
     - name: Process files
       shell: bash
       run: ${{ steps.cs-install-python.outputs.python-path }} ${GITHUB_ACTION_PATH}/../scripts/configuration/process_coding_standards_config.py

From 2180087c2a7ae458cc87b81f67bdb4a4614ff267 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 13:12:57 +0100
Subject: [PATCH 353/435] Combine steps to apply LD_LIBRARY_PATH to both steps

---
 apply-configuration/action.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apply-configuration/action.yml b/apply-configuration/action.yml
index bc12db4f60..89a702b72a 100644
--- a/apply-configuration/action.yml
+++ b/apply-configuration/action.yml
@@ -11,7 +11,7 @@ runs:
       with:
         python-version: 3.9
         update-environment: false
-    - name: Install dependencies
+    - name: Install dependencies and process files
       shell: bash
       run: |
         install_dir=$(dirname $(dirname "${{ steps.cs-install-python.outputs.python-path }}"))
@@ -21,6 +21,4 @@ runs:
           export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$install_dir/lib"
         fi
         ${{ steps.cs-install-python.outputs.python-path }} -m pip install -r ${GITHUB_ACTION_PATH}/../scripts/configuration/requirements.txt
-    - name: Process files
-      shell: bash
-      run: ${{ steps.cs-install-python.outputs.python-path }} ${GITHUB_ACTION_PATH}/../scripts/configuration/process_coding_standards_config.py
+        ${{ steps.cs-install-python.outputs.python-path }} ${GITHUB_ACTION_PATH}/../scripts/configuration/process_coding_standards_config.py
\ No newline at end of file

From 80988039fccdeef7b5f375ff26f269d3db513391 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 14:11:09 +0100
Subject: [PATCH 354/435] Removed leftover debugging

---
 .github/workflows/code-scanning-pack-gen.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 5a37353f19..306a33e735 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -120,8 +120,8 @@ jobs:
           codeql pack bundle --output=common-c-coding-standards.tgz c/common/src
           codeql pack bundle --output=misra-c-coding-standards.tgz c/misra/src
           codeql pack bundle --output=cert-c-coding-standards.tgz c/cert/src
-          codeql pack bundle --output=cert-cpp-coding-standards.tgz -vvv cpp/cert/src
-          codeql pack bundle --output=autosar-cpp-coding-standards.tgz -vvv cpp/autosar/src
+          codeql pack bundle --output=cert-cpp-coding-standards.tgz cpp/cert/src
+          codeql pack bundle --output=autosar-cpp-coding-standards.tgz cpp/autosar/src
           codeql pack bundle --output=report-cpp-coding-standards.tgz cpp/report/src
 
       - name: Upload qlpack bundles

From 772d593ef3279626b062abade169dd7c9c2ed72e Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 14:11:23 +0100
Subject: [PATCH 355/435] Pack generation: update report pack name for clarity

---
 .github/workflows/code-scanning-pack-gen.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 306a33e735..68961b3202 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -122,7 +122,7 @@ jobs:
           codeql pack bundle --output=cert-c-coding-standards.tgz c/cert/src
           codeql pack bundle --output=cert-cpp-coding-standards.tgz cpp/cert/src
           codeql pack bundle --output=autosar-cpp-coding-standards.tgz cpp/autosar/src
-          codeql pack bundle --output=report-cpp-coding-standards.tgz cpp/report/src
+          codeql pack bundle --output=report-coding-standards.tgz cpp/report/src
 
       - name: Upload qlpack bundles
         uses: actions/upload-artifact@v4

From f146f74ebf5d39509bcd94529660bff334728894 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 17:23:09 +0100
Subject: [PATCH 356/435] Rename to coding-standards-codeql-packs

---
 .github/workflows/code-scanning-pack-gen.yml | 2 +-
 scripts/release/release-layout.yml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index 68961b3202..e03b377424 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -127,5 +127,5 @@ jobs:
       - name: Upload qlpack bundles
         uses: actions/upload-artifact@v4
         with:
-          name: coding-standards-qlpacks
+          name: coding-standards-codeql-packs
           path: '*-coding-standards.tgz'
\ No newline at end of file
diff --git a/scripts/release/release-layout.yml b/scripts/release/release-layout.yml
index 357b7a56fc..4ced0b4d30 100644
--- a/scripts/release/release-layout.yml
+++ b/scripts/release/release-layout.yml
@@ -10,10 +10,10 @@ layout:
     - workflow-artifact:
         name: "Code Scanning Query Pack Generation"
         artifact: code-scanning-cpp-query-pack.zip
-  coding-standards-qlpacks.zip:
+  coding-standards-codeql-packs.zip:
     - workflow-artifact:
         name: "Code Scanning Query Pack Generation"
-        artifact: coding-standards-qlpacks
+        artifact: coding-standards-codeql-packs
   supported_rules_list.csv:
     - shell: |
         python ${{ coding-standards.root }}/scripts/release/create_supported_rules_list.py --csv > supported_rules_list.csv

From eee63999c5bb6714c07d4b20cc68f40a9b02ed62 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 18:13:34 +0100
Subject: [PATCH 357/435] Add MISRA C++ 2023 CodeQL pack

---
 .github/workflows/code-scanning-pack-gen.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index e03b377424..ea13a4e76c 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -122,6 +122,7 @@ jobs:
           codeql pack bundle --output=cert-c-coding-standards.tgz c/cert/src
           codeql pack bundle --output=cert-cpp-coding-standards.tgz cpp/cert/src
           codeql pack bundle --output=autosar-cpp-coding-standards.tgz cpp/autosar/src
+          codeql pack bundle --output=misra-cpp-coding-standards.tgz cpp/misra/src
           codeql pack bundle --output=report-coding-standards.tgz cpp/report/src
 
       - name: Upload qlpack bundles

From 499fa76800e24e7e28879d6f87e2858bc037ea1d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 18:14:10 +0100
Subject: [PATCH 358/435] Update user manual with CodeQL packs

---
 docs/user_manual.md             | 101 +++++++++++++++++++++++++++-----
 scripts/release/bump-version.sh |   1 +
 2 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/docs/user_manual.md b/docs/user_manual.md
index 17c08237ef..b74c962d0e 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -29,13 +29,15 @@
 | 0.21.0  | 2024-05-01 | Luke Cartey     | Add MISRA C++ 2023 as under development, and clarify MISRA C 2012 coverage.                                             |
 | 0.22.0  | 2024-10-02 | Luke Cartey     | Add MISRA C 2023 as under development, and clarify MISRA C 2012 coverage.                                               |
 | 0.23.0  | 2024-10-21 | Luke Cartey     | Add assembly as a hazard.                                                                                               |
+| 0.24.0  | 2024-10-22 | Luke Cartey     | Add CodeQL packs as a usable output, update release artifacts list.                                                                                               |
 
 ## Release information
 
 This user manual documents release `2.37.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
-- `code-scanning-cpp-query-pack-2.37.0-dev.zip`: coding standard queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `coding-standards-codeql-packs-2.37.0-dev.zip`: CodeQL packs that can be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `code-scanning-cpp-query-pack-2.37.0-dev.zip`: Legacy packaging for the queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
 - `supported_rules_list_2.37.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
 - `supported_rules_list_2.37.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
 - `user_manual_2.37.0-dev.md`: This user manual.
@@ -158,22 +160,52 @@ This section describes how to operate the "CodeQL Coding Standards".
 
 #### Pre-requisite: downloading the CodeQL CLI
 
-You must download a compatible version of the CodeQL CLI and CodeQL Standard Library for C++.
+You must download a compatible version of the CodeQL CLI, as specified in the release notes for the release you are using.
 
-**Option 1:** Use the CodeQL CLI bundle, which includes both required components:
+**Option 1:** Use the CodeQL CLI bundle, which includes both the CodeQL CLI and GitHub's default security queries:
 
  1. Download the CodeQL CLI bundle from the [`github/codeql-action` releases page](https://github.com/github/codeql-action/releases).
  2. Expand the compressed archive to a specified location on your machine.
  3. [Optional] Add the CodeQL CLI to your user or system path.
 
-**Option 2:** Fetch the components separately:
+This approach is suitable if you wish to use the default queries provided by GitHub in addition to the Coding Standards queries.
+
+**Option 2:** Use the CodeQL CLI binary:
 
  1. Download the CodeQL CLI from the [`github/codeql-cli-binaries` releases page](https://github.com/github/codeql-cli-binaries/releases)
  2. Expand the compressed archive to a specified location on your machine.
- 3. Using `git`, clone the [`github/codeql`](https://github.com/github/codeql) repository to a sibling directory of the CodeQL CLI. The `github/codeql` repository contains the CodeQL Standard Library for C++.
- 4. [Optional] Add the CodeQL CLI to your user or system path.
+3. [Optional] Add the CodeQL CLI to your user or system path.
+
+#### Pre-requisite: downloading the Coding Standards queries
+
+The Coding Standards packs can be downloaded into the local CodeQL package cache using the following command:
+
+```bash
+codeql pack download codeql/<standard>-<language>-coding-standards@<version>
+```
+
+The supported standards and languages are:
+ * `codeql/misra-c-coding-standards` - a CodeQL query pack for reporting violations of MISRA C.
+ * `codeql/cert-c-coding-standards` - a CodeQL query pack for reporting violations of CERT C.
+ * `codeql/misra-cpp-coding-standards` - a CodeQL query pack for reporting violations of MISRA C++.
+ * `codeql/cert-cpp-coding-standards` - a CodeQL query pack for reporting violations of CERT C++.
+ * `codeql/autosar-cpp-coding-standards` - - a CodeQL query pack for reporting violations of AUTOSAR for C++.
+
+Ensure that the `@<version>` string matches the desired Coding Standards version.
+
+Alternatively, the packs can be downloaded directly from a release on the `github/codeql-coding-standards` repository by choosing the `coding-standards-codeql-packs.zip`, which contains the following files:
+
+  * `misra-c-coding-standards.tgz` - a CodeQL query pack for reporting violations of MISRA C.
+  * `cert-c-coding-standards.tgz` - a CodeQL query pack for reporting violations of CERT C.
+  * `cert-cpp-coding-standards.tgz`  - a CodeQL query pack for reporting violations of CERT C++.
+  * `autosar-cpp-coding-standards.tgz` - a CodeQL query pack for reporting violations of AUTOSAR for C++.
+  * `common-cpp-coding-standards.tgz` - a CodeQL library pack, used if you are writing your own C++ queries against Coding Standards.
+  * `common-c-coding-standards.tgz` - a CodeQL library pack, used if you are writing your own C queries against Coding Standards.
+  * `report-coding-standards.tgz` - a CodeQL query pack for running diagnostics on databases.
 
-The release notes for the "CodeQL Coding Standards" pack you are using will specify the appropriate versions to use.
+Each pack will need to be decompressed using the `tar` program, and placed in a known location.
+
+Finally, we provide a legacy single zip containing all the artifacts from a release, named `code-scanning-cpp-query-pack.zip`. This also contains the CodeQL packs listed above.
 
 #### Creating a CodeQL database
 
@@ -194,26 +226,65 @@ Reference: [CodeQL CLI: Creating a CodeQL database](https://codeql.github.com/do
 
 #### Running the default analysis for one or more Coding Standards
 
-Once you have a CodeQL database for your project, you can run the "default" query suite. This will run all the "automated" queries for each implemented rule in the specified Coding Standards.
+Once you have a CodeQL database for your project you can run the default analysis for a specified Coding Standard using the `codeql database analyze` command by specifying the names of the QL packs which you want to run as arguments, along with a version specifier:
+
+```bash
+codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> codeql/<standard>-<language>-coding-standard@version
+```
+
+For example, this command would run MISRA C and CERT C with the default query sets:
+
+```bash
+codeql database analyze --format=sarifv2.1.0 --output=results.sarif path/to/<output_database_name> codeql/misra-c-coding-standard@version codeql/cert-c-coding-standard@version
+```
+The output of this command will be a [SARIF file](https://sarifweb.azurewebsites.net/) called `<name-of-results-file>.sarif`.
+
+##### Locating the Coding Standards CodeQL packs
+
+If you have downloaded a release artifact containing the packs, you will need to provide the `--search-path` parameter, pointing to each of the uncompressed query packs.
+```
+--search-path path/to/pack1:path/to/pack2
+```
+
+Alternatively, the packs can be made available to CodeQL without specification on the comamnd line by placing them inside the distribution under the `qlpacks/codeql/` directory, or placed inside a directory adjacent to the folder containing the distribution.
+
+##### Alternative query sets
+
+Each supported standard includes a variety of query suites, which enable the running of different sets of queries based on specified properties. In addition, a custom query suite can be defined as specified by the CodeQL CLI documentation, in order to select any arbitrary sets of queries in this repository. To run
+
+```bash
+codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> codeql/<standard>-<language>-coding-standard@version:codeql-suites/<alternative-suite>.qls
+```
 
-The query suites can be run by using the `codeql database analyze` command:
+If modifying the query suite, ensure that all Rules you expect to be covered by CodeQL in your Guideline Enforcement Plan (or similar) are included in the query suite, by running:
 
 ```bash
-codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> path/to/codeql-coding-standards/cpp/<coding-standard>/src/codeql-suites/<coding-standard>-default.qls...
+codeql resolve queries codeql/<standard>-<language>-coding-standard@version:codeql-suites/<alternative-suite>.qls
 ```
 
-For each Coding Standard you want to run, add a trailing entry in the following format: `path/to/codeql-coding-standards/cpp/<coding-standard>/src/codeql-suites/<coding-standard>-default.qls`.
+##### Supported SARIF versions
 
 The only supported SARIF version for use in a functional safety environment is version 2.1.0.
 To select this SARIF version you **must** specify the flag `--format=sarifv2.1.0` when invoking the database analyze command `codeql database analyze ...` as shown in the above example.
 
-Running the default analysis for one or more Coding Standards may require further performance customizations for larger codebases.
-The following flags may be passed to the `database analyze` command to adjust the performance:
+##### Performance optimizations
+
+Running the default analysis for one or more Coding Standards may require further performance customizations for larger codebases. The following flags may be passed to the `database analyze` command to adjust the performance:
 
 - `--ram` - to specify the maximum amount of RAM to use during the analysis as [documented](https://codeql.github.com/docs/codeql-cli/manual/database-analyze/#options-to-control-ram-usage) in the CodeQL CLI manual.
 - `--thread` - to specify number of threads to use while evaluating as [documented](https://codeql.github.com/docs/codeql-cli/manual/database-analyze/#cmdoption-codeql-database-analyze-j) in the CodeQL CLI manual.
 
-The output of this command will be a [SARIF file](https://sarifweb.azurewebsites.net/) called `<name-of-results-file>.sarif`.
+##### Legacy approach
+
+If you have downloaded the legacy release artifact `code-scanning-query-pack.zip`, you can run the default query suite using the `codeql database analyze` command as follows:
+
+```bash
+codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> path/to/codeql-coding-standards/<language>/<coding-standard>/src/codeql-suites/<coding-standard>-default.qls...
+```
+
+For each Coding Standard you want to run, add a trailing entry in the following format: `path/to/codeql-coding-standards/<language>/<coding-standard>/src/codeql-suites/<coding-standard>-default.qls`. Custom query suites can be run by specifying the appropriate paths.
+
+All other options discussed above are valid.
 
 #### Running the analysis for audit level queries
 
@@ -223,8 +294,6 @@ Optionally, you may want to run the "audit" level queries. These queries produce
 codeql database analyze --format=sarifv2.1.0 --output=<name-of-results-file>.sarif path/to/<output_database_name> path/to/codeql-coding-standards/cpp/<coding-standard>/src/codeql-suites/<coding-standard>-audit.qls...
 ```
 
-For each Coding Standard you want to run, add a trailing entry in the following format: `path/to/codeql-coding-standards/cpp/<coding-standard>/src/codeql-suites/<coding-standard>-default.qls`.
-
 #### Producing an analysis report
 
 In addition to producing a results file, an analysis report can be produced that summarizes:
diff --git a/scripts/release/bump-version.sh b/scripts/release/bump-version.sh
index fd5ab5ea0d..5bbd0eeae0 100755
--- a/scripts/release/bump-version.sh
+++ b/scripts/release/bump-version.sh
@@ -15,6 +15,7 @@ find . -name 'qlpack.yml' | grep -v './codeql_modules' | grep -v './scripts' | x
 # update the documentation. 
 
 find docs -name 'user_manual.md' -print0 | xargs -0 sed -i "s/code-scanning-cpp-query-pack-.*\.zip\`/code-scanning-cpp-query-pack-${1}.zip\`/"
+find docs -name 'user_manual.md' -print0 | xargs -0 sed -i "s/coding-standard-codeql-pack-.*\.zip\`/coding-standard-codeql-pack-${1}.zip\`/"
 find docs -name 'user_manual.md' -print0 | xargs -0 sed -i "s/supported_rules_list_.*\.csv\`/supported_rules_list_${1}.csv\`/"
 find docs -name 'user_manual.md' -print0 | xargs -0 sed -i "s/supported_rules_list_.*\.md\`/supported_rules_list_${1}.md\`/"
 find docs -name 'user_manual.md' -print0 | xargs -0 sed -i "s/user_manual_.*\.md\`/user_manual_${1}.md\`/"

From 1c6fce51adf7e2bc0441603f487de61d5322d9d0 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 19:11:02 +0100
Subject: [PATCH 359/435] Update wording of recommendation to use the bundle

---
 docs/user_manual.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user_manual.md b/docs/user_manual.md
index b74c962d0e..c9fbacdd4b 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -168,7 +168,7 @@ You must download a compatible version of the CodeQL CLI, as specified in the re
  2. Expand the compressed archive to a specified location on your machine.
  3. [Optional] Add the CodeQL CLI to your user or system path.
 
-This approach is suitable if you wish to use the default queries provided by GitHub in addition to the Coding Standards queries.
+This approach is recommended if you wish to use the default queries provided by GitHub in addition to the Coding Standards queries.
 
 **Option 2:** Use the CodeQL CLI binary:
 

From 47804a7b52f4606d123bb4ca0f45e1e0acd558ca Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 19:11:19 +0100
Subject: [PATCH 360/435] Add release notes

---
 change_notes/2024-10-22-update-release-artifacts.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 change_notes/2024-10-22-update-release-artifacts.md

diff --git a/change_notes/2024-10-22-update-release-artifacts.md b/change_notes/2024-10-22-update-release-artifacts.md
new file mode 100644
index 0000000000..46d0ed0c30
--- /dev/null
+++ b/change_notes/2024-10-22-update-release-artifacts.md
@@ -0,0 +1,4 @@
+ - Modifications to the release artifacts:
+   - New CodeQL pack release artifacts have been created. These release artifacts can be downloaded from the release, and will be published to the GitHub registry under the `codeql` org for ease of deployment.
+   - The user manual has been updated to describe how to use the CodeQL packs.
+ - We no longer require a separate download of the CodeQL Standard Library for C++ - all queries have been pre-compiled and linked with the appropriate standard library.
\ No newline at end of file

From 4b9d8136208c4cc002c24bba794d4c208663ebcf Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 21:12:32 +0100
Subject: [PATCH 361/435] Share PointerOrArrayType

---
 .../codingstandards/c/UndefinedBehavior.qll   | 20 +++----------------
 .../src/codingstandards/cpp/Pointers.qll      | 12 ++++++++++-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/c/common/src/codingstandards/c/UndefinedBehavior.qll b/c/common/src/codingstandards/c/UndefinedBehavior.qll
index bbbb08678b..6a72cb6eb7 100644
--- a/c/common/src/codingstandards/c/UndefinedBehavior.qll
+++ b/c/common/src/codingstandards/c/UndefinedBehavior.qll
@@ -1,4 +1,5 @@
 import cpp
+import codingstandards.cpp.Pointers
 import codingstandards.cpp.UndefinedBehavior
 
 /**
@@ -6,21 +7,6 @@ import codingstandards.cpp.UndefinedBehavior
  */
 abstract class CUndefinedBehavior extends UndefinedBehavior { }
 
-class PointerOrArrayType extends DerivedType {
-  PointerOrArrayType() {
-    this instanceof PointerType or
-    this instanceof ArrayType
-  }
-}
-
-Type get(Function main) {
-  main.getName() = "main" and
-  main.getNumberOfParameters() = 2 and
-  main.getType().getUnderlyingType() instanceof IntType and
-  main.getParameter(0).getType().getUnderlyingType() instanceof IntType and
-  result = main.getParameter(1).getType().getUnderlyingType().(PointerOrArrayType).getBaseType()
-}
-
 /**
  * A function which has the signature - but not the name - of a main function.
  */
@@ -32,9 +18,9 @@ class C99MainFunction extends Function {
     this.getParameter(1)
         .getType()
         .getUnderlyingType()
-        .(PointerOrArrayType)
+        .(UnspecifiedPointerOrArrayType)
         .getBaseType()
-        .(PointerOrArrayType)
+        .(UnspecifiedPointerOrArrayType)
         .getBaseType() instanceof CharType
     or
     this.getNumberOfParameters() = 0 and
diff --git a/cpp/common/src/codingstandards/cpp/Pointers.qll b/cpp/common/src/codingstandards/cpp/Pointers.qll
index 8ed55b2bc0..28b6abc340 100644
--- a/cpp/common/src/codingstandards/cpp/Pointers.qll
+++ b/cpp/common/src/codingstandards/cpp/Pointers.qll
@@ -6,7 +6,7 @@ import cpp
 import codingstandards.cpp.Type
 
 /**
- * A type that is a pointer or array type.
+ * A type that is a pointer or array type after stripping top-level specifiers.
  */
 class PointerOrArrayType extends DerivedType {
   PointerOrArrayType() {
@@ -15,6 +15,16 @@ class PointerOrArrayType extends DerivedType {
   }
 }
 
+/**
+ * A type that is a pointer or array type.
+ */
+class UnspecifiedPointerOrArrayType extends DerivedType {
+  UnspecifiedPointerOrArrayType() {
+    this instanceof PointerType or
+    this instanceof ArrayType
+  }
+}
+
 /**
  * An expression which performs pointer arithmetic
  */

From 57dd7485f67c15a414d079a8b5a15902cf3c5b7b Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 21:18:01 +0100
Subject: [PATCH 362/435] Rule 5.4: Address review comments

---
 .../src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql    | 4 ++--
 .../src/codingstandards/cpp/PreprocessorDirective.qll    | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
index ed124692e5..36b946491b 100644
--- a/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
+++ b/c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql
@@ -99,8 +99,8 @@ where
   // when m2 is defined
   isIncludedUnconditionallyFromCommonFile(m, m2) and
   // Macros can't be mutually exclusive
-  not mutuallyExclusiveMacros(m, m2) and
-  not mutuallyExclusiveMacros(m2, m) and
+  not mutuallyExclusiveBranchDirectiveMacros(m, m2) and
+  not mutuallyExclusiveBranchDirectiveMacros(m2, m) and
   // If at least one invocation exists for at least one of the macros, then they must share a link
   // target - i.e. must both be expanded in the same context
   (
diff --git a/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll b/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
index 1f6cc140d8..ca943742d9 100644
--- a/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
+++ b/cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll
@@ -98,12 +98,9 @@ predicate isMacroDefinedWithinBranch(PreprocessorBranchDirective bd, Macro m) {
  * Holds if the pair of macros are "conditional" i.e. only one of the macros is followed in any
  * particular compilation of the containing file.
  */
-predicate mutuallyExclusiveMacros(Macro firstMacro, Macro secondMacro) {
-  exists(
-    PreprocessorBranchDirective b1, PreprocessorBranchDirective b2, string filepath,
-    int b1StartLocation, int b2StartLocation
-  |
-    isBranchDirectivePair(b1, b2, filepath, b1StartLocation, b2StartLocation) and
+predicate mutuallyExclusiveBranchDirectiveMacros(Macro firstMacro, Macro secondMacro) {
+  exists(PreprocessorBranchDirective b1, PreprocessorBranchDirective b2 |
+    isBranchDirectivePair(b1, b2, _, _, _) and
     isMacroDefinedWithinBranch(b1, firstMacro) and
     isMacroDefinedWithinBranch(b2, secondMacro)
   )

From 68c1dafa713f5654e2aacd9b9be6a957ae6999ac Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 21:26:58 +0100
Subject: [PATCH 363/435] Add test case

---
 cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected |  1 +
 cpp/autosar/test/rules/M0-1-2/test.cpp                | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected b/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected
index 9cb237e8b3..b5528014d1 100644
--- a/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected
+++ b/cpp/autosar/test/rules/M0-1-2/InfeasiblePath.expected
@@ -8,3 +8,4 @@
 | test.cpp:86:9:86:14 | ... < ... | The true path is infeasible because 0 (max value: 0) is always less than or equal to a (minimum value: 0). |
 | test.cpp:117:7:117:7 | 0 | The path is unreachable in a template. |
 | test.cpp:123:7:123:8 | ! ... | The path is unreachable in a template. |
+| test.cpp:137:7:137:12 | ... > ... | The path is unreachable in a template. |
diff --git a/cpp/autosar/test/rules/M0-1-2/test.cpp b/cpp/autosar/test/rules/M0-1-2/test.cpp
index 31c564d8a5..f36cbc790d 100644
--- a/cpp/autosar/test/rules/M0-1-2/test.cpp
+++ b/cpp/autosar/test/rules/M0-1-2/test.cpp
@@ -131,4 +131,15 @@ void test_infeasible_instantiates() {
   template_infeasible_true_path<B>();
   template_infeasible_false_path<A>();
   template_infeasible_false_path<B>();
+}
+
+template <unsigned int i> int template_infeasible_relation() {
+  if (i > -1) { // NON_COMPLIANT - true path is infeasible in all circumstances
+    return 3;
+  }
+}
+
+void test_infeasible_relation() {
+  template_infeasible_relation<0>();
+  template_infeasible_relation<1>();
 }
\ No newline at end of file

From 460fb26a4b4971bf3014c8a3081a809105322f63 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 22:22:15 +0100
Subject: [PATCH 364/435] Reinstate macro instantiation results

---
 .../RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql    | 2 --
 .../codingstandards/cpp/alertreporting/HoldsForAllCopies.qll  | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
index f5cf07f8fc..ddb8cbcdcc 100644
--- a/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
+++ b/c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
@@ -31,8 +31,6 @@ class NonConstPointerVariableCandidate extends Variable {
       // In a type declared locally
       this.(Field).getDeclaringType+().getEnclosingFunction() = a.getEnclosingFunction()
     ) and
-    // Avoid elements in macro expansions, as they cannot be equated across copies
-    not this.isInMacroExpansion() and
     exists(PointerOrArrayType type |
       // include only pointers which point to a const-qualified type
       this.getType() = type and
diff --git a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
index 634c1bf610..1d47e833dc 100644
--- a/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
+++ b/cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
@@ -85,11 +85,9 @@ module HoldsForAllCopies<CandidateElementSig CandidateElement, ElementSetSig Ele
       string filepath, int startline, int startcolumn, int endline, int endcolumn
     ) {
       exists(CandidateElement s |
-        // Only consider candidates where we can match up the location
-        isNotWithinMacroExpansion(s) and
         hasLocation(s, filepath, startline, startcolumn, endline, endcolumn) and
         // All relevant elements that occur at the same location are candidates
-        forex(RelevantElement relevantElement | s = relevantElement.getCandidateElement() |
+        forall(RelevantElement relevantElement | s = relevantElement.getCandidateElement() |
           relevantElement instanceof CandidateElement
         )
       )

From dd07767d6a57731be2e43c29984183dff0c0aead Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 22 Oct 2024 22:58:36 +0100
Subject: [PATCH 365/435] Rule 2.5: Consider macros accessed before definition

---
 .../rules/RULE-2-5/UnusedMacroDeclaration.ql  | 11 +++++++
 c/misra/test/rules/RULE-2-5/test.c            | 33 ++++++++++++++++++-
 change_notes/2024-10-22-rule-2-5.md           |  2 ++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 change_notes/2024-10-22-rule-2-5.md

diff --git a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
index b7ea9f64de..5e70755eea 100644
--- a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
@@ -19,7 +19,18 @@ import codingstandards.c.misra
 from Macro m
 where
   not isExcluded(m, DeadCodePackage::unusedMacroDeclarationQuery()) and
+  // We consider a macro "used" if there is a macro access
   not exists(MacroAccess ma | ma.getMacro() = m) and
+  // Or if there exists a check whether the macro is defined which the extractor
+  // hasn't been able to tie to a macro (usually because this use came before
+  // the macro was defined e.g. a header guard)
+  not exists(PreprocessorBranchDirective bd |
+    // Covers the #ifdef and #ifndef cases
+    bd.getHead() = m.getName()
+    or
+    // Covers the use of defined() to check if a macro is defined
+    m.getName() = bd.getHead().regexpCapture(".*defined\\((.*)\\).*", 1)
+  ) and
   // We consider a macro "used" if the name is undef-ed at some point in the same file, or a file
   // that includes the file defining the macro. This will over approximate use in the case of a
   // macro which is defined, then undefined, then re-defined but not used.
diff --git a/c/misra/test/rules/RULE-2-5/test.c b/c/misra/test/rules/RULE-2-5/test.c
index f37acb1509..755b783eab 100644
--- a/c/misra/test/rules/RULE-2-5/test.c
+++ b/c/misra/test/rules/RULE-2-5/test.c
@@ -13,4 +13,35 @@
 void test() {
   MACRO2;
   HEADER_MACRO2;
-}
\ No newline at end of file
+}
+
+#define CHECKED_MACRO_1 // COMPLIANT - used in branch
+#define CHECKED_MACRO_2 // COMPLIANT - used in branch
+#define CHECKED_MACRO_3 // COMPLIANT - used in branch
+
+#ifdef CHECKED_MACRO_1
+#endif
+
+#ifndef CHECKED_MACRO_2
+#endif
+
+#if defined(CHECKED_MACRO_3)
+#endif
+
+// In the case above, the extractor will identify macro accesses with each use
+// of the macro. In the case above, the extractor does not tie them together,
+// but the standard considers this acceptable usage. Notably, this type of
+// pattern occurs for header guards.
+
+#ifdef CHECKED_MACRO_BEFORE_1
+#endif
+
+#ifndef CHECKED_MACRO_BEFORE_2
+#endif
+
+#if defined(CHECKED_MACRO_BEFORE_3)
+#endif
+
+#define CHECKED_MACRO_BEFORE_1 // COMPLIANT - used in branch
+#define CHECKED_MACRO_BEFORE_2 // COMPLIANT - used in branch
+#define CHECKED_MACRO_BEFORE_3 // COMPLIANT - used in branch
\ No newline at end of file
diff --git a/change_notes/2024-10-22-rule-2-5.md b/change_notes/2024-10-22-rule-2-5.md
new file mode 100644
index 0000000000..6de3f0be11
--- /dev/null
+++ b/change_notes/2024-10-22-rule-2-5.md
@@ -0,0 +1,2 @@
+ - `RULE-2-5` - `UnusedMacroDeclaration.ql`:
+   - Exclude false positives where a macro was used before definition, for example a header guard.
\ No newline at end of file

From 96366ae6cb1c006e1176d55cf285fd606bed1fdb Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 23 Oct 2024 09:33:16 +0100
Subject: [PATCH 366/435] Update links

---
 docs/user_manual.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/user_manual.md b/docs/user_manual.md
index c9fbacdd4b..926d1b13f4 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -271,8 +271,8 @@ To select this SARIF version you **must** specify the flag `--format=sarifv2.1.0
 
 Running the default analysis for one or more Coding Standards may require further performance customizations for larger codebases. The following flags may be passed to the `database analyze` command to adjust the performance:
 
-- `--ram` - to specify the maximum amount of RAM to use during the analysis as [documented](https://codeql.github.com/docs/codeql-cli/manual/database-analyze/#options-to-control-ram-usage) in the CodeQL CLI manual.
-- `--thread` - to specify number of threads to use while evaluating as [documented](https://codeql.github.com/docs/codeql-cli/manual/database-analyze/#cmdoption-codeql-database-analyze-j) in the CodeQL CLI manual.
+- `--ram` - to specify the maximum amount of RAM to use during the analysis as [documented](https://docs.github.com/en/code-security/codeql-cli/codeql-cli-manual/database-analyze#options-to-control-ram-usage) in the CodeQL CLI manual.
+- `--thread` - to specify number of threads to use while evaluating as [documented](https://docs.github.com/en/code-security/codeql-cli/codeql-cli-manual/database-analyze#-j---threadsnum) in the CodeQL CLI manual.
 
 ##### Legacy approach
 

From 5b61358f7f3dc1fb525b279b19ed098bfa56b1c7 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 23 Oct 2024 14:38:02 +0100
Subject: [PATCH 367/435] Improve regex to handle spaces

---
 .../src/rules/RULE-2-5/UnusedMacroDeclaration.ql   |  2 +-
 c/misra/test/rules/RULE-2-5/test.c                 | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
index 5e70755eea..2b5a8e8c1d 100644
--- a/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
+++ b/c/misra/src/rules/RULE-2-5/UnusedMacroDeclaration.ql
@@ -29,7 +29,7 @@ where
     bd.getHead() = m.getName()
     or
     // Covers the use of defined() to check if a macro is defined
-    m.getName() = bd.getHead().regexpCapture(".*defined\\((.*)\\).*", 1)
+    m.getName() = bd.getHead().regexpCapture(".*defined *\\(? *([^\\s()]+) *\\)?\\.*", 1)
   ) and
   // We consider a macro "used" if the name is undef-ed at some point in the same file, or a file
   // that includes the file defining the macro. This will over approximate use in the case of a
diff --git a/c/misra/test/rules/RULE-2-5/test.c b/c/misra/test/rules/RULE-2-5/test.c
index 755b783eab..e220b3d444 100644
--- a/c/misra/test/rules/RULE-2-5/test.c
+++ b/c/misra/test/rules/RULE-2-5/test.c
@@ -42,6 +42,18 @@ void test() {
 #if defined(CHECKED_MACRO_BEFORE_3)
 #endif
 
+#if defined(CHECKED_MACRO_BEFORE_4)
+#endif
+
+#if defined(CHECKED_MACRO_BEFORE_5)
+#endif
+
+#if defined(CHECKED_MACRO_BEFORE_6)
+#endif
+
 #define CHECKED_MACRO_BEFORE_1 // COMPLIANT - used in branch
 #define CHECKED_MACRO_BEFORE_2 // COMPLIANT - used in branch
-#define CHECKED_MACRO_BEFORE_3 // COMPLIANT - used in branch
\ No newline at end of file
+#define CHECKED_MACRO_BEFORE_3 // COMPLIANT - used in branch
+#define CHECKED_MACRO_BEFORE_4 // COMPLIANT - used in branch
+#define CHECKED_MACRO_BEFORE_5 // COMPLIANT - used in branch
+#define CHECKED_MACRO_BEFORE_6 // COMPLIANT - used in branch
\ No newline at end of file

From cbcf0374aa9ac115e25b428a70717cdd705497c1 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 23 Oct 2024 14:43:45 +0100
Subject: [PATCH 368/435] Add test case for spaces, ensure no clang-format

---
 c/misra/test/rules/RULE-2-5/test.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/c/misra/test/rules/RULE-2-5/test.c b/c/misra/test/rules/RULE-2-5/test.c
index e220b3d444..15930f68d1 100644
--- a/c/misra/test/rules/RULE-2-5/test.c
+++ b/c/misra/test/rules/RULE-2-5/test.c
@@ -42,18 +42,26 @@ void test() {
 #if defined(CHECKED_MACRO_BEFORE_3)
 #endif
 
-#if defined(CHECKED_MACRO_BEFORE_4)
+// clang-format off
+
+#if defined (CHECKED_MACRO_BEFORE_4)
+#endif
+
+#if defined( CHECKED_MACRO_BEFORE_5 )
 #endif
 
-#if defined(CHECKED_MACRO_BEFORE_5)
+#if defined ( CHECKED_MACRO_BEFORE_6 )
 #endif
 
-#if defined(CHECKED_MACRO_BEFORE_6)
+#if defined CHECKED_MACRO_BEFORE_7
 #endif
 
+// clang-format on
+
 #define CHECKED_MACRO_BEFORE_1 // COMPLIANT - used in branch
 #define CHECKED_MACRO_BEFORE_2 // COMPLIANT - used in branch
 #define CHECKED_MACRO_BEFORE_3 // COMPLIANT - used in branch
 #define CHECKED_MACRO_BEFORE_4 // COMPLIANT - used in branch
 #define CHECKED_MACRO_BEFORE_5 // COMPLIANT - used in branch
-#define CHECKED_MACRO_BEFORE_6 // COMPLIANT - used in branch
\ No newline at end of file
+#define CHECKED_MACRO_BEFORE_6 // COMPLIANT - used in branch
+#define CHECKED_MACRO_BEFORE_7 // COMPLIANT - used in branch
\ No newline at end of file

From a183198b68b2e27c72c4e79855bbf4c41905c2bb Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 23 Oct 2024 18:04:35 +0100
Subject: [PATCH 369/435] Ignore explicit casts when idenitying cvalues by
 parent

---
 ...ConvertedToDifferentUnderlyingType.expected |  8 +++++---
 cpp/autosar/test/rules/M5-0-3/test.cpp         | 18 ++++++++++++++++++
 cpp/autosar/test/rules/M5-0-7/test.cpp         |  9 +++++++++
 cpp/autosar/test/rules/M5-0-8/test.cpp         | 18 ++++++++++++++++++
 ...plicitSignednessConversionOfCValue.expected |  6 +++---
 cpp/autosar/test/rules/M5-0-9/test.cpp         |  7 +++++++
 cpp/common/src/codingstandards/cpp/Expr.qll    | 12 ++++++++++--
 7 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected b/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected
index 5782ac9849..773691efd1 100644
--- a/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected
+++ b/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected
@@ -1,3 +1,5 @@
-| test.cpp:11:8:11:14 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:11:8:11:14 | ... + ... | expression |
-| test.cpp:11:8:11:14 | ... + ... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:11:8:11:14 | ... + ... | expression |
-| test.cpp:13:8:13:13 | ... + ... | Implicit conversion converts cvalue $@ from signed short to signed int. | test.cpp:13:8:13:13 | ... + ... | expression |
+| test.cpp:12:8:12:14 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:12:8:12:14 | ... + ... | expression |
+| test.cpp:12:8:12:14 | ... + ... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:12:8:12:14 | ... + ... | expression |
+| test.cpp:14:8:14:13 | ... + ... | Implicit conversion converts cvalue $@ from signed short to signed int. | test.cpp:14:8:14:13 | ... + ... | expression |
+| test.cpp:23:13:23:19 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:23:13:23:19 | ... + ... | expression |
+| test.cpp:30:12:30:18 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:30:12:30:18 | ... + ... | expression |
diff --git a/cpp/autosar/test/rules/M5-0-3/test.cpp b/cpp/autosar/test/rules/M5-0-3/test.cpp
index cb74512979..9f368bae3f 100644
--- a/cpp/autosar/test/rules/M5-0-3/test.cpp
+++ b/cpp/autosar/test/rules/M5-0-3/test.cpp
@@ -1,4 +1,5 @@
 #include <cstdint>
+
 void f1() {
   using std::int16_t;
   using std::int32_t;
@@ -13,4 +14,21 @@ void f1() {
   l3 = l2 + 1;                        // NON_COMPLIANT
   l3 = static_cast<int32_t>(l2) + 1;  // COMPLIANT
   l3 = l2 + 0x01ffff;                 // COMPLIANT
+}
+
+void int16_arg(std::int16_t t);
+
+void test_func_call() {
+  std::int8_t l1;
+  int16_arg(l1 + l1);                            // NON_COMPLIANT
+  int16_arg(static_cast<std::int16_t>(l1 + l1)); // COMPLIANT
+}
+
+std::int16_t test_return(int test) {
+  std::int8_t l1;
+  if (test > 0) {
+    return l1 + l1; // NON_COMPLIANT
+  } else {
+    return static_cast<std::int16_t>(l1 + l1); // COMPLIANT
+  }
 }
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-0-7/test.cpp b/cpp/autosar/test/rules/M5-0-7/test.cpp
index 36a2259028..ecbddd6750 100644
--- a/cpp/autosar/test/rules/M5-0-7/test.cpp
+++ b/cpp/autosar/test/rules/M5-0-7/test.cpp
@@ -18,4 +18,13 @@ void f1() {
   s16a = static_cast<int16_t>(f32a / f32b); // NON_COMPLIANT
   s16a = static_cast<int16_t>(f32a);        // COMPLIANT
   s16a = static_cast<int16_t>(f32a) / f32b; // COMPLIANT
+}
+
+void int_arg(std::int32_t i);
+
+std::int16_t test_args() {
+  float f32a;
+  float f32b;
+  int_arg(static_cast<std::int16_t>(f32a)); // COMPLIANT - f32a is not a cvalue
+  return static_cast<std::int16_t>(f32a);   // COMPLIANT - f32a is not a cvalue
 }
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-0-8/test.cpp b/cpp/autosar/test/rules/M5-0-8/test.cpp
index 198bebed9f..ab785c661a 100644
--- a/cpp/autosar/test/rules/M5-0-8/test.cpp
+++ b/cpp/autosar/test/rules/M5-0-8/test.cpp
@@ -22,4 +22,22 @@ void f() {
   f64 = static_cast<double>(1.0f + 1.0f); // NON_COMPLIANT
   f32 = static_cast<float>(1.0f + 1);     // COMPLIANT
   f64 = static_cast<double>(1.0 + 1); // COMPLIANT; no suffix defines a double
+}
+
+#include <vector>
+
+void function_args() {
+  std::vector<std::uint8_t> v{0};
+
+  std::uint32_t u32{0};
+  v.at(static_cast<std::size_t>(u32)); // COMPLIANT - cast is not a cvalue
+  std::size_t st =
+      static_cast<std::size_t>(u32); // COMPLIANT - cast is not a cvalue
+  v.at(st);
+}
+
+std::size_t return_args() {
+  std::uint32_t u32{0};
+
+  return static_cast<std::size_t>(u32); // COMPLIANT
 }
\ No newline at end of file
diff --git a/cpp/autosar/test/rules/M5-0-9/ExplicitSignednessConversionOfCValue.expected b/cpp/autosar/test/rules/M5-0-9/ExplicitSignednessConversionOfCValue.expected
index b2619503b3..b7fc97f99c 100644
--- a/cpp/autosar/test/rules/M5-0-9/ExplicitSignednessConversionOfCValue.expected
+++ b/cpp/autosar/test/rules/M5-0-9/ExplicitSignednessConversionOfCValue.expected
@@ -1,3 +1,3 @@
-| test.cpp:16:8:16:35 | static_cast<int8_t>... | Explicit integral conversion converts the signedness of the $@ from unsigned to signed. | test.cpp:16:28:16:34 | ... + ... | cvalue |
-| test.cpp:18:8:18:40 | static_cast<int8_t>... | Explicit integral conversion converts the signedness of the $@ from unsigned to signed. | test.cpp:18:28:18:39 | ... + ... | cvalue |
-| test.cpp:20:8:20:35 | static_cast<int8_t>... | Explicit integral conversion converts the signedness of the $@ from unsigned to signed. | test.cpp:20:28:20:34 | ... * ... | cvalue |
+| test.cpp:20:8:20:35 | static_cast<int8_t>... | Explicit integral conversion converts the signedness of the $@ from unsigned to signed. | test.cpp:20:28:20:34 | ... + ... | cvalue |
+| test.cpp:22:8:22:40 | static_cast<int8_t>... | Explicit integral conversion converts the signedness of the $@ from unsigned to signed. | test.cpp:22:28:22:39 | ... + ... | cvalue |
+| test.cpp:24:8:24:35 | static_cast<int8_t>... | Explicit integral conversion converts the signedness of the $@ from unsigned to signed. | test.cpp:24:28:24:34 | ... * ... | cvalue |
diff --git a/cpp/autosar/test/rules/M5-0-9/test.cpp b/cpp/autosar/test/rules/M5-0-9/test.cpp
index b46dbc390f..7b050d24de 100644
--- a/cpp/autosar/test/rules/M5-0-9/test.cpp
+++ b/cpp/autosar/test/rules/M5-0-9/test.cpp
@@ -1,4 +1,8 @@
 #include <cstdint>
+
+void signed_arg(std::uint32_t s);
+void unsigned_arg(std::uint32_t u);
+
 void f() {
   using std::int16_t;
   using std::int32_t;
@@ -22,4 +26,7 @@ void f() {
   i16 = static_cast<int16_t>(i16 / i8); // NON_COMPLIANT
 
   i8 = static_cast<int8_t>(u8) + static_cast<int8_t>(u8); // COMPLIANT
+
+  unsigned(static_cast<uint32_t>(i32)); // COMPLIANT - i32 is not a cvalue
+  signed(static_cast<int32_t>(u32));    // COMPLIANT - u32 is not a cvalue
 }
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/Expr.qll b/cpp/common/src/codingstandards/cpp/Expr.qll
index fe2877f849..51066cf4cb 100644
--- a/cpp/common/src/codingstandards/cpp/Expr.qll
+++ b/cpp/common/src/codingstandards/cpp/Expr.qll
@@ -148,9 +148,17 @@ module MisraExpr {
   private predicate isCValue(Expr e) {
     not e.isConstant() and
     (
-      exists(ReturnStmt return | e = return.getExpr())
+      exists(ReturnStmt return |
+        e = return.getExpr() and
+        // Only return statements which are not explicitly casted are considered
+        not exists(Cast c | not c.isImplicit() and c.getExpr() = e)
+      )
       or
-      exists(Call call | e = call.getAnArgument())
+      exists(FunctionCall call |
+        e = call.getAnArgument() and
+        // // Only function arguments which are not explicitly casted are considered
+        not exists(Cast c | not c.isImplicit() and c.getExpr() = e)
+      )
     )
     or
     isCValue(e.(ParenthesisExpr).getExpr())

From 7eaad201460a779c21e79b0e427a9a9fed9b230f Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 24 Oct 2024 12:00:15 +0100
Subject: [PATCH 370/435] Compatible types: performance improvements

Modify the `Compatible.qll` library to improve performance by
restricting to function declarations for the same function.

Adopt the Compatible library in DCL40-C, which has also improved
detection of compatible types.
---
 .../IncompatibleFunctionDeclarations.ql       | 36 ++++++++++---------
 change_notes/2024-10-24-compatible-types.md   |  2 ++
 .../src/codingstandards/cpp/Compatible.qll    |  4 +++
 3 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 change_notes/2024-10-24-compatible-types.md

diff --git a/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql b/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql
index 4660e69b68..20b6e5e59e 100644
--- a/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql
+++ b/c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql
@@ -16,30 +16,32 @@
 
 import cpp
 import codingstandards.c.cert
+import codingstandards.cpp.Compatible
 import ExternalIdentifiers
 
-//checks if they are incompatible based on return type, number of parameters and parameter types
-predicate checkMatchingFunction(FunctionDeclarationEntry d, FunctionDeclarationEntry d2) {
-  not d.getType() = d2.getType()
-  or
-  not d.getNumberOfParameters() = d2.getNumberOfParameters()
-  or
-  exists(ParameterDeclarationEntry p, ParameterDeclarationEntry p2, int i |
-    d.getParameterDeclarationEntry(i) = p and
-    d2.getParameterDeclarationEntry(i) = p2 and
-    not p.getType() = p2.getType()
-  )
-}
-
 from ExternalIdentifiers d, FunctionDeclarationEntry f1, FunctionDeclarationEntry f2
 where
   not isExcluded(f1, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
   not isExcluded(f2, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
-  f1 = d.getADeclarationEntry() and
-  f2 = d.getADeclarationEntry() and
   not f1 = f2 and
-  f1.getLocation().getStartLine() >= f2.getLocation().getStartLine() and
+  f1.getDeclaration() = d and
+  f2.getDeclaration() = d and
   f1.getName() = f2.getName() and
-  checkMatchingFunction(f1, f2)
+  (
+    //return type check
+    not typesCompatible(f1.getType(), f2.getType())
+    or
+    //parameter type check
+    parameterTypesIncompatible(f1, f2)
+    or
+    not f1.getNumberOfParameters() = f2.getNumberOfParameters()
+  ) and
+  // Apply ordering on start line, trying to avoid the optimiser applying this join too early
+  // in the pipeline
+  exists(int f1Line, int f2Line |
+    f1.getLocation().hasLocationInfo(_, f1Line, _, _, _) and
+    f2.getLocation().hasLocationInfo(_, f2Line, _, _, _) and
+    f1Line >= f2Line
+  )
 select f1, "The object $@ is not compatible with re-declaration $@", f1, f1.getName(), f2,
   f2.getName()
diff --git a/change_notes/2024-10-24-compatible-types.md b/change_notes/2024-10-24-compatible-types.md
new file mode 100644
index 0000000000..05afbd64d9
--- /dev/null
+++ b/change_notes/2024-10-24-compatible-types.md
@@ -0,0 +1,2 @@
+ - `DCL40-C` - `IncompatibleFunctionDeclarations.ql`:
+   - Reduce false positives by identifying compatible integer arithmetic types (e.g. "signed int" and "int").
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/Compatible.qll b/cpp/common/src/codingstandards/cpp/Compatible.qll
index 12a53965fe..0f6e2108ff 100644
--- a/cpp/common/src/codingstandards/cpp/Compatible.qll
+++ b/cpp/common/src/codingstandards/cpp/Compatible.qll
@@ -1,5 +1,7 @@
 import cpp
 
+pragma[noinline]
+pragma[nomagic]
 predicate typesCompatible(Type t1, Type t2) {
   t1 = t2
   or
@@ -8,6 +10,7 @@ predicate typesCompatible(Type t1, Type t2) {
 }
 
 predicate parameterTypesIncompatible(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
+  f1.getDeclaration() = f2.getDeclaration() and
   exists(ParameterDeclarationEntry p1, ParameterDeclarationEntry p2, int i |
     p1 = f1.getParameterDeclarationEntry(i) and
     p2 = f2.getParameterDeclarationEntry(i)
@@ -17,6 +20,7 @@ predicate parameterTypesIncompatible(FunctionDeclarationEntry f1, FunctionDeclar
 }
 
 predicate parameterNamesIncompatible(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
+  f1.getDeclaration() = f2.getDeclaration() and
   exists(ParameterDeclarationEntry p1, ParameterDeclarationEntry p2, int i |
     p1 = f1.getParameterDeclarationEntry(i) and
     p2 = f2.getParameterDeclarationEntry(i)

From dfdfe9b6984e8d83c977e65f4bd6e3f97d82f047 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 24 Oct 2024 12:06:38 +0100
Subject: [PATCH 371/435] NotDistinctIdentifier: Performance optimization

Hint optimizer to perform join of exclusions after determining
results.
---
 .../notdistinctidentifier/NotDistinctIdentifier.qll  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll b/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll
index 093b804e0f..102c53428b 100644
--- a/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll
@@ -12,6 +12,16 @@ abstract class NotDistinctIdentifierSharedQuery extends Query { }
 
 Query getQuery() { result instanceof NotDistinctIdentifierSharedQuery }
 
+bindingset[d, d2]
+pragma[inline_late]
+private predicate after(ExternalIdentifiers d, ExternalIdentifiers d2) {
+  exists(int dStartLine, int d2StartLine |
+    d.getLocation().hasLocationInfo(_, dStartLine, _, _, _) and
+    d2.getLocation().hasLocationInfo(_, d2StartLine, _, _, _) and
+    dStartLine >= d2StartLine
+  )
+}
+
 query predicate problems(
   ExternalIdentifiers d, string message, ExternalIdentifiers d2, string nameplaceholder
 ) {
@@ -20,10 +30,10 @@ query predicate problems(
   d.getName().length() >= 31 and
   d2.getName().length() >= 31 and
   not d = d2 and
-  d.getLocation().getStartLine() >= d2.getLocation().getStartLine() and
   d.getSignificantName() = d2.getSignificantName() and
   not d.getName() = d2.getName() and
   nameplaceholder = d2.getName() and
+  after(d, d2) and
   message =
     "External identifer " + d.getName() +
       " is nondistinct in characters at or over 31 limit, compared to $@"

From 8f909177a25d6a68435603aa01922ef8a10383bd Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 24 Oct 2024 12:07:35 +0100
Subject: [PATCH 372/435] MSC39-C: Hint optimizer to join isExcluded after
 determining results

---
 ...CallVaArgOnAVaListThatHasAnIndeterminateValue.ql | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
index 821b79c8e4..2fc334ba50 100644
--- a/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
+++ b/c/cert/src/rules/MSC39-C/DoNotCallVaArgOnAVaListThatHasAnIndeterminateValue.ql
@@ -71,12 +71,19 @@ predicate sameSource(VaAccess e1, VaAccess e2) {
   )
 }
 
+/**
+ * Extracted to avoid poor magic join ordering on the `isExcluded` predicate.
+ */
+predicate query(VaAccess va_acc, VaArgArg va_arg, FunctionCall fc) {
+  sameSource(va_acc, va_arg) and
+  fc = preceedsFC(va_acc) and
+  fc.getTarget().calls*(va_arg.getEnclosingFunction())
+}
+
 from VaAccess va_acc, VaArgArg va_arg, FunctionCall fc
 where
   not isExcluded(va_acc,
     Contracts7Package::doNotCallVaArgOnAVaListThatHasAnIndeterminateValueQuery()) and
-  sameSource(va_acc, va_arg) and
-  fc = preceedsFC(va_acc) and
-  fc.getTarget().calls*(va_arg.getEnclosingFunction())
+  query(va_acc, va_arg, fc)
 select va_acc, "The value of " + va_acc.toString() + " is indeterminate after the $@.", fc,
   fc.toString()

From a124f6346fe76fd398660c092c8162c1eea27a50 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 24 Oct 2024 12:08:03 +0100
Subject: [PATCH 373/435] Rule 9.4: Performance optimization of aggregate
 initializer pairs

Refactored calculation to work top down, instead of bottom up,
which ensures we are always comparing elements from within the
same initializer.
---
 ...dInitializationOfAggregateObjectElement.ql | 60 ++++++++++++-------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
index 4f72d6720b..8663843a78 100644
--- a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
+++ b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
@@ -60,35 +60,55 @@ int getMaxDepth(ArrayAggregateLiteral al) {
   else result = 1 + max(Expr child | child = al.getAnElementExpr(_) | getMaxDepth(child))
 }
 
-// internal recursive predicate for `hasMultipleInitializerExprsForSameIndex`
 predicate hasMultipleInitializerExprsForSameIndexInternal(
-  ArrayAggregateLiteral al1, ArrayAggregateLiteral al2, Expr out_al1_expr, Expr out_al2_expr
+  ArrayAggregateLiteral root, Expr e1, Expr e2
 ) {
-  exists(int shared_index, Expr al1_expr, Expr al2_expr |
-    // an `Expr` initializing an element of the same index in both `al1` and `al2`
-    shared_index = [0 .. al1.getArraySize() - 1] and
-    al1_expr = al1.getAnElementExpr(shared_index) and
-    al2_expr = al2.getAnElementExpr(shared_index) and
-    // but not the same `Expr`
-    not al1_expr = al2_expr and
-    (
-      // case A - the children are not aggregate literals
-      // holds if `al1` and `al2` both hold for .getElement[sharedIndex]
-      not al1_expr instanceof ArrayAggregateLiteral and
-      out_al1_expr = al1_expr and
-      out_al2_expr = al2_expr
-      or
-      // case B - `al1` and `al2` both have an aggregate literal child at the same index, so recurse
-      hasMultipleInitializerExprsForSameIndexInternal(al1_expr, al2_expr, out_al1_expr, out_al2_expr)
-    )
+  root = e1 and root = e2
+  or
+  exists(ArrayAggregateLiteral parent1, ArrayAggregateLiteral parent2, int shared_index |
+    hasMultipleInitializerExprsForSameIndexInternal(root, parent1, parent2) and
+    shared_index = [0 .. parent1.getArraySize() - 1] and
+    e1 = parent1.getAnElementExpr(shared_index) and
+    e2 = parent2.getAnElementExpr(shared_index)
   )
 }
 
+// // internal recursive predicate for `hasMultipleInitializerExprsForSameIndex`
+// predicate hasMultipleInitializerExprsForSameIndexInternal(
+//   ArrayAggregateLiteral al1, ArrayAggregateLiteral al2, Expr out_al1_expr, Expr out_al2_expr
+// ) {
+//   exists(int shared_index, Expr al1_expr, Expr al2_expr |
+//     // an `Expr` initializing an element of the same index in both `al1` and `al2`
+//     shared_index = [0 .. al1.getArraySize() - 1] and
+//     al1_expr = al1.getAnElementExpr(shared_index) and
+//     al2_expr = al2.getAnElementExpr(shared_index) and
+//     // but not the same `Expr`
+//     not al1_expr = al2_expr and
+//     (
+//       // case A - the children are not aggregate literals
+//       // holds if `al1` and `al2` both hold for .getElement[sharedIndex]
+//       not al1_expr instanceof ArrayAggregateLiteral and
+//       out_al1_expr = al1_expr and
+//       out_al2_expr = al2_expr
+//       or
+//       // case B - `al1` and `al2` both have an aggregate literal child at the same index, so recurse
+//       hasMultipleInitializerExprsForSameIndexInternal(al1_expr, al2_expr, out_al1_expr, out_al2_expr)
+//     )
+//   )
+// }
 /**
  * Holds if `expr1` and `expr2` both initialize the same array element of `root`.
  */
 predicate hasMultipleInitializerExprsForSameIndex(ArrayAggregateLiteral root, Expr expr1, Expr expr2) {
-  hasMultipleInitializerExprsForSameIndexInternal(root, root, expr1, expr2)
+  hasMultipleInitializerExprsForSameIndexInternal(root, expr1, expr2) and
+  not root = expr1 and
+  not root = expr2 and
+  not expr1 = expr2 and
+  (
+    not expr1 instanceof ArrayAggregateLiteral
+    or
+    not expr2 instanceof ArrayAggregateLiteral
+  )
 }
 
 /**

From 10b84ec9ec41aea5fb96114cadf24662c410ac71 Mon Sep 17 00:00:00 2001
From: Luke Cartey <5377966+lcartey@users.noreply.github.com>
Date: Thu, 24 Oct 2024 16:17:48 +0100
Subject: [PATCH 374/435] Remove commented-out code

---
 ...dInitializationOfAggregateObjectElement.ql | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
index 8663843a78..dfe3fd8fff 100644
--- a/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
+++ b/c/misra/src/rules/RULE-9-4/RepeatedInitializationOfAggregateObjectElement.ql
@@ -60,6 +60,7 @@ int getMaxDepth(ArrayAggregateLiteral al) {
   else result = 1 + max(Expr child | child = al.getAnElementExpr(_) | getMaxDepth(child))
 }
 
+// internal recursive predicate for `hasMultipleInitializerExprsForSameIndex`
 predicate hasMultipleInitializerExprsForSameIndexInternal(
   ArrayAggregateLiteral root, Expr e1, Expr e2
 ) {
@@ -73,29 +74,6 @@ predicate hasMultipleInitializerExprsForSameIndexInternal(
   )
 }
 
-// // internal recursive predicate for `hasMultipleInitializerExprsForSameIndex`
-// predicate hasMultipleInitializerExprsForSameIndexInternal(
-//   ArrayAggregateLiteral al1, ArrayAggregateLiteral al2, Expr out_al1_expr, Expr out_al2_expr
-// ) {
-//   exists(int shared_index, Expr al1_expr, Expr al2_expr |
-//     // an `Expr` initializing an element of the same index in both `al1` and `al2`
-//     shared_index = [0 .. al1.getArraySize() - 1] and
-//     al1_expr = al1.getAnElementExpr(shared_index) and
-//     al2_expr = al2.getAnElementExpr(shared_index) and
-//     // but not the same `Expr`
-//     not al1_expr = al2_expr and
-//     (
-//       // case A - the children are not aggregate literals
-//       // holds if `al1` and `al2` both hold for .getElement[sharedIndex]
-//       not al1_expr instanceof ArrayAggregateLiteral and
-//       out_al1_expr = al1_expr and
-//       out_al2_expr = al2_expr
-//       or
-//       // case B - `al1` and `al2` both have an aggregate literal child at the same index, so recurse
-//       hasMultipleInitializerExprsForSameIndexInternal(al1_expr, al2_expr, out_al1_expr, out_al2_expr)
-//     )
-//   )
-// }
 /**
  * Holds if `expr1` and `expr2` both initialize the same array element of `root`.
  */

From 9f4b33209789eb18ab044ab29caf9bc3f4723e05 Mon Sep 17 00:00:00 2001
From: knewbury01 <knewbury01@users.noreply.github.com>
Date: Thu, 24 Oct 2024 20:44:19 +0000
Subject: [PATCH 375/435] Bump version to 2.38.0-dev

---
 c/cert/src/qlpack.yml       |  2 +-
 c/cert/test/qlpack.yml      |  2 +-
 c/common/src/qlpack.yml     |  2 +-
 c/common/test/qlpack.yml    |  2 +-
 c/misra/src/qlpack.yml      |  2 +-
 c/misra/test/qlpack.yml     |  2 +-
 cpp/autosar/src/qlpack.yml  |  2 +-
 cpp/autosar/test/qlpack.yml |  2 +-
 cpp/cert/src/qlpack.yml     |  2 +-
 cpp/cert/test/qlpack.yml    |  2 +-
 cpp/common/src/qlpack.yml   |  2 +-
 cpp/common/test/qlpack.yml  |  2 +-
 cpp/misra/src/qlpack.yml    |  2 +-
 cpp/misra/test/qlpack.yml   |  2 +-
 cpp/report/src/qlpack.yml   |  2 +-
 docs/user_manual.md         | 12 ++++++------
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index 2b94485102..db08fb3ebe 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
index b9ae07d6ef..0242ecdd10 100644
--- a/c/cert/test/qlpack.yml
+++ b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.37.0-dev
+version: 2.38.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index b4128cbbe8..9d05e536fd 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
index ec8fdff257..e19cb371e8 100644
--- a/c/common/test/qlpack.yml
+++ b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.37.0-dev
+version: 2.38.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 36619027dd..0c78ad44b6 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
index b205f34897..f27c03ca9e 100644
--- a/c/misra/test/qlpack.yml
+++ b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.37.0-dev
+version: 2.38.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index c7c633184a..810af3bde4 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
index d470b12f70..37dd488774 100644
--- a/cpp/autosar/test/qlpack.yml
+++ b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.37.0-dev
+version: 2.38.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index d70429c0de..2fb82cfe3f 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
index ae70b1f71c..dfe027d387 100644
--- a/cpp/cert/test/qlpack.yml
+++ b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.37.0-dev
+version: 2.38.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index ed33ca2398..eeee5f1fa9 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.12.9
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
index de878794a7..8c37adba8d 100644
--- a/cpp/common/test/qlpack.yml
+++ b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.37.0-dev
+version: 2.38.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index e0d399484e..2ca5752f9c 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 description: MISRA C++ 2023
 default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
index e77a784a18..b1601bcb74 100644
--- a/cpp/misra/test/qlpack.yml
+++ b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.37.0-dev
+version: 2.38.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 58b473f755..797c50b92b 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.37.0-dev
+version: 2.38.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.12.9
diff --git a/docs/user_manual.md b/docs/user_manual.md
index 926d1b13f4..7f505673df 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -33,14 +33,14 @@
 
 ## Release information
 
-This user manual documents release `2.37.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
+This user manual documents release `2.38.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
 - `coding-standards-codeql-packs-2.37.0-dev.zip`: CodeQL packs that can be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `code-scanning-cpp-query-pack-2.37.0-dev.zip`: Legacy packaging for the queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `supported_rules_list_2.37.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
-- `supported_rules_list_2.37.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
-- `user_manual_2.37.0-dev.md`: This user manual.
+- `code-scanning-cpp-query-pack-2.38.0-dev.zip`: Legacy packaging for the queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `supported_rules_list_2.38.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
+- `supported_rules_list_2.38.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
+- `user_manual_2.38.0-dev.md`: This user manual.
 - `Source Code (zip)`: A zip archive containing the contents of https://github.com/github/codeql-coding-standards
 - `Source Code (tar.gz)`: A GZip compressed tar archive containing the contents of https://github.com/github/codeql-coding-standards
 - `checksums.txt`: A text file containing sha256 checksums for the aforementioned artifacts.
@@ -573,7 +573,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Out of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
-|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.37.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
+|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.38.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
 |                              | Incorrect deviation record specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation records with a reason. Ensure that all deviation records are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |

From 61d4ba36397e33de69e05362826c5e6ff11ecb87 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Wed, 30 Oct 2024 14:02:40 +0900
Subject: [PATCH 376/435] Fix #629.

---
 change_notes/2024-10-30-fix-issue-629.md             |  2 ++
 ...DeclarationAndInitializationNotOnSeparateLines.ql |  4 ++--
 cpp/autosar/test/rules/A7-1-7/test.cpp               | 12 +++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 change_notes/2024-10-30-fix-issue-629.md

diff --git a/change_notes/2024-10-30-fix-issue-629.md b/change_notes/2024-10-30-fix-issue-629.md
new file mode 100644
index 0000000000..1e7421f6f6
--- /dev/null
+++ b/change_notes/2024-10-30-fix-issue-629.md
@@ -0,0 +1,2 @@
+- `A7-1-7` - `IdentifierDeclarationAndInitializationNotOnSeparateLines.ql`
+  - Fixes #629. Adds brackets, excluding expressions statements in macros.
diff --git a/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql b/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
index 8c10a0f80c..9cc593ecb1 100644
--- a/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
+++ b/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
@@ -19,7 +19,7 @@ import codingstandards.cpp.autosar
 class UniqueLineStmt extends Locatable {
   UniqueLineStmt() {
     not isAffectedByMacro() and
-    exists(Declaration d |
+    (exists(Declaration d |
       this = d.getADeclarationEntry() and
       not d instanceof Parameter and
       not d instanceof TemplateParameter and
@@ -38,7 +38,7 @@ class UniqueLineStmt extends Locatable {
     or
     this instanceof ExprStmt and
     not exists(ForStmt f | f.getInitialization().getAChild*() = this) and
-    not exists(LambdaExpression l | l.getLambdaFunction().getBlock().getAChild*() = this)
+    not exists(LambdaExpression l | l.getLambdaFunction().getBlock().getAChild*() = this))
   }
 }
 
diff --git a/cpp/autosar/test/rules/A7-1-7/test.cpp b/cpp/autosar/test/rules/A7-1-7/test.cpp
index 7c5a6263cf..80f6542b11 100644
--- a/cpp/autosar/test/rules/A7-1-7/test.cpp
+++ b/cpp/autosar/test/rules/A7-1-7/test.cpp
@@ -152,4 +152,14 @@ void example_function() { f1(); } // COMPLIANT
 
 // clang-format off
 typedef struct x { int y; } z; //COMPLIANT - for struct typedef and struct var //NON_COMPLIANT - for struct all on one line
-// clang-format on
\ No newline at end of file
+// clang-format on
+
+#define foo(x, y)                                                              \
+  x++;                                                                         \
+  y++;
+
+void test_foo() {
+  int a = 1;
+  int b = 1;
+  foo(a, b); // COMPLIANT
+}

From 525fba7fec474c0ac46c4ac162c2593804dea214 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 31 Oct 2024 15:37:02 -0700
Subject: [PATCH 377/435] Pack creation: load help from base reference

For pull requests the current process attempts to load the help
from the equivalent ref in the help repo. As most PRs do not add
an equivalent branch on the help repo, this means that most PRs
do not load any help at all, and the constructed artifacts are
missing help.

This is problematic during the release process, where we appear to
use the artifacts built from the PR event, instead of the artifacts
built from the branch itself, therefore using artifacts without
any help included.

This commit modifies the behaviour to fetch the help for the base
ref for the pull request or merge group. This should ensure that
help files are always loaded, regardless of where the artifacts
are built.
---
 .github/workflows/code-scanning-pack-gen.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index ea13a4e76c..c665c4e6ea 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -68,11 +68,14 @@ jobs:
       - name: Determine ref for external help files
         id: determine-ref
         run: |
-          if [[ $GITHUB_EVENT_NAME == "pull_request" || $GITHUB_EVENT_NAME == "merge_group" ]]; then
-            echo "EXTERNAL_HELP_REF=$GITHUB_HEAD_REF" >> "$GITHUB_ENV"
+          if [[ $GITHUB_EVENT_NAME == "pull_request" ]]; then
+            EXTERNAL_HELP_REF="${{ github.event.pull_request.base.ref }}"
+          elif [[ $GITHUB_EVENT_NAME == "merge_group" ]]; then
+            EXTERNAL_HELP_REF="${{ github.event.merge_group.base_ref }}"
           else
-            echo "EXTERNAL_HELP_REF=$GITHUB_REF" >> "$GITHUB_ENV"
+            EXTERNAL_HELP_REF="$GITHUB_REF"
           fi
+          echo "EXTERNAL_HELP_REF=$EXTERNAL_HELP_REF" >> "$GITHUB_ENV"
           echo "Using ref $EXTERNAL_HELP_REF for external help files."
 
       - name: Checkout external help files

From 839112f3c6d6516bdaf6bd698759f15f0ab914e9 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 31 Oct 2024 15:44:33 -0700
Subject: [PATCH 378/435] Do not continue on error for checkout of the help
 repo

This is to avoid accidental errors when loading the reference.
---
 .github/workflows/code-scanning-pack-gen.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index c665c4e6ea..a217c5781e 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -79,7 +79,6 @@ jobs:
           echo "Using ref $EXTERNAL_HELP_REF for external help files."
 
       - name: Checkout external help files
-        continue-on-error: true
         id: checkout-external-help-files
         uses: actions/checkout@v4
         with:

From 98c76101502b0bc50e6e504d7bb20edb04161f2a Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Fri, 1 Nov 2024 08:17:21 +0900
Subject: [PATCH 379/435] Fix query formatting.

---
 ...tionAndInitializationNotOnSeparateLines.ql | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql b/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
index 9cc593ecb1..89aca8048e 100644
--- a/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
+++ b/cpp/autosar/src/rules/A7-1-7/IdentifierDeclarationAndInitializationNotOnSeparateLines.ql
@@ -19,26 +19,28 @@ import codingstandards.cpp.autosar
 class UniqueLineStmt extends Locatable {
   UniqueLineStmt() {
     not isAffectedByMacro() and
-    (exists(Declaration d |
-      this = d.getADeclarationEntry() and
-      not d instanceof Parameter and
-      not d instanceof TemplateParameter and
-      // TODO - Needs to be enhanced to solve issues with
-      // templated inner classes.
-      not d instanceof Function and
-      not d.isFromTemplateInstantiation(_) and
-      not d.(Variable).isCompilerGenerated() and
-      not exists(RangeBasedForStmt f | f.getADeclaration() = d) and
-      not exists(DeclStmt declStmt, ForStmt f |
-        f.getInitialization() = declStmt and
-        declStmt.getADeclaration() = d
-      ) and
-      not exists(LambdaCapture lc | lc.getField().getADeclarationEntry() = this)
+    (
+      exists(Declaration d |
+        this = d.getADeclarationEntry() and
+        not d instanceof Parameter and
+        not d instanceof TemplateParameter and
+        // TODO - Needs to be enhanced to solve issues with
+        // templated inner classes.
+        not d instanceof Function and
+        not d.isFromTemplateInstantiation(_) and
+        not d.(Variable).isCompilerGenerated() and
+        not exists(RangeBasedForStmt f | f.getADeclaration() = d) and
+        not exists(DeclStmt declStmt, ForStmt f |
+          f.getInitialization() = declStmt and
+          declStmt.getADeclaration() = d
+        ) and
+        not exists(LambdaCapture lc | lc.getField().getADeclarationEntry() = this)
+      )
+      or
+      this instanceof ExprStmt and
+      not exists(ForStmt f | f.getInitialization().getAChild*() = this) and
+      not exists(LambdaExpression l | l.getLambdaFunction().getBlock().getAChild*() = this)
     )
-    or
-    this instanceof ExprStmt and
-    not exists(ForStmt f | f.getInitialization().getAChild*() = this) and
-    not exists(LambdaExpression l | l.getLambdaFunction().getBlock().getAChild*() = this))
   }
 }
 

From bc8bcfe45b179e6f26a86079c63b4ba8a47de895 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 5 Nov 2024 23:21:09 +0000
Subject: [PATCH 380/435] Update actions/upload-artifact to v4

---
 .github/workflows/extra-rule-validation.yml | 8 ++++----
 .github/workflows/generate-html-docs.yml    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/extra-rule-validation.yml b/.github/workflows/extra-rule-validation.yml
index a18f47c65d..02d37f92b2 100644
--- a/.github/workflows/extra-rule-validation.yml
+++ b/.github/workflows/extra-rule-validation.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Check Rules 
         shell: pwsh
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Ensure CPP Shared Rules Have Valid Structure  
         shell: pwsh
@@ -44,13 +44,13 @@ jobs:
         run: scripts/util/Test-SharedImplementationsHaveTestCases.ps1 -Language c -CIMode
 
         
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: missing-test-report.csv
           path: MissingTestReport*.csv
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-report.csv
diff --git a/.github/workflows/generate-html-docs.yml b/.github/workflows/generate-html-docs.yml
index 71359a8e6f..8ae26b0270 100644
--- a/.github/workflows/generate-html-docs.yml
+++ b/.github/workflows/generate-html-docs.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Python
         uses: actions/setup-python@v4
@@ -35,7 +35,7 @@ jobs:
           python scripts/documentation/generate_iso26262_docs.py coding-standards-html-docs
 
       - name: Upload HTML documentation
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coding-standards-docs-${{ github.sha }}
           path: coding-standards-html-docs/

From 0ac5171884bba2abde0be1c746f78ba815b26c5a Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 5 Nov 2024 23:21:25 +0000
Subject: [PATCH 381/435] Update actions/cache to v4

---
 .github/workflows/code-scanning-pack-gen.yml               | 2 +-
 .github/workflows/codeql_unit_tests.yml                    | 2 +-
 .github/workflows/standard_library_upgrade_tests.yml       | 2 +-
 .github/workflows/tooling-unit-tests.yml                   | 2 +-
 .github/workflows/verify-standard-library-dependencies.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/code-scanning-pack-gen.yml b/.github/workflows/code-scanning-pack-gen.yml
index ea13a4e76c..c88dae52cd 100644
--- a/.github/workflows/code-scanning-pack-gen.yml
+++ b/.github/workflows/code-scanning-pack-gen.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Cache CodeQL
         id: cache-codeql
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/codeql_home
           key: codeql-home-${{ matrix.os }}-${{ matrix.codeql_cli }}-${{ matrix.codeql_standard_library }}
diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index d20198af35..9cfa886e8b 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Cache CodeQL
         id: cache-codeql
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: ${{github.workspace}}/codeql_home
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
index b6c3d38d87..cf77a5ff8a 100644
--- a/.github/workflows/standard_library_upgrade_tests.yml
+++ b/.github/workflows/standard_library_upgrade_tests.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Cache CodeQL
         id: cache-codeql
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v4
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: ${{github.workspace}}/codeql_home
diff --git a/.github/workflows/tooling-unit-tests.yml b/.github/workflows/tooling-unit-tests.yml
index 490d399e8b..b2374c8e16 100644
--- a/.github/workflows/tooling-unit-tests.yml
+++ b/.github/workflows/tooling-unit-tests.yml
@@ -52,7 +52,7 @@ jobs:
 
       - name: Cache CodeQL
         id: cache-codeql
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/codeql_home
           key: codeql-home-${{ matrix.os }}-${{ matrix.codeql_cli }}-${{ matrix.codeql_standard_library }}
diff --git a/.github/workflows/verify-standard-library-dependencies.yml b/.github/workflows/verify-standard-library-dependencies.yml
index cd5d35248d..f44183a27c 100644
--- a/.github/workflows/verify-standard-library-dependencies.yml
+++ b/.github/workflows/verify-standard-library-dependencies.yml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Cache CodeQL
         id: cache-codeql
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v4
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: ${{github.workspace}}/codeql_home

From 3e8c336866f622c055be8f4b54283520ca999b5c Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 5 Nov 2024 23:21:48 +0000
Subject: [PATCH 382/435] Update actions/checkout to v4

---
 .github/workflows/prepare-release.yml                     | 2 +-
 .github/workflows/standard_library_upgrade_tests.yml      | 4 ++--
 .github/workflows/tooling-unit-tests.yml                  | 8 ++++----
 .github/workflows/validate-package-files.yml              | 2 +-
 .github/workflows/validate-query-formatting.yml           | 2 +-
 .github/workflows/validate-query-help.yml                 | 2 +-
 .github/workflows/validate-query-test-case-formatting.yml | 2 +-
 .../workflows/verify-standard-library-dependencies.yml    | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index ba258e06f5..f23db508b2 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
index cf77a5ff8a..811194dd7e 100644
--- a/.github/workflows/standard_library_upgrade_tests.yml
+++ b/.github/workflows/standard_library_upgrade_tests.yml
@@ -19,7 +19,7 @@ jobs:
       matrix: ${{ steps.export-unit-test-matrix.outputs.matrix }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Export unit test matrix
         id: export-unit-test-matrix
@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Python 3
         uses: actions/setup-python@v2
diff --git a/.github/workflows/tooling-unit-tests.yml b/.github/workflows/tooling-unit-tests.yml
index b2374c8e16..e952474408 100644
--- a/.github/workflows/tooling-unit-tests.yml
+++ b/.github/workflows/tooling-unit-tests.yml
@@ -22,7 +22,7 @@ jobs:
       matrix: ${{ steps.export-supported-codeql-env-matrix.outputs.matrix }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Export supported CodeQL environment matrix
         id: export-supported-codeql-env-matrix
@@ -40,7 +40,7 @@ jobs:
       matrix: ${{ fromJSON(needs.prepare-supported-codeql-env-matrix.outputs.matrix) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Python
         uses: actions/setup-python@v4
@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Python
         uses: actions/setup-python@v4
@@ -102,7 +102,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Python
         uses: actions/setup-python@v4
diff --git a/.github/workflows/validate-package-files.yml b/.github/workflows/validate-package-files.yml
index 0e38e4a1da..a0a09d8ecb 100644
--- a/.github/workflows/validate-package-files.yml
+++ b/.github/workflows/validate-package-files.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
diff --git a/.github/workflows/validate-query-formatting.yml b/.github/workflows/validate-query-formatting.yml
index e4c6871ad5..88b4c0d438 100644
--- a/.github/workflows/validate-query-formatting.yml
+++ b/.github/workflows/validate-query-formatting.yml
@@ -19,7 +19,7 @@ jobs:
       runs-on: ubuntu-22.04
       steps:
         - name: Checkout
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
           with:
             ref: ${{ inputs.ref }}
 
diff --git a/.github/workflows/validate-query-help.yml b/.github/workflows/validate-query-help.yml
index d99144fc7f..90f0d16dbc 100644
--- a/.github/workflows/validate-query-help.yml
+++ b/.github/workflows/validate-query-help.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
diff --git a/.github/workflows/validate-query-test-case-formatting.yml b/.github/workflows/validate-query-test-case-formatting.yml
index 7b95484376..879c1c9058 100644
--- a/.github/workflows/validate-query-test-case-formatting.yml
+++ b/.github/workflows/validate-query-test-case-formatting.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
diff --git a/.github/workflows/verify-standard-library-dependencies.yml b/.github/workflows/verify-standard-library-dependencies.yml
index f44183a27c..b04f200157 100644
--- a/.github/workflows/verify-standard-library-dependencies.yml
+++ b/.github/workflows/verify-standard-library-dependencies.yml
@@ -22,7 +22,7 @@ jobs:
       matrix: ${{ steps.export-matrix.outputs.matrix }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Export unit test matrix
         id: export-matrix
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Python 3
         uses: actions/setup-python@v4

From b5c1a95311ae8635ea2f4b23e8c844e7b1d016f8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 5 Nov 2024 23:24:42 +0000
Subject: [PATCH 383/435] Update actions/setup-python to v5

---
 .github/workflows/codeql_unit_tests.yml                    | 2 +-
 .github/workflows/finalize-release.yml                     | 2 +-
 .github/workflows/generate-html-docs.yml                   | 2 +-
 .github/workflows/prepare-release.yml                      | 2 +-
 .github/workflows/standard_library_upgrade_tests.yml       | 4 ++--
 .github/workflows/tooling-unit-tests.yml                   | 6 +++---
 .github/workflows/update-release.yml                       | 2 +-
 .github/workflows/validate-package-files.yml               | 2 +-
 .github/workflows/verify-standard-library-dependencies.yml | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index 9cfa886e8b..2c771b4575 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -48,7 +48,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/finalize-release.yml b/.github/workflows/finalize-release.yml
index 7afc516aac..a7ccc0375e 100644
--- a/.github/workflows/finalize-release.yml
+++ b/.github/workflows/finalize-release.yml
@@ -52,7 +52,7 @@ jobs:
           path: tooling 
       
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/generate-html-docs.yml b/.github/workflows/generate-html-docs.yml
index 8ae26b0270..d63f631421 100644
--- a/.github/workflows/generate-html-docs.yml
+++ b/.github/workflows/generate-html-docs.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index f23db508b2..19dbe1adbd 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -39,7 +39,7 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/standard_library_upgrade_tests.yml b/.github/workflows/standard_library_upgrade_tests.yml
index 811194dd7e..a401150b07 100644
--- a/.github/workflows/standard_library_upgrade_tests.yml
+++ b/.github/workflows/standard_library_upgrade_tests.yml
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Python 3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 
@@ -157,7 +157,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/tooling-unit-tests.yml b/.github/workflows/tooling-unit-tests.yml
index e952474408..3f4fde932d 100644
--- a/.github/workflows/tooling-unit-tests.yml
+++ b/.github/workflows/tooling-unit-tests.yml
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
@@ -86,7 +86,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
@@ -105,7 +105,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/update-release.yml b/.github/workflows/update-release.yml
index c825fab347..4f779d0841 100644
--- a/.github/workflows/update-release.yml
+++ b/.github/workflows/update-release.yml
@@ -34,7 +34,7 @@ jobs:
           ref: ${{ inputs.head-sha }}
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/validate-package-files.yml b/.github/workflows/validate-package-files.yml
index a0a09d8ecb..a716921053 100644
--- a/.github/workflows/validate-package-files.yml
+++ b/.github/workflows/validate-package-files.yml
@@ -21,7 +21,7 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/verify-standard-library-dependencies.yml b/.github/workflows/verify-standard-library-dependencies.yml
index b04f200157..06ab4d23e2 100644
--- a/.github/workflows/verify-standard-library-dependencies.yml
+++ b/.github/workflows/verify-standard-library-dependencies.yml
@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.9"
 

From a9f2bf141dfe551f2f2d2f877554ec7337f1c2bb Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 5 Nov 2024 23:30:37 +0000
Subject: [PATCH 384/435] Add dependabot.yml file to keep Actions up-to-date

---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..73f11c1f47
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"
\ No newline at end of file

From de24d43f7c5590528e026a6ea21f76d7a971a8a3 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Mon, 11 Nov 2024 13:17:25 +0900
Subject: [PATCH 385/435] Fix #789

---
 change_notes/2024-11-11-fix-fp-789.md         |  2 ++
 .../rules/A7-1-2/VariableMissingConstexpr.ql  |  6 +++++
 .../A7-1-2/VariableMissingConstexpr.expected  |  5 ++--
 cpp/autosar/test/rules/A7-1-2/test.cpp        | 25 +++++++++++++------
 cpp/common/src/codingstandards/cpp/Expr.qll   |  4 ++-
 5 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 change_notes/2024-11-11-fix-fp-789.md

diff --git a/change_notes/2024-11-11-fix-fp-789.md b/change_notes/2024-11-11-fix-fp-789.md
new file mode 100644
index 0000000000..6ba34dbd7c
--- /dev/null
+++ b/change_notes/2024-11-11-fix-fp-789.md
@@ -0,0 +1,2 @@
+- `A7-1-2` - `VariableMissingConstexpr.ql`:
+  - Fixes #789. Doesn't alert on non-static member variables and compiler generated variables of range based for-loops.
diff --git a/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql b/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql
index f0adab07d4..b051965a56 100644
--- a/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql
+++ b/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql
@@ -42,6 +42,12 @@ where
   not v.isConstexpr() and
   not v instanceof Parameter and
   not v.isAffectedByMacro() and
+  // Don't consider non-static member variables.
+  (
+    not v instanceof MemberVariable
+    or
+    v.isStatic()
+  ) and
   isLiteralType(v.getType()) and
   // Unfortunately, `isConstant` is not sufficient here because it doesn't include calls to
   // constexpr constructors, and does not take into account zero initialization
diff --git a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
index f86faf1a7b..ee33044a2d 100644
--- a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
+++ b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
@@ -7,9 +7,8 @@
 | test.cpp:41:14:41:15 | l2 | Variable 'l2' could be marked 'constexpr'. |
 | test.cpp:44:16:44:17 | lc | Variable 'lc' could be marked 'constexpr'. |
 | test.cpp:45:17:45:19 | lc2 | Variable 'lc2' could be marked 'constexpr'. |
-| test.cpp:55:7:55:8 | m2 | Variable 'm2' could be marked 'constexpr'. |
-| test.cpp:130:7:130:8 | m1 | Variable 'm1' could be marked 'constexpr'. |
-| test.cpp:141:7:141:8 | m1 | Variable 'm1' could be marked 'constexpr'. |
+| test.cpp:55:20:55:21 | m2 | Variable 'm2' could be marked 'constexpr'. |
+| test.cpp:143:5:143:20 | m1 | Variable 'm1' could be marked 'constexpr'. |
 | test.cpp:221:7:221:8 | l1 | Variable 'l1' could be marked 'constexpr'. |
 | test.cpp:235:7:235:8 | l6 | Variable 'l6' could be marked 'constexpr'. |
 | test.cpp:237:7:237:8 | l8 | Variable 'l8' could be marked 'constexpr'. |
diff --git a/cpp/autosar/test/rules/A7-1-2/test.cpp b/cpp/autosar/test/rules/A7-1-2/test.cpp
index 8395f60ff3..3b45516bc3 100644
--- a/cpp/autosar/test/rules/A7-1-2/test.cpp
+++ b/cpp/autosar/test/rules/A7-1-2/test.cpp
@@ -51,9 +51,9 @@ class MemberConstExpr {
   MemberConstExpr(int p3) : m3(p3) {}
 
 private:
-  int m1;     // COMPLIANT - is not always zero initialized
-  int m2 = 0; // NON_COMPLIANT
-  int m3 = 0; // COMPLIANT - can be set by constructor
+  int m1;                  // COMPLIANT - is not always zero initialized
+  static const int m2 = 0; // NON_COMPLIANT
+  int m3 = 0;              // COMPLIANT - can be set by constructor
 };
 
 int h1(int x, int y) { // NON_COMPLIANT
@@ -127,7 +127,7 @@ class MissingConstexprClass {
   MissingConstexprClass(int i) = delete;           // NON_COMPLIANT
   MissingConstexprClass(int i, LiteralClass lc) {} // NON_COMPLIANT
 private:
-  int m1 = 0;
+  int m1 = 0; // COMPLIANT - non-static member variable
 };
 
 class VirtualBaseClass {};
@@ -138,9 +138,9 @@ class DerivedClass : public virtual VirtualBaseClass {
   DerivedClass(int i) = delete;           // COMPLIANT
   DerivedClass(int i, LiteralClass lc) {} // COMPLIANT
 private:
-  int m1 = 0;
+  static int m1; // NON_COMPLAINT - static member variable can be constexpr
 };
-
+int DerivedClass::m1 = 0;
 class NotAllMembersInitializedClass {
 public:
   NotAllMembersInitializedClass() = default;               // COMPLIANT
@@ -274,4 +274,15 @@ template <typename T> T *init() {
   return t;
 }
 
-void test_template_instantiation() { int *t = init<int>(); }
\ No newline at end of file
+void test_template_instantiation() { int *t = init<int>(); }
+
+#include <memory>
+#include <vector>
+void a_function() {
+  auto origin = std::vector<int>{1, 2, 3, 4, 5, 6, 7, 8, 9};
+  auto values = std::vector<std::unique_ptr<int>>{};
+  for (auto &value :
+       origin) { // Sometimes, CodeQL reports "value" should be constexpr
+    values.emplace_back(std::make_unique<int>(value));
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/Expr.qll b/cpp/common/src/codingstandards/cpp/Expr.qll
index fe2877f849..90730b9718 100644
--- a/cpp/common/src/codingstandards/cpp/Expr.qll
+++ b/cpp/common/src/codingstandards/cpp/Expr.qll
@@ -267,7 +267,9 @@ predicate isCompileTimeEvaluatedCall(Call call) {
     parameterUsingDefaultValue.getAnAssignedValue() = defaultValue
   |
     isDirectCompileTimeEvaluatedExpression(defaultValue)
-  )
+  ) and
+  // 4. the call's qualifier is compile time evaluated.
+  (not call.hasQualifier() or isCompileTimeEvaluatedExpression(call.getQualifier()))
 }
 
 /*

From 9aa4c38e4a54856234e9dc1d2c5297a0cbba1125 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:39:26 +0000
Subject: [PATCH 386/435] Bump actions/github-script from 3 to 7

Bumps [actions/github-script](https://github.com/actions/github-script) from 3 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v3...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql_unit_tests.yml                  | 2 +-
 .github/workflows/dispatch-matrix-test-on-comment.yml    | 2 +-
 .github/workflows/dispatch-release-performance-check.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql_unit_tests.yml b/.github/workflows/codeql_unit_tests.yml
index 2c771b4575..2fc28fc900 100644
--- a/.github/workflows/codeql_unit_tests.yml
+++ b/.github/workflows/codeql_unit_tests.yml
@@ -166,7 +166,7 @@ jobs:
     steps:
       - name: Check if run-test-suites job failed to complete, if so fail
         if: ${{ needs.run-test-suites.result == 'failure' }}
-        uses: actions/github-script@v3
+        uses: actions/github-script@v7
         with:
           script: |
             core.setFailed('Test run job failed')
diff --git a/.github/workflows/dispatch-matrix-test-on-comment.yml b/.github/workflows/dispatch-matrix-test-on-comment.yml
index 297b6fbc7e..964fb7e9f3 100644
--- a/.github/workflows/dispatch-matrix-test-on-comment.yml
+++ b/.github/workflows/dispatch-matrix-test-on-comment.yml
@@ -40,7 +40,7 @@ jobs:
           --json \
             -R github/codeql-coding-standards-release-engineering
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-matrix') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |
diff --git a/.github/workflows/dispatch-release-performance-check.yml b/.github/workflows/dispatch-release-performance-check.yml
index 260846185a..a8df297f7d 100644
--- a/.github/workflows/dispatch-release-performance-check.yml
+++ b/.github/workflows/dispatch-release-performance-check.yml
@@ -40,7 +40,7 @@ jobs:
           --json \
           -R github/codeql-coding-standards-release-engineering
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/test-performance') && steps.check-write-permission.outputs.has-permission }}
         with:
           script: |

From 73c075d2bc1b745a00efa5b1a4cbc5e8ede13b74 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Wed, 13 Nov 2024 14:36:39 +0900
Subject: [PATCH 387/435] Fix #796

---
 change_notes/2024-11-13-fix-fp-796.md                          | 2 ++
 ...onThatContainsForwardingReferenceAsItsArgumentOverloaded.ql | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 change_notes/2024-11-13-fix-fp-796.md

diff --git a/change_notes/2024-11-13-fix-fp-796.md b/change_notes/2024-11-13-fix-fp-796.md
new file mode 100644
index 0000000000..5fa32f57e8
--- /dev/null
+++ b/change_notes/2024-11-13-fix-fp-796.md
@@ -0,0 +1,2 @@
+ - `A13-3-1` - `FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql`:
+   - Reduce false positives by explicitly checking that the locations of overloaded functions are different.
diff --git a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
index 81ca7039c3..e3fb59bd8a 100644
--- a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
+++ b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
@@ -29,6 +29,9 @@ where
     OperatorsPackage::functionThatContainsForwardingReferenceAsItsArgumentOverloadedQuery()) and
   not f.isDeleted() and
   f = c.getAnOverload() and
+  // CodeQL sometimes fetches an overloaded function at the same location.
+  // Thus, a check is added explicitly (refer #796).
+  f.getLocation() != c.getLocation() and
   // allow for overloading with different number of parameters, because there is no
   // confusion on what function will be called.
   f.getNumberOfParameters() = c.getNumberOfParameters() and

From b1c76190f42c28f51edceadb944b83c3daa7a28c Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 14 Nov 2024 20:56:51 -0800
Subject: [PATCH 388/435] Fix broken test

---
 .../RULE-1-5/UngetcCallOnStreamPositionZero.expected      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
index 98e7b34fbe..ff25a58e3c 100644
--- a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
+++ b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
@@ -1,8 +1,8 @@
 edges
-| test.c:39:16:39:20 | call to fopen indirection | test.c:41:15:41:18 | file indirection |
+| test.c:39:16:39:20 | *call to fopen | test.c:41:15:41:18 | *file | provenance |  |
 nodes
-| test.c:39:16:39:20 | call to fopen indirection | semmle.label | call to fopen indirection |
-| test.c:41:15:41:18 | file indirection | semmle.label | file indirection |
+| test.c:39:16:39:20 | *call to fopen | semmle.label | *call to fopen |
+| test.c:41:15:41:18 | *file | semmle.label | *file |
 subpaths
 #select
-| test.c:41:15:41:18 | file indirection | test.c:39:16:39:20 | call to fopen indirection | test.c:41:15:41:18 | file indirection | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:39:16:39:20 | call to fopen indirection | call to fopen indirection |
+| test.c:41:15:41:18 | *file | test.c:39:16:39:20 | *call to fopen | test.c:41:15:41:18 | *file | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:39:16:39:20 | *call to fopen | *call to fopen |

From bed2b88b76964c690aa327b73e08671e1d1bc0b4 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Mon, 18 Nov 2024 08:30:26 +0900
Subject: [PATCH 389/435] review: add test cases.

---
 ...oopCounterModifiedWithinStatement.expected |  1 +
 cpp/autosar/test/rules/M6-5-3/test.cpp        | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected b/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected
index a6988586f0..a8fc2afff6 100644
--- a/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected
+++ b/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected
@@ -2,3 +2,4 @@
 | test.cpp:25:35:25:35 | x | Loop counters should not be modified within a statement in a for loop. |
 | test.cpp:36:5:36:5 | x | Loop counters should not be modified within a statement in a for loop. |
 | test.cpp:43:9:43:9 | i | Loop counters should not be modified within a statement in a for loop. |
+| test.cpp:99:15:99:15 | i | Loop counters should not be modified within a statement in a for loop. |
diff --git a/cpp/autosar/test/rules/M6-5-3/test.cpp b/cpp/autosar/test/rules/M6-5-3/test.cpp
index a534e6ba8e..d60980588b 100644
--- a/cpp/autosar/test/rules/M6-5-3/test.cpp
+++ b/cpp/autosar/test/rules/M6-5-3/test.cpp
@@ -43,3 +43,60 @@ void test_loop_counter_mod_in_side_effect() {
     inc(i); // NON_COMPLIANT - modifies `i`
   }
 }
+
+void test_loop_counter_reference_mod_in_condition() {
+  auto loop = [](int& i){
+    for (; (i++ < 10); i++) { // NON_COMPLIANT
+    }
+  };
+  int i = 0;
+  loop(i);
+}
+
+void test_loop_counter_reference_mod() {
+  auto loop = [](int& i){
+    for (; i < 10; i++) { // COMPLIANT
+    }
+  };
+  int i = 0;
+  loop(i);
+}
+
+void test_loop_const_reference() {
+  auto loop = []([[maybe_unused]] int const& i){
+    for (int i = 0; i < 10; i++) { // COMPLIANT
+    }
+  };
+  int i = 0;
+  loop(i);
+}
+
+void test_loop_counter_reference_mod_in_statement() {
+  auto loop = [](int& i){
+    for (; (i < 10); i++) {
+      i++; // NON_COMPLIANT
+    }
+  };
+  int i = 0;
+  loop(i);
+}
+
+int const_reference(int const& i) {
+  return i;
+}
+
+int reference(int& i) {
+  return i;
+}
+
+int copy(int i) {
+  return i;
+}
+
+void test_pass_argument_by() {
+  for (int i = 0; i < 10; i++) {
+    const_reference(i); // COMPLIANT
+    reference(i);       // NON_COMPLIANT
+    copy(i);            // COMPLIANT
+  }
+}

From dac5019b346f902eeef2a0889e7dbde3b523b647 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Mon, 18 Nov 2024 08:48:15 +0900
Subject: [PATCH 390/435] Format test case.

---
 cpp/autosar/test/rules/M6-5-3/test.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/cpp/autosar/test/rules/M6-5-3/test.cpp b/cpp/autosar/test/rules/M6-5-3/test.cpp
index d60980588b..a41ba8a22d 100644
--- a/cpp/autosar/test/rules/M6-5-3/test.cpp
+++ b/cpp/autosar/test/rules/M6-5-3/test.cpp
@@ -45,7 +45,7 @@ void test_loop_counter_mod_in_side_effect() {
 }
 
 void test_loop_counter_reference_mod_in_condition() {
-  auto loop = [](int& i){
+  auto loop = [](int &i) {
     for (; (i++ < 10); i++) { // NON_COMPLIANT
     }
   };
@@ -54,7 +54,7 @@ void test_loop_counter_reference_mod_in_condition() {
 }
 
 void test_loop_counter_reference_mod() {
-  auto loop = [](int& i){
+  auto loop = [](int &i) {
     for (; i < 10; i++) { // COMPLIANT
     }
   };
@@ -63,7 +63,7 @@ void test_loop_counter_reference_mod() {
 }
 
 void test_loop_const_reference() {
-  auto loop = []([[maybe_unused]] int const& i){
+  auto loop = []([[maybe_unused]] int const &i) {
     for (int i = 0; i < 10; i++) { // COMPLIANT
     }
   };
@@ -72,7 +72,7 @@ void test_loop_const_reference() {
 }
 
 void test_loop_counter_reference_mod_in_statement() {
-  auto loop = [](int& i){
+  auto loop = [](int &i) {
     for (; (i < 10); i++) {
       i++; // NON_COMPLIANT
     }
@@ -81,17 +81,11 @@ void test_loop_counter_reference_mod_in_statement() {
   loop(i);
 }
 
-int const_reference(int const& i) {
-  return i;
-}
+int const_reference(int const &i) { return i; }
 
-int reference(int& i) {
-  return i;
-}
+int reference(int &i) { return i; }
 
-int copy(int i) {
-  return i;
-}
+int copy(int i) { return i; }
 
 void test_pass_argument_by() {
   for (int i = 0; i < 10; i++) {

From 916388130da293b0831348dcfe04d3fc6e52c18d Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Mon, 18 Nov 2024 10:46:53 +0900
Subject: [PATCH 391/435] Update test case expected's line number after
 previous format.

---
 .../rules/M6-5-3/LoopCounterModifiedWithinStatement.expected    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected b/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected
index a8fc2afff6..4643298e3a 100644
--- a/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected
+++ b/cpp/autosar/test/rules/M6-5-3/LoopCounterModifiedWithinStatement.expected
@@ -2,4 +2,4 @@
 | test.cpp:25:35:25:35 | x | Loop counters should not be modified within a statement in a for loop. |
 | test.cpp:36:5:36:5 | x | Loop counters should not be modified within a statement in a for loop. |
 | test.cpp:43:9:43:9 | i | Loop counters should not be modified within a statement in a for loop. |
-| test.cpp:99:15:99:15 | i | Loop counters should not be modified within a statement in a for loop. |
+| test.cpp:93:15:93:15 | i | Loop counters should not be modified within a statement in a for loop. |

From 0683d4c67a47fd17732673bf6475ac406ed47b99 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Sun, 17 Nov 2024 19:12:24 -0800
Subject: [PATCH 392/435] Address feedback.

---
 ...RedeclarationOfObjectWithUnmatchedAlignment.ql | 15 ++-------------
 .../RedeclarationOfObjectWithoutAlignment.ql      |  7 +++----
 .../MoreThanOneAlignmentSpecifierOnDeclaration.ql |  5 ++++-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
index b17c1ef6c1..2969c0ea06 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
@@ -15,21 +15,10 @@
 
 import cpp
 import codingstandards.c.misra
-
-predicate lexicallyEqualExpr(Expr a, Expr b) {
-  a.toString() = b.toString() and
-  a.getNumChild() = b.getNumChild() and
-  forall(Expr aChild, Expr bChild, int i |
-    aChild = a.getChild(i) and
-    bChild = b.getChild(i) and
-    i < a.getNumChild()
-  |
-    lexicallyEqualExpr(aChild, bChild)
-  )
-}
+import semmle.code.cpp.valuenumbering.HashCons
 
 predicate lexicallyEqual(AttributeArgument a, AttributeArgument b) {
-  lexicallyEqualExpr(a.getValueConstant(), b.getValueConstant()) or
+  hashCons(a.getValueConstant()) =  hashCons(b.getValueConstant()) or
   a.getValueType() = b.getValueType()
 }
 
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
index 986ab92f5a..3088708de0 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
@@ -46,10 +46,9 @@ newtype TAttributeDeclLocation =
  * This should give us a highly reliable means of finding which attributes are
  * associated with which `DeclarationEntry`s.
  *
- * One note of caution: the associated `Variable` must be treated with caution,
- * as there are multiple instances of that `Variable` if it is declared
- * multiple times, they equal each other, and `getLocation()` on each variable
- * returns every location result. This class must act on `DeclarationEntry`s to
+ * One note of caution: the location of the associated `Variable` must be
+ * treated with caution, as calls to `getLocation()` on a redeclared `Variable`
+ * can return multiple results. This class must act on `DeclarationEntry`s to
  * deliver reliable results.
  */
 class DeclarationEntryAttribute extends Attribute {
diff --git a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
index 3c89a190ec..f4e0d93d92 100644
--- a/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
+++ b/c/misra/src/rules/RULE-8-17/MoreThanOneAlignmentSpecifierOnDeclaration.ql
@@ -20,9 +20,12 @@ where
   not isExcluded(v, AlignmentPackage::moreThanOneAlignmentSpecifierOnDeclarationQuery()) and
   first = v.getAnAttribute() and
   last = v.getAnAttribute() and
-  first != last and
+  not first = last and
   first.hasName("_Alignas") and
   last.hasName("_Alignas") and
+  // Handle double reporting: the first Attribute should really be first, and the last Attribute
+  // should really be last. This implies the first is before the last. This approach also ensures
+  // a single result for variables that have more than two alignment specifiers.
   not exists(Attribute beforeFirst |
     beforeFirst.getLocation().isBefore(first.getLocation(), _) and
     v.getAnAttribute() = beforeFirst

From d584e309b212ad29e05e74a4a0760fb567ed92e7 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Mon, 18 Nov 2024 13:12:44 +0900
Subject: [PATCH 393/435] Consider feedback on #789

---
 .../rules/A7-1-2/VariableMissingConstexpr.ql  | 17 ++++++++++----
 .../A7-1-2/VariableMissingConstexpr.expected  |  5 ++--
 cpp/autosar/test/rules/A7-1-2/test.cpp        | 23 +++++--------------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql b/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql
index b051965a56..a07dbd43f7 100644
--- a/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql
+++ b/cpp/autosar/src/rules/A7-1-2/VariableMissingConstexpr.ql
@@ -35,18 +35,24 @@ predicate isTypeZeroInitializable(Type t) {
   t.getUnderlyingType() instanceof ArrayType
 }
 
-from Variable v
+from Variable v, string msg
 where
   not isExcluded(v, ConstPackage::variableMissingConstexprQuery()) and
   v.hasDefinition() and
   not v.isConstexpr() and
   not v instanceof Parameter and
   not v.isAffectedByMacro() and
-  // Don't consider non-static member variables.
   (
     not v instanceof MemberVariable
     or
-    v.isStatic()
+    // In case member functions are left un-instantiated, it is possible
+    // the member variable could be modified in them.
+    // Hence, don't raise an alert in case this member variable's class
+    // has a member function that doesn't have a definition.
+    not exists(MemberFunction mf |
+      mf.getDeclaringType() = v.getDeclaringType() and
+      mf.isFromUninstantiatedTemplate(_)
+    )
   ) and
   isLiteralType(v.getType()) and
   // Unfortunately, `isConstant` is not sufficient here because it doesn't include calls to
@@ -72,5 +78,6 @@ where
   // Exclude variables in uninstantiated templates, as they may be incomplete
   not v.isFromUninstantiatedTemplate(_) and
   // Exclude compiler generated variables, which are not user controllable
-  not v.isCompilerGenerated()
-select v, "Variable '" + v.getName() + "' could be marked 'constexpr'."
+  not v.isCompilerGenerated() and
+  if v instanceof MemberVariable and not v.isStatic() then msg = " and static." else msg = "."
+select v, "Variable '" + v.getName() + "' could be marked 'constexpr'" + msg
diff --git a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
index ee33044a2d..31c26a11ff 100644
--- a/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
+++ b/cpp/autosar/test/rules/A7-1-2/VariableMissingConstexpr.expected
@@ -7,8 +7,9 @@
 | test.cpp:41:14:41:15 | l2 | Variable 'l2' could be marked 'constexpr'. |
 | test.cpp:44:16:44:17 | lc | Variable 'lc' could be marked 'constexpr'. |
 | test.cpp:45:17:45:19 | lc2 | Variable 'lc2' could be marked 'constexpr'. |
-| test.cpp:55:20:55:21 | m2 | Variable 'm2' could be marked 'constexpr'. |
-| test.cpp:143:5:143:20 | m1 | Variable 'm1' could be marked 'constexpr'. |
+| test.cpp:55:7:55:8 | m2 | Variable 'm2' could be marked 'constexpr' and static. |
+| test.cpp:130:7:130:8 | m1 | Variable 'm1' could be marked 'constexpr' and static. |
+| test.cpp:141:7:141:8 | m1 | Variable 'm1' could be marked 'constexpr' and static. |
 | test.cpp:221:7:221:8 | l1 | Variable 'l1' could be marked 'constexpr'. |
 | test.cpp:235:7:235:8 | l6 | Variable 'l6' could be marked 'constexpr'. |
 | test.cpp:237:7:237:8 | l8 | Variable 'l8' could be marked 'constexpr'. |
diff --git a/cpp/autosar/test/rules/A7-1-2/test.cpp b/cpp/autosar/test/rules/A7-1-2/test.cpp
index 3b45516bc3..1bbe32a933 100644
--- a/cpp/autosar/test/rules/A7-1-2/test.cpp
+++ b/cpp/autosar/test/rules/A7-1-2/test.cpp
@@ -51,9 +51,9 @@ class MemberConstExpr {
   MemberConstExpr(int p3) : m3(p3) {}
 
 private:
-  int m1;                  // COMPLIANT - is not always zero initialized
-  static const int m2 = 0; // NON_COMPLIANT
-  int m3 = 0;              // COMPLIANT - can be set by constructor
+  int m1;     // COMPLIANT - is not always zero initialized
+  int m2 = 0; // NON_COMPLIANT
+  int m3 = 0; // COMPLIANT - can be set by constructor
 };
 
 int h1(int x, int y) { // NON_COMPLIANT
@@ -127,7 +127,7 @@ class MissingConstexprClass {
   MissingConstexprClass(int i) = delete;           // NON_COMPLIANT
   MissingConstexprClass(int i, LiteralClass lc) {} // NON_COMPLIANT
 private:
-  int m1 = 0; // COMPLIANT - non-static member variable
+  int m1 = 0;
 };
 
 class VirtualBaseClass {};
@@ -138,9 +138,9 @@ class DerivedClass : public virtual VirtualBaseClass {
   DerivedClass(int i) = delete;           // COMPLIANT
   DerivedClass(int i, LiteralClass lc) {} // COMPLIANT
 private:
-  static int m1; // NON_COMPLAINT - static member variable can be constexpr
+  int m1 = 0;
 };
-int DerivedClass::m1 = 0;
+
 class NotAllMembersInitializedClass {
 public:
   NotAllMembersInitializedClass() = default;               // COMPLIANT
@@ -275,14 +275,3 @@ template <typename T> T *init() {
 }
 
 void test_template_instantiation() { int *t = init<int>(); }
-
-#include <memory>
-#include <vector>
-void a_function() {
-  auto origin = std::vector<int>{1, 2, 3, 4, 5, 6, 7, 8, 9};
-  auto values = std::vector<std::unique_ptr<int>>{};
-  for (auto &value :
-       origin) { // Sometimes, CodeQL reports "value" should be constexpr
-    values.emplace_back(std::make_unique<int>(value));
-  }
-}

From e736cb0dd3c50a7648b89c66f7a2b6f2ad52b468 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Mon, 18 Nov 2024 13:18:14 +0900
Subject: [PATCH 394/435] Update change notes

---
 change_notes/2024-11-11-fix-fp-789.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/change_notes/2024-11-11-fix-fp-789.md b/change_notes/2024-11-11-fix-fp-789.md
index 6ba34dbd7c..b06ebb9b11 100644
--- a/change_notes/2024-11-11-fix-fp-789.md
+++ b/change_notes/2024-11-11-fix-fp-789.md
@@ -1,2 +1,3 @@
 - `A7-1-2` - `VariableMissingConstexpr.ql`:
-  - Fixes #789. Doesn't alert on non-static member variables and compiler generated variables of range based for-loops.
+  - Do not report on member variables if the class has un-instantiated member function(s).
+  - Check a call's qualifier as well whether it can be compile time evaluated or not.

From 06ba26dca5afee4bd7a708ea2e0ab01e36f26007 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Sun, 17 Nov 2024 22:03:28 -0800
Subject: [PATCH 395/435] Address feedback

---
 ...ointersToVariablyModifiedArrayTypesUsed.ql | 79 +----------------
 .../RULE-18-8/VariableLengthArrayTypesUsed.ql |  6 +-
 ...rayToPointerConversionOfTemporaryObject.ql | 28 ++----
 .../cpp/VariablyModifiedTypes.qll             | 85 +++++++++++++++++--
 .../cpp/lifetimes/CLifetimes.qll              |  2 +-
 5 files changed, 92 insertions(+), 108 deletions(-)

diff --git a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
index fec8f5d2e1..6ca2289c67 100644
--- a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
@@ -18,84 +18,11 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.VariablyModifiedTypes
 
-/**
- * Check that the declaration entry, which may be a parameter or a variable
- * etc., seems to subsume the location of `inner`, including the declaration
- * type text.
- *
- * The location of the `DeclarationEntry` itself points to the _identifier_
- * that is declared. This range will not include the type of the declaration.
- *
- * For parameters, the `before` and `end` `Location` objects will be
- * constrained to the closest earlier element (parameter or function body),
- * these values can therefore be captured and inspected for debugging.
- *
- * For declarations which occur in statements, the `before` and `end`
- * `Location` objects will be both constrained to be equal, and equal to,
- * the `Location` of the containing `DeclStmt`.
- */
-predicate declarationSubsumes(
-  DeclarationEntry entry, Location inner, Location before, Location after
-) {
-  inner.getFile() = entry.getLocation().getFile() and
-  (
-    exists(ParameterDeclarationEntry param, FunctionDeclarationEntry func, int i |
-      param = entry and
-      func = param.getFunctionDeclarationEntry() and
-      func.getParameterDeclarationEntry(i) = param and
-      before = entry.getLocation() and
-      (
-        after = func.getParameterDeclarationEntry(i + 1).getLocation()
-        or
-        not exists(ParameterDeclarationEntry afterParam |
-          afterParam = func.getParameterDeclarationEntry(i + 1)
-        ) and
-        after = func.getBlock().getLocation()
-      )
-    ) and
-    before.isBefore(inner, _) and
-    inner.isBefore(after, _)
-    or
-    exists(DeclStmt s |
-      s.getADeclaration() = entry.getDeclaration() and
-      before = s.getLocation() and
-      after = before and
-      before.subsumes(inner)
-    )
-  )
-}
-
-/**
- * A declaration involving a pointer to a variably-modified type.
- */
-class InvalidDeclaration extends DeclarationEntry {
-  Expr sizeExpr;
-  CandidateVlaType vlaType;
-  // `before` and `after` are captured for debugging, see doc comment for
-  // `declarationSubsumes`.
-  Location before;
-  Location after;
-
-  InvalidDeclaration() {
-    sizeExpr = any(VlaDimensionStmt vla).getDimensionExpr() and
-    declarationSubsumes(this, sizeExpr.getLocation(), before, after) and
-    (
-      if this instanceof ParameterDeclarationEntry
-      then vlaType = this.getType().(VariablyModifiedTypeIfAdjusted).getInnerVlaType()
-      else vlaType = this.getType().(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
-    ) and
-    // Capture only pointers to VLA types, not raw VLA types.
-    not vlaType = this.getType()
-  }
-
-  Expr getSizeExpr() { result = sizeExpr }
-
-  CandidateVlaType getVlaType() { result = vlaType }
-}
-
-from InvalidDeclaration v, string declstr, string adjuststr, string relationstr
+from VmtDeclarationEntry v, string declstr, string adjuststr, string relationstr
 where
   not isExcluded(v, InvalidMemory3Package::pointersToVariablyModifiedArrayTypesUsedQuery()) and
+  // Capture only pointers to VLA types, not raw VLA types.
+  not v.getVlaType() = v.getType() and
   (
     if v instanceof ParameterDeclarationEntry
     then declstr = "Parameter "
diff --git a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
index 96fbf697af..8e599f39f7 100644
--- a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
@@ -20,9 +20,11 @@ where
   not isExcluded(v, Declarations7Package::variableLengthArrayTypesUsedQuery()) and
   size = v.getVlaDimensionStmt(0).getDimensionExpr() and
   (
-    arrayType = v.getVariable().getType()
+    // Holds is if v is a variable declaration:
+    arrayType = v.getVariable().getType().stripTopLevelSpecifiers()
     or
-    arrayType = v.getType().getUnspecifiedType()
+    // Holds is if v is a typedef declaration:
+    arrayType = v.getType().stripTopLevelSpecifiers()
   ) and
   typeStr = arrayType.getBaseType().toString()
 select v, "Variable length array of element type '" + typeStr + "' with non-constant size $@.",
diff --git a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
index 7df4e5371c..a64ccd44ff 100644
--- a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
+++ b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
@@ -18,32 +18,20 @@ import codingstandards.c.misra
 import codingstandards.cpp.lifetimes.CLifetimes
 
 /**
- * Get the expression(s) whose value is "used" by this expression.
+ * Holds if the value of an expression is used or stored.
  *
  * For instance, `(x)` does not use any values, but `x + y` uses `x` and `y`.
  *
  * A pointer-to-array conversion does not need to be flagged if the result of
  * that conversion is not used or stored.
  */
-Expr usedValuesOf(Expr expr) {
-  result = expr.(BinaryOperation).getLeftOperand()
+predicate isUsedOrStored(Expr e) {
+  e = any(Operation o).getAnOperand()
   or
-  result = expr.(BinaryOperation).getRightOperand()
+  e = any(ConditionalExpr c).getCondition()
   or
-  result = expr.(UnaryOperation).getOperand()
+  e = any(Call c).getAnArgument()
   or
-  result = expr.(ConditionalExpr).getCondition()
-  or
-  result = expr.(Call).getAnArgument()
-}
-
-/**
- * Get the expression(s) whose value is stored by this declaration.
- *
- * A pointer-to-array conversion does not need to be flagged if the result of
- * that conversion is not used or stored.
- */
-predicate isStored(Expr e) {
   e = any(VariableDeclarationEntry d).getDeclaration().getInitializer().getExpr()
   or
   e = any(ClassAggregateLiteral l).getAFieldExpr(_)
@@ -77,10 +65,6 @@ where
   not isExcluded(conversion, InvalidMemory3Package::arrayToPointerConversionOfTemporaryObjectQuery()) and
   fa.getTemporary() = temporary and
   conversion.getExpr() = fa and
-  (
-    temporaryObjectFlowStep*(conversion.getExpr()) = usedValuesOf(any(Expr e))
-    or
-    isStored(temporaryObjectFlowStep*(conversion.getExpr()))
-  )
+  isUsedOrStored(temporaryObjectFlowStep*(conversion.getExpr()))
 select conversion, "Array to pointer conversion of array $@ from temporary object $@",
   fa.getTarget(), fa.getTarget().getName(), temporary, temporary.toString()
diff --git a/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll b/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
index 730a52d763..c0fb3a3db6 100644
--- a/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
+++ b/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
@@ -1,5 +1,82 @@
 import cpp
 
+/**
+ * A declaration involving a variably-modified type.
+ */
+class VmtDeclarationEntry extends DeclarationEntry {
+  Expr sizeExpr;
+  CandidateVlaType vlaType;
+  // `before` and `after` are captured for debugging, see doc comment for
+  // `declarationSubsumes`.
+  Location before;
+  Location after;
+
+  VmtDeclarationEntry() {
+    // Most of this library looks for candidate VLA types, by looking for arrays
+    // without a size. These may or may not be VLA types. To confirm an a
+    // candidate type is really a VLA type, we check that the location of the
+    // declaration subsumes a `VlaDimensionStmt` which indicates a real VLA.
+    sizeExpr = any(VlaDimensionStmt vla).getDimensionExpr() and
+    declarationSubsumes(this, sizeExpr.getLocation(), before, after) and
+    (
+      if this instanceof ParameterDeclarationEntry
+      then vlaType = this.getType().(VariablyModifiedTypeIfAdjusted).getInnerVlaType()
+      else vlaType = this.getType().(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
+    )
+  }
+
+  Expr getSizeExpr() { result = sizeExpr }
+
+  CandidateVlaType getVlaType() { result = vlaType }
+}
+
+/**
+ * Check that the declaration entry, which may be a parameter or a variable
+ * etc., seems to subsume the location of `inner`, including the declaration
+ * type text.
+ *
+ * The location of the `DeclarationEntry` itself points to the _identifier_
+ * that is declared. This range will not include the type of the declaration.
+ *
+ * For parameters, the `before` and `end` `Location` objects will be
+ * constrained to the closest earlier element (parameter or function body),
+ * these values can therefore be captured and inspected for debugging.
+ *
+ * For declarations which occur in statements, the `before` and `end`
+ * `Location` objects will be both constrained to be equal, and equal to,
+ * the `Location` of the containing `DeclStmt`.
+ */
+private predicate declarationSubsumes(
+  DeclarationEntry entry, Location inner, Location before, Location after
+) {
+  inner.getFile() = entry.getLocation().getFile() and
+  (
+    exists(ParameterDeclarationEntry param, FunctionDeclarationEntry func, int i |
+      param = entry and
+      func = param.getFunctionDeclarationEntry() and
+      func.getParameterDeclarationEntry(i) = param and
+      before = entry.getLocation() and
+      (
+        after = func.getParameterDeclarationEntry(i + 1).getLocation()
+        or
+        not exists(ParameterDeclarationEntry afterParam |
+          afterParam = func.getParameterDeclarationEntry(i + 1)
+        ) and
+        after = func.getBlock().getLocation()
+      )
+    ) and
+    before.isBefore(inner, _) and
+    inner.isBefore(after, _)
+    or
+    exists(DeclStmt s |
+      s.getADeclaration() = entry.getDeclaration() and
+      before = s.getLocation() and
+      after = before and
+      before.subsumes(inner)
+    )
+  )
+}
+
 /**
  * A candidate to be a variably length array type (VLA).
  *
@@ -90,19 +167,13 @@ class NoAdjustmentVariablyModifiedType extends Type {
   NoAdjustmentVariablyModifiedType() {
     exists(Type innerType |
       (
-        innerType = this.(PointerType).getBaseType()
-        or
-        innerType = this.(ArrayType).getBaseType()
+        innerType = this.(DerivedType).getBaseType()
         or
         innerType = this.(RoutineType).getReturnType()
         or
-        innerType = this.(RoutineType).getAParameterType()
-        or
         innerType = this.(FunctionPointerType).getReturnType()
         or
         innerType = this.(TypedefType).getBaseType()
-        or
-        innerType = this.(SpecifiedType).getBaseType()
       ) and
       vlaType = innerType.(VariablyModifiedTypeIfUnadjusted).getInnerVlaType()
     )
diff --git a/cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll b/cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll
index d27034f50d..9282260fb9 100644
--- a/cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll
+++ b/cpp/common/src/codingstandards/cpp/lifetimes/CLifetimes.qll
@@ -25,7 +25,7 @@ class TemporaryLifetimeExpr extends Expr {
     getUnconverted().getUnspecifiedType() instanceof StructOrUnionTypeWithArrayField and
     not isCLValue(this)
     or
-    this.(ArrayExpr).getArrayBase() instanceof TemporaryLifetimeArrayAccess
+    this.getUnconverted().(ArrayExpr).getArrayBase() instanceof TemporaryLifetimeArrayAccess
   }
 }
 

From 0ec29359aaf921e5bc6c9af3b41327106f32542e Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Sun, 17 Nov 2024 22:05:43 -0800
Subject: [PATCH 396/435] fix format

---
 .../RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
index 2969c0ea06..878bfeeeaf 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
@@ -18,7 +18,7 @@ import codingstandards.c.misra
 import semmle.code.cpp.valuenumbering.HashCons
 
 predicate lexicallyEqual(AttributeArgument a, AttributeArgument b) {
-  hashCons(a.getValueConstant()) =  hashCons(b.getValueConstant()) or
+  hashCons(a.getValueConstant()) = hashCons(b.getValueConstant()) or
   a.getValueType() = b.getValueType()
 }
 

From 492da67c1fa4f08075cbb6d8918abf966690da08 Mon Sep 17 00:00:00 2001
From: knewbury01 <knewbury01@users.noreply.github.com>
Date: Fri, 22 Nov 2024 18:24:29 +0000
Subject: [PATCH 397/435] Bump version to 2.39.0-dev

---
 c/cert/src/qlpack.yml       |  2 +-
 c/cert/test/qlpack.yml      |  2 +-
 c/common/src/qlpack.yml     |  2 +-
 c/common/test/qlpack.yml    |  2 +-
 c/misra/src/qlpack.yml      |  2 +-
 c/misra/test/qlpack.yml     |  2 +-
 cpp/autosar/src/qlpack.yml  |  2 +-
 cpp/autosar/test/qlpack.yml |  2 +-
 cpp/cert/src/qlpack.yml     |  2 +-
 cpp/cert/test/qlpack.yml    |  2 +-
 cpp/common/src/qlpack.yml   |  2 +-
 cpp/common/test/qlpack.yml  |  2 +-
 cpp/misra/src/qlpack.yml    |  2 +-
 cpp/misra/test/qlpack.yml   |  2 +-
 cpp/report/src/qlpack.yml   |  2 +-
 docs/user_manual.md         | 12 ++++++------
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index db08fb3ebe..00a8221f28 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
index 0242ecdd10..a79ef5f692 100644
--- a/c/cert/test/qlpack.yml
+++ b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.38.0-dev
+version: 2.39.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 9d05e536fd..41bf42d337 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
index e19cb371e8..41737a34ec 100644
--- a/c/common/test/qlpack.yml
+++ b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.38.0-dev
+version: 2.39.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 0c78ad44b6..b160f27b6e 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
index f27c03ca9e..3acb8455b1 100644
--- a/c/misra/test/qlpack.yml
+++ b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.38.0-dev
+version: 2.39.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 810af3bde4..cd37cef87e 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
index 37dd488774..e7e8d3e2ce 100644
--- a/cpp/autosar/test/qlpack.yml
+++ b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.38.0-dev
+version: 2.39.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 2fb82cfe3f..464a5172fc 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
index dfe027d387..ba7415c43e 100644
--- a/cpp/cert/test/qlpack.yml
+++ b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.38.0-dev
+version: 2.39.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index eeee5f1fa9..3912f3531f 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.12.9
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
index 8c37adba8d..3f061a2920 100644
--- a/cpp/common/test/qlpack.yml
+++ b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.38.0-dev
+version: 2.39.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index 2ca5752f9c..c27400fc8e 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 description: MISRA C++ 2023
 default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
index b1601bcb74..e79e5934fa 100644
--- a/cpp/misra/test/qlpack.yml
+++ b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.38.0-dev
+version: 2.39.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 797c50b92b..6477e52747 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.38.0-dev
+version: 2.39.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 0.12.9
diff --git a/docs/user_manual.md b/docs/user_manual.md
index 7f505673df..4c020dc73b 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -33,14 +33,14 @@
 
 ## Release information
 
-This user manual documents release `2.38.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
+This user manual documents release `2.39.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
 - `coding-standards-codeql-packs-2.37.0-dev.zip`: CodeQL packs that can be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `code-scanning-cpp-query-pack-2.38.0-dev.zip`: Legacy packaging for the queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `supported_rules_list_2.38.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
-- `supported_rules_list_2.38.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
-- `user_manual_2.38.0-dev.md`: This user manual.
+- `code-scanning-cpp-query-pack-2.39.0-dev.zip`: Legacy packaging for the queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `supported_rules_list_2.39.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
+- `supported_rules_list_2.39.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
+- `user_manual_2.39.0-dev.md`: This user manual.
 - `Source Code (zip)`: A zip archive containing the contents of https://github.com/github/codeql-coding-standards
 - `Source Code (tar.gz)`: A GZip compressed tar archive containing the contents of https://github.com/github/codeql-coding-standards
 - `checksums.txt`: A text file containing sha256 checksums for the aforementioned artifacts.
@@ -573,7 +573,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Out of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
-|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.38.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
+|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.39.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
 |                              | Incorrect deviation record specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation records with a reason. Ensure that all deviation records are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |

From a490400e4eacd36f0d36ed626c317e7609adad34 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 22 Nov 2024 20:40:25 -0800
Subject: [PATCH 398/435] Add full stops to report messages

---
 ...edeclarationOfObjectWithUnmatchedAlignment.ql |  2 +-
 .../RedeclarationOfObjectWithoutAlignment.ql     |  2 +-
 ...rationOfObjectWithUnmatchedAlignment.expected | 16 ++++++++--------
 ...edeclarationOfObjectWithoutAlignment.expected |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
index 878bfeeeaf..dc82f63d10 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.ql
@@ -32,5 +32,5 @@ where
   ) and
   not lexicallyEqual(alignment.getArgument(0), mismatched.getArgument(0))
 select alignment,
-  "Variable " + variable + " declared with lexically different _Alignof() values '$@' and '$@'",
+  "Variable " + variable + " declared with lexically different _Alignof() values '$@' and '$@'.",
   alignment, alignment.getArgument(0).toString(), mismatched, mismatched.getArgument(0).toString()
diff --git a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
index 3088708de0..df9f3f2d1c 100644
--- a/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
+++ b/c/misra/src/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.ql
@@ -92,5 +92,5 @@ where
   )
 select unaligned,
   "Variable " + unaligned.getName() +
-    " declared without explicit alignment to match $@ with alignment $@", aligned,
+    " declared without explicit alignment to match $@ with alignment $@.", aligned,
   "other definition", attribute, attribute.toString()
diff --git a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected
index 83a27f9074..3479ef1e35 100644
--- a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected
+++ b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithUnmatchedAlignment.expected
@@ -1,8 +1,8 @@
-| test.c:18:8:18:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@' | test.c:18:8:18:15 | alignas(...) | int | test.c:19:8:19:15 | alignas(...) | 4 |
-| test.c:19:8:19:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@' | test.c:19:8:19:15 | alignas(...) | 4 | test.c:18:8:18:15 | alignas(...) | int |
-| test.c:22:8:22:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@' | test.c:22:8:22:15 | alignas(...) | ... * ... | test.c:23:8:23:15 | alignas(...) | 32 |
-| test.c:23:8:23:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@' | test.c:23:8:23:15 | alignas(...) | 32 | test.c:22:8:22:15 | alignas(...) | ... * ... |
-| test.c:28:8:28:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@' | test.c:28:8:28:15 | alignas(...) | ... * ... | test.c:29:8:29:15 | alignas(...) | ... * ... |
-| test.c:29:8:29:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@' | test.c:29:8:29:15 | alignas(...) | ... * ... | test.c:28:8:28:15 | alignas(...) | ... * ... |
-| test.c:34:8:34:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@' | test.c:34:8:34:15 | alignas(...) | signed int | test.c:35:8:35:15 | alignas(...) | unsigned int |
-| test.c:35:8:35:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@' | test.c:35:8:35:15 | alignas(...) | unsigned int | test.c:34:8:34:15 | alignas(...) | signed int |
+| test.c:18:8:18:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:18:8:18:15 | alignas(...) | int | test.c:19:8:19:15 | alignas(...) | 4 |
+| test.c:19:8:19:15 | alignas(...) | Variable g6 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:19:8:19:15 | alignas(...) | 4 | test.c:18:8:18:15 | alignas(...) | int |
+| test.c:22:8:22:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:22:8:22:15 | alignas(...) | ... * ... | test.c:23:8:23:15 | alignas(...) | 32 |
+| test.c:23:8:23:15 | alignas(...) | Variable g7 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:23:8:23:15 | alignas(...) | 32 | test.c:22:8:22:15 | alignas(...) | ... * ... |
+| test.c:28:8:28:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:28:8:28:15 | alignas(...) | ... * ... | test.c:29:8:29:15 | alignas(...) | ... * ... |
+| test.c:29:8:29:15 | alignas(...) | Variable g9 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:29:8:29:15 | alignas(...) | ... * ... | test.c:28:8:28:15 | alignas(...) | ... * ... |
+| test.c:34:8:34:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:34:8:34:15 | alignas(...) | signed int | test.c:35:8:35:15 | alignas(...) | unsigned int |
+| test.c:35:8:35:15 | alignas(...) | Variable g11 declared with lexically different _Alignof() values '$@' and '$@'. | test.c:35:8:35:15 | alignas(...) | unsigned int | test.c:34:8:34:15 | alignas(...) | signed int |
diff --git a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected
index e9b91d33a4..69d2c8bb2d 100644
--- a/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected
+++ b/c/misra/test/rules/RULE-8-15/RedeclarationOfObjectWithoutAlignment.expected
@@ -1,2 +1,2 @@
-| test.c:5:12:5:13 | declaration of g2 | Variable g2 declared without explicit alignment to match $@ with alignment $@ | test.c:4:25:4:26 | declaration of g2 | other definition | test.c:4:8:4:15 | alignas(...) | alignas(...) |
-| test.c:7:12:7:13 | declaration of g3 | Variable g3 declared without explicit alignment to match $@ with alignment $@ | test.c:8:25:8:26 | declaration of g3 | other definition | test.c:8:8:8:15 | alignas(...) | alignas(...) |
+| test.c:5:12:5:13 | declaration of g2 | Variable g2 declared without explicit alignment to match $@ with alignment $@. | test.c:4:25:4:26 | declaration of g2 | other definition | test.c:4:8:4:15 | alignas(...) | alignas(...) |
+| test.c:7:12:7:13 | declaration of g3 | Variable g3 declared without explicit alignment to match $@ with alignment $@. | test.c:8:25:8:26 | declaration of g3 | other definition | test.c:8:8:8:15 | alignas(...) | alignas(...) |

From 791526e1583c7db9dd1175dff816a45697ce5cdb Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 22 Nov 2024 21:49:09 -0800
Subject: [PATCH 399/435] Address next round of feedback

---
 ...ointersToVariablyModifiedArrayTypesUsed.ql |  4 +-
 .../RULE-18-8/VariableLengthArrayTypesUsed.ql | 47 +++++++++++++++++--
 ...rayToPointerConversionOfTemporaryObject.ql |  2 +-
 c/misra/test/rules/RULE-18-10/test.c          | 12 ++++-
 c/misra/test/rules/RULE-18-8/test.c           | 10 ++--
 .../cpp/VariablyModifiedTypes.qll             | 10 ++++
 6 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
index 6ca2289c67..3a99ebd842 100644
--- a/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-10/PointersToVariablyModifiedArrayTypesUsed.ql
@@ -42,7 +42,9 @@ where
     if v.getType().(PointerType).getBaseType() instanceof CandidateVlaType
     then relationstr = "pointer to"
     else relationstr = "with inner"
-  )
+  ) and
+  // Remove results that appear to be unreliable, potentially from a macro.
+  not v.appearsDuplicated()
 select v,
   declstr + v.getName() + " is " + adjuststr + " variably-modified type, " + relationstr +
     " variable length array of non constant size $@ and element type '" +
diff --git a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
index 8e599f39f7..6e6f5c10c5 100644
--- a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
@@ -15,16 +15,55 @@
 import cpp
 import codingstandards.c.misra
 
-from VlaDeclStmt v, Expr size, ArrayType arrayType, string typeStr
+/**
+ * Typedefs may be declared as VLAs, eg, `typedef int vla[x];`. This query finds types that refer to
+ * such typedef types, for instance `vla foo;` or adding a dimension via `vla bar[10];`.
+ *
+ * Consts and other specifiers may be added, but `vla *ptr;` is not a VLA any more, and is excluded.
+ */
+class VlaTypedefType extends Type {
+  VlaDeclStmt vlaDecl;
+  ArrayType arrayType;
+
+  VlaTypedefType() {
+    // Holds for direct references to the typedef type:
+    this = vlaDecl.getType() and
+    vlaDecl.getType() instanceof TypedefType and
+    arrayType = vlaDecl.getType().stripTopLevelSpecifiers()
+    or
+    // Holds for adding a constant dimension to a VLA typedef type:
+    arrayType = this.stripTopLevelSpecifiers() and
+    vlaDecl = arrayType.getBaseType().(VlaTypedefType).getVlaDeclStmt()
+    or
+    // Carefully ignore specifiers, `stripTopLevelSpecifiers()` resolves past the typedef
+    exists(SpecifiedType st, VlaTypedefType inner |
+      st = this and
+      st.getBaseType() = inner and
+      arrayType = inner.getArrayType() and
+      vlaDecl = inner.getVlaDeclStmt()
+    )
+  }
+
+  VlaDeclStmt getVlaDeclStmt() { result = vlaDecl }
+
+  ArrayType getArrayType() { result = arrayType }
+}
+
+from Variable v, Expr size, ArrayType arrayType, VlaDeclStmt vlaDecl, string typeStr
 where
   not isExcluded(v, Declarations7Package::variableLengthArrayTypesUsedQuery()) and
-  size = v.getVlaDimensionStmt(0).getDimensionExpr() and
+  size = vlaDecl.getVlaDimensionStmt(0).getDimensionExpr() and
   (
     // Holds is if v is a variable declaration:
-    arrayType = v.getVariable().getType().stripTopLevelSpecifiers()
+    v = vlaDecl.getVariable() and
+    arrayType = v.getType().stripTopLevelSpecifiers()
     or
     // Holds is if v is a typedef declaration:
-    arrayType = v.getType().stripTopLevelSpecifiers()
+    exists(VlaTypedefType typedef |
+      v.getType() = typedef and
+      arrayType = typedef.getArrayType() and
+      vlaDecl = typedef.getVlaDeclStmt()
+    )
   ) and
   typeStr = arrayType.getBaseType().toString()
 select v, "Variable length array of element type '" + typeStr + "' with non-constant size $@.",
diff --git a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
index a64ccd44ff..5317966f3b 100644
--- a/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
+++ b/c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql
@@ -66,5 +66,5 @@ where
   fa.getTemporary() = temporary and
   conversion.getExpr() = fa and
   isUsedOrStored(temporaryObjectFlowStep*(conversion.getExpr()))
-select conversion, "Array to pointer conversion of array $@ from temporary object $@",
+select conversion, "Array to pointer conversion of array $@ from temporary object $@.",
   fa.getTarget(), fa.getTarget().getName(), temporary, temporary.toString()
diff --git a/c/misra/test/rules/RULE-18-10/test.c b/c/misra/test/rules/RULE-18-10/test.c
index dbddbecec8..3a44abd264 100644
--- a/c/misra/test/rules/RULE-18-10/test.c
+++ b/c/misra/test/rules/RULE-18-10/test.c
@@ -92,4 +92,14 @@ void f2(int (*p1)[3],    // COMPLIANT
         int (*p3)[2][*], // NON-COMPLIANT[FALSE_NEGATIVE]
         int (*p4)[*][2], // NON-COMPLIANT[FALSE_NEGATIVE]
         int (*p5)[*][*]  // NON-COMPLIANT[FALSE_NEGATIVE]
-);
\ No newline at end of file
+);
+
+#define CONFUSING_MACRO() \
+  int x; \
+  int (*vla)[x]; \
+  int (*not_vla)[];
+
+void f3() {
+  // We cannot report `vla` in this macro without a false positive for `not_vla`.
+  CONFUSING_MACRO() // COMPLIANT
+}
\ No newline at end of file
diff --git a/c/misra/test/rules/RULE-18-8/test.c b/c/misra/test/rules/RULE-18-8/test.c
index c2f6027216..e6e038049c 100644
--- a/c/misra/test/rules/RULE-18-8/test.c
+++ b/c/misra/test/rules/RULE-18-8/test.c
@@ -14,9 +14,13 @@ void f(int n) {
 
   extern int e1[]; // COMPLIANT
 
-  // A typedef is not a VLA. However, `VlaDeclStmt`s match the typedef.
-  typedef int vlaTypedef[n]; // COMPLIANT[FALSE_POSITIVE]
-  vlaTypedef t1;             // NON_COMPLIANT[FALSE_NEGATIVE]
+  // A typedef is not a VLA.
+  typedef int vlaTypedef[n]; // COMPLIANT
+  // The declarations using the typedef may or may not be VLAs.
+  vlaTypedef t1;    // NON_COMPLIANT
+  vlaTypedef t2[1]; // NON_COMPLIANT
+  vlaTypedef t3[x]; // NON_COMPLIANT
+  vlaTypedef *t4;   // COMPLIANT
 }
 
 void f1(int n,
diff --git a/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll b/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
index c0fb3a3db6..9de533d050 100644
--- a/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
+++ b/cpp/common/src/codingstandards/cpp/VariablyModifiedTypes.qll
@@ -2,6 +2,8 @@ import cpp
 
 /**
  * A declaration involving a variably-modified type.
+ *
+ * Note, this holds for both VLA variable and VLA typedefs.
  */
 class VmtDeclarationEntry extends DeclarationEntry {
   Expr sizeExpr;
@@ -28,6 +30,14 @@ class VmtDeclarationEntry extends DeclarationEntry {
   Expr getSizeExpr() { result = sizeExpr }
 
   CandidateVlaType getVlaType() { result = vlaType }
+
+  /* VLAs may occur in macros, and result in duplication that messes up our analysis. */
+  predicate appearsDuplicated() {
+    exists(VmtDeclarationEntry other |
+      other != this and
+      other.getSizeExpr() = getSizeExpr()
+    )
+  }
 }
 
 /**

From b477e34ef5ab008e6b5ce3e7586fa4308427dcbc Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Fri, 22 Nov 2024 21:51:29 -0800
Subject: [PATCH 400/435] Fix macro testcase formatting

---
 c/misra/test/rules/RULE-18-10/test.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/c/misra/test/rules/RULE-18-10/test.c b/c/misra/test/rules/RULE-18-10/test.c
index 3a44abd264..645943733d 100644
--- a/c/misra/test/rules/RULE-18-10/test.c
+++ b/c/misra/test/rules/RULE-18-10/test.c
@@ -94,12 +94,13 @@ void f2(int (*p1)[3],    // COMPLIANT
         int (*p5)[*][*]  // NON-COMPLIANT[FALSE_NEGATIVE]
 );
 
-#define CONFUSING_MACRO() \
-  int x; \
-  int (*vla)[x]; \
-  int (*not_vla)[];
+#define CONFUSING_MACRO()                                                      \
+  int x;                                                                       \
+  int(*vla)[x];                                                                \
+  int(*not_vla)[];
 
 void f3() {
-  // We cannot report `vla` in this macro without a false positive for `not_vla`.
+  // We cannot report `vla` in this macro without a false positive for
+  // `not_vla`.
   CONFUSING_MACRO() // COMPLIANT
 }
\ No newline at end of file

From 3873be762a39d123b9b3048a83881c2a992a6777 Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Sat, 23 Nov 2024 00:03:59 -0800
Subject: [PATCH 401/435] Commit changes to expected files, improve problem
 messages

---
 .../RULE-18-8/VariableLengthArrayTypesUsed.ql | 18 +++---
 .../VariableLengthArrayTypesUsed.expected     | 13 ++--
 ...ointerConversionOfTemporaryObject.expected | 60 +++++++++----------
 3 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
index 6e6f5c10c5..cf19c02eca 100644
--- a/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
+++ b/c/misra/src/rules/RULE-18-8/VariableLengthArrayTypesUsed.ql
@@ -31,16 +31,14 @@ class VlaTypedefType extends Type {
     vlaDecl.getType() instanceof TypedefType and
     arrayType = vlaDecl.getType().stripTopLevelSpecifiers()
     or
-    // Holds for adding a constant dimension to a VLA typedef type:
-    arrayType = this.stripTopLevelSpecifiers() and
-    vlaDecl = arrayType.getBaseType().(VlaTypedefType).getVlaDeclStmt()
-    or
-    // Carefully ignore specifiers, `stripTopLevelSpecifiers()` resolves past the typedef
-    exists(SpecifiedType st, VlaTypedefType inner |
-      st = this and
-      st.getBaseType() = inner and
-      arrayType = inner.getArrayType() and
-      vlaDecl = inner.getVlaDeclStmt()
+    // Handle arrays of VLA typedefs, and carefully handle specified VLA typedef types, as
+    // `stripTopLevelSpecifiers` resolves past the VLA typedef type.
+    exists(DerivedType dt, VlaTypedefType vlaType |
+      (dt instanceof ArrayType or dt instanceof SpecifiedType) and
+      this = dt and
+      vlaType = dt.getBaseType() and
+      vlaDecl = vlaType.getVlaDeclStmt() and
+      arrayType = vlaType.getArrayType()
     )
   }
 
diff --git a/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected b/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected
index 24856619bf..af73daccfd 100644
--- a/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected
+++ b/c/misra/test/rules/RULE-18-8/VariableLengthArrayTypesUsed.expected
@@ -1,5 +1,8 @@
-| test.c:6:7:6:7 | VLA declaration | Variable length array of element type 'int' with non-constant size $@. | test.c:6:10:6:14 | ... + ... | ... + ... |
-| test.c:7:7:7:7 | VLA declaration | Variable length array of element type 'int' with non-constant size $@. | test.c:7:10:7:10 | n | n |
-| test.c:8:7:8:7 | VLA declaration | Variable length array of element type 'int[]' with non-constant size $@. | test.c:8:13:8:13 | n | n |
-| test.c:12:7:12:7 | VLA declaration | Variable length array of element type 'int[1]' with non-constant size $@. | test.c:12:10:12:10 | n | n |
-| test.c:18:15:18:15 | VLA declaration | Variable length array of element type 'int' with non-constant size $@. | test.c:18:26:18:26 | n | n |
+| test.c:6:7:6:8 | a1 | Variable length array of element type 'int' with non-constant size $@. | test.c:6:10:6:14 | ... + ... | ... + ... |
+| test.c:7:7:7:8 | a2 | Variable length array of element type 'int' with non-constant size $@. | test.c:7:10:7:10 | n | n |
+| test.c:8:7:8:8 | a3 | Variable length array of element type 'int[]' with non-constant size $@. | test.c:8:13:8:13 | n | n |
+| test.c:12:7:12:8 | a7 | Variable length array of element type 'int[1]' with non-constant size $@. | test.c:12:10:12:10 | n | n |
+| test.c:20:14:20:15 | t1 | Variable length array of element type 'int' with non-constant size $@. | test.c:18:26:18:26 | n | n |
+| test.c:21:14:21:15 | t2 | Variable length array of element type 'int' with non-constant size $@. | test.c:18:26:18:26 | n | n |
+| test.c:22:14:22:15 | t3 | Variable length array of element type 'int' with non-constant size $@. | test.c:18:26:18:26 | n | n |
+| test.c:22:14:22:15 | t3 | Variable length array of element type 'vlaTypedef' with non-constant size $@. | test.c:22:17:22:17 | x | x |
diff --git a/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected b/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected
index 7d760dc4a6..688dde4650 100644
--- a/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected
+++ b/c/misra/test/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.expected
@@ -1,30 +1,30 @@
-| test.c:45:3:45:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:45:3:45:8 | call to get_s1 | call to get_s1 |
-| test.c:46:3:46:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:46:3:46:8 | call to get_s1 | call to get_s1 |
-| test.c:47:7:47:24 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:47:7:47:12 | call to get_s1 | call to get_s1 |
-| test.c:48:4:48:21 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:48:4:48:9 | call to get_s1 | call to get_s1 |
-| test.c:49:4:49:21 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:49:4:49:9 | call to get_s1 | call to get_s1 |
-| test.c:50:3:50:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:50:3:50:8 | call to get_s1 | call to get_s1 |
-| test.c:51:3:51:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:51:3:51:8 | call to get_s1 | call to get_s1 |
-| test.c:52:3:52:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:52:3:52:8 | call to get_s1 | call to get_s1 |
-| test.c:53:3:53:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:53:3:53:8 | call to get_s1 | call to get_s1 |
-| test.c:54:3:54:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:54:3:54:8 | call to get_s1 | call to get_s1 |
-| test.c:55:8:55:25 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:55:8:55:13 | call to get_s1 | call to get_s1 |
-| test.c:56:3:56:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:56:3:56:8 | call to get_s1 | call to get_s1 |
-| test.c:57:8:57:25 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:57:8:57:13 | call to get_s1 | call to get_s1 |
-| test.c:58:3:58:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:58:3:58:8 | call to get_s1 | call to get_s1 |
-| test.c:59:3:59:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:59:3:59:8 | call to get_s1 | call to get_s1 |
-| test.c:60:15:60:32 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:60:15:60:20 | call to get_s1 | call to get_s1 |
-| test.c:61:16:61:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:61:16:61:21 | call to get_s1 | call to get_s1 |
-| test.c:62:23:62:40 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:62:23:62:28 | call to get_s1 | call to get_s1 |
-| test.c:63:7:63:24 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:63:7:63:12 | call to get_s1 | call to get_s1 |
-| test.c:64:16:64:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:64:16:64:21 | call to get_s1 | call to get_s1 |
-| test.c:65:15:65:32 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:65:15:65:20 | call to get_s1 | call to get_s1 |
-| test.c:66:16:66:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:66:16:66:21 | call to get_s1 | call to get_s1 |
-| test.c:67:23:67:40 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:67:23:67:28 | call to get_s1 | call to get_s1 |
-| test.c:89:3:89:30 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:89:12:89:20 | member_s1 | member_s1 |
-| test.c:90:3:90:36 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:90:3:90:26 | access to array | access to array |
-| test.c:91:15:91:42 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:91:24:91:32 | member_s1 | member_s1 |
-| test.c:92:15:92:48 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:92:15:92:38 | access to array | access to array |
-| test.c:111:15:111:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:111:16:111:22 | ... = ... | ... = ... |
-| test.c:113:15:113:37 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:113:16:113:26 | ... ? ... : ... | ... ? ... : ... |
-| test.c:114:15:114:31 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@ | test.c:3:13:3:21 | const_arr | const_arr | test.c:114:16:114:20 | ... , ... | ... , ... |
+| test.c:45:3:45:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:45:3:45:8 | call to get_s1 | call to get_s1 |
+| test.c:46:3:46:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:46:3:46:8 | call to get_s1 | call to get_s1 |
+| test.c:47:7:47:24 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:47:7:47:12 | call to get_s1 | call to get_s1 |
+| test.c:48:4:48:21 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:48:4:48:9 | call to get_s1 | call to get_s1 |
+| test.c:49:4:49:21 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:49:4:49:9 | call to get_s1 | call to get_s1 |
+| test.c:50:3:50:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:50:3:50:8 | call to get_s1 | call to get_s1 |
+| test.c:51:3:51:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:51:3:51:8 | call to get_s1 | call to get_s1 |
+| test.c:52:3:52:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:52:3:52:8 | call to get_s1 | call to get_s1 |
+| test.c:53:3:53:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:53:3:53:8 | call to get_s1 | call to get_s1 |
+| test.c:54:3:54:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:54:3:54:8 | call to get_s1 | call to get_s1 |
+| test.c:55:8:55:25 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:55:8:55:13 | call to get_s1 | call to get_s1 |
+| test.c:56:3:56:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:56:3:56:8 | call to get_s1 | call to get_s1 |
+| test.c:57:8:57:25 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:57:8:57:13 | call to get_s1 | call to get_s1 |
+| test.c:58:3:58:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:58:3:58:8 | call to get_s1 | call to get_s1 |
+| test.c:59:3:59:20 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:59:3:59:8 | call to get_s1 | call to get_s1 |
+| test.c:60:15:60:32 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:60:15:60:20 | call to get_s1 | call to get_s1 |
+| test.c:61:16:61:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:61:16:61:21 | call to get_s1 | call to get_s1 |
+| test.c:62:23:62:40 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:62:23:62:28 | call to get_s1 | call to get_s1 |
+| test.c:63:7:63:24 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:63:7:63:12 | call to get_s1 | call to get_s1 |
+| test.c:64:16:64:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:64:16:64:21 | call to get_s1 | call to get_s1 |
+| test.c:65:15:65:32 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:65:15:65:20 | call to get_s1 | call to get_s1 |
+| test.c:66:16:66:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:66:16:66:21 | call to get_s1 | call to get_s1 |
+| test.c:67:23:67:40 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:67:23:67:28 | call to get_s1 | call to get_s1 |
+| test.c:89:3:89:30 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:89:12:89:20 | member_s1 | member_s1 |
+| test.c:90:3:90:36 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:90:3:90:26 | access to array | access to array |
+| test.c:91:15:91:42 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:91:24:91:32 | member_s1 | member_s1 |
+| test.c:92:15:92:48 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:92:15:92:38 | access to array | access to array |
+| test.c:111:15:111:33 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:111:16:111:22 | ... = ... | ... = ... |
+| test.c:113:15:113:37 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:113:16:113:26 | ... ? ... : ... | ... ? ... : ... |
+| test.c:114:15:114:31 | array to pointer conversion | Array to pointer conversion of array $@ from temporary object $@. | test.c:3:13:3:21 | const_arr | const_arr | test.c:114:16:114:20 | ... , ... | ... , ... |

From e9b3ebd1c9e4e92d83ac47a6a65f119709e0a5a5 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Mon, 25 Nov 2024 10:15:29 +0900
Subject: [PATCH 402/435] Add markers for non-compliant cases

---
 cpp/autosar/test/rules/A7-1-2/test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/autosar/test/rules/A7-1-2/test.cpp b/cpp/autosar/test/rules/A7-1-2/test.cpp
index 1bbe32a933..664a9cb8e7 100644
--- a/cpp/autosar/test/rules/A7-1-2/test.cpp
+++ b/cpp/autosar/test/rules/A7-1-2/test.cpp
@@ -127,7 +127,7 @@ class MissingConstexprClass {
   MissingConstexprClass(int i) = delete;           // NON_COMPLIANT
   MissingConstexprClass(int i, LiteralClass lc) {} // NON_COMPLIANT
 private:
-  int m1 = 0;
+  int m1 = 0; // NON_COMPLIANT
 };
 
 class VirtualBaseClass {};
@@ -138,7 +138,7 @@ class DerivedClass : public virtual VirtualBaseClass {
   DerivedClass(int i) = delete;           // COMPLIANT
   DerivedClass(int i, LiteralClass lc) {} // COMPLIANT
 private:
-  int m1 = 0;
+  int m1 = 0; // NON_COMPLIANT
 };
 
 class NotAllMembersInitializedClass {

From 56d886e8cd24d9ee2c9120e91881d9174f8a5b89 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 26 Nov 2024 13:05:28 +0900
Subject: [PATCH 403/435] Fix as per review comments

---
 ...hatContainsForwardingReferenceAsItsArgumentOverloaded.ql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
index e3fb59bd8a..1ae2bc87ab 100644
--- a/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
+++ b/cpp/autosar/src/rules/A13-3-1/FunctionThatContainsForwardingReferenceAsItsArgumentOverloaded.ql
@@ -14,6 +14,7 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.FunctionEquivalence
 
 class Candidate extends TemplateFunction {
   Candidate() {
@@ -29,9 +30,8 @@ where
     OperatorsPackage::functionThatContainsForwardingReferenceAsItsArgumentOverloadedQuery()) and
   not f.isDeleted() and
   f = c.getAnOverload() and
-  // CodeQL sometimes fetches an overloaded function at the same location.
-  // Thus, a check is added explicitly (refer #796).
-  f.getLocation() != c.getLocation() and
+  // Ensure the functions are not equivalent to each other (refer #796).
+  not f = getAnEquivalentFunction(c) and
   // allow for overloading with different number of parameters, because there is no
   // confusion on what function will be called.
   f.getNumberOfParameters() = c.getNumberOfParameters() and

From b8d399e2a327c0d8d6c74e8b5863b95d5228d905 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 27 Nov 2024 23:49:55 +0000
Subject: [PATCH 404/435] M5-0-3: Consider static casts to be cvalues, as per
 spec

---
 ...essionConvertedToDifferentUnderlyingType.expected |  4 +++-
 cpp/autosar/test/rules/M5-0-3/test.cpp               |  3 +++
 cpp/common/src/codingstandards/cpp/Expr.qll          | 12 ++----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected b/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected
index 773691efd1..8ce6a225dc 100644
--- a/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected
+++ b/cpp/autosar/test/rules/M5-0-3/CvalueExpressionConvertedToDifferentUnderlyingType.expected
@@ -2,4 +2,6 @@
 | test.cpp:12:8:12:14 | ... + ... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:12:8:12:14 | ... + ... | expression |
 | test.cpp:14:8:14:13 | ... + ... | Implicit conversion converts cvalue $@ from signed short to signed int. | test.cpp:14:8:14:13 | ... + ... | expression |
 | test.cpp:23:13:23:19 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:23:13:23:19 | ... + ... | expression |
-| test.cpp:30:12:30:18 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:30:12:30:18 | ... + ... | expression |
+| test.cpp:25:13:25:45 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:25:13:25:45 | static_cast<int8_t>... | expression |
+| test.cpp:31:12:31:18 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:31:12:31:18 | ... + ... | expression |
+| test.cpp:33:12:33:44 | (int16_t)... | Implicit conversion converts cvalue $@ from signed char to signed short. | test.cpp:33:12:33:44 | static_cast<int8_t>... | expression |
diff --git a/cpp/autosar/test/rules/M5-0-3/test.cpp b/cpp/autosar/test/rules/M5-0-3/test.cpp
index 9f368bae3f..7275204519 100644
--- a/cpp/autosar/test/rules/M5-0-3/test.cpp
+++ b/cpp/autosar/test/rules/M5-0-3/test.cpp
@@ -22,12 +22,15 @@ void test_func_call() {
   std::int8_t l1;
   int16_arg(l1 + l1);                            // NON_COMPLIANT
   int16_arg(static_cast<std::int16_t>(l1 + l1)); // COMPLIANT
+  int16_arg(static_cast<std::int8_t>(l1 + l1));  // NON_COMPLIANT
 }
 
 std::int16_t test_return(int test) {
   std::int8_t l1;
   if (test > 0) {
     return l1 + l1; // NON_COMPLIANT
+  } else if (test < 0) {
+    return static_cast<std::int8_t>(l1 + l1); // NON_COMPLIANT
   } else {
     return static_cast<std::int16_t>(l1 + l1); // COMPLIANT
   }
diff --git a/cpp/common/src/codingstandards/cpp/Expr.qll b/cpp/common/src/codingstandards/cpp/Expr.qll
index 51066cf4cb..c97c808f6f 100644
--- a/cpp/common/src/codingstandards/cpp/Expr.qll
+++ b/cpp/common/src/codingstandards/cpp/Expr.qll
@@ -148,17 +148,9 @@ module MisraExpr {
   private predicate isCValue(Expr e) {
     not e.isConstant() and
     (
-      exists(ReturnStmt return |
-        e = return.getExpr() and
-        // Only return statements which are not explicitly casted are considered
-        not exists(Cast c | not c.isImplicit() and c.getExpr() = e)
-      )
+      exists(ReturnStmt return | e = return.getExpr().getExplicitlyConverted())
       or
-      exists(FunctionCall call |
-        e = call.getAnArgument() and
-        // // Only function arguments which are not explicitly casted are considered
-        not exists(Cast c | not c.isImplicit() and c.getExpr() = e)
-      )
+      exists(FunctionCall call | e = call.getAnArgument().getExplicitlyConverted())
     )
     or
     isCValue(e.(ParenthesisExpr).getExpr())

From 9a1cbf3e1ddd88bbb6c8ca7b6eb61f5a9b9513aa Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Tue, 3 Dec 2024 15:02:22 +0000
Subject: [PATCH 405/435] Cvalue widening change note

---
 change_notes/2024-10-23-cvalue-widening.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-10-23-cvalue-widening.md

diff --git a/change_notes/2024-10-23-cvalue-widening.md b/change_notes/2024-10-23-cvalue-widening.md
new file mode 100644
index 0000000000..1d7a0f876a
--- /dev/null
+++ b/change_notes/2024-10-23-cvalue-widening.md
@@ -0,0 +1,2 @@
+ - `M5-0-3`, `M5-0-7`, `M5-0-8`, `M5-0-9` - `CvalueExpressionConvertedToDifferentUnderlyingType.ql`, `ExplicitFloatingIntegralConversionOfACValueExpr.ql`, `ExplicitWideningConversionOfACValueExpr.ql`, `ExplicitSignedness.ql`:
+   - Reduce false positives from misidentifying an explicitly casted expression used as a function argument or return value as a `cvalue`.

From 466f16ec87d17af43abcb67357f7c503a3a2512b Mon Sep 17 00:00:00 2001
From: lcartey <5377966+lcartey@users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:01:54 +0000
Subject: [PATCH 406/435] Upgrading `github/codeql` dependency to 2.18.4

---
 c/cert/src/codeql-pack.lock.yml               | 20 ++++++++++++-------
 c/cert/src/qlpack.yml                         |  2 +-
 c/cert/test/codeql-pack.lock.yml              | 20 ++++++++++++-------
 c/common/src/codeql-pack.lock.yml             | 20 ++++++++++++-------
 c/common/src/qlpack.yml                       |  2 +-
 c/common/test/codeql-pack.lock.yml            | 20 ++++++++++++-------
 c/misra/src/codeql-pack.lock.yml              | 20 ++++++++++++-------
 c/misra/src/qlpack.yml                        |  2 +-
 c/misra/test/codeql-pack.lock.yml             | 20 ++++++++++++-------
 cpp/autosar/src/codeql-pack.lock.yml          | 20 ++++++++++++-------
 cpp/autosar/src/qlpack.yml                    |  2 +-
 cpp/autosar/test/codeql-pack.lock.yml         | 20 ++++++++++++-------
 cpp/cert/src/codeql-pack.lock.yml             | 20 ++++++++++++-------
 cpp/cert/src/qlpack.yml                       |  2 +-
 cpp/cert/test/codeql-pack.lock.yml            | 20 ++++++++++++-------
 cpp/common/src/codeql-pack.lock.yml           | 20 ++++++++++++-------
 cpp/common/src/qlpack.yml                     |  2 +-
 cpp/common/test/codeql-pack.lock.yml          | 20 ++++++++++++-------
 cpp/misra/src/codeql-pack.lock.yml            | 20 ++++++++++++-------
 cpp/misra/src/qlpack.yml                      |  2 +-
 cpp/misra/test/codeql-pack.lock.yml           | 20 ++++++++++++-------
 cpp/report/src/codeql-pack.lock.yml           | 20 ++++++++++++-------
 cpp/report/src/qlpack.yml                     |  2 +-
 .../queries/codeql-pack.lock.yml              | 20 ++++++++++++-------
 scripts/generate_modules/queries/qlpack.yml   |  2 +-
 supported_codeql_configs.json                 |  6 +++---
 26 files changed, 220 insertions(+), 124 deletions(-)

diff --git a/c/cert/src/codeql-pack.lock.yml b/c/cert/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/c/cert/src/codeql-pack.lock.yml
+++ b/c/cert/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index 00a8221f28..f7454d1ff0 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
diff --git a/c/cert/test/codeql-pack.lock.yml b/c/cert/test/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/c/cert/test/codeql-pack.lock.yml
+++ b/c/cert/test/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/c/common/src/codeql-pack.lock.yml b/c/common/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/c/common/src/codeql-pack.lock.yml
+++ b/c/common/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 41bf42d337..1930faeeb0 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -3,4 +3,4 @@ version: 2.39.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
diff --git a/c/common/test/codeql-pack.lock.yml b/c/common/test/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/c/common/test/codeql-pack.lock.yml
+++ b/c/common/test/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/c/misra/src/codeql-pack.lock.yml b/c/misra/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/c/misra/src/codeql-pack.lock.yml
+++ b/c/misra/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index b160f27b6e..656394ad1d 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -6,4 +6,4 @@ license: MIT
 default-suite-file: codeql-suites/misra-c-default.qls
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
diff --git a/c/misra/test/codeql-pack.lock.yml b/c/misra/test/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/c/misra/test/codeql-pack.lock.yml
+++ b/c/misra/test/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/autosar/src/codeql-pack.lock.yml b/cpp/autosar/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/autosar/src/codeql-pack.lock.yml
+++ b/cpp/autosar/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index cd37cef87e..e1843eb2e7 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
diff --git a/cpp/autosar/test/codeql-pack.lock.yml b/cpp/autosar/test/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/autosar/test/codeql-pack.lock.yml
+++ b/cpp/autosar/test/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/cert/src/codeql-pack.lock.yml b/cpp/cert/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/cert/src/codeql-pack.lock.yml
+++ b/cpp/cert/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 464a5172fc..949087dfd5 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -4,5 +4,5 @@ description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
   codeql/common-cpp-coding-standards: '*'
diff --git a/cpp/cert/test/codeql-pack.lock.yml b/cpp/cert/test/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/cert/test/codeql-pack.lock.yml
+++ b/cpp/cert/test/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/common/src/codeql-pack.lock.yml b/cpp/common/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/common/src/codeql-pack.lock.yml
+++ b/cpp/common/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index 3912f3531f..1cfc63d8d9 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -2,6 +2,6 @@ name: codeql/common-cpp-coding-standards
 version: 2.39.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
 dataExtensions:
 - ext/*.model.yml
diff --git a/cpp/common/test/codeql-pack.lock.yml b/cpp/common/test/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/common/test/codeql-pack.lock.yml
+++ b/cpp/common/test/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/misra/src/codeql-pack.lock.yml b/cpp/misra/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/misra/src/codeql-pack.lock.yml
+++ b/cpp/misra/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index c27400fc8e..4f94ff4bec 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -5,4 +5,4 @@ default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
diff --git a/cpp/misra/test/codeql-pack.lock.yml b/cpp/misra/test/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/misra/test/codeql-pack.lock.yml
+++ b/cpp/misra/test/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/report/src/codeql-pack.lock.yml b/cpp/report/src/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/cpp/report/src/codeql-pack.lock.yml
+++ b/cpp/report/src/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 6477e52747..73f4cf3276 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/report-cpp-coding-standards
 version: 2.39.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
diff --git a/scripts/generate_modules/queries/codeql-pack.lock.yml b/scripts/generate_modules/queries/codeql-pack.lock.yml
index 2cbbccee53..910a6e060e 100644
--- a/scripts/generate_modules/queries/codeql-pack.lock.yml
+++ b/scripts/generate_modules/queries/codeql-pack.lock.yml
@@ -2,17 +2,23 @@
 lockVersion: 1.0.0
 dependencies:
   codeql/cpp-all:
-    version: 0.12.9
+    version: 1.4.2
   codeql/dataflow:
-    version: 0.2.3
+    version: 1.1.1
+  codeql/mad:
+    version: 1.0.7
   codeql/rangeanalysis:
-    version: 0.0.11
+    version: 1.0.7
   codeql/ssa:
-    version: 0.2.12
+    version: 1.0.7
   codeql/tutorial:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/typeflow:
+    version: 1.0.7
   codeql/typetracking:
-    version: 0.2.12
+    version: 1.0.7
   codeql/util:
-    version: 0.2.12
+    version: 1.0.7
+  codeql/xml:
+    version: 1.0.7
 compiled: false
diff --git a/scripts/generate_modules/queries/qlpack.yml b/scripts/generate_modules/queries/qlpack.yml
index fea871b973..88a48269e7 100644
--- a/scripts/generate_modules/queries/qlpack.yml
+++ b/scripts/generate_modules/queries/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/standard-library-extraction-cpp-coding-standards
 version: 0.0.0
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.12.9
+  codeql/cpp-all: 1.4.2
diff --git a/supported_codeql_configs.json b/supported_codeql_configs.json
index e8b2597100..b143f67fe9 100644
--- a/supported_codeql_configs.json
+++ b/supported_codeql_configs.json
@@ -1,9 +1,9 @@
 {
   "supported_environment": [
     {
-      "codeql_cli": "2.16.6",
-      "codeql_standard_library": "codeql-cli/v2.16.6",
-      "codeql_cli_bundle": "codeql-bundle-v2.16.6"
+      "codeql_cli": "2.18.4",
+      "codeql_standard_library": "codeql-cli/v2.18.4",
+      "codeql_cli_bundle": "codeql-bundle-v2.18.4"
     }
   ],
   "supported_language": [

From 585b864eccb3b836659b41941f1d87c8eaabe374 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Wed, 4 Dec 2024 23:02:33 +0000
Subject: [PATCH 407/435] ValidContainerElementAccess: Address new FPs

We had some new false positives because in 2.18.4 string taint is
tracked into the qualifier of a string operation, such as insert.
This caused us to erroneously identify the container itself as a
reference to an element of the container. This has been addressed
by excluding uses of the owning container from pointer or reference
access.
---
 cpp/common/src/codingstandards/cpp/Iterators.qll              | 4 +++-
 .../ValidContainerElementAccess.expected                      | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Iterators.qll b/cpp/common/src/codingstandards/cpp/Iterators.qll
index 8add8598fc..76751aa87b 100644
--- a/cpp/common/src/codingstandards/cpp/Iterators.qll
+++ b/cpp/common/src/codingstandards/cpp/Iterators.qll
@@ -37,7 +37,9 @@ class ContainerPointerOrReferenceAccess extends ContainerAccess {
       ) and
       localTaint(DataFlow::exprNode(fc), DataFlow::exprNode(this)) and
       (getUnderlyingType() instanceof ReferenceType or getUnderlyingType() instanceof PointerType) and
-      fc.getQualifier().(VariableAccess).getTarget() = owningContainer
+      fc.getQualifier().(VariableAccess).getTarget() = owningContainer and
+      // Exclude cases where we see taint into the owning container
+      not this = owningContainer.getAnAccess()
     )
   }
 
diff --git a/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected b/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected
index 1738cbe330..988846beef 100644
--- a/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected
+++ b/cpp/common/test/rules/validcontainerelementaccess/ValidContainerElementAccess.expected
@@ -7,6 +7,4 @@
 | test.cpp:89:15:89:16 | it | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:86:20:86:20 | d | container | test.cpp:92:7:92:12 | call to insert | invalidation |
 | test.cpp:91:9:91:10 | it | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:86:20:86:20 | d | container | test.cpp:92:7:92:12 | call to insert | invalidation |
 | test.cpp:98:56:98:58 | loc | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:96:44:96:46 | str | container | test.cpp:99:9:99:14 | call to insert | invalidation |
-| test.cpp:99:5:99:7 | str | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:96:44:96:46 | str | container | test.cpp:99:9:99:14 | call to insert | invalidation |
 | test.cpp:99:16:99:18 | loc | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:96:44:96:46 | str | container | test.cpp:99:9:99:14 | call to insert | invalidation |
-| test.cpp:106:11:106:13 | str | Elements of $@ not accessed with valid reference, pointer, or iterator because of a prior $@. | test.cpp:103:45:103:47 | str | container | test.cpp:106:15:106:20 | call to insert | invalidation |

From 365c090bc85532c53605b43b1f47aa8c7a765ed9 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 5 Dec 2024 10:18:40 +0000
Subject: [PATCH 408/435] Update expected results files after upgrade

 - Rule 1.5 has an extra data flow node that is harmless.
 - The other rules had changes to the .ql which affected the
   location of the deprecated data flow library warnings.
---
 .../UngetcCallOnStreamPositionZero.expected      |  2 ++
 ...rrayFunctionArgumentNumberOfElements.expected | 12 ++++++------
 ...mpUsedToCompareNullTerminatedStrings.expected |  8 ++++----
 ...penForReadAndWriteOnDifferentStreams.expected |  2 +-
 .../AttemptToWriteToAReadOnlyStream.expected     | 12 ++++++------
 ...BeComparedWithUnmodifiedReturnValues.expected | 16 ++++++++--------
 6 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
index ff25a58e3c..fb8d44ea19 100644
--- a/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
+++ b/c/misra/test/rules/RULE-1-5/UngetcCallOnStreamPositionZero.expected
@@ -1,7 +1,9 @@
 edges
+| test.c:39:16:39:20 | *call to fopen | test.c:39:16:39:20 | *call to fopen | provenance |  |
 | test.c:39:16:39:20 | *call to fopen | test.c:41:15:41:18 | *file | provenance |  |
 nodes
 | test.c:39:16:39:20 | *call to fopen | semmle.label | *call to fopen |
+| test.c:39:16:39:20 | *call to fopen | semmle.label | *call to fopen |
 | test.c:41:15:41:18 | *file | semmle.label | *file |
 subpaths
 #select
diff --git a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
index cb4422f5f1..174c6aa40f 100644
--- a/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
+++ b/c/misra/test/rules/RULE-17-5/ArrayFunctionArgumentNumberOfElements.expected
@@ -1,9 +1,9 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:47,36-44)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:48,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:50,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:55,25-33)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,28-36)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:71,51-59)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:48,36-44)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:49,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:51,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:56,25-33)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:72,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (ArrayFunctionArgumentNumberOfElements.ql:72,51-59)
 | test.c:18:6:18:6 | 0 | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:19:6:19:7 | ar | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
 | test.c:21:6:21:9 | ar2p | The function argument does not have a sufficient number or elements declared in the $@. | test.c:1:13:1:14 | ar | parameter |
diff --git a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
index cf45b21eb4..5ae49919a9 100644
--- a/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
+++ b/c/misra/test/rules/RULE-21-14/MemcmpUsedToCompareNullTerminatedStrings.expected
@@ -1,7 +1,7 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:22,54-62)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:23,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:49,20-28)
-WARNING: module 'TaintTracking' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:57,43-56)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:23,54-62)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:24,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:50,20-28)
+WARNING: module 'TaintTracking' has been deprecated and may be removed in future (MemcmpUsedToCompareNullTerminatedStrings.ql:58,43-56)
 edges
 | test.c:12:13:12:15 | a | test.c:14:10:14:10 | a | provenance |  |
 | test.c:12:13:12:15 | a | test.c:23:13:23:13 | a | provenance |  |
diff --git a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
index 6360b21973..0365f4980d 100644
--- a/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
+++ b/c/misra/test/rules/RULE-22-3/FileOpenForReadAndWriteOnDifferentStreams.expected
@@ -1,4 +1,4 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (FileOpenForReadAndWriteOnDifferentStreams.ql:38,9-17)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (FileOpenForReadAndWriteOnDifferentStreams.ql:39,9-17)
 | test.c:6:14:6:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:5:14:5:18 | call to fopen | here |
 | test.c:17:14:17:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:16:14:16:18 | call to fopen | here |
 | test.c:33:14:33:18 | call to fopen | The same file was already opened $@. Files should not be read and written at the same time using different streams. | test.c:32:14:32:18 | call to fopen | here |
diff --git a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
index 88dca316a2..dbf08e3d3d 100644
--- a/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
+++ b/c/misra/test/rules/RULE-22-4/AttemptToWriteToAReadOnlyStream.expected
@@ -1,8 +1,8 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:18,32-40)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:19,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:24,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:30,21-29)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:32,6-14)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:35,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:19,32-40)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:20,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:25,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:31,21-29)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:33,6-14)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (AttemptToWriteToAReadOnlyStream.ql:36,28-36)
 | test.c:10:3:10:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:9:14:9:18 | call to fopen | stream |
 | test.c:15:3:15:9 | call to fprintf | Attempt to write to a $@ opened as read-only. | test.c:18:14:18:18 | call to fopen | stream |
diff --git a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
index a7ee20c0b0..83a10a46fb 100644
--- a/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
+++ b/c/misra/test/rules/RULE-22-7/EofShallBeComparedWithUnmodifiedReturnValues.expected
@@ -1,10 +1,10 @@
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:22,28-36)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:23,22-30)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:27,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:36,23-31)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:41,17-25)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:50,5-13)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,20-28)
-WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:58,46-54)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:23,28-36)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:24,22-30)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:28,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:37,23-31)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:42,17-25)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:51,5-13)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:59,20-28)
+WARNING: module 'DataFlow' has been deprecated and may be removed in future (EofShallBeComparedWithUnmodifiedReturnValues.ql:59,46-54)
 | test.c:6:7:6:20 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:5:14:5:20 | call to getchar | call to getchar |
 | test.c:13:7:13:15 | ... != ... | The check is not reliable as the type of the return value of $@ is converted. | test.c:12:14:12:20 | call to getchar | call to getchar |

From 7595aa41a7e0bfff32776d5a679e5f9366b30528 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 5 Dec 2024 10:54:28 +0000
Subject: [PATCH 409/435] Add FALSE_NEGATIVE markers for #811

https://github.com/github/codeql-coding-standards/issues/811
---
 cpp/autosar/test/rules/A12-8-6/test.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/autosar/test/rules/A12-8-6/test.cpp b/cpp/autosar/test/rules/A12-8-6/test.cpp
index 6a31ca60ae..d197fc18fb 100644
--- a/cpp/autosar/test/rules/A12-8-6/test.cpp
+++ b/cpp/autosar/test/rules/A12-8-6/test.cpp
@@ -12,8 +12,8 @@ class DerivedClass1 // COMPLIANT - not a base class itself
 
 // Base class with compiler generated move/copy is not compliant, because they
 // are public by default
-class BaseClass2 {}; // NON_COMPLIANT - compiler generated move and assignment
-                     // are in contravention
+class BaseClass2 {}; // NON_COMPLIANT[FALSE_NEGATIVE] - compiler generated move
+                     // and assignment are in contravention
 class DerivedClass2  // COMPLIANT - not a base class itself
     : public BaseClass2 {};
 
@@ -87,7 +87,7 @@ template <class T1> class BaseClass7 {
   BaseClass7 &operator=(BaseClass7 const &) = default; // NON_COMPLIANT
   BaseClass7 &operator=(BaseClass7 &&) = default;      // NON_COMPLIANT
   int operator=(int i); // COMPLIANT - not an assignment operator
-};                      // COMPLIANT
+};
 
 template <class T>
 class DerivedClass7 // COMPLIANT - not a base class itself
@@ -121,7 +121,7 @@ class DerivedClass9 // COMPLIANT - not a base class itself
   T t;
 };
 
-template <class T> class BaseClass9 { // NON_COMPLIANT
+template <class T> class BaseClass9 { // NON_COMPLIANT[FALSE_NEGATIVE]
 
 public:
   BaseClass9() {}

From d7be5cca7f47055a1de40a2e51b308680147c852 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 5 Dec 2024 10:55:05 +0000
Subject: [PATCH 410/435] Add change note for upgrade

---
 change_notes/2024-12-05-upgrade-to-2.18.4.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 change_notes/2024-12-05-upgrade-to-2.18.4.md

diff --git a/change_notes/2024-12-05-upgrade-to-2.18.4.md b/change_notes/2024-12-05-upgrade-to-2.18.4.md
new file mode 100644
index 0000000000..6f3d4ba404
--- /dev/null
+++ b/change_notes/2024-12-05-upgrade-to-2.18.4.md
@@ -0,0 +1,3 @@
+- Updated the CodeQL version to `2.18.4`.
+- `A12-8-6` - `CopyAndMoveNotDeclaredProtected.ql`:
+  - Implicitly created copy and move constructors will no longer be flagged in tenplate instantiations when they are unused, or trivial (tracked at https://github.com/github/codeql-coding-standards/issues/811).
\ No newline at end of file

From 0aa1f5f6965b7835fdcabab09fa60f1b8eea7208 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Thu, 5 Dec 2024 22:45:24 +0000
Subject: [PATCH 411/435] Remove no longer needed false positive markers

---
 cpp/common/test/rules/validcontainerelementaccess/test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/common/test/rules/validcontainerelementaccess/test.cpp b/cpp/common/test/rules/validcontainerelementaccess/test.cpp
index d9e2c2d89a..55c94cf8f1 100644
--- a/cpp/common/test/rules/validcontainerelementaccess/test.cpp
+++ b/cpp/common/test/rules/validcontainerelementaccess/test.cpp
@@ -96,14 +96,14 @@ void f8(const int *ar) {
 void f9(const std::string &s, std::string &str) {
   std::string::iterator loc = str.begin();
   for (auto i = s.begin(), e = s.end(); i != e; ++i, ++loc) { // NON_COMPLIANT
-    str.insert(loc, 'c'); // NON_COMPLIANT[FALSE POSITIVE for str]
+    str.insert(loc, 'c');                                     // NON_COMPLIANT
   }
 }
 
 void f10(const std::string &s, std::string &str) {
   std::string::iterator loc = str.begin();
   for (auto i = s.begin(), e = s.end(); i != e; ++i, ++loc) { // COMPLIANT
-    loc = str.insert(loc, 'c'); // COMPLIANT[FALSE POSITIVE]
+    loc = str.insert(loc, 'c');                               // COMPLIANT
   }
 }
 

From 27efc319d67e44524f3eeeae10b61b85f71671c0 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 6 Dec 2024 22:53:18 +0000
Subject: [PATCH 412/435] Remove unused Scope import

---
 cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql b/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
index 3f91530c84..368c0a05e4 100644
--- a/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
+++ b/cpp/cert/src/rules/DCL53-CPP/LocalFunctionDeclaration.ql
@@ -13,7 +13,6 @@
 
 import cpp
 import codingstandards.cpp.cert
-import codingstandards.cpp.Scope
 
 class LocalUserFunctionDeclarationEntry extends FunctionDeclarationEntry {
   DeclStmt ds;

From 0c92f2efa9b6305fae4e3e188c5eab2939f71886 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Fri, 6 Dec 2024 23:54:56 +0000
Subject: [PATCH 413/435] DCL53-CPP: Migrate to hidesStrict

Any conflicting variable will be, by definition, in a different
scope.
---
 .../LocalConstructorInitializedObjectHidesIdentifier.ql         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql b/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
index 237ebbe985..f6fe18a3db 100644
--- a/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
+++ b/cpp/cert/src/rules/DCL53-CPP/LocalConstructorInitializedObjectHidesIdentifier.ql
@@ -20,6 +20,6 @@ from UserVariable v, UserVariable hidden
 where
   not isExcluded(v, ScopePackage::localConstructorInitializedObjectHidesIdentifierQuery()) and
   v.getInitializer().getExpr() instanceof ConstructorCall and
-  hides(hidden, v)
+  hidesStrict(hidden, v)
 select v, "The declaration declares variable " + v.getName() + " that hides $@", hidden,
   hidden.getName()

From 90d4127a7bc8c8f3a9a09541f39aebb50f25a98d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sat, 7 Dec 2024 00:04:46 +0000
Subject: [PATCH 414/435] Scope: Remove hides(..) and related predicates

There are no more consumers of hides(..).

In addition, it doesn't make sense conceptually to look for
variables in the same scope with the same name, as scopes will
prohibit using the same name in the same scope. Reviewing real
world cases where this occurs, they all seem to be extractor
oddities (multiple copies of parameters for the same function etc.)
which provides further evidence that this mode is not required.
---
 cpp/common/src/codingstandards/cpp/Scope.qll | 28 --------------------
 1 file changed, 28 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index d9a81b98e3..b05c5dc9c4 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -160,15 +160,6 @@ predicate inSameTranslationUnit(File f1, File f2) {
   )
 }
 
-/**
- * Gets a user variable which occurs in the "potential scope" of variable `v`.
- */
-cached
-UserVariable getPotentialScopeOfVariable(UserVariable v) {
-  result = getPotentialScopeOfVariable_candidate(v) and
-  inSameTranslationUnit(v.getFile(), result.getFile())
-}
-
 /**
  * Gets a user variable which occurs in the "outer scope" of variable `v`.
  */
@@ -203,15 +194,6 @@ class TranslationUnit extends SourceFile {
   }
 }
 
-/** Holds if `v2` may hide `v1`. */
-private predicate hides_candidate(UserVariable v1, UserVariable v2) {
-  not v1 = v2 and
-  v2 = getPotentialScopeOfVariable(v1) and
-  v1.getName() = v2.getName() and
-  // Member variables cannot hide other variables nor be hidden because the can be referenced through their qualified name.
-  not (v1.isMember() or v2.isMember())
-}
-
 /** Holds if `v2` may hide `v1`. */
 private predicate hides_candidateStrict(UserVariable v1, UserVariable v2) {
   not v1 = v2 and
@@ -256,16 +238,6 @@ private Stmt getEnclosingStmt(LocalScopeVariable v) {
   )
 }
 
-/** Holds if `v2` hides `v1`. */
-predicate hides(UserVariable v1, UserVariable v2) {
-  hides_candidate(v1, v2) and
-  // Confirm that there's no closer candidate variable which `v2` hides
-  not exists(UserVariable mid |
-    hides_candidate(v1, mid) and
-    hides_candidate(mid, v2)
-  )
-}
-
 /** Holds if `v2` strictly (`v2` is in an inner scope compared to `v1`) hides `v1`. */
 predicate hidesStrict(UserVariable v1, UserVariable v2) {
   hides_candidateStrict(v1, v2) and

From 6b5021a923702d9b85bca2e923ff279b8e5fd69f Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 17:23:28 +0000
Subject: [PATCH 415/435] Scope: Add getParentScope testing

 - Expose the internal getParentScope for testing.
 - Add test cases
---
 cpp/common/src/codingstandards/cpp/Scope.qll  | 107 ++++++++++--------
 .../cpp/scope/ParentScope.expected            |  96 ++++++++++++++++
 .../codingstandards/cpp/scope/ParentScope.ql  |   5 +
 .../codingstandards/cpp/scope/test.cpp        |  37 ++++++
 4 files changed, 195 insertions(+), 50 deletions(-)
 create mode 100644 cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
 create mode 100644 cpp/common/test/library/codingstandards/cpp/scope/ParentScope.ql
 create mode 100644 cpp/common/test/library/codingstandards/cpp/scope/test.cpp

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index b05c5dc9c4..9af5c8e21c 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -5,54 +5,59 @@
 import cpp
 
 /**
- * Gets the parent scope of this `Element`, if any.
- * A scope is a `Type` (`Class` / `Enum`), a `Namespace`, a `Block`, a `Function`,
- * or certain kinds of `Statement`.
- * Differs from `Element::getParentScope` when `e` is a `LoopControlVariable`
+ * Internal module, exposed for testing.
  */
-private Element getParentScope(Element e) {
-  /*
-   * A `Block` cannot have a `ForStmt` as its parent scope so we have to special case
-   * for loop bodies to ensure that identifiers inside the loop bodies have the for stmt as a parent scope.
-   * If this is not the case then `i2` in the following example cannot be in `i1`'s potential scope, because
-   * the parent scope of `i1` is the `ForStmt` while the transitive closure of the parent scope for `i2` doesn't include
-   * outer scope. Blocks can only have blocks as parent scopes.
-   * void f() {
-   *  for( int i1; ... ) {
-   *    for (int i2; ...) {
-   *    }
-   *  }
-   * }
+module Internal {
+  /**
+   * Gets the parent scope of this `Element`, if any.
+   * A scope is a `Type` (`Class` / `Enum`), a `Namespace`, a `Block`, a `Function`,
+   * or certain kinds of `Statement`.
+   * Differs from `Element::getParentScope` when `e` is a `LoopControlVariable`
    */
-
-  exists(Loop loop | loop.getStmt() = e and result = loop)
-  or
-  exists(IfStmt ifStmt |
-    (ifStmt.getThen() = e or ifStmt.getElse() = e) and
-    result = ifStmt
-  )
-  or
-  exists(SwitchStmt switchStmt | switchStmt.getStmt() = e and result = switchStmt)
-  or
-  not result.(Loop).getStmt() = e and
-  not result.(IfStmt).getThen() = e and
-  not result.(IfStmt).getElse() = e and
-  not result.(SwitchStmt).getStmt() = e and
-  if exists(e.getParentScope())
-  then result = e.getParentScope()
-  else (
-    // Statements do no have a parent scope, so return the enclosing block.
-    result = e.(Stmt).getEnclosingBlock()
+  Element getParentScope(Element e) {
+    /*
+     * A `Block` cannot have a `ForStmt` as its parent scope so we have to special case
+     * for loop bodies to ensure that identifiers inside the loop bodies have the for stmt as a parent scope.
+     * If this is not the case then `i2` in the following example cannot be in `i1`'s potential scope, because
+     * the parent scope of `i1` is the `ForStmt` while the transitive closure of the parent scope for `i2` doesn't include
+     * outer scope. Blocks can only have blocks as parent scopes.
+     * void f() {
+     *  for( int i1; ... ) {
+     *    for (int i2; ...) {
+     *    }
+     *  }
+     * }
+     */
+
+    exists(Loop loop | loop.getStmt() = e and result = loop)
+    or
+    exists(IfStmt ifStmt |
+      (ifStmt.getThen() = e or ifStmt.getElse() = e) and
+      result = ifStmt
+    )
     or
-    result = e.(Expr).getEnclosingBlock()
+    exists(SwitchStmt switchStmt | switchStmt.getStmt() = e and result = switchStmt)
     or
-    // Catch block parameters don't have an enclosing scope, so attach them to the
-    // the block itself
-    exists(CatchBlock cb |
-      e = cb.getParameter() and
-      result = cb
+    not result.(Loop).getStmt() = e and
+    not result.(IfStmt).getThen() = e and
+    not result.(IfStmt).getElse() = e and
+    not result.(SwitchStmt).getStmt() = e and
+    if exists(e.getParentScope())
+    then result = e.getParentScope()
+    else (
+      // Statements do no have a parent scope, so return the enclosing block.
+      result = e.(Stmt).getEnclosingBlock()
+      or
+      result = e.(Expr).getEnclosingBlock()
+      or
+      // Catch block parameters don't have an enclosing scope, so attach them to the
+      // the block itself
+      exists(CatchBlock cb |
+        e = cb.getParameter() and
+        result = cb
+      )
     )
-  )
+  }
 }
 
 /** A variable which is defined by the user, rather than being from a third party or compiler generated. */
@@ -68,19 +73,19 @@ class UserVariable extends Variable {
 
 /** An element which is the parent scope of at least one other element in the program. */
 class Scope extends Element {
-  Scope() { this = getParentScope(_) }
+  Scope() { this = Internal::getParentScope(_) }
 
-  UserVariable getAVariable() { getParentScope(result) = this }
+  UserVariable getAVariable() { Internal::getParentScope(result) = this }
 
   int getNumberOfVariables() { result = count(getAVariable()) }
 
   Scope getAnAncestor() { result = this.getStrictParent+() }
 
-  Scope getStrictParent() { result = getParentScope(this) }
+  Scope getStrictParent() { result = Internal::getParentScope(this) }
 
-  Declaration getADeclaration() { getParentScope(result) = this }
+  Declaration getADeclaration() { Internal::getParentScope(result) = this }
 
-  Expr getAnExpr() { this = getParentScope(result) }
+  Expr getAnExpr() { this = Internal::getParentScope(result) }
 
   private predicate getLocationInfo(
     PreprocessorBranchDirective pbd, string file1, string file2, int startline1, int startline2
@@ -112,9 +117,11 @@ class Scope extends Element {
   predicate isGenerated() { this instanceof GeneratedBlockStmt }
 
   int getDepth() {
-    exists(Scope parent | parent = getParentScope(this) and result = 1 + parent.getDepth())
+    exists(Scope parent |
+      parent = Internal::getParentScope(this) and result = 1 + parent.getDepth()
+    )
     or
-    not exists(getParentScope(this)) and result = 0
+    not exists(Internal::getParentScope(this)) and result = 0
   }
 }
 
diff --git a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
new file mode 100644
index 0000000000..0d36cc980d
--- /dev/null
+++ b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
@@ -0,0 +1,96 @@
+| file://:0:0:0:0 | (unnamed parameter 0) | file://:0:0:0:0 | operator= |
+| file://:0:0:0:0 | (unnamed parameter 0) | file://:0:0:0:0 | operator= |
+| file://:0:0:0:0 | (unnamed parameter 0) | test.cpp:8:7:8:7 | operator= |
+| file://:0:0:0:0 | (unnamed parameter 0) | test.cpp:8:7:8:7 | operator= |
+| file://:0:0:0:0 | (unnamed parameter 0) | test.cpp:27:28:27:28 | (unnamed constructor) |
+| file://:0:0:0:0 | (unnamed parameter 0) | test.cpp:27:28:27:28 | (unnamed constructor) |
+| file://:0:0:0:0 | (unnamed parameter 0) | test.cpp:27:28:27:28 | operator= |
+| file://:0:0:0:0 | __va_list_tag | file://:0:0:0:0 | (global namespace) |
+| file://:0:0:0:0 | fp_offset | file://:0:0:0:0 | __va_list_tag |
+| file://:0:0:0:0 | gp_offset | file://:0:0:0:0 | __va_list_tag |
+| file://:0:0:0:0 | operator= | file://:0:0:0:0 | __va_list_tag |
+| file://:0:0:0:0 | operator= | file://:0:0:0:0 | __va_list_tag |
+| file://:0:0:0:0 | overflow_arg_area | file://:0:0:0:0 | __va_list_tag |
+| file://:0:0:0:0 | reg_save_area | file://:0:0:0:0 | __va_list_tag |
+| test.cpp:1:5:1:7 | id1 | file://:0:0:0:0 | (global namespace) |
+| test.cpp:3:11:3:13 | ns1 | file://:0:0:0:0 | (global namespace) |
+| test.cpp:4:5:4:7 | id1 | test.cpp:3:11:3:13 | ns1 |
+| test.cpp:6:11:6:13 | ns1::ns2 | test.cpp:3:11:3:13 | ns1 |
+| test.cpp:7:5:7:7 | id1 | test.cpp:6:11:6:13 | ns1::ns2 |
+| test.cpp:8:7:8:7 | C1 | test.cpp:8:7:8:8 | C1 |
+| test.cpp:8:7:8:7 | operator= | test.cpp:8:7:8:8 | C1 |
+| test.cpp:8:7:8:7 | operator= | test.cpp:8:7:8:8 | C1 |
+| test.cpp:8:7:8:8 | C1 | test.cpp:6:11:6:13 | ns1::ns2 |
+| test.cpp:9:7:9:9 | id1 | test.cpp:8:7:8:8 | C1 |
+| test.cpp:10:8:10:17 | test_scope | test.cpp:8:7:8:8 | C1 |
+| test.cpp:10:23:10:25 | id1 | test.cpp:10:8:10:17 | test_scope |
+| test.cpp:10:28:34:3 | { ... } | test.cpp:10:8:10:17 | test_scope |
+| test.cpp:11:5:33:5 | for(...;...;...) ... | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:10:11:17 | declaration | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:14:11:16 | id1 | test.cpp:11:5:33:5 | for(...;...;...) ... |
+| test.cpp:11:19:11:21 | id1 | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:19:11:25 | ... < ... | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:25:11:25 | 1 | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:28:11:30 | id1 | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:28:11:32 | ... ++ | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:35:33:5 | { ... } | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:35:33:5 | { ... } | test.cpp:11:5:33:5 | for(...;...;...) ... |
+| test.cpp:12:7:32:7 | for(...;...;...) ... | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:12:12:19 | declaration | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:16:12:18 | id1 | test.cpp:12:7:32:7 | for(...;...;...) ... |
+| test.cpp:12:21:12:23 | id1 | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:21:12:27 | ... < ... | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:27:12:27 | 1 | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:30:12:32 | id1 | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:30:12:34 | ... ++ | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:37:32:7 | { ... } | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:37:32:7 | { ... } | test.cpp:12:7:32:7 | for(...;...;...) ... |
+| test.cpp:13:9:31:9 | { ... } | test.cpp:12:37:32:7 | { ... } |
+| test.cpp:14:11:14:18 | declaration | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:14:15:14:17 | id1 | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:16:11:20:11 | if (...) ...  | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:16:15:16:17 | id1 | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:16:15:16:22 | ... == ... | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:16:22:16:22 | 0 | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:16:25:18:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:16:25:18:11 | { ... } | test.cpp:16:11:20:11 | if (...) ...  |
+| test.cpp:17:13:17:20 | declaration | test.cpp:16:25:18:11 | { ... } |
+| test.cpp:17:17:17:19 | id1 | test.cpp:16:25:18:11 | { ... } |
+| test.cpp:18:18:20:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:18:18:20:11 | { ... } | test.cpp:16:11:20:11 | if (...) ...  |
+| test.cpp:19:13:19:20 | declaration | test.cpp:18:18:20:11 | { ... } |
+| test.cpp:19:17:19:19 | id1 | test.cpp:18:18:20:11 | { ... } |
+| test.cpp:21:11:25:11 | switch (...) ...  | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:21:19:21:21 | id1 | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:21:24:25:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:21:24:25:11 | { ... } | test.cpp:21:11:25:11 | switch (...) ...  |
+| test.cpp:22:11:22:17 | case ...: | test.cpp:21:24:25:11 | { ... } |
+| test.cpp:22:16:22:16 | 0 | test.cpp:21:24:25:11 | { ... } |
+| test.cpp:23:13:23:20 | declaration | test.cpp:21:24:25:11 | { ... } |
+| test.cpp:23:17:23:19 | id1 | test.cpp:21:24:25:11 | { ... } |
+| test.cpp:24:13:24:18 | break; | test.cpp:21:24:25:11 | { ... } |
+| test.cpp:25:11:25:11 | label ...: | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:26:11:28:11 | try { ... } | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:26:15:28:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:27:13:27:53 | declaration | test.cpp:26:15:28:11 | { ... } |
+| test.cpp:27:18:27:24 | lambda1 | test.cpp:26:15:28:11 | { ... } |
+| test.cpp:27:27:27:52 | [...](...){...} | test.cpp:26:15:28:11 | { ... } |
+| test.cpp:27:27:27:52 | {...} | test.cpp:26:15:28:11 | { ... } |
+| test.cpp:27:28:27:28 | (unnamed constructor) | file://:0:0:0:0 | decltype([...](...){...}) |
+| test.cpp:27:28:27:28 | (unnamed constructor) | file://:0:0:0:0 | decltype([...](...){...}) |
+| test.cpp:27:28:27:28 | (unnamed constructor) | file://:0:0:0:0 | decltype([...](...){...}) |
+| test.cpp:27:28:27:28 | operator= | file://:0:0:0:0 | decltype([...](...){...}) |
+| test.cpp:27:29:27:29 | id1 | file://:0:0:0:0 | decltype([...](...){...}) |
+| test.cpp:27:29:27:31 | id1 | test.cpp:26:15:28:11 | { ... } |
+| test.cpp:27:33:27:33 | operator() | file://:0:0:0:0 | decltype([...](...){...}) |
+| test.cpp:27:36:27:52 | { ... } | test.cpp:27:33:27:33 | operator() |
+| test.cpp:27:38:27:50 | declaration | test.cpp:27:36:27:52 | { ... } |
+| test.cpp:27:42:27:44 | id1 | test.cpp:27:36:27:52 | { ... } |
+| test.cpp:27:47:27:49 | 10 | test.cpp:27:36:27:52 | { ... } |
+| test.cpp:27:52:27:52 | return ... | test.cpp:27:36:27:52 | { ... } |
+| test.cpp:28:24:28:26 | id1 | test.cpp:28:29:30:11 | { ... } |
+| test.cpp:28:29:30:11 | <handler> | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:28:29:30:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:29:13:29:20 | declaration | test.cpp:28:29:30:11 | { ... } |
+| test.cpp:29:17:29:19 | id1 | test.cpp:28:29:30:11 | { ... } |
+| test.cpp:34:3:34:3 | return ... | test.cpp:10:28:34:3 | { ... } |
diff --git a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.ql b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.ql
new file mode 100644
index 0000000000..47d27fb0f0
--- /dev/null
+++ b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.ql
@@ -0,0 +1,5 @@
+import codingstandards.cpp.Scope
+
+from Element e, Element parent
+where Internal::getParentScope(e) = parent
+select e, parent
diff --git a/cpp/common/test/library/codingstandards/cpp/scope/test.cpp b/cpp/common/test/library/codingstandards/cpp/scope/test.cpp
new file mode 100644
index 0000000000..a0b617916d
--- /dev/null
+++ b/cpp/common/test/library/codingstandards/cpp/scope/test.cpp
@@ -0,0 +1,37 @@
+int id1;
+
+namespace ns1 {
+int id1; // COMPLIANT
+
+namespace ns2 {
+int id1; // COMPLIANT
+class C1 {
+  int id1;
+  void test_scope(int id1) {
+    for (int id1; id1 < 1; id1++) {
+      for (int id1; id1 < 1; id1++) {
+        {
+          int id1;
+
+          if (id1 == 0) {
+            int id1;
+          } else {
+            int id1;
+          }
+          switch (id1) {
+          case 0:
+            int id1;
+            break;
+          }
+          try {
+            auto lambda1 = [id1]() { int id1 = 10; };
+          } catch (int id1) {
+            int id1;
+          }
+        }
+      }
+    }
+  }
+};
+} // namespace ns2
+} // namespace ns1

From b8b41312c24fa6d9ce511a5d0543ddef08c7f6ee Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 17:26:09 +0000
Subject: [PATCH 416/435] Scope: Address logic flaw creating multiple parents

We adjust the parent scope explicitly for loops, if statements and
switch statements, but, due to a logic bug, we previously retained
the existing results provided by Element.getParentScope().
---
 cpp/common/src/codingstandards/cpp/Scope.qll               | 7 +++----
 .../library/codingstandards/cpp/scope/ParentScope.expected | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index 9af5c8e21c..ce8c5be113 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -38,10 +38,9 @@ module Internal {
     or
     exists(SwitchStmt switchStmt | switchStmt.getStmt() = e and result = switchStmt)
     or
-    not result.(Loop).getStmt() = e and
-    not result.(IfStmt).getThen() = e and
-    not result.(IfStmt).getElse() = e and
-    not result.(SwitchStmt).getStmt() = e and
+    not exists(Loop loop | loop.getStmt() = e) and
+    not exists(IfStmt ifStmt | ifStmt.getThen() = e or ifStmt.getElse() = e) and
+    not exists(SwitchStmt switchStmt | switchStmt.getStmt() = e) and
     if exists(e.getParentScope())
     then result = e.getParentScope()
     else (
diff --git a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
index 0d36cc980d..6335394970 100644
--- a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
+++ b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
@@ -33,7 +33,6 @@
 | test.cpp:11:25:11:25 | 1 | test.cpp:10:28:34:3 | { ... } |
 | test.cpp:11:28:11:30 | id1 | test.cpp:10:28:34:3 | { ... } |
 | test.cpp:11:28:11:32 | ... ++ | test.cpp:10:28:34:3 | { ... } |
-| test.cpp:11:35:33:5 | { ... } | test.cpp:10:28:34:3 | { ... } |
 | test.cpp:11:35:33:5 | { ... } | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:12:7:32:7 | for(...;...;...) ... | test.cpp:11:35:33:5 | { ... } |
 | test.cpp:12:12:12:19 | declaration | test.cpp:11:35:33:5 | { ... } |
@@ -43,7 +42,6 @@
 | test.cpp:12:27:12:27 | 1 | test.cpp:11:35:33:5 | { ... } |
 | test.cpp:12:30:12:32 | id1 | test.cpp:11:35:33:5 | { ... } |
 | test.cpp:12:30:12:34 | ... ++ | test.cpp:11:35:33:5 | { ... } |
-| test.cpp:12:37:32:7 | { ... } | test.cpp:11:35:33:5 | { ... } |
 | test.cpp:12:37:32:7 | { ... } | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:13:9:31:9 | { ... } | test.cpp:12:37:32:7 | { ... } |
 | test.cpp:14:11:14:18 | declaration | test.cpp:13:9:31:9 | { ... } |
@@ -52,17 +50,14 @@
 | test.cpp:16:15:16:17 | id1 | test.cpp:13:9:31:9 | { ... } |
 | test.cpp:16:15:16:22 | ... == ... | test.cpp:13:9:31:9 | { ... } |
 | test.cpp:16:22:16:22 | 0 | test.cpp:13:9:31:9 | { ... } |
-| test.cpp:16:25:18:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
 | test.cpp:16:25:18:11 | { ... } | test.cpp:16:11:20:11 | if (...) ...  |
 | test.cpp:17:13:17:20 | declaration | test.cpp:16:25:18:11 | { ... } |
 | test.cpp:17:17:17:19 | id1 | test.cpp:16:25:18:11 | { ... } |
-| test.cpp:18:18:20:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
 | test.cpp:18:18:20:11 | { ... } | test.cpp:16:11:20:11 | if (...) ...  |
 | test.cpp:19:13:19:20 | declaration | test.cpp:18:18:20:11 | { ... } |
 | test.cpp:19:17:19:19 | id1 | test.cpp:18:18:20:11 | { ... } |
 | test.cpp:21:11:25:11 | switch (...) ...  | test.cpp:13:9:31:9 | { ... } |
 | test.cpp:21:19:21:21 | id1 | test.cpp:13:9:31:9 | { ... } |
-| test.cpp:21:24:25:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
 | test.cpp:21:24:25:11 | { ... } | test.cpp:21:11:25:11 | switch (...) ...  |
 | test.cpp:22:11:22:17 | case ...: | test.cpp:21:24:25:11 | { ... } |
 | test.cpp:22:16:22:16 | 0 | test.cpp:21:24:25:11 | { ... } |

From 1f8e2baedb543b5a4318fc87d63b797865902f18 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 17:31:41 +0000
Subject: [PATCH 417/435] Scope: Ensure loop entries have correct parent scope

All direct children of a for loop should have the for loop itself
as the scope.
---
 cpp/common/src/codingstandards/cpp/Scope.qll         |  4 ++--
 .../codingstandards/cpp/scope/ParentScope.expected   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index ce8c5be113..ad99ab8bd4 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -29,7 +29,7 @@ module Internal {
      * }
      */
 
-    exists(Loop loop | loop.getStmt() = e and result = loop)
+    exists(Loop loop | loop.getAChild() = e and result = loop)
     or
     exists(IfStmt ifStmt |
       (ifStmt.getThen() = e or ifStmt.getElse() = e) and
@@ -38,7 +38,7 @@ module Internal {
     or
     exists(SwitchStmt switchStmt | switchStmt.getStmt() = e and result = switchStmt)
     or
-    not exists(Loop loop | loop.getStmt() = e) and
+    not exists(Loop loop | loop.getAChild() = e) and
     not exists(IfStmt ifStmt | ifStmt.getThen() = e or ifStmt.getElse() = e) and
     not exists(SwitchStmt switchStmt | switchStmt.getStmt() = e) and
     if exists(e.getParentScope())
diff --git a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
index 6335394970..34a48c8065 100644
--- a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
+++ b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
@@ -26,22 +26,22 @@
 | test.cpp:10:23:10:25 | id1 | test.cpp:10:8:10:17 | test_scope |
 | test.cpp:10:28:34:3 | { ... } | test.cpp:10:8:10:17 | test_scope |
 | test.cpp:11:5:33:5 | for(...;...;...) ... | test.cpp:10:28:34:3 | { ... } |
-| test.cpp:11:10:11:17 | declaration | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:10:11:17 | declaration | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:14:11:16 | id1 | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:19:11:21 | id1 | test.cpp:10:28:34:3 | { ... } |
-| test.cpp:11:19:11:25 | ... < ... | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:19:11:25 | ... < ... | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:25:11:25 | 1 | test.cpp:10:28:34:3 | { ... } |
 | test.cpp:11:28:11:30 | id1 | test.cpp:10:28:34:3 | { ... } |
-| test.cpp:11:28:11:32 | ... ++ | test.cpp:10:28:34:3 | { ... } |
+| test.cpp:11:28:11:32 | ... ++ | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:11:35:33:5 | { ... } | test.cpp:11:5:33:5 | for(...;...;...) ... |
 | test.cpp:12:7:32:7 | for(...;...;...) ... | test.cpp:11:35:33:5 | { ... } |
-| test.cpp:12:12:12:19 | declaration | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:12:12:19 | declaration | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:16:12:18 | id1 | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:21:12:23 | id1 | test.cpp:11:35:33:5 | { ... } |
-| test.cpp:12:21:12:27 | ... < ... | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:21:12:27 | ... < ... | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:27:12:27 | 1 | test.cpp:11:35:33:5 | { ... } |
 | test.cpp:12:30:12:32 | id1 | test.cpp:11:35:33:5 | { ... } |
-| test.cpp:12:30:12:34 | ... ++ | test.cpp:11:35:33:5 | { ... } |
+| test.cpp:12:30:12:34 | ... ++ | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:12:37:32:7 | { ... } | test.cpp:12:7:32:7 | for(...;...;...) ... |
 | test.cpp:13:9:31:9 | { ... } | test.cpp:12:37:32:7 | { ... } |
 | test.cpp:14:11:14:18 | declaration | test.cpp:13:9:31:9 | { ... } |

From 63a60b1855f00c96a63e16242055ab2f660782f8 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 18:19:26 +0000
Subject: [PATCH 418/435] Scope: Address performance issues with
 excludedViaNestedNamespace

Add pragma_inline to ensure we consider this as a post-filtering
step.
---
 cpp/common/src/codingstandards/cpp/Scope.qll | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index ad99ab8bd4..3e1bb6c803 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -269,6 +269,8 @@ predicate hasBlockScope(Declaration decl) { exists(BlockStmt b | b.getADeclarati
 /**
  * identifiers in nested (named/nonglobal) namespaces are exceptions to hiding due to being able access via fully qualified ids
  */
+bindingset[outerDecl, innerDecl]
+pragma[inline_late]
 predicate excludedViaNestedNamespaces(UserVariable outerDecl, UserVariable innerDecl) {
   exists(Namespace inner, Namespace outer |
     outer.getAChildNamespace+() = inner and

From 1bd839c34c39e3546484d666ebe8b15d0e9e0451 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sat, 7 Dec 2024 00:43:37 +0000
Subject: [PATCH 419/435] Scope: Improve performance of hidesStrict

Improves performance by:
 - Capturing for each scope the list of names defined by nested
   scopes
 - Use that to determine hidden identifiers for a scope.
 - Separately determine the hiding identifiers for a scope.

This addresses performance issues in the now deleted predicate
getOuterScopesOfVariable_candidate().
---
 cpp/common/src/codingstandards/cpp/Scope.qll | 119 +++++++++++++------
 1 file changed, 82 insertions(+), 37 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index 3e1bb6c803..8e618cb21e 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -122,39 +122,77 @@ class Scope extends Element {
     or
     not exists(Internal::getParentScope(this)) and result = 0
   }
-}
 
-class GeneratedBlockStmt extends BlockStmt {
-  GeneratedBlockStmt() { this.getLocation() instanceof UnknownLocation }
-}
+  /**
+   * Holds if `name` is declared in this scope, or in a nested scope.
+   */
+  private predicate isNameDeclaredInThisOrNestedScope(string name) {
+    name = getAVariable().getName()
+    or
+    isNameDeclaredInNestedScope(name)
+  }
+
+  /**
+   * Holds if `name` is declared in a nested scope.
+   */
+  private predicate isNameDeclaredInNestedScope(string name) {
+    exists(Scope child |
+      child.getStrictParent() = this and
+      child.isNameDeclaredInThisOrNestedScope(name)
+    )
+  }
+
+  /**
+   * Holds if `name` is declared in this scope and is hidden in a child scope.
+   */
+  private predicate isDeclaredNameHiddenByChild(string name) {
+    isNameDeclaredInNestedScope(name) and
+    name = getAVariable().getName()
+  }
+
+  /**
+   * Gets a variable with `name` which is hidden in at least one nested scope.
+   */
+  UserVariable getAHiddenVariable(string name) {
+    result = getAVariable() and
+    result.getName() = name and
+    isDeclaredNameHiddenByChild(name)
+  }
 
-/** Gets a variable that is in the potential scope of variable `v`. */
-private UserVariable getPotentialScopeOfVariable_candidate(UserVariable v) {
-  exists(Scope s |
-    result = s.getAVariable() and
+  /**
+   * Holds if `name` is declared above this scope and hidden by this or a nested scope.
+   */
+  private predicate isNameDeclaredAboveHiddenByThisOrNested(string name) {
     (
-      // Variable in an ancestor scope, but only if there are less than 100 variables in this scope
-      v = s.getAnAncestor().getAVariable() and
-      s.getNumberOfVariables() < 100
+      this.getStrictParent().isDeclaredNameHiddenByChild(name) or
+      this.getStrictParent().isNameDeclaredAboveHiddenByThisOrNested(name)
+    ) and
+    isNameDeclaredInThisOrNestedScope(name)
+  }
+
+  /**
+   * Gets a variable with `name` which is declared above and hidden by a variable in this or a nested scope.
+   */
+  UserVariable getAHidingVariable(string name) {
+    isNameDeclaredAboveHiddenByThisOrNested(name) and
+    (
+      // Declared in this scope
+      getAVariable().getName() = name and
+      result = getAVariable() and
+      result.getName() = name
       or
-      // In the same scope, but not the same variable, and choose just one to report
-      v = s.getAVariable() and
-      not result = v and
-      v.getName() <= result.getName()
+      // Declared in a child scope
+      exists(Scope child |
+        child.getStrictParent() = this and
+        child.isNameDeclaredInThisOrNestedScope(name) and
+        result = child.getAHidingVariable(name)
+      )
     )
-  )
+  }
 }
 
-/** Gets a variable that is in the potential scope of variable `v`. */
-private UserVariable getOuterScopesOfVariable_candidate(UserVariable v) {
-  exists(Scope s |
-    result = s.getAVariable() and
-    (
-      // Variable in an ancestor scope, but only if there are less than 100 variables in this scope
-      v = s.getAnAncestor().getAVariable() and
-      s.getNumberOfVariables() < 100
-    )
-  )
+class GeneratedBlockStmt extends BlockStmt {
+  GeneratedBlockStmt() { this.getLocation() instanceof UnknownLocation }
 }
 
 /** Holds if there exists a translation unit that includes both `f1` and `f2`. */
@@ -167,12 +205,17 @@ predicate inSameTranslationUnit(File f1, File f2) {
 }
 
 /**
- * Gets a user variable which occurs in the "outer scope" of variable `v`.
+ * Holds if there exists a translation unit that includes both `f1` and `f2`.
+ *
+ * This version is late bound.
  */
-cached
-UserVariable getPotentialScopeOfVariableStrict(UserVariable v) {
-  result = getOuterScopesOfVariable_candidate(v) and
-  inSameTranslationUnit(v.getFile(), result.getFile())
+bindingset[f1, f2]
+pragma[inline_late]
+predicate inSameTranslationUnitLate(File f1, File f2) {
+  exists(TranslationUnit c |
+    c.getAUserFile() = f1 and
+    c.getAUserFile() = f2
+  )
 }
 
 /** A file that is a C/C++ source file */
@@ -200,12 +243,14 @@ class TranslationUnit extends SourceFile {
   }
 }
 
-/** Holds if `v2` may hide `v1`. */
-private predicate hides_candidateStrict(UserVariable v1, UserVariable v2) {
-  not v1 = v2 and
-  v2 = getPotentialScopeOfVariableStrict(v1) and
-  v1.getName() = v2.getName() and
-  // Member variables cannot hide other variables nor be hidden because the can be referenced through their qualified name.
+/** Holds if `v2` strictly (`v2` is in an inner scope compared to `v1`) hides `v1`. */
+predicate hides_candidateStrict(UserVariable v1, UserVariable v2) {
+  exists(Scope s, string name |
+    v1 = s.getStrictParent().getAHiddenVariable(name) and
+    v2 = s.getAHidingVariable(name) and
+    not v1 = v2
+  ) and
+  inSameTranslationUnitLate(v1.getFile(), v2.getFile()) and
   not (v1.isMember() or v2.isMember()) and
   (
     // If v1 is a local variable, ensure that v1 is declared before v2

From f25507e821aeae14df6e2b676599b57768016387 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 19:20:03 +0000
Subject: [PATCH 420/435] Scope: Add a child scope accessor

---
 cpp/common/src/codingstandards/cpp/Scope.qll | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index 8e618cb21e..1c9a621b39 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -80,6 +80,8 @@ class Scope extends Element {
 
   Scope getAnAncestor() { result = this.getStrictParent+() }
 
+  Scope getAChildScope() { result.getStrictParent() = this }
+
   Scope getStrictParent() { result = Internal::getParentScope(this) }
 
   Declaration getADeclaration() { Internal::getParentScope(result) = this }

From b5ff407e07197d229664b462503916f1da268104 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 19:20:40 +0000
Subject: [PATCH 421/435] Scope: Adopt use of getAChildScope()

---
 cpp/common/src/codingstandards/cpp/Scope.qll | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index 1c9a621b39..d0f5995537 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -138,10 +138,7 @@ class Scope extends Element {
    * Holds if `name` is declared in a nested scope.
    */
   private predicate isNameDeclaredInNestedScope(string name) {
-    exists(Scope child |
-      child.getStrictParent() = this and
-      child.isNameDeclaredInThisOrNestedScope(name)
-    )
+    this.getAChildScope().isNameDeclaredInThisOrNestedScope(name)
   }
 
   /**
@@ -173,7 +170,8 @@ class Scope extends Element {
   }
 
   /**
-   * Gets a variable with `name` which is declared above and hidden by a variable in this or a nested scope.
+   * Gets a variable with `name` which is declared in a scope above this one, and hidden by a variable in this or a
+   * nested scope.
    */
   UserVariable getAHidingVariable(string name) {
     isNameDeclaredAboveHiddenByThisOrNested(name) and
@@ -185,7 +183,7 @@ class Scope extends Element {
       or
       // Declared in a child scope
       exists(Scope child |
-        child.getStrictParent() = this and
+        getAChildScope() = child and
         child.isNameDeclaredInThisOrNestedScope(name) and
         result = child.getAHidingVariable(name)
       )
@@ -248,8 +246,8 @@ class TranslationUnit extends SourceFile {
 /** Holds if `v2` strictly (`v2` is in an inner scope compared to `v1`) hides `v1`. */
 predicate hides_candidateStrict(UserVariable v1, UserVariable v2) {
   exists(Scope s, string name |
-    v1 = s.getStrictParent().getAHiddenVariable(name) and
-    v2 = s.getAHidingVariable(name) and
+    v1 = s.getAHiddenVariable(name) and
+    v2 = s.getAChildScope().getAHidingVariable(name) and
     not v1 = v2
   ) and
   inSameTranslationUnitLate(v1.getFile(), v2.getFile()) and

From dbd3fe6eeb10a1db03b2599765632a80539557e7 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 22:27:35 +0000
Subject: [PATCH 422/435] Scope: Fix the parent scope of catch blocks

We now tie the Handler into the TryStmt, and catch-block parameters
into the Handler for a consistent AST hierarchy.
---
 cpp/common/src/codingstandards/cpp/Scope.qll   | 18 ++++++++++--------
 .../cpp/scope/ParentScope.expected             |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index d0f5995537..1027e251f2 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -38,23 +38,25 @@ module Internal {
     or
     exists(SwitchStmt switchStmt | switchStmt.getStmt() = e and result = switchStmt)
     or
+    // A catch-block parameter, whose parent is the `Handler`
+    exists(CatchBlock c | c.getParameter() = e and result = c.getParent())
+    or
+    // A catch-block `Handler`, whose parent is the `TryStmt`
+    e.(Handler).getParent() = result
+    or
     not exists(Loop loop | loop.getAChild() = e) and
     not exists(IfStmt ifStmt | ifStmt.getThen() = e or ifStmt.getElse() = e) and
     not exists(SwitchStmt switchStmt | switchStmt.getStmt() = e) and
+    not exists(CatchBlock c | c.getParameter() = e) and
+    not e instanceof Handler and
     if exists(e.getParentScope())
     then result = e.getParentScope()
     else (
-      // Statements do no have a parent scope, so return the enclosing block.
+      // Statements do not have a parent scope, so return the enclosing block.
       result = e.(Stmt).getEnclosingBlock()
       or
+      // Expressions do not have a parent scope, so return the enclosing block.
       result = e.(Expr).getEnclosingBlock()
-      or
-      // Catch block parameters don't have an enclosing scope, so attach them to the
-      // the block itself
-      exists(CatchBlock cb |
-        e = cb.getParameter() and
-        result = cb
-      )
     )
   }
 }
diff --git a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
index 34a48c8065..e2152773af 100644
--- a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
+++ b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
@@ -83,8 +83,8 @@
 | test.cpp:27:42:27:44 | id1 | test.cpp:27:36:27:52 | { ... } |
 | test.cpp:27:47:27:49 | 10 | test.cpp:27:36:27:52 | { ... } |
 | test.cpp:27:52:27:52 | return ... | test.cpp:27:36:27:52 | { ... } |
-| test.cpp:28:24:28:26 | id1 | test.cpp:28:29:30:11 | { ... } |
-| test.cpp:28:29:30:11 | <handler> | test.cpp:13:9:31:9 | { ... } |
+| test.cpp:28:24:28:26 | id1 | test.cpp:28:29:30:11 | <handler> |
+| test.cpp:28:29:30:11 | <handler> | test.cpp:26:11:28:11 | try { ... } |
 | test.cpp:28:29:30:11 | { ... } | test.cpp:13:9:31:9 | { ... } |
 | test.cpp:29:13:29:20 | declaration | test.cpp:28:29:30:11 | { ... } |
 | test.cpp:29:17:29:19 | id1 | test.cpp:28:29:30:11 | { ... } |

From 61521e0144707fe65c611988f2412d86af94e07c Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Sun, 8 Dec 2024 23:20:37 +0000
Subject: [PATCH 423/435] Scope: Simplify mechanism for identifying declaration
 order

---
 cpp/common/src/codingstandards/cpp/Scope.qll | 50 +++++++-------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index 1027e251f2..c716896356 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -247,48 +247,30 @@ class TranslationUnit extends SourceFile {
 
 /** Holds if `v2` strictly (`v2` is in an inner scope compared to `v1`) hides `v1`. */
 predicate hides_candidateStrict(UserVariable v1, UserVariable v2) {
-  exists(Scope s, string name |
-    v1 = s.getAHiddenVariable(name) and
-    v2 = s.getAChildScope().getAHidingVariable(name) and
+  exists(Scope parentScope, Scope childScope, string name |
+    v1 = parentScope.getAHiddenVariable(name) and
+    childScope = parentScope.getAChildScope() and
+    v2 = childScope.getAHidingVariable(name) and
     not v1 = v2
-  ) and
-  inSameTranslationUnitLate(v1.getFile(), v2.getFile()) and
-  not (v1.isMember() or v2.isMember()) and
-  (
-    // If v1 is a local variable, ensure that v1 is declared before v2
+  |
+    // If v1 is a local variable defined in a `DeclStmt` ensure that it is declared before `v2`,
+    // otherwise it would not be hidden
     (
-      v1 instanceof LocalVariable and
-      // Ignore variables declared in conditional expressions, as they apply to
-      // the nested scope
-      not v1 = any(ConditionDeclExpr cde).getVariable() and
-      // Ignore variables declared in loops
-      not exists(Loop l | l.getADeclaration() = v1)
+      parentScope instanceof BlockStmt and
+      exists(DeclStmt ds | ds.getADeclaration() = v1) and
+      exists(parentScope.(BlockStmt).getIndexOfStmt(childScope))
     )
     implies
     exists(BlockStmt bs, DeclStmt v1Stmt, Stmt v2Stmt |
-      v1 = v1Stmt.getADeclaration() and
-      getEnclosingStmt(v2).getParentStmt*() = v2Stmt
+      bs = parentScope and
+      v2Stmt = childScope and
+      v1Stmt.getADeclaration() = v1
     |
       bs.getIndexOfStmt(v1Stmt) <= bs.getIndexOfStmt(v2Stmt)
     )
-  )
-}
-
-/**
- * Gets the enclosing statement of the given variable, if any.
- */
-private Stmt getEnclosingStmt(LocalScopeVariable v) {
-  result.(DeclStmt).getADeclaration() = v
-  or
-  exists(ConditionDeclExpr cde |
-    cde.getVariable() = v and
-    result = cde.getEnclosingStmt()
-  )
-  or
-  exists(CatchBlock cb |
-    cb.getParameter() = v and
-    result = cb.getEnclosingStmt()
-  )
+  ) and
+  inSameTranslationUnitLate(v1.getFile(), v2.getFile()) and
+  not (v1.isMember() or v2.isMember())
 }
 
 /** Holds if `v2` strictly (`v2` is in an inner scope compared to `v1`) hides `v1`. */

From 47b3fb272f27f2fd7f06ab09d0c1195a7d06a16d Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 9 Dec 2024 12:15:50 +0000
Subject: [PATCH 424/435] Scope: refactor hides calculation to expose pairs of
 variables

Behaviour preserving refactor to allow future filtering of invalid
pairs of variables during the traversal algorithm.

For example, whether a variable declared within a lambda variable
hides an outer scope variable depends on the type and nature of the
variable.

By exposing pairs of candidate variables, we can more easily filter
on these conditions.
---
 cpp/common/src/codingstandards/cpp/Scope.qll | 54 ++++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index c716896356..6ca3fc8657 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -78,6 +78,14 @@ class Scope extends Element {
 
   UserVariable getAVariable() { Internal::getParentScope(result) = this }
 
+  /**
+   * Gets the `Variable` with the given `name` that is declared in this scope.
+   */
+  UserVariable getVariable(string name) {
+    result = getAVariable() and
+    result.getName() = name
+  }
+
   int getNumberOfVariables() { result = count(getAVariable()) }
 
   Scope getAnAncestor() { result = this.getStrictParent+() }
@@ -152,9 +160,9 @@ class Scope extends Element {
   }
 
   /**
-   * Gets a variable with `name` which is hidden in at least one nested scope.
+   * Gets a variable with `name` which is potentially hidden in at least one nested scope.
    */
-  UserVariable getAHiddenVariable(string name) {
+  private UserVariable getAPotentiallyHiddenVariable(string name) {
     result = getAVariable() and
     result.getName() = name and
     isDeclaredNameHiddenByChild(name)
@@ -163,34 +171,43 @@ class Scope extends Element {
   /**
    * Holds if `name` is declared above this scope and hidden by this or a nested scope.
    */
-  private predicate isNameDeclaredAboveHiddenByThisOrNested(string name) {
-    (
-      this.getStrictParent().isDeclaredNameHiddenByChild(name) or
-      this.getStrictParent().isNameDeclaredAboveHiddenByThisOrNested(name)
+  UserVariable getAVariableHiddenByThisOrNestedScope(string name) {
+    exists(Scope parent | parent = this.getStrictParent() |
+      result = parent.getAPotentiallyHiddenVariable(name) or
+      result = parent.getAVariableHiddenByThisOrNestedScope(name)
     ) and
     isNameDeclaredInThisOrNestedScope(name)
   }
 
   /**
-   * Gets a variable with `name` which is declared in a scope above this one, and hidden by a variable in this or a
-   * nested scope.
+   * Holds if `hiddenVariable` and `hidingVariable` are a candidate hiding pair at this scope.
    */
-  UserVariable getAHidingVariable(string name) {
-    isNameDeclaredAboveHiddenByThisOrNested(name) and
+  private predicate hidesCandidate(
+    UserVariable hiddenVariable, UserVariable hidingVariable, string name
+  ) {
     (
       // Declared in this scope
-      getAVariable().getName() = name and
-      result = getAVariable() and
-      result.getName() = name
+      hidingVariable = getVariable(name) and
+      hiddenVariable = getAVariableHiddenByThisOrNestedScope(name)
       or
       // Declared in a child scope
       exists(Scope child |
         getAChildScope() = child and
-        child.isNameDeclaredInThisOrNestedScope(name) and
-        result = child.getAHidingVariable(name)
+        child.hidesCandidate(hiddenVariable, hidingVariable, name)
       )
     )
   }
+
+  /**
+   * Holds if `hiddenVariable` is declared in this scope and hidden by `hidingVariable`.
+   */
+  predicate hides(UserVariable hiddenVariable, UserVariable hidingVariable, Scope childScope) {
+    exists(string name |
+      hiddenVariable = getAPotentiallyHiddenVariable(name) and
+      childScope = getAChildScope() and
+      childScope.hidesCandidate(hiddenVariable, hidingVariable, name)
+    )
+  }
 }
 
 class GeneratedBlockStmt extends BlockStmt {
@@ -247,12 +264,7 @@ class TranslationUnit extends SourceFile {
 
 /** Holds if `v2` strictly (`v2` is in an inner scope compared to `v1`) hides `v1`. */
 predicate hides_candidateStrict(UserVariable v1, UserVariable v2) {
-  exists(Scope parentScope, Scope childScope, string name |
-    v1 = parentScope.getAHiddenVariable(name) and
-    childScope = parentScope.getAChildScope() and
-    v2 = childScope.getAHidingVariable(name) and
-    not v1 = v2
-  |
+  exists(Scope parentScope, Scope childScope | parentScope.hides(v1, v2, childScope) |
     // If v1 is a local variable defined in a `DeclStmt` ensure that it is declared before `v2`,
     // otherwise it would not be hidden
     (

From 9b7e1299fc91d9845f5e9250d33102b6fb627755 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 9 Dec 2024 12:27:50 +0000
Subject: [PATCH 425/435] Scope: Special case lambda expressions

Lambda expressions have special visibility rules that affect
identifier hiding, which we incorporate into the Scope hiding
calculations.

Note: Lambda expressions are not currently tied into the parent
scope hierarchy, so this change doesn't affect calculations until
getParentScope(Element e) is extended to support them.
---
 cpp/common/src/codingstandards/cpp/Scope.qll | 59 ++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index 6ca3fc8657..c705137d8c 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -3,6 +3,19 @@
  */
 
 import cpp
+import codingstandards.cpp.ConstHelpers
+
+/**
+ * a `Variable` that is nonvolatile and const
+ * and of type `IntegralOrEnumType`
+ */
+class NonVolatileConstIntegralOrEnumVariable extends Variable {
+  NonVolatileConstIntegralOrEnumVariable() {
+    not this.isVolatile() and
+    this.isConst() and
+    this.getUnspecifiedType() instanceof IntegralOrEnumType
+  }
+}
 
 /**
  * Internal module, exposed for testing.
@@ -210,6 +223,52 @@ class Scope extends Element {
   }
 }
 
+/**
+ * A scope representing the generated `operator()` of a lambda function.
+ */
+class LambdaScope extends Scope {
+  Closure closure;
+
+  LambdaScope() { this = closure.getLambdaFunction() }
+
+  override UserVariable getAVariableHiddenByThisOrNestedScope(string name) {
+    // Handle special cases for lambdas
+    exists(UserVariable hiddenVariable, LambdaExpression lambdaExpr |
+      // Find the variable that is potentially hidden inside the lambda
+      hiddenVariable = super.getAVariableHiddenByThisOrNestedScope(name) and
+      result = hiddenVariable and
+      lambdaExpr = closure.getLambdaExpression()
+    |
+      // A definition can be hidden if it is in scope and it is captured by the lambda,
+      exists(LambdaCapture cap |
+        lambdaExpr.getACapture() = cap and
+        // The outer declaration is captured by the lambda
+        hiddenVariable.getAnAccess() = cap.getInitializer()
+      )
+      or
+      // it is is non-local,
+      hiddenVariable instanceof GlobalVariable
+      or
+      // it has static or thread local storage duration,
+      (hiddenVariable.isThreadLocal() or hiddenVariable.isStatic())
+      or
+      //it is a reference that has been initialized with a constant expression.
+      hiddenVariable.getType().stripTopLevelSpecifiers() instanceof ReferenceType and
+      hiddenVariable.getInitializer().getExpr() instanceof Literal
+      or
+      // //it const non-volatile integral or enumeration type and has been initialized with a constant expression
+      hiddenVariable instanceof NonVolatileConstIntegralOrEnumVariable and
+      hiddenVariable.getInitializer().getExpr() instanceof Literal
+      or
+      //it is constexpr and has no mutable members
+      hiddenVariable.isConstexpr() and
+      not exists(Class c |
+        c = hiddenVariable.getType() and not c.getAMember() instanceof MutableVariable
+      )
+    )
+  }
+}
+
 class GeneratedBlockStmt extends BlockStmt {
   GeneratedBlockStmt() { this.getLocation() instanceof UnknownLocation }
 }

From 117d0fba033e58ac03d7903ada230e2a09114972 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 9 Dec 2024 12:30:30 +0000
Subject: [PATCH 426/435] Scope: Extend getParentScope for lambda expressions

Lambda functions are tied into the parent statement of their
declaring lambda expression, which enables Scope's hiding
predicates to calculate hiding behaviour for lambda expressions.
---
 cpp/common/src/codingstandards/cpp/Scope.qll          | 11 +++++++++++
 .../codingstandards/cpp/scope/ParentScope.expected    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cpp/common/src/codingstandards/cpp/Scope.qll b/cpp/common/src/codingstandards/cpp/Scope.qll
index c705137d8c..5438c17133 100644
--- a/cpp/common/src/codingstandards/cpp/Scope.qll
+++ b/cpp/common/src/codingstandards/cpp/Scope.qll
@@ -57,11 +57,22 @@ module Internal {
     // A catch-block `Handler`, whose parent is the `TryStmt`
     e.(Handler).getParent() = result
     or
+    // The parent scope of a lambda is the scope in which the lambda expression is defined.
+    //
+    // Lambda functions are defined in a generated `Closure` class, as the `operator()` function. We choose the
+    // enclosing statement of the lambda expression as the parent scope of the lambda function. This is so we can
+    // determine the order of definition if a variable is defined in the same scope as the lambda expression.
+    exists(Closure lambdaClosure |
+      lambdaClosure.getLambdaFunction() = e and
+      lambdaClosure.getLambdaExpression().getEnclosingStmt() = result
+    )
+    or
     not exists(Loop loop | loop.getAChild() = e) and
     not exists(IfStmt ifStmt | ifStmt.getThen() = e or ifStmt.getElse() = e) and
     not exists(SwitchStmt switchStmt | switchStmt.getStmt() = e) and
     not exists(CatchBlock c | c.getParameter() = e) and
     not e instanceof Handler and
+    not exists(Closure lambdaClosure | lambdaClosure.getLambdaFunction() = e) and
     if exists(e.getParentScope())
     then result = e.getParentScope()
     else (
diff --git a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
index e2152773af..90aa3b30c8 100644
--- a/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
+++ b/cpp/common/test/library/codingstandards/cpp/scope/ParentScope.expected
@@ -77,7 +77,7 @@
 | test.cpp:27:28:27:28 | operator= | file://:0:0:0:0 | decltype([...](...){...}) |
 | test.cpp:27:29:27:29 | id1 | file://:0:0:0:0 | decltype([...](...){...}) |
 | test.cpp:27:29:27:31 | id1 | test.cpp:26:15:28:11 | { ... } |
-| test.cpp:27:33:27:33 | operator() | file://:0:0:0:0 | decltype([...](...){...}) |
+| test.cpp:27:33:27:33 | operator() | test.cpp:27:13:27:53 | declaration |
 | test.cpp:27:36:27:52 | { ... } | test.cpp:27:33:27:33 | operator() |
 | test.cpp:27:38:27:50 | declaration | test.cpp:27:36:27:52 | { ... } |
 | test.cpp:27:42:27:44 | id1 | test.cpp:27:36:27:52 | { ... } |

From 411ecde2794bb92bb6981ee6107044d66d5de4ac Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 9 Dec 2024 12:32:08 +0000
Subject: [PATCH 427/435] IdentifierHidden: remove lambda special casing

This removes the special handling of lambda expressions, which
was causing performance issues.

Instead, we rely on the new behviour of the Scope library, which
calculates identifier hiding for lambda expressions as part of the
main calculation.

This has one semantic change - the new code applies
`isInSameTranslationUnit`, which reduces false positives where the
identifier "hiding" in a lambda occurred with an outer variable in
a different translation unit.
---
 .../identifierhidden/IdentifierHidden.qll     | 66 +------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll b/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll
index 9534c2f78a..39d24299b8 100644
--- a/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/identifierhidden/IdentifierHidden.qll
@@ -9,75 +9,11 @@ import cpp
 import codingstandards.cpp.Customizations
 import codingstandards.cpp.Exclusions
 import codingstandards.cpp.Scope
-import codingstandards.cpp.ConstHelpers
 
 abstract class IdentifierHiddenSharedQuery extends Query { }
 
 Query getQuery() { result instanceof IdentifierHiddenSharedQuery }
 
-/**
- * a `Variable` that is nonvolatile and const
- * and of type `IntegralOrEnumType`
- */
-class NonVolatileConstIntegralOrEnumVariable extends Variable {
-  NonVolatileConstIntegralOrEnumVariable() {
-    not this.isVolatile() and
-    this.isConst() and
-    this.getUnspecifiedType() instanceof IntegralOrEnumType
-  }
-}
-
-/**
- * Holds if declaration `innerDecl`, declared in a lambda, hides a declaration `outerDecl` by the lambda.
- */
-predicate hiddenInLambda(UserVariable outerDecl, UserVariable innerDecl) {
-  exists(
-    Scope innerScope, LambdaExpression lambdaExpr, Scope lambdaExprScope, Scope outerScope,
-    Closure lambdaClosure
-  |
-    // The variable `innerDecl` is declared inside of the lambda.
-    innerScope.getADeclaration() = innerDecl and
-    // Because a lambda is compiled down to a closure, we need to use the closure to determine if the declaration
-    // is part of the lambda.
-    innerScope.getAnAncestor() = lambdaClosure and
-    // Next we determine the scope of the lambda expression to determine if `outerDecl` is visible in the scope of the lambda.
-    lambdaClosure.getLambdaExpression() = lambdaExpr and
-    lambdaExprScope.getAnExpr() = lambdaExpr and
-    outerScope.getADeclaration() = outerDecl and
-    lambdaExprScope.getStrictParent*() = outerScope and
-    (
-      // A definition can be hidden if it is in scope and it is captured by the lambda,
-      exists(LambdaCapture cap |
-        lambdaExpr.getACapture() = cap and
-        // The outer declaration is captured by the lambda
-        outerDecl.getAnAccess() = cap.getInitializer()
-      )
-      or
-      // it is is non-local,
-      outerDecl instanceof GlobalVariable
-      or
-      // it has static or thread local storage duration,
-      (outerDecl.isThreadLocal() or outerDecl.isStatic())
-      or
-      //it is a reference that has been initialized with a constant expression.
-      outerDecl.getType().stripTopLevelSpecifiers() instanceof ReferenceType and
-      outerDecl.getInitializer().getExpr() instanceof Literal
-      or
-      // //it const non-volatile integral or enumeration type and has been initialized with a constant expression
-      outerDecl instanceof NonVolatileConstIntegralOrEnumVariable and
-      outerDecl.getInitializer().getExpr() instanceof Literal
-      or
-      //it is constexpr and has no mutable members
-      outerDecl.isConstexpr() and
-      not exists(Class c |
-        c = outerDecl.getType() and not c.getAMember() instanceof MutableVariable
-      )
-    ) and
-    // Finally, the variables must have the same names.
-    innerDecl.getName() = outerDecl.getName()
-  )
-}
-
 query predicate problems(
   UserVariable innerDecl, string message, UserVariable outerDecl, string varName
 ) {
@@ -86,7 +22,7 @@ query predicate problems(
   //ignore template variables for this rule
   not outerDecl instanceof TemplateVariable and
   not innerDecl instanceof TemplateVariable and
-  (hidesStrict(outerDecl, innerDecl) or hiddenInLambda(outerDecl, innerDecl)) and
+  hidesStrict(outerDecl, innerDecl) and
   not excludedViaNestedNamespaces(outerDecl, innerDecl) and
   varName = outerDecl.getName() and
   message = "Variable is hiding variable $@."

From 52e1bc142013d35d1ebb6050111b7939dc1f25cb Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 9 Dec 2024 12:54:54 +0000
Subject: [PATCH 428/435] IdentifierHiding - Add change note

---
 change_notes/2024-12-08-identifier-hiding.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 change_notes/2024-12-08-identifier-hiding.md

diff --git a/change_notes/2024-12-08-identifier-hiding.md b/change_notes/2024-12-08-identifier-hiding.md
new file mode 100644
index 0000000000..0600c9e6ee
--- /dev/null
+++ b/change_notes/2024-12-08-identifier-hiding.md
@@ -0,0 +1,4 @@
+ - `A2-10-1` - `IdentifierHiding.ql`:
+   - Improved evaluation performance.
+   - Addressed false negatives where nested loops used the same variable name.
+   - Exclude cases where a variable declared in a lambda expression shadowed a globa or namespace variable that did not appear in the same translation unit.

From cf315bad52bb20208ab84809f90310e3875bb7b3 Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 9 Dec 2024 12:57:12 +0000
Subject: [PATCH 429/435] Add extra change note entry

---
 change_notes/2024-12-08-identifier-hiding.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/change_notes/2024-12-08-identifier-hiding.md b/change_notes/2024-12-08-identifier-hiding.md
index 0600c9e6ee..c983f5390a 100644
--- a/change_notes/2024-12-08-identifier-hiding.md
+++ b/change_notes/2024-12-08-identifier-hiding.md
@@ -2,3 +2,6 @@
    - Improved evaluation performance.
    - Addressed false negatives where nested loops used the same variable name.
    - Exclude cases where a variable declared in a lambda expression shadowed a globa or namespace variable that did not appear in the same translation unit.
+ - `RULE-5-3` - `IdentifierHidingC.ql`:
+   - Improved evaluation performance.
+   - Addressed false negatives where nested loops used the same variable name.
\ No newline at end of file

From c56e1ce54401c05d5f27c9c86a843625f6f6b37c Mon Sep 17 00:00:00 2001
From: Luke Cartey <lcartey@github.com>
Date: Mon, 9 Dec 2024 23:34:03 +0000
Subject: [PATCH 430/435] TypographicallyDifferent: Update after changes to
 Scope

Scope no longer provides a suitable predicate for determining
variables in nested scopes.

Instead, first determine the set of conflicting names, then
identify a set of variables which are conflicting, and are hidden
within a nested scope.
---
 ...entifiersNotTypographicallyUnambiguous.qll | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/differentidentifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.qll b/cpp/common/src/codingstandards/cpp/rules/differentidentifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.qll
index 87a4580ab3..5c7475883e 100644
--- a/cpp/common/src/codingstandards/cpp/rules/differentidentifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/differentidentifiersnottypographicallyunambiguous/DifferentIdentifiersNotTypographicallyUnambiguous.qll
@@ -46,16 +46,32 @@ string step1(string s) {
 
 string step2(string s) { s = "m_" and result = "rn" }
 
-predicate violation(UserVariable v1, UserVariable v2) {
-  v2 = getPotentialScopeOfVariable(v1) and
+class VariableName extends string {
+  VariableName() { exists(UserVariable uv | uv.getName() = this) }
+
+  string getCanon() {
+    result =
+      this.toLowerCase()
+          .replaceAll("_", "")
+          .regexpReplaceAll("[il]", "1")
+          .replaceAll("s", "5")
+          .replaceAll("z", "2")
+          .replaceAll("b", "8")
+          .replaceAll("h", "n")
+          .replaceAll("m", "rn")
+          .replaceAll("o", "0")
+  }
+}
+
+predicate isConflictingName(VariableName name1, VariableName name2) {
   exists(string s1, string s2 |
     // over-approximate a match, because it is cheaper to compute
-    getCanon(v1) = getCanon(v2) and
-    v1 != v2 and
-    not v1.getName() = v2.getName() and
+    name1.getCanon() = name2.getCanon() and
+    // Exclude identical names
+    not name1 = name2 and
     // expand 'm' to 'm_' to match either 'm_' or 'rn'
-    s1 = v1.getName().replaceAll("_", "").replaceAll("m", "m_") and
-    s2 = v2.getName().replaceAll("_", "").replaceAll("m", "m_") and
+    s1 = name1.replaceAll("_", "").replaceAll("m", "m_") and
+    s2 = name2.replaceAll("_", "").replaceAll("m", "m_") and
     // at this point the strings must have equal length, the substitutions do not expand nor contract the string
     s1.length() = s2.length() and
     forall(int i | i in [0 .. s1.length() - 1] |
@@ -87,6 +103,23 @@ predicate violation(UserVariable v1, UserVariable v2) {
   )
 }
 
+predicate violation(UserVariable v1, UserVariable v2) {
+  exists(string name1, string name2 |
+    isConflictingName(name1, name2) and
+    exists(Scope parentScope, Scope childScope |
+      parentScope.getVariable(name1) = v1 and
+      childScope.getVariable(name2) = v2
+    |
+      childScope.getStrictParent+() = parentScope
+      or
+      // Disambiguate names in the same scope by name order
+      childScope = parentScope and
+      name1 < name2
+    ) and
+    inSameTranslationUnitLate(v1.getFile(), v2.getFile())
+  )
+}
+
 query predicate problems(
   UserVariable v, string message, UserVariable v1, string v1Description, UserVariable v2,
   string v2Description

From 4d31f5f11cd33031a87d1c1ff070c791f0049529 Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 10 Dec 2024 01:16:51 -0500
Subject: [PATCH 431/435] Update change_notes/2024-12-08-identifier-hiding.md

Co-authored-by: Fernando Jose <fernando.jose@woven.toyota>
---
 change_notes/2024-12-08-identifier-hiding.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/change_notes/2024-12-08-identifier-hiding.md b/change_notes/2024-12-08-identifier-hiding.md
index c983f5390a..b769b16e57 100644
--- a/change_notes/2024-12-08-identifier-hiding.md
+++ b/change_notes/2024-12-08-identifier-hiding.md
@@ -1,7 +1,7 @@
  - `A2-10-1` - `IdentifierHiding.ql`:
    - Improved evaluation performance.
    - Addressed false negatives where nested loops used the same variable name.
-   - Exclude cases where a variable declared in a lambda expression shadowed a globa or namespace variable that did not appear in the same translation unit.
+   - Exclude cases where a variable declared in a lambda expression shadowed a global or namespace variable that did not appear in the same translation unit.
  - `RULE-5-3` - `IdentifierHidingC.ql`:
    - Improved evaluation performance.
    - Addressed false negatives where nested loops used the same variable name.
\ No newline at end of file

From 7631a61cdd55ec9b46804941bdd04d65d3a40f38 Mon Sep 17 00:00:00 2001
From: knewbury01 <knewbury01@users.noreply.github.com>
Date: Tue, 10 Dec 2024 21:27:28 +0000
Subject: [PATCH 432/435] Bump version to 2.40.0-dev

---
 c/cert/src/qlpack.yml       |  2 +-
 c/cert/test/qlpack.yml      |  2 +-
 c/common/src/qlpack.yml     |  2 +-
 c/common/test/qlpack.yml    |  2 +-
 c/misra/src/qlpack.yml      |  2 +-
 c/misra/test/qlpack.yml     |  2 +-
 cpp/autosar/src/qlpack.yml  |  2 +-
 cpp/autosar/test/qlpack.yml |  2 +-
 cpp/cert/src/qlpack.yml     |  2 +-
 cpp/cert/test/qlpack.yml    |  2 +-
 cpp/common/src/qlpack.yml   |  2 +-
 cpp/common/test/qlpack.yml  |  2 +-
 cpp/misra/src/qlpack.yml    |  2 +-
 cpp/misra/test/qlpack.yml   |  2 +-
 cpp/report/src/qlpack.yml   |  2 +-
 docs/user_manual.md         | 12 ++++++------
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index f7454d1ff0..2778e44435 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 description: CERT C 2016
 suites: codeql-suites
 license: MIT
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
index a79ef5f692..461ebe9677 100644
--- a/c/cert/test/qlpack.yml
+++ b/c/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-c-coding-standards-tests
-version: 2.39.0-dev
+version: 2.40.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 1930faeeb0..f39f3cb1c4 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
index 41737a34ec..d417a17df2 100644
--- a/c/common/test/qlpack.yml
+++ b/c/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-c-coding-standards-tests
-version: 2.39.0-dev
+version: 2.40.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index 656394ad1d..9aceed1a49 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 description: MISRA C 2012
 suites: codeql-suites
 license: MIT
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
index 3acb8455b1..d53bc95f28 100644
--- a/c/misra/test/qlpack.yml
+++ b/c/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-c-coding-standards-tests
-version: 2.39.0-dev
+version: 2.40.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index e1843eb2e7..f44ad54c74 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 description: AUTOSAR C++14 Guidelines R22-11, R21-11, R20-11, R19-11 and R19-03
 suites: codeql-suites
 license: MIT
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
index e7e8d3e2ce..178d8cc314 100644
--- a/cpp/autosar/test/qlpack.yml
+++ b/cpp/autosar/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/autosar-cpp-coding-standards-tests
-version: 2.39.0-dev
+version: 2.40.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 949087dfd5..735dd9f5b4 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
index ba7415c43e..3a6d02e7d4 100644
--- a/cpp/cert/test/qlpack.yml
+++ b/cpp/cert/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cert-cpp-coding-standards-tests
-version: 2.39.0-dev
+version: 2.40.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index 1cfc63d8d9..1ae6dfd997 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 1.4.2
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
index 3f061a2920..90236b203e 100644
--- a/cpp/common/test/qlpack.yml
+++ b/cpp/common/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/common-cpp-coding-standards-tests
-version: 2.39.0-dev
+version: 2.40.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index 4f94ff4bec..96fc96ce24 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 description: MISRA C++ 2023
 default-suite: codeql-suites/misra-cpp-default.qls
 license: MIT
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
index e79e5934fa..207facda4e 100644
--- a/cpp/misra/test/qlpack.yml
+++ b/cpp/misra/test/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/misra-cpp-coding-standards-tests
-version: 2.39.0-dev
+version: 2.40.0-dev
 extractor: cpp
 license: MIT
 dependencies:
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 73f4cf3276..e569153ae8 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/report-cpp-coding-standards
-version: 2.39.0-dev
+version: 2.40.0-dev
 license: MIT
 dependencies:
   codeql/cpp-all: 1.4.2
diff --git a/docs/user_manual.md b/docs/user_manual.md
index 4c020dc73b..952a9a3c99 100644
--- a/docs/user_manual.md
+++ b/docs/user_manual.md
@@ -33,14 +33,14 @@
 
 ## Release information
 
-This user manual documents release `2.39.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
+This user manual documents release `2.40.0-dev` of the coding standards located at [https://github.com/github/codeql-coding-standards](https://github.com/github/codeql-coding-standards).
 The release page documents the release notes and contains the following artifacts part of the release:
 
 - `coding-standards-codeql-packs-2.37.0-dev.zip`: CodeQL packs that can be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `code-scanning-cpp-query-pack-2.39.0-dev.zip`: Legacy packaging for the queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
-- `supported_rules_list_2.39.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
-- `supported_rules_list_2.39.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
-- `user_manual_2.39.0-dev.md`: This user manual.
+- `code-scanning-cpp-query-pack-2.40.0-dev.zip`: Legacy packaging for the queries and scripts to be used with GitHub Code Scanning or the CodeQL CLI as documented in the section _Operating manual_.
+- `supported_rules_list_2.40.0-dev.csv`: A Comma Separated File (CSV) containing the supported rules per standard and the queries that implement the rule.
+- `supported_rules_list_2.40.0-dev.md`: A Markdown formatted file with a table containing the supported rules per standard and the queries that implement the rule.
+- `user_manual_2.40.0-dev.md`: This user manual.
 - `Source Code (zip)`: A zip archive containing the contents of https://github.com/github/codeql-coding-standards
 - `Source Code (tar.gz)`: A GZip compressed tar archive containing the contents of https://github.com/github/codeql-coding-standards
 - `checksums.txt`: A text file containing sha256 checksums for the aforementioned artifacts.
@@ -573,7 +573,7 @@ This section describes known failure modes for "CodeQL Coding Standards" and des
 |                              | Out of space                                                                                                                                                       | Less output. Some files may be only be partially analyzed, or not analyzed at all.                                                                        | Error reported on the command line.                                                                                                                                                                                                                                                                                                  | Increase space. If it remains an issue report space consumption issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                            |
 |                              | False positives                                                                                                                                                    | More output. Results are reported which are not violations of the guidelines.                                                                             | All reported results must be reviewed.                                                                                                                                                                                                                                                                                               | Report false positive issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
 |                              | False negatives                                                                                                                                                    | Less output. Violations of the guidelines are not reported.                                                                                               | Other validation and verification processes during software development should be used to complement the analysis performed by CodeQL Coding Standards.                                                                                                                                                                              | Report false negative issues via the CodeQL Coding Standards [bug tracker](https://github.com/github/codeql-coding-standards/issues).                                                                                                                                                                                                                                      |
-|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.39.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
+|                              | Modifying coding standard suite                                                                                                                                    | More or less output. If queries are added to the query set more result can be reported. If queries are removed less results might be reported.            | All queries supported by the CodeQL Coding Standards are listed in the release artifacts `supported_rules_list_2.40.0-dev.csv` where VERSION is replaced with the used release. The rules in the resulting Sarif file must be cross-referenced with the expected rules in this list to determine the validity of the used CodeQL suite. | Ensure that the CodeQL Coding Standards are not modified in ways that are not documented as supported modifications.                                                                                                                                                                                                                                                    |
 |                              | Incorrect deviation record specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation records with a reason. Ensure that all deviation records are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Incorrect deviation permit specification                                                                                                                           | More output. Results are reported for guidelines for which a deviation is assigned.                                                                       | Analysis integrity report lists all deviations and incorrectly specified deviation permits with a reason. Ensure that all deviation permits are correctly specified.                                                                                                                                                                 | Ensure that the deviation record is specified according to the specification in the user manual.                                                                                                                                                                                                                                                                           |
 |                              | Unapproved use of a deviation record                                                                                                                               | Less output. Results for guideline violations are not reported.                                                                                           | Validate that the deviation record use is approved by verifying the approved-by attribute of the deviation record specification.                                                                                                                                                                                                     | Ensure that each raised deviation record is approved by an independent approver through an auditable process.                                                                                                                                                                                                                                                              |

From 3342bb525e410e4c8d2b4232e73a5c3f06b00659 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Tue, 17 Dec 2024 16:07:55 +0900
Subject: [PATCH 433/435] Fixes #824

---
 change_notes/2024-12-17-fix-fp-824-a15-4-4       | 2 ++
 cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 change_notes/2024-12-17-fix-fp-824-a15-4-4

diff --git a/change_notes/2024-12-17-fix-fp-824-a15-4-4 b/change_notes/2024-12-17-fix-fp-824-a15-4-4
new file mode 100644
index 0000000000..0908c14ffa
--- /dev/null
+++ b/change_notes/2024-12-17-fix-fp-824-a15-4-4
@@ -0,0 +1,2 @@
+ - `A15-4-4` - `MissingNoExcept.ql`:
+   - Reduce false positives by not reporting on functions that have a noexcept specification with a complex expression.
diff --git a/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql b/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql
index 7701a8a1ea..2721b42af3 100644
--- a/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql
+++ b/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql
@@ -28,6 +28,9 @@ where
   not isNoExceptTrue(f) and
   // Not explicitly marked noexcept(false)
   not isNoExceptExplicitlyFalse(f) and
+  // Not having a noexcept specification that
+  // could not be computed as true or false above.
+  not exists(f.getADeclarationEntry().getNoExceptExpr()) and
   // Not compiler generated
   not f.isCompilerGenerated() and
   // The function is defined in this database

From 23ddafa76ec60d06ef5f339062647f41cfb436ef Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Wed, 18 Dec 2024 11:13:46 +0900
Subject: [PATCH 434/435] Fix #540

---
 change_notes/2024-12-18-fix-fp-540-a3-9-1.md        |  2 ++
 .../rules/A3-9-1/VariableWidthIntegerTypesUsed.ql   |  4 ++++
 cpp/autosar/test/rules/A3-9-1/test.cpp              | 13 ++++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 change_notes/2024-12-18-fix-fp-540-a3-9-1.md

diff --git a/change_notes/2024-12-18-fix-fp-540-a3-9-1.md b/change_notes/2024-12-18-fix-fp-540-a3-9-1.md
new file mode 100644
index 0000000000..fbd09ca840
--- /dev/null
+++ b/change_notes/2024-12-18-fix-fp-540-a3-9-1.md
@@ -0,0 +1,2 @@
+ - `A3-9-1` - `VariableWidthIntegerTypesUsed.ql`:
+   - Reduce false positives by not considering variables from template instantiations.
diff --git a/cpp/autosar/src/rules/A3-9-1/VariableWidthIntegerTypesUsed.ql b/cpp/autosar/src/rules/A3-9-1/VariableWidthIntegerTypesUsed.ql
index 84a38b0f6a..fa19ad998f 100644
--- a/cpp/autosar/src/rules/A3-9-1/VariableWidthIntegerTypesUsed.ql
+++ b/cpp/autosar/src/rules/A3-9-1/VariableWidthIntegerTypesUsed.ql
@@ -32,6 +32,10 @@ where
     typeStrippedOfSpecifiers instanceof SignedCharType
   ) and
   not v instanceof ExcludedVariable and
+  // Dont consider template instantiations because instantiations with
+  // Fixed Width Types are recorded after stripping their typedef'd type,
+  // thereby, causing false positives (#540).
+  not v.isFromTemplateInstantiation(_) and
   //post-increment/post-decrement operators are required by the standard to have a dummy int parameter
   not v.(Parameter).getFunction() instanceof PostIncrementOperator and
   not v.(Parameter).getFunction() instanceof PostDecrementOperator
diff --git a/cpp/autosar/test/rules/A3-9-1/test.cpp b/cpp/autosar/test/rules/A3-9-1/test.cpp
index 882738eea1..7ffb87ca39 100644
--- a/cpp/autosar/test/rules/A3-9-1/test.cpp
+++ b/cpp/autosar/test/rules/A3-9-1/test.cpp
@@ -75,4 +75,15 @@ void test_variable_width_type_qualified_variables() {
 struct test_fix_fp_614 {
   test_fix_fp_614 operator++(int); // COMPLIANT
   test_fix_fp_614 operator--(int); // COMPLIANT
-};
\ No newline at end of file
+};
+
+// COMPLIANT - instantiated with Fixed Width Types.
+template <typename MyType> constexpr void test_fix_fp_540(MyType value) {
+  value++;
+}
+
+int call_test_fix_fp_540() {
+  test_fix_fp_540<std::uint8_t>(19);
+  test_fix_fp_540<std::int16_t>(20);
+  return 0;
+}

From f5394d0b1ef8bad2b32ef07298eebb7803a902b6 Mon Sep 17 00:00:00 2001
From: "rakesh.pothengil" <rakesh.pothengil@woven-planet.global>
Date: Thu, 19 Dec 2024 11:17:11 +0900
Subject: [PATCH 435/435] Check called functions with noexcept(unknown)

---
 change_notes/2024-12-17-fix-fp-824-a15-4-4    |  2 +-
 .../src/rules/A15-4-4/MissingNoExcept.ql      | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/change_notes/2024-12-17-fix-fp-824-a15-4-4 b/change_notes/2024-12-17-fix-fp-824-a15-4-4
index 0908c14ffa..89ccf49815 100644
--- a/change_notes/2024-12-17-fix-fp-824-a15-4-4
+++ b/change_notes/2024-12-17-fix-fp-824-a15-4-4
@@ -1,2 +1,2 @@
  - `A15-4-4` - `MissingNoExcept.ql`:
-   - Reduce false positives by not reporting on functions that have a noexcept specification with a complex expression.
+   - Reduce false positives by not reporting on functions that have a noexcept specification with a complex expression or call other such functions.
diff --git a/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql b/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql
index 2721b42af3..33369e00a4 100644
--- a/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql
+++ b/cpp/autosar/src/rules/A15-4-4/MissingNoExcept.ql
@@ -19,6 +19,36 @@ import codingstandards.cpp.autosar
 import codingstandards.cpp.exceptions.ExceptionSpecifications
 import codingstandards.cpp.exceptions.ExceptionFlow
 
+// These functions have a noexcept specification that could not be resolved
+// to noexcept(true). So either, they are noexcept(false) functions which
+// means, they can throw an exception OR they have an expression which
+// could not be resolved to "true" or "false". Even in this case, lets
+// be more conservative and assume they may thrown an exception.
+class FunctionWithUnknownNoExcept extends Function {
+  FunctionWithUnknownNoExcept() {
+    // Exists a noexcept specification but not noexcept(true)
+    exists(this.getADeclarationEntry().getNoExceptExpr()) and
+    not isNoExceptTrue(this)
+  }
+}
+
+// This predicate checks if a function can call to other functions
+// that may have a noexcept specification which cannot be resolved to
+// noexcept(true).
+predicate mayCallThrowingFunctions(Function f) {
+  // Exists a call in this function
+  exists(Call fc |
+    fc.getEnclosingFunction() = f and
+    (
+      // Either this call is to a function with an unknown noexcept OR
+      fc.getTarget() instanceof FunctionWithUnknownNoExcept
+      or
+      // That function can further have calls to unknown noexcept functions.
+      mayCallThrowingFunctions(fc.getTarget())
+    )
+  )
+}
+
 from Function f
 where
   not isExcluded(f, Exceptions1Package::missingNoExceptQuery()) and
@@ -31,6 +61,9 @@ where
   // Not having a noexcept specification that
   // could not be computed as true or false above.
   not exists(f.getADeclarationEntry().getNoExceptExpr()) and
+  // Not calling function(s) which have a noexcept specification that
+  // could not be computed as true.
+  not mayCallThrowingFunctions(f) and
   // Not compiler generated
   not f.isCompilerGenerated() and
   // The function is defined in this database