Fix Autosar tests when compiled with qcc

Author: mbaluda

cpp/autosar/src/rules/A18-1-2/VectorboolSpecializationUsed.ql

@@ -18,13 +18,17 @@
 import cpp
 import codingstandards.cpp.autosar
 
-predicate isVectorBool(ClassTemplateInstantiation c) {
-  (
-    c.getNamespace() instanceof StdNamespace
+class StdNS extends Namespace {
+  StdNS() {
+    this instanceof StdNamespace
     or
-    c.getNamespace().isInline() and
-    c.getNamespace().getParentNamespace() instanceof StdNamespace
-  ) and
+    this.isInline() and
+    this.getParentNamespace() instanceof StdNS
+  }
+}
+
+predicate isVectorBool(ClassTemplateInstantiation c) {
+  c.getNamespace() instanceof StdNS and
   c.getTemplateArgument(0) instanceof BoolType and
   c.getSimpleName() = "vector"
 }

cpp/autosar/src/rules/M6-5-2/tempfile renamed to cpp/autosar/test/rules/A23-0-1/tempfile

@@ -1,4 +1,3 @@
-| test.cpp:36:24:36:29 | unused | Member POD variable unused in C1 is only $@. | test.cpp:36:31:36:31 | initializer for unused | used once |
 | test_global_or_namespace.cpp:16:7:16:7 | x | Member POD variable x in GA is only $@. | test_global_or_namespace.cpp:38:6:38:6 | x | used once |
 | test_global_or_namespace.cpp:54:7:54:7 | x | Member POD variable x in N1A is only $@. | test_global_or_namespace.cpp:76:6:76:6 | x | used once |
 | test_member.cpp:5:7:5:8 | m2 | Member POD variable m2 in A is only $@. | test_member.cpp:9:21:9:25 | constructor init of field m2 | used once |

cpp/common/test/rules/exithandlerthrowsexception/test.cpp renamed to cpp/autosar/test/rules/A23-0-2/tempfile

@@ -33,8 +33,7 @@ void test_templates() {
 }
 
 class C1 {
-  static constexpr int unused{1}; // NON_COMPLIANT
-  static constexpr int used{2};   // COMPLIANT
+  static constexpr int used{2}; // COMPLIANT
   int test_use() { return used; }
   static constexpr int size{3};               // COMPLIANT
   std::array<bool, size> array{false, false}; // size is used here

cpp/autosar/test/rules/M0-1-4/SingleUseMemberPODVariable.expected

@@ -6,6 +6,15 @@ import cpp
 import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.dataflow.TaintTracking
 
+class StdNS extends Namespace {
+  StdNS() {
+    this instanceof StdNamespace
+    or
+    this.isInline() and
+    this.getParentNamespace() instanceof StdNS
+  }
+}
+
 abstract class ContainerAccess extends VariableAccess {
   abstract Variable getOwningContainer();
 }
@@ -168,11 +177,7 @@ class ContainerInvalidationOperation extends FunctionCall {
             ]
         )
         or
-        exists(FunctionCall fc |
-          fc.getTarget().getNamespace().getName() = "std" and
-          fc.getTarget().getName() in ["swap", "operator>>", "getline"] and
-          this = fc
-        )
+        this.getTarget().hasGlobalOrStdName(["swap", "operator>>", "getline"])
       )
     )
   }
