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] 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 000000000..fbd09ca84
--- /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 84a38b0f6..fa19ad998 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 882738eea..7ffb87ca3 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;
+}