Merge branch 'main' into jeongsoolee09/MISRA-C++-2023-Banned7

jeongsoolee09 · web-flow · commit 568daa7e1405 · 2026-04-09T23:41:26.000-04:00
diff --git a/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql b/cpp/autosar/src/rules/M3-1-2/FunctionsDeclaredAtBlockScope.ql
@@ -17,10 +17,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.functiondeclaredatblockscope.FunctionDeclaredAtBlockScope
 
-from DeclStmt decl, Function f
-where
-  not isExcluded(decl, DeclarationsPackage::functionsDeclaredAtBlockScopeQuery()) and
-  not isExcluded(f, DeclarationsPackage::functionsDeclaredAtBlockScopeQuery()) and
-  decl.getADeclaration() = f
-select f, "Function " + f.getName() + " is declared at block scope."
+module FunctionDeclaredAtBlockScopeConfig implements FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery() { result = DeclarationsPackage::functionsDeclaredAtBlockScopeQuery() }
+}
+
+import FunctionDeclaredAtBlockScope<FunctionDeclaredAtBlockScopeConfig>
diff --git a/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.qlref b/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.qlref
diff --git a/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.testref b/cpp/autosar/test/rules/M3-1-2/FunctionsDeclaredAtBlockScope.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Declarations3.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Declarations3.qll
@@ -0,0 +1,44 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Declarations3Query =
+  TVariableDeclaredArrayTypeQuery() or
+  TBlockScopeFunctionAmbiguousQuery()
+
+predicate isDeclarations3QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `variableDeclaredArrayType` query
+    Declarations3Package::variableDeclaredArrayTypeQuery() and
+  queryId =
+    // `@id` for the `variableDeclaredArrayType` query
+    "cpp/misra/variable-declared-array-type" and
+  ruleId = "RULE-11-3-1" and
+  category = "advisory"
+  or
+  query =
+    // `Query` instance for the `blockScopeFunctionAmbiguous` query
+    Declarations3Package::blockScopeFunctionAmbiguousQuery() and
+  queryId =
+    // `@id` for the `blockScopeFunctionAmbiguous` query
+    "cpp/misra/block-scope-function-ambiguous" and
+  ruleId = "RULE-6-0-1" and
+  category = "required"
+}
+
+module Declarations3Package {
+  Query variableDeclaredArrayTypeQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `variableDeclaredArrayType` query
+      TQueryCPP(TDeclarations3PackageQuery(TVariableDeclaredArrayTypeQuery()))
+  }
+
+  Query blockScopeFunctionAmbiguousQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `blockScopeFunctionAmbiguous` query
+      TQueryCPP(TDeclarations3PackageQuery(TBlockScopeFunctionAmbiguousQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/Declarations4.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/Declarations4.qll
@@ -0,0 +1,26 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Declarations4Query = TVolatileQualifierNotUsedAppropriatelyQuery()
+
+predicate isDeclarations4QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `volatileQualifierNotUsedAppropriately` query
+    Declarations4Package::volatileQualifierNotUsedAppropriatelyQuery() and
+  queryId =
+    // `@id` for the `volatileQualifierNotUsedAppropriately` query
+    "cpp/misra/volatile-qualifier-not-used-appropriately" and
+  ruleId = "RULE-10-1-2" and
+  category = "required"
+}
+
+module Declarations4Package {
+  Query volatileQualifierNotUsedAppropriatelyQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `volatileQualifierNotUsedAppropriately` query
+      TQueryCPP(TDeclarations4PackageQuery(TVolatileQualifierNotUsedAppropriatelyQuery()))
+  }
+}
diff --git a/cpp/common/src/codingstandards/cpp/exclusions/cpp/RuleMetadata.qll b/cpp/common/src/codingstandards/cpp/exclusions/cpp/RuleMetadata.qll
@@ -35,6 +35,8 @@ import DeadCode9
 import Declarations
 import Declarations1
 import Declarations2
+import Declarations3
+import Declarations4
 import ExceptionSafety
 import Exceptions1
 import Exceptions2
