Handle overloads

Author: MichaelRFairhurst

cpp/misra/src/rules/RULE-6-2-3/SourceCodeImplementedOnlyOnce.ql

@@ -16,24 +16,29 @@
 
 import cpp
 import codingstandards.cpp.misra
+import codingstandards.cpp.types.Compatible
 
-predicate isInline(DeclarationEntry d) {
-  // There is no way to detect if a `GlobalVariable` is declared inline.
-  d.getDeclaration().(Function).isInline()
+predicate isInline(FunctionDeclarationEntry d) { d.getDeclaration().isInline() }
+
+predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
+  f1.isDefinition() and
+  f2.isDefinition() and
+  f1.getDeclaration().getQualifiedName() = f2.getDeclaration().getQualifiedName() and
+  isInline(f1) and
+  isInline(f2) and
+  not f1.getFile() = f2.getFile()
 }
 
-from DeclarationEntry d1, DeclarationEntry d2, string namespace, string name
+module FunDeclEquiv =
+  FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>;
+
+from FunctionDeclarationEntry d1, FunctionDeclarationEntry d2, string namespace, string name
 where
   not isExcluded([d1, d2], Declarations8Package::sourceCodeImplementedOnlyOnceQuery()) and
-  d1 != d2 and
-  d1.isDefinition() and
-  d2.isDefinition() and
-  isInline(d1) and
-  isInline(d2) and
+  interestedInFunctions(d1, d2) and
+  FunDeclEquiv::equalParameterTypes(d1, d2) and
   d1.getDeclaration().hasQualifiedName(namespace, name) and
   d2.getDeclaration().hasQualifiedName(namespace, name) and
-  d1.getFile() != d2.getFile() and
   d1.getFile().getAbsolutePath() < d2.getFile().getAbsolutePath()
-select d1,
-  "Inline variable '" + d1.getName() +
-    "' is defined in multiple files, violating the source code uniqueness requirement."
+select d1, "Inline function '" + d1.getName() + "' is implemented in multiple files: $@ and $@.",
+  d1, d1.getFile().getBaseName(), d2, d2.getFile().getBaseName()

cpp/misra/test/rules/RULE-6-2-3/DuplicateTypeDefinitions.expected

