Copilot feedback

Author: MichaelRFairhurst

cpp/misra/src/rules/RULE-28-6-4/PotentiallyErroneousContainerUsage.ql

@@ -16,21 +16,23 @@
 
 import cpp
 import codingstandards.cpp.misra
+import codingstandards.cpp.Iterators
 
 predicate isRemoveOrUniqueCall(FunctionCall fc) {
   exists(string name | name = fc.getTarget().getName() |
     name = "remove" or
     name = "remove_if" or
     name = "unique"
   ) and
-  fc.getTarget().hasQualifiedName("std", _)
+  fc.getTarget().hasQualifiedName("std", _) and
+  fc.getAnArgument().getUnderlyingType() instanceof IteratorType
 }
 
 predicate isEmptyCall(FunctionCall fc) {
   fc.getTarget().getName() = "empty" and
   (
     fc.getTarget().hasQualifiedName("std", "empty") or
-    fc.getTarget() instanceof MemberFunction
+    fc.getTarget().(MemberFunction).getDeclaringType().hasQualifiedName("std", _)
   )
 }
 

cpp/misra/test/rules/RULE-28-6-4/PotentiallyErroneousContainerUsage.expected

@@ -6,3 +6,5 @@
 | test.cpp:100:3:100:12 | call to empty | Result of call to 'empty' is not used. |
 | test.cpp:117:3:117:13 | call to remove | Result of call to 'remove' is not used. |
 | test.cpp:122:6:122:10 | call to empty | Result of call to 'empty' is not used. |
+| test.cpp:148:21:148:31 | call to remove | Result of call to 'remove' is not used. |
+| test.cpp:149:9:149:19 | call to remove | Result of call to 'remove' is not used. |

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

@@ -141,4 +141,29 @@ void test_remove_chained_operations() {
   std::vector<std::int32_t> v2 = {5, 6, 7};
   v1.erase(std::remove(v1.begin(), v1.end(), 2), v1.end()); // COMPLIANT
   v2.erase(std::remove(v2.begin(), v2.end(), 6), v2.end()); // COMPLIANT
+}
+
+void test_cast_to_void() {
+  std::vector<std::int32_t> v1 = {1, 2, 3, 2, 4};
+  static_cast<void>(std::remove(v1.begin(), v1.end(), 2)); // NON_COMPLIANT
+  (void)std::remove(v1.begin(), v1.end(), 2);              // NON_COMPLIANT
+}
+
+void test_unrelated_empty() {
+  class MyClass {
+    std::vector<int> v1;
+
+  public:
+    void empty() { v1.clear(); }
+  };
+
+  MyClass c1;
+  c1.empty(); // COMPLIANT - empty is not a member function of a standard
+}
+
+#include <cstdio>
+void test_cstdio_remove() {
+  std::remove("filename.txt"); // COMPLIANT - std::remove from <cstdio>
+  remove("filename.txt"); // COMPLIANT - std::remove from <cstdio> with using
+                          // directive
 }