@@ -133,6 +135,8 @@ newtype TCPPQuery =
   TDeclarationsPackageQuery(DeclarationsQuery q) or
   TDeclarations1PackageQuery(Declarations1Query q) or
   TDeclarations2PackageQuery(Declarations2Query q) or
+  TDeclarations3PackageQuery(Declarations3Query q) or
+  TDeclarations4PackageQuery(Declarations4Query q) or
   TExceptionSafetyPackageQuery(ExceptionSafetyQuery q) or
   TExceptions1PackageQuery(Exceptions1Query q) or
   TExceptions2PackageQuery(Exceptions2Query q) or
@@ -231,6 +235,8 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isDeclarationsQueryMetadata(query, queryId, ruleId, category) or
   isDeclarations1QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations2QueryMetadata(query, queryId, ruleId, category) or
+  isDeclarations3QueryMetadata(query, queryId, ruleId, category) or
+  isDeclarations4QueryMetadata(query, queryId, ruleId, category) or
   isExceptionSafetyQueryMetadata(query, queryId, ruleId, category) or
   isExceptions1QueryMetadata(query, queryId, ruleId, category) or
   isExceptions2QueryMetadata(query, queryId, ruleId, category) or
diff --git a/cpp/common/src/codingstandards/cpp/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.qll b/cpp/common/src/codingstandards/cpp/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.qll
@@ -0,0 +1,25 @@
+/**
+ * Provides a configurable module FunctionDeclaredAtBlockScope with a `problems` predicate
+ * for the following issue:
+ * A function declared at block scope can make code harder to read and may lead to
+ * developer confusion.
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+signature module FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery();
+}
+
+module FunctionDeclaredAtBlockScope<FunctionDeclaredAtBlockScopeConfigSig Config> {
+  query predicate problems(Function f, string message) {
+    exists(DeclStmt decl |
+      not isExcluded(decl, Config::getQuery()) and
+      not isExcluded(f, Config::getQuery()) and
+      decl.getADeclaration() = f and
+      message = "Function " + f.getName() + " is declared at block scope."
+    )
+  }
+}
diff --git a/cpp/common/test/includes/standard-library/string_view b/cpp/common/test/includes/standard-library/string_view
@@ -75,6 +75,13 @@ typedef basic_string_view<wchar_t> wstring_view;
 typedef basic_string_view<char16_t> u16string_view;
 typedef basic_string_view<char32_t> u32string_view;
 
+inline namespace literals {
+inline namespace string_view_literals {
+// suffix for basic_string_view literals
+constexpr string_view operator""sv(const char *str, size_t len) noexcept;
+} // namespace string_view_literals
+} // namespace literals
+
 } // namespace std
 
 #endif // _GHLIBCPP_STRING_VIEW
diff --git a/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.expected b/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.expected
diff --git a/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql b/cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql
@@ -0,0 +1,8 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.functiondeclaredatblockscope.FunctionDeclaredAtBlockScope
+
+module TestFileConfig implements FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery() { result instanceof TestQuery }
+}
+
+import FunctionDeclaredAtBlockScope<TestFileConfig>
diff --git a/cpp/common/test/rules/functiondeclaredatblockscope/test.cpp b/cpp/common/test/rules/functiondeclaredatblockscope/test.cpp
diff --git a/cpp/misra/src/rules/RULE-10-1-2/VolatileQualifierNotUsedAppropriately.ql b/cpp/misra/src/rules/RULE-10-1-2/VolatileQualifierNotUsedAppropriately.ql
@@ -0,0 +1,32 @@
+/**
+ * @id cpp/misra/volatile-qualifier-not-used-appropriately
+ * @name RULE-10-1-2: The volatile qualifier shall be used appropriately
+ * @description Using the volatile qualifier on certain entities has behavior that is not
+ *              well-defined and can make code harder to understand, especially as its application
+ *              to these entities does not prevent data races or guarantee safe multithreading.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-10-1-2
+ *       correctness
+ *       readability
+ *       maintainability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/required
+ */
+
+import cpp
+import codingstandards.cpp.misra
+
+from Declaration d
+where
+  not isExcluded(d, Declarations4Package::volatileQualifierNotUsedAppropriatelyQuery()) and
+  d.getADeclarationEntry().getType().isVolatile() and
+  (
+    d instanceof LocalVariable or
+    exists(d.(Parameter).getFunction()) or
+    d instanceof Function or
+    d.(Variable).isStructuredBinding()
+  )
+select d, "Volatile entity '" + d.getName() + "' declared."
diff --git a/cpp/misra/src/rules/RULE-11-3-1/VariableDeclaredArrayType.ql b/cpp/misra/src/rules/RULE-11-3-1/VariableDeclaredArrayType.ql
@@ -0,0 +1,35 @@
+/**
+ * @id cpp/misra/variable-declared-array-type
+ * @name RULE-11-3-1: Variables of array type should not be declared
+ * @description Using array type instead of container types can lead to difficulty manually managing
+ *              size and accesses.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity error
+ * @tags external/misra/id/rule-11-3-1
+ *       correctness
+ *       maintainability
+ *       readability
+ *       scope/single-translation-unit
+ *       external/misra/enforcement/decidable
+ *       external/misra/obligation/advisory
+ */
+
+import cpp
+import codingstandards.cpp.misra
+
+class FixedSizeCharArray extends Variable {
+  FixedSizeCharArray() {
+    this.isStatic() and
+    this.getUnspecifiedType().stripType() instanceof CharType and
+    this.getInitializer().getExpr() instanceof StringLiteral
+  }
+}
+
+from Variable v
+where
+  not isExcluded(v, Declarations3Package::variableDeclaredArrayTypeQuery()) and
+  exists(ArrayType a | v.getType() = a | not v instanceof FixedSizeCharArray) and
+  // Exclude the compiler generated __func__ as it is the only way to access the function name information
+  not v.getName() = "__func__"
+select v, "Variable " + v.getName() + " has an array type."
diff --git a/cpp/misra/src/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.ql b/cpp/misra/src/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.ql
@@ -0,0 +1,25 @@
+/**
+ * @id cpp/misra/block-scope-function-ambiguous
+ * @name RULE-6-0-1: Block scope declarations shall not be visually ambiguous
+ * @description A function declared at block scope can make code harder to read and may lead to
+ *              developer confusion.
+ * @kind problem
+ * @precision very-high
+ * @problem.severity warning
+ * @tags external/misra/id/rule-6-0-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.functiondeclaredatblockscope.FunctionDeclaredAtBlockScope
+
+module BlockScopeFunctionAmbiguousConfig implements FunctionDeclaredAtBlockScopeConfigSig {
+  Query getQuery() { result = Declarations3Package::blockScopeFunctionAmbiguousQuery() }
+}
+
+import FunctionDeclaredAtBlockScope<BlockScopeFunctionAmbiguousConfig>
diff --git a/cpp/misra/test/rules/RULE-10-1-2/VolatileQualifierNotUsedAppropriately.expected b/cpp/misra/test/rules/RULE-10-1-2/VolatileQualifierNotUsedAppropriately.expected
@@ -0,0 +1,7 @@
+| test.cpp:2:16:2:16 | g1 | Volatile entity 'g1' declared. |
+| test.cpp:5:21:5:21 | p | Volatile entity 'p' declared. |
+| test.cpp:6:16:6:16 | x | Volatile entity 'x' declared. |
+| test.cpp:10:18:10:18 | a | Volatile entity 'a' declared. |
+| test.cpp:13:14:13:15 | f1 | Volatile entity 'f1' declared. |
+| test.cpp:16:23:16:23 | p | Volatile entity 'p' declared. |
+| test.cpp:20:16:20:16 | m | Volatile entity 'm' declared. |
diff --git a/cpp/misra/test/rules/RULE-10-1-2/VolatileQualifierNotUsedAppropriately.qlref b/cpp/misra/test/rules/RULE-10-1-2/VolatileQualifierNotUsedAppropriately.qlref
@@ -0,0 +1 @@
+rules/RULE-10-1-2/VolatileQualifierNotUsedAppropriately.ql
diff --git a/cpp/misra/test/rules/RULE-10-1-2/test.cpp b/cpp/misra/test/rules/RULE-10-1-2/test.cpp
@@ -0,0 +1,27 @@
+int g[1] = {1};
+auto volatile [g1] = g; // NON_COMPLIANT
+volatile int g2;        // COMPLIANT
+
+void f(volatile int p) { // NON_COMPLIANT
+  volatile int x = 1;    // NON_COMPLIANT
+  int y = 2;             // COMPLIANT
+
+  int z[1] = {1};
+  auto volatile [a] = z; // NON_COMPLIANT
+}
+
+volatile int f1(); // NON_COMPLIANT
+
+void f2(volatile int *p); // COMPLIANT
+void f3(int *volatile p); // NON_COMPLIANT
+
+class C {
+public:
+  volatile int m(); // NON_COMPLIANT
+  int m1();         // COMPLIANT
+  volatile int m2;  // COMPLIANT
+};
+
+struct S {
+  volatile int s; // COMPLIANT
+};
diff --git a/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.expected b/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.expected
@@ -0,0 +1,9 @@
+| test.cpp:5:5:5:5 | g | Variable g has an array type. |
+| test.cpp:9:24:9:24 | a | Variable a has an array type. |
+| test.cpp:10:7:10:8 | a1 | Variable a1 has an array type. |
+| test.cpp:14:7:14:8 | a1 | Variable a1 has an array type. |
+| test.cpp:19:7:19:7 | x | Variable x has an array type. |
+| test.cpp:20:17:20:17 | a | Variable a has an array type. |
+| test.cpp:22:8:22:9 | x1 | Variable x1 has an array type. |
+| test.cpp:28:6:28:7 | g1 | Variable g1 has an array type. |
+| test.cpp:34:21:34:21 | p | Variable p has an array type. |
diff --git a/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.qlref b/cpp/misra/test/rules/RULE-11-3-1/VariableDeclaredArrayType.qlref
@@ -0,0 +1 @@
+rules/RULE-11-3-1/VariableDeclaredArrayType.ql
diff --git a/cpp/misra/test/rules/RULE-11-3-1/test.cpp b/cpp/misra/test/rules/RULE-11-3-1/test.cpp
@@ -0,0 +1,36 @@
+
+#include <array>
+#include <string_view>
+
+int g[100]; // NON_COMPLIANT
+
+class C {
+public:
+  static constexpr int a[1]{0}; // NON_COMPLIANT
+  int a1[1];                    // NON_COMPLIANT
+};
+
+struct S {
+  int a1[1]; // NON_COMPLIANT
+};
+
+void test_c_arrays() {
+
+  int x[100];                 // NON_COMPLIANT
+  constexpr int a[]{0, 1, 2}; // NON_COMPLIANT
+  const size_t s{1};
+  char x1[s];             // NON_COMPLIANT
+  std::array<char, s> x2; // COMPLIANT
+
+  __func__; // COMPLIANT
+}
+
+char g1[] = "abc";       // NON_COMPLIANT
+const char g2[] = "abc"; // COMPLIANT
+
+using namespace std::literals;
+const auto g3 = "abc"sv; // COMPLIANT
+
+void param_test(int p[1], int (&p1)[1], int (*p2)[1],
+                int *p3) { // NON_COMPLIANT -- p, rest are compliant
+}
diff --git a/cpp/misra/test/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.testref b/cpp/misra/test/rules/RULE-6-0-1/BlockScopeFunctionAmbiguous.testref
@@ -0,0 +1 @@
+cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql
diff --git a/rule_packages/cpp/Declarations.json b/rule_packages/cpp/Declarations.json
@@ -291,6 +291,7 @@
           "precision": "very-high",
           "severity": "warning",
           "short_name": "FunctionsDeclaredAtBlockScope",
+          "shared_implementation_short_name": "FunctionDeclaredAtBlockScope",
           "tags": [
             "correctness",
             "maintainability"
diff --git a/rule_packages/cpp/Declarations3.json b/rule_packages/cpp/Declarations3.json
diff --git a/rule_packages/cpp/Declarations4.json b/rule_packages/cpp/Declarations4.json
diff --git a/rules.csv b/rules.csv

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+cpp/common/test/rules/functiondeclaredatblockscope/FunctionDeclaredAtBlockScope.ql`