Merge pull request #1018 from knewbury01/knewbury01/Linkage2

Add package linkage 2

Author: knewbury01

.vscode/tasks.json

@@ -259,6 +259,8 @@
                 "Language1",
                 "Language2",
                 "Language3",
+                "Linkage1",
+                "Linkage2",
                 "Literals",
                 "Loops",
                 "Macros",

change_notes/2026-01-26-improve-queries.md

@@ -0,0 +1,4 @@
+- `A3-1-1` - `ViolationsOfOneDefinitionRule.ql`:
+  - The query previously would incorrectly allow cases where something was defined with `extern` and did not use the defined external linkage library to find external linkage. This change may result in the query finding more results. Additionally a typo has been fixed in the alert message which will cause the old alerts for this query to now show up as new ones.
+  - `RULE-6-0-2`, `A3-1-4` - `ExternalLinkageArrayWithoutExplicitSizeMisra.ql`, `ExternalLinkageArrayWithoutExplicitSizeAutosar.ql`:
+  - The queries listed now find flexible member arrays in structs, as those do not have an explicit size.

cpp/autosar/src/rules/A3-1-1/ViolationsOfOneDefinitionRule.ql

@@ -20,67 +20,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.AcceptableHeader
+import codingstandards.cpp.rules.violationsofonedefinitionrule.ViolationsOfOneDefinitionRule
 
