M14-6-1: Ensure local scope variables are ignored

Access of a local scope variable shadowing a dependent base member is
not a case with confusing behaviour - the local scope variable would
be expected to be the target.

Author: lcartey

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

@@ -92,7 +92,9 @@ private VariableAccess helper_memberaccess(
   not target.getDeclaringType() = dependentBaseType and
   result = target.getAnAccess() and
   result.getEnclosingFunction() = t.getAMemberFunction() and
-  name = target.getName()
+  name = target.getName() and
+  // The target is not a local variable, which isn't subject to confusion
+  not target instanceof LocalScopeVariable
 }
 
 /**

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

@@ -31,7 +31,6 @@ where
     fn = getConfusingFunctionCall(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
     not exists(Expr e | e = fn.(FunctionCall).getQualifier())
     or
-    not fn.(VariableAccess).getTarget() instanceof Parameter and
     fn =
       getConfusingMemberVariableAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
     not exists(Expr e | e = fn.(VariableAccess).getQualifier())

cpp/autosar/test/rules/M14-6-1/test.cpp

@@ -29,12 +29,21 @@ template <typename T> class A : B<T> {
     typename B<T>::TYPE t2 = 0;   // COMPLIANT
     g1();                         // COMPLIANT, identifier not found in B
   }
+  void m3(int m) {
+    m = 0;            // COMPLIANT, hides member
+  }
+  void m4() {
+    int m = 0;
+    m = 0;            // COMPLIANT, hides member
+  }
 };
 
 void f() {
   A<int> a;
   a.m1();
   a.m2();
+  a.m3(1);
+  a.m4();
 }
 
 class D {