M14-6-1: Push dependent base type context

Push the dependent type context into the individual determination of
contravening cases to work towards addressing performance issues.

Author: lcartey

cpp/autosar/src/rules/M14-6-1/NameInDependentBase.qll

@@ -18,44 +18,47 @@ TemplateClass getADependentBaseType(TemplateClass t) {
 }
 
 /**
- * There is a `MemberFunction` in parent class with same name
- * as a `FunctionCall` that exists in a child `MemberFunction`
+ * Gets a function call in `TemplateClass` `t` where the target function name exists in a dependent
+ * base type and the function does not call that function.
  */
-FunctionCall parentMemberFunctionCall(Class child, Class parent) {
-  exists(MemberFunction parentFunction, Function other |
+FunctionCall parentMemberFunctionCall(TemplateClass t) {
+  exists(TemplateClass dependentBaseType, MemberFunction parentFunction, Function other |
+    dependentBaseType = getADependentBaseType(t) and
     not other = parentFunction and
-    parent.getAMember() = parentFunction and
+    dependentBaseType.getAMember() = parentFunction and
     other.getName() = parentFunction.getName() and
     result = other.getACallToThisFunction() and
-    result.getEnclosingFunction() = child.getAMemberFunction()
+    result.getEnclosingFunction() = t.getAMemberFunction()
   )
 }
 
 /**
  * There is a `MemberFunction` in parent class with same name
  * as a `FunctionAccess` that exists in a child `MemberFunction`
  */
-FunctionAccess parentMemberFunctionAccess(Class child, Class parent) {
-  exists(MemberFunction parentFunction, Function other |
+FunctionAccess parentMemberFunctionAccess(TemplateClass t) {
+  exists(TemplateClass dependentBaseType, MemberFunction parentFunction, Function other |
+    dependentBaseType = getADependentBaseType(t) and
     not other = parentFunction and
-    parent.getAMember() = parentFunction and
+    dependentBaseType.getAMember() = parentFunction and
     other.getName() = parentFunction.getName() and
     result = other.getAnAccess() and
-    result.getEnclosingFunction() = child.getAMemberFunction()
+    result.getEnclosingFunction() = t.getAMemberFunction()
   )
 }
 
 /**
  * There is a `MemberVariable` in parent class with same name
  * as a `VariableAccess` that exists in a child `MemberFunction`
  */
-Access parentMemberAccess(Class child, Class parent) {
-  exists(MemberVariable parentMember, Variable other |
+Access parentMemberAccess(TemplateClass t) {
+  exists(TemplateClass dependentBaseType, MemberVariable parentMember, Variable other |
+    dependentBaseType = getADependentBaseType(t) and
     not other = parentMember and
-    parent.getAMemberVariable() = parentMember and
+    dependentBaseType.getAMemberVariable() = parentMember and
     other.getName() = parentMember.getName() and
     result = other.getAnAccess() and
-    result.getEnclosingFunction() = child.getAMemberFunction()
+    result.getEnclosingFunction() = t.getAMemberFunction()
   )
 }
 

cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql

@@ -18,23 +18,22 @@ import cpp
 import codingstandards.cpp.autosar
 import NameInDependentBase
 
-from TemplateClass c, TemplateClass dependentBaseType, NameQualifiableElement fn
+from TemplateClass c, NameQualifiableElement fn
 where
   not isExcluded(fn, TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisQuery()) and
   not isCustomExcluded(fn) and
-  dependentBaseType = getADependentBaseType(c) and
   missingNameQualifier(fn) and
   (
     fn instanceof FunctionAccess and
-    fn = parentMemberFunctionAccess(c, dependentBaseType)
+    fn = parentMemberFunctionAccess(c)
     or
     fn instanceof FunctionCall and
-    fn = parentMemberFunctionCall(c, dependentBaseType) and
+    fn = parentMemberFunctionCall(c) and
     not exists(Expr e | e = fn.(FunctionCall).getQualifier())
     or
     fn instanceof VariableAccess and
     not fn.(VariableAccess).getTarget() instanceof Parameter and
-    fn = parentMemberAccess(c, dependentBaseType) and
+    fn = parentMemberAccess(c) and
     not exists(Expr e | e = fn.(VariableAccess).getQualifier())
   ) and
   not fn.isAffectedByMacro()

cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql

@@ -18,23 +18,22 @@ import cpp
 import codingstandards.cpp.autosar
 import NameInDependentBase
 
-from TemplateClass c, TemplateClass dependentBaseType, NameQualifiableElement fn
+from TemplateClass c, NameQualifiableElement fn
 where
   not isExcluded(fn, TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisAuditQuery()) and
   not isCustomExcluded(fn) and
-  dependentBaseType = getADependentBaseType(c) and
   missingNameQualifier(fn) and
   (
     fn instanceof FunctionAccess and
-    fn = parentMemberFunctionAccess(c, dependentBaseType)
+    fn = parentMemberFunctionAccess(c)
     or
     fn instanceof FunctionCall and
-    fn = parentMemberFunctionCall(c, dependentBaseType) and
+    fn = parentMemberFunctionCall(c) and
     not exists(Expr e | e = fn.(FunctionCall).getQualifier())
     or
     fn instanceof VariableAccess and
     not fn.(VariableAccess).getTarget() instanceof Parameter and
-    fn = parentMemberAccess(c, dependentBaseType) and
+    fn = parentMemberAccess(c) and
     not exists(Expr e | e = fn.(VariableAccess).getQualifier())
   )
 select fn, "Use of identifier that also exists in a base class that is not fully qualified."