github
diff --git a/‎change_notes/2024-07-05-fix-fp-621-A7-1-1.md
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎change_notes/2024-07-05-fix-fp-621-A7-1-1.md
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎cpp/autosar/src/rules/A7-1-1/DeclarationUnmodifiedObjectMissingConstSpecifier.ql
Copy file name to clipboardExpand all lines: cpp/autosar/src/rules/A7-1-1/DeclarationUnmodifiedObjectMissingConstSpecifier.ql
+3-1Lines changed: 3 additions & 1 deletion b/‎cpp/autosar/src/rules/A7-1-1/DeclarationUnmodifiedObjectMissingConstSpecifier.ql
Copy file name to clipboardExpand all lines: cpp/autosar/src/rules/A7-1-1/DeclarationUnmodifiedObjectMissingConstSpecifier.ql
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎cpp/autosar/test/rules/A7-1-1/test.cpp
Copy file name to clipboardExpand all lines: cpp/autosar/test/rules/A7-1-1/test.cpp
+8-1Lines changed: 8 additions & 1 deletion b/‎cpp/autosar/test/rules/A7-1-1/test.cpp
Copy file name to clipboardExpand all lines: cpp/autosar/test/rules/A7-1-1/test.cpp
+8-1Lines changed: 8 additions & 1 deletion
@@ -0,0 +1,2 @@
+- `A7-1-1` - `DeclarationUnmodifiedObjectMissingConstSpecifier.ql`:
+  - Fixes #621. Exclude template instantiations that come from constexpr templates.
@@ -37,5 +37,7 @@ where
   ) and
   not exists(LambdaExpression lc | lc.getACapture().getField() = v) and
   not v.isFromUninstantiatedTemplate(_) and
-  not v.isCompilerGenerated()
+  not v.isCompilerGenerated() and
+  //if the instantiation is not constexpr but the template is, still exclude it as a candidate
+  not exists(TemplateVariable b | b.getAnInstantiation() = v and b.isConstexpr())
 select v, "Non-constant variable " + v.getName() + cond + " and is not modified."
@@ -76,4 +76,11 @@ int main(int, char **) noexcept {
   new A7_1_1b<A7_1_1bHelper>(0);
 
   (new Issue18)->F(0);
-}
+}
+
+template <bool... Args> extern constexpr bool recurse_var = true; // COMPLIANT
+
+template <bool B1, bool... Args>
+extern constexpr bool recurse_var<B1, Args...> = B1 &&recurse_var<Args...>;
+
+void fp_621() { recurse_var<true, true, true>; }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+- `A7-1-1` - `DeclarationUnmodifiedObjectMissingConstSpecifier.ql`:
	`2`	`+ - Fixes #621. Exclude template instantiations that come from constexpr templates.`