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] 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