Fix implementation RULE-6-8-4

Author: knewbury01

cpp/common/src/codingstandards/cpp/exclusions/cpp/RuleMetadata.qll

@@ -33,8 +33,8 @@ import DeadCode8
 import DeadCode9
 import Declarations
 import Declarations1
-import Declarations5
 import Declarations2
+import Declarations5
 import ExceptionSafety
 import Exceptions1
 import Exceptions2
@@ -131,8 +131,8 @@ newtype TCPPQuery =
   TDeadCode9PackageQuery(DeadCode9Query q) or
   TDeclarationsPackageQuery(DeclarationsQuery q) or
   TDeclarations1PackageQuery(Declarations1Query q) or
-  TDeclarations5PackageQuery(Declarations5Query q) or
   TDeclarations2PackageQuery(Declarations2Query q) or
+  TDeclarations5PackageQuery(Declarations5Query q) or
   TExceptionSafetyPackageQuery(ExceptionSafetyQuery q) or
   TExceptions1PackageQuery(Exceptions1Query q) or
   TExceptions2PackageQuery(Exceptions2Query q) or
@@ -229,8 +229,8 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isDeadCode9QueryMetadata(query, queryId, ruleId, category) or
   isDeclarationsQueryMetadata(query, queryId, ruleId, category) or
   isDeclarations1QueryMetadata(query, queryId, ruleId, category) or
-  isDeclarations5QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations2QueryMetadata(query, queryId, ruleId, category) or
+  isDeclarations5QueryMetadata(query, queryId, ruleId, category) or
   isExceptionSafetyQueryMetadata(query, queryId, ruleId, category) or
   isExceptions1QueryMetadata(query, queryId, ruleId, category) or
   isExceptions2QueryMetadata(query, queryId, ruleId, category) or

cpp/misra/src/rules/RULE-6-8-4/MemberFunctionsRefqualified.ql

@@ -18,7 +18,14 @@ import codingstandards.cpp.misra
 import codingstandards.cpp.types.Compatible
 import codingstandards.cpp.Operator
 
-abstract class MembersReturningObjectOrSubobject extends MemberFunction {
+class MembersReturningPointerOrRef extends MemberFunction {
+  MembersReturningPointerOrRef() {
+    this.getUnspecifiedType() instanceof PointerType or
+    this.getUnspecifiedType() instanceof ReferenceType
+  }
+}
+
+abstract class MembersReturningObjectOrSubobject extends MembersReturningPointerOrRef {
   string toString() { result = "Members returning object or subobject" }
 }
 

cpp/misra/test/rules/RULE-6-8-4/MemberFunctionsRefqualified.expected

@@ -1,4 +1,3 @@
-| test.cpp:10:7:10:11 | Members returning object or subobject | Member function is not properly ref qualified. |
 | test.cpp:12:14:12:20 | Members returning object or subobject | Member function is not properly ref qualified. |
 | test.cpp:24:12:24:23 | Members returning object or subobject | Member function is not properly ref qualified. |
 | test.cpp:28:6:28:18 | Members returning object or subobject | Member function is not properly ref qualified. |

cpp/misra/test/rules/RULE-6-8-4/test.cpp

@@ -7,7 +7,7 @@ struct A {
   int const &geta2() const & { // COMPLIANT  -- due to overload below
     return a;
   }
-  int geta2() && { return a; } // NON_COMPLIANT
+  int geta2() && { return a; }
 
   int const &getabad() const & { // NON_COMPLIANT  -- no overload provided
     return a;