@@ -1,9 +1,9 @@
-| test.cpp:15:8:15:22 | definition of StructRedefined | Type 'StructRedefined' is defined in files $@ and $@. | test.cpp:15:8:15:22 | definition of StructRedefined | test.cpp | test2.cpp:16:8:16:22 | definition of StructRedefined | test2.cpp |
-| test.cpp:22:29:22:40 | definition of TplRedefined<T> | Type 'TplRedefined<T>' is defined in files $@ and $@. | test.cpp:22:29:22:40 | definition of TplRedefined<T> | test.cpp | test2.cpp:22:29:22:40 | definition of TplRedefined<T> | test2.cpp |
-| test.cpp:26:6:26:18 | definition of DuplicateEnum | Type 'DuplicateEnum' is defined in files $@ and $@. | test.cpp:26:6:26:18 | definition of DuplicateEnum | test.cpp | test2.cpp:25:6:25:18 | definition of DuplicateEnum | test2.cpp |
-| test.cpp:27:12:27:29 | definition of DuplicateEnumClass | Type 'DuplicateEnumClass' is defined in files $@ and $@. | test.cpp:27:12:27:29 | definition of DuplicateEnumClass | test.cpp | test2.cpp:26:12:26:29 | definition of DuplicateEnumClass | test2.cpp |
-| test.cpp:29:17:29:32 | declaration of DuplicateTypedef | Type 'DuplicateTypedef' is defined in files $@ and $@. | test.cpp:29:17:29:32 | declaration of DuplicateTypedef | test.cpp | test2.cpp:28:17:28:32 | declaration of DuplicateTypedef | test2.cpp |
-| test.cpp:30:7:30:20 | declaration of DuplicateUsing | Type 'DuplicateUsing' is defined in files $@ and $@. | test.cpp:30:7:30:20 | declaration of DuplicateUsing | test.cpp | test2.cpp:29:7:29:20 | declaration of DuplicateUsing | test2.cpp |
-| test.cpp:31:7:31:20 | definition of DuplicateUnion | Type 'DuplicateUnion' is defined in files $@ and $@. | test.cpp:31:7:31:20 | definition of DuplicateUnion | test.cpp | test2.cpp:30:7:30:20 | definition of DuplicateUnion | test2.cpp |
-| test.cpp:36:7:36:11 | definition of Outer | Type 'ns1::Outer' is defined in files $@ and $@. | test.cpp:36:7:36:11 | definition of Outer | test.cpp | test2.cpp:35:7:35:11 | definition of Outer | test2.cpp |
-| test.cpp:37:9:37:13 | definition of Inner | Type 'ns1::Outer::Inner' is defined in files $@ and $@. | test.cpp:37:9:37:13 | definition of Inner | test.cpp | test2.cpp:36:9:36:13 | definition of Inner | test2.cpp |
+| test.cpp:16:8:16:22 | definition of StructRedefined | Type 'StructRedefined' is defined in files $@ and $@. | test.cpp:16:8:16:22 | definition of StructRedefined | test.cpp | test2.cpp:17:8:17:22 | definition of StructRedefined | test2.cpp |
+| test.cpp:23:29:23:40 | definition of TplRedefined<T> | Type 'TplRedefined<T>' is defined in files $@ and $@. | test.cpp:23:29:23:40 | definition of TplRedefined<T> | test.cpp | test2.cpp:23:29:23:40 | definition of TplRedefined<T> | test2.cpp |
+| test.cpp:27:6:27:18 | definition of DuplicateEnum | Type 'DuplicateEnum' is defined in files $@ and $@. | test.cpp:27:6:27:18 | definition of DuplicateEnum | test.cpp | test2.cpp:26:6:26:18 | definition of DuplicateEnum | test2.cpp |
+| test.cpp:28:12:28:29 | definition of DuplicateEnumClass | Type 'DuplicateEnumClass' is defined in files $@ and $@. | test.cpp:28:12:28:29 | definition of DuplicateEnumClass | test.cpp | test2.cpp:27:12:27:29 | definition of DuplicateEnumClass | test2.cpp |
+| test.cpp:30:17:30:32 | declaration of DuplicateTypedef | Type 'DuplicateTypedef' is defined in files $@ and $@. | test.cpp:30:17:30:32 | declaration of DuplicateTypedef | test.cpp | test2.cpp:29:17:29:32 | declaration of DuplicateTypedef | test2.cpp |
+| test.cpp:31:7:31:20 | declaration of DuplicateUsing | Type 'DuplicateUsing' is defined in files $@ and $@. | test.cpp:31:7:31:20 | declaration of DuplicateUsing | test.cpp | test2.cpp:30:7:30:20 | declaration of DuplicateUsing | test2.cpp |
+| test.cpp:32:7:32:20 | definition of DuplicateUnion | Type 'DuplicateUnion' is defined in files $@ and $@. | test.cpp:32:7:32:20 | definition of DuplicateUnion | test.cpp | test2.cpp:31:7:31:20 | definition of DuplicateUnion | test2.cpp |
+| test.cpp:37:7:37:11 | definition of Outer | Type 'ns1::Outer' is defined in files $@ and $@. | test.cpp:37:7:37:11 | definition of Outer | test.cpp | test2.cpp:36:7:36:11 | definition of Outer | test2.cpp |
+| test.cpp:38:9:38:13 | definition of Inner | Type 'ns1::Outer::Inner' is defined in files $@ and $@. | test.cpp:38:9:38:13 | definition of Inner | test.cpp | test2.cpp:37:9:37:13 | definition of Inner | test2.cpp |

cpp/misra/test/rules/RULE-6-2-3/test.cpp

@@ -6,6 +6,7 @@ inline int16_t global_redeclared = 0; // COMPLIANT
 inline void func_redefined() {}       // NON_COMPLIANT
 inline void func_unique() {}          // COMPLIANT
 inline void func_redeclared() {}      // COMPLIANT
+inline void func_overloaded(int) {}   // COMPLIANT
 
 // Violates our implementation of 6.2.1, but legal in our implementation
 // of 6.2.3

cpp/misra/test/rules/RULE-6-2-3/test2.cpp

@@ -7,6 +7,7 @@ inline int16_t global_redefined = 0;     // NON_COMPLIANT[False negative]
 extern inline int16_t global_redeclared; // COMPLIANT
 inline void func_redefined() {}          // NON_COMPLIANT -- flagged in test.cpp
 inline void func_redeclared();           // COMPLIANT
+inline void func_overloaded(double) {}   // COMPLIANT
 
 // Violates our implementation of 6.2.1, but legal in our implementation
 // of 6.2.3