-predicate isInline(Function decl) {
-  exists(Specifier spec |
-    spec = decl.getASpecifier() and
-    (
-      spec.hasName("inline") or
-      spec.hasName("constexpr")
-    )
-  )
+class ViolationsOfOneDefinitionRuleQuery extends ViolationsOfOneDefinitionRuleSharedQuery {
+  ViolationsOfOneDefinitionRuleQuery() {
+    this = IncludesPackage::violationsOfOneDefinitionRuleQuery()
+  }
 }
-
-predicate isExtern(FunctionDeclarationEntry decl) {
-  exists(string spec |
-    spec = decl.getASpecifier() and
-    spec = "extern"
-  )
-}
-
-from DeclarationEntry decl, string case, string name
-where
-  (
-    //a non-inline/non-extern function defined in a header
-    exists(FunctionDeclarationEntry fn |
-      fn.isDefinition() and
-      not (
-        isInline(fn.getDeclaration())
-        or
-        isExtern(fn)
-        or
-        //any (defined) templates do not violate the ODR
-        fn.isFromUninstantiatedTemplate(_)
-        or
-        fn.isFromTemplateInstantiation(_) and
-        //except for specializations, those do violate ODR
-        not fn.isSpecialization()
-        or
-        fn.getDeclaration().isStatic()
-      ) and
-      decl = fn and
-      case = "function"
-    )
-    or
-    //an non-const object defined in a header
-    exists(GlobalOrNamespaceVariable object |
-      object.hasDefinition() and
-      not (
-        object.isConstexpr()
-        or
-        object.isConst()
-        or
-        object.isStatic()
-      ) and
-      decl = object.getDefinition() and
-      case = "object"
-    )
-  ) and
-  not decl.getDeclaration().getNamespace().isAnonymous() and
-  decl.getFile() instanceof AcceptableHeader and
-  not isExcluded(decl, IncludesPackage::violationsOfOneDefinitionRuleQuery()) and
-  name = decl.getName()
-select decl,
-  "Header file $@ contains " + case + " " + name + " that lead to One Defintion Rule violation.",
-  decl.getFile(), decl.getFile().getBaseName()

cpp/autosar/test/rules/A3-1-1/ViolationsOfOneDefinitionRule.expected

@@ -0,0 +1 @@
+cpp/common/test/rules/violationsofonedefinitionrule/ViolationsOfOneDefinitionRule.ql

cpp/autosar/test/rules/A3-1-1/ViolationsOfOneDefinitionRule.qlref

@@ -369,6 +369,9 @@ predicate hidesStrict(UserVariable v1, UserVariable v2) {
 predicate hasNamespaceScope(Declaration decl) {
   // getNamespace always returns a namespace (e.g. the global namespace).
   exists(Namespace n | namespacembrs(unresolveElement(n), underlyingElement(decl)))
+  or
+  decl.isTopLevel() and
+  not namespacembrs(_, decl)
 }
 
 /** Holds if `decl` has class scope. */

cpp/autosar/test/rules/A3-1-1/ViolationsOfOneDefinitionRule.testref

@@ -0,0 +1,44 @@
+//** THIS FILE IS AUTOGENERATED, DO NOT MODIFY DIRECTLY.  **/
+import cpp
+import RuleMetadata
+import codingstandards.cpp.exclusions.RuleMetadata
+
+newtype Linkage2Query =
+  TViolationsOfOneDefinitionRuleMisraQuery() or
+  TInternalLinkageSpecifiedAppropriatelyQuery()
+
+predicate isLinkage2QueryMetadata(Query query, string queryId, string ruleId, string category) {
+  query =
+    // `Query` instance for the `violationsOfOneDefinitionRuleMisra` query
+    Linkage2Package::violationsOfOneDefinitionRuleMisraQuery() and
+  queryId =
+    // `@id` for the `violationsOfOneDefinitionRuleMisra` query
+    "cpp/misra/violations-of-one-definition-rule-misra" and
+  ruleId = "RULE-6-2-4" and
+  category = "required"
+  or
+  query =
+    // `Query` instance for the `internalLinkageSpecifiedAppropriately` query
+    Linkage2Package::internalLinkageSpecifiedAppropriatelyQuery() and
+  queryId =
+    // `@id` for the `internalLinkageSpecifiedAppropriately` query
+    "cpp/misra/internal-linkage-specified-appropriately" and
+  ruleId = "RULE-6-5-2" and
+  category = "advisory"
+}
+
+module Linkage2Package {
+  Query violationsOfOneDefinitionRuleMisraQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `violationsOfOneDefinitionRuleMisra` query
+      TQueryCPP(TLinkage2PackageQuery(TViolationsOfOneDefinitionRuleMisraQuery()))
+  }
+
+  Query internalLinkageSpecifiedAppropriatelyQuery() {
+    //autogenerate `Query` type
+    result =
+      // `Query` type for `internalLinkageSpecifiedAppropriately` query
+      TQueryCPP(TLinkage2PackageQuery(TInternalLinkageSpecifiedAppropriatelyQuery()))
+  }
+}

cpp/autosar/test/rules/A3-1-1/test.hpp

@@ -36,6 +36,7 @@ import Invariants
 import Iterators
 import Lambdas
 import Linkage1
+import Linkage2
 import Literals
 import Loops
 import Macros
@@ -100,6 +101,7 @@ newtype TCPPQuery =
   TIteratorsPackageQuery(IteratorsQuery q) or
   TLambdasPackageQuery(LambdasQuery q) or
   TLinkage1PackageQuery(Linkage1Query q) or
+  TLinkage2PackageQuery(Linkage2Query q) or
   TLiteralsPackageQuery(LiteralsQuery q) or
   TLoopsPackageQuery(LoopsQuery q) or
   TMacrosPackageQuery(MacrosQuery q) or
@@ -164,6 +166,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isIteratorsQueryMetadata(query, queryId, ruleId, category) or
   isLambdasQueryMetadata(query, queryId, ruleId, category) or
   isLinkage1QueryMetadata(query, queryId, ruleId, category) or
+  isLinkage2QueryMetadata(query, queryId, ruleId, category) or
   isLiteralsQueryMetadata(query, queryId, ruleId, category) or
   isLoopsQueryMetadata(query, queryId, ruleId, category) or
   isMacrosQueryMetadata(query, queryId, ruleId, category) or