@@ -195,7 +200,7 @@ class ContainerInvalidationOperation extends FunctionCall {
 /** An iterator type in the `std` namespace. */
 class StdIteratorType extends UserType {
   StdIteratorType() {
-    getNamespace().getName() = "std" and
+    this.getNamespace() instanceof StdNS and
     getSimpleName().matches("%_iterator") and
     not getSimpleName().matches("const_%")
   }
@@ -247,16 +252,11 @@ class AdditiveOperatorFunctionCall extends FunctionCall {
  */
 class STLContainer extends Class {
   STLContainer() {
-    getNamespace().getName() = "std" and
-    getSimpleName() in [
+    this.hasGlobalOrStdName([
         "vector", "list", "deque", "set", "multiset", "map", "multimap", "stack", "queue",
         "priority_queue", "string", "forward_list", "unordered_set", "unordered_multiset",
         "unordered_map", "unordered_multimap", "valarray", "string", "basic_string"
-      ]
-    or
-    getSimpleName() = "string"
-    or
-    getSimpleName() = "basic_string"
+      ])
   }
 
   /**
@@ -291,7 +291,7 @@ class STLContainer extends Class {
   IteratorSource getAConstIteratorEndFunctionCall() { result = getACallTo("cend") }
 
   IteratorSource getANonConstIteratorFunctionCall() {
-    result = getACallToAFunction() and
+    //result = this.getACallToAFunction() and
     result.getTarget().getType() instanceof NonConstIteratorType
   }
 
@@ -343,24 +343,24 @@ class STLContainerVariable extends Variable {
  * to create this functionality.
  */
 class IteratorRangeModel extends Function {
-  IteratorRangeModel() { hasQualifiedName("std", "lexicographical_compare") }
+  IteratorRangeModel() { this.hasGlobalOrStdName("lexicographical_compare") }
 
   int getAnIndexOfAStartRange() {
-    (hasQualifiedName("std", "lexicographical_compare") and result = [0, 1])
+    (this.hasGlobalOrStdName("lexicographical_compare") and result = [0, 1])
   }
 
   int getAnIndexOfAEndRange() {
-    (hasQualifiedName("std", "lexicographical_compare") and result = [2, 3])
+    (this.hasGlobalOrStdName("lexicographical_compare") and result = [2, 3])
   }
 
   int getAnIteratorArgumentIndex() {
-    (hasQualifiedName("std", "lexicographical_compare") and result = [0, 1, 2, 3])
+    (this.hasGlobalOrStdName("lexicographical_compare") and result = [0, 1, 2, 3])
   }
 
   predicate getAPairOfStartEndIndexes(int start, int end) {
-    hasQualifiedName("std", "lexicographical_compare") and start = 0 and end = 1
+    this.hasGlobalOrStdName("lexicographical_compare") and start = 0 and end = 1
     or
-    hasQualifiedName("std", "lexicographical_compare") and start = 2 and end = 3
+    this.hasGlobalOrStdName("lexicographical_compare") and start = 2 and end = 3
   }
 }
 
@@ -378,7 +378,7 @@ class IteratorRangeFunctionCall extends FunctionCall {
     count(Expr e |
       e = getAnArgument() and
       e.getType() instanceof IteratorType and
-      getTarget().getNamespace().getName() = "std" and
+      getTarget().getNamespace() instanceof StdNS and
       not getTarget().getName() in ["operator==", "operator!="]
     ) > 1
   }

cpp/autosar/test/rules/M0-1-4/test.cpp

@@ -17,7 +17,7 @@ class ExitHandler extends ExceptionThrowingFunction {
   Call c;
 
   ExitHandler() {
-    c.getTarget().hasQualifiedName("std", ["atexit", "at_quick_exit"]) and
+    c.getTarget().hasGlobalOrStdName(["atexit", "at_quick_exit"]) and
     c.getArgument(0) = this.getAnAccess()
   }
 

cpp/common/test/rules/explicitabrupttermination/test.cpp renamed to cpp/autosar/test/rules/M6-5-2/tempfile

@@ -4,15 +4,15 @@ import cpp
 
 /** The function `std::quick_exit`. */
 class StdQuickExit extends Function {
-  StdQuickExit() { hasQualifiedName("std", "quick_exit") }
+  StdQuickExit() { this.hasGlobalOrStdName("quick_exit") }
 }
 
 /** The function `std::abort`. */
 class StdAbort extends Function {
-  StdAbort() { hasQualifiedName("std", "abort") }
+  StdAbort() { this.hasGlobalOrStdName("abort") }
 }
 
 /** The function `std::_Exit`. */
 class Std_Exit extends Function {
-  Std_Exit() { hasQualifiedName("std", "_Exit") }
+  Std_Exit() { this.hasGlobalOrStdName("_Exit") }
 }