Simplify MISRA C rule matching and reporting

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mbaluda

c/misra/src/rules/RULE-21-8/TerminationFunctionsOfStdlibhUsed.ql

@@ -18,27 +18,17 @@ import cpp
 import codingstandards.c.misra
 import semmle.code.cpp.commons.Assertions
 
-/** A Standard Library termination function prohibited by this rule. */
-class BannedFunction extends Function {
-  BannedFunction() {
-    this.getName() = ["abort", "exit", "system"] and
-    this.getFile().getBaseName() = "stdlib.h"
-  }
-}
-
-from FunctionCall fc, Function f, string message
+from FunctionCall fc, string message
 where
   not isExcluded(fc, BannedPackage::terminationFunctionsOfStdlibhUsedQuery()) and
-  f = fc.getTarget() and
-  (
-    f instanceof BannedFunction
-    or
-    any(Options options).exits(f) and
-    exists(LibcAssert assertion | assertion.getAnExpandedElement() = fc)
-  ) and
-  (
-    if f instanceof BannedFunction
+  exists(Function f | f = fc.getTarget() |
+    if f.hasGlobalOrStdName(["abort", "exit", "system"]) and f.getFile().getBaseName() = "stdlib.h"
     then message = "Call to banned function " + f.getName() + "."
-    else message = "Enabled assertion calls non-returning function '" + f.getName() + "'."
+    else
+      exists(Options options, LibcAssert assertion |
+        options.exits(f) and
+        assertion.getAnExpandedElement() = fc and
+        message = "Enabled assertion calls non-returning function '" + f.getName() + "'."
+      )
   )
 select fc, message

c/misra/test/rules/RULE-21-8/qualified-names/TerminationFunctionsOfStdlibhUsed.expected

@@ -0,0 +1,3 @@
+| test.cpp:12:3:12:7 | call to abort | Call to banned function abort. |
+| test.cpp:13:3:13:6 | call to exit | Call to banned function exit. |
+| test.cpp:14:3:14:8 | call to system | Call to banned function system. |

c/misra/test/rules/RULE-21-8/qualified-names/TerminationFunctionsOfStdlibhUsed.qlref

@@ -0,0 +1 @@
+rules/RULE-21-8/TerminationFunctionsOfStdlibhUsed.ql

c/misra/test/rules/RULE-21-8/qualified-names/headers/stdlib.h

@@ -0,0 +1,11 @@
+namespace application {
+void abort();
+void exit(int);
+int system(const char *);
+} // namespace application
+
+namespace std {
+void abort();
+void exit(int);
+int system(const char *);
+} // namespace std

c/misra/test/rules/RULE-21-8/qualified-names/test.cpp

@@ -0,0 +1,15 @@
+// semmle-extractor-options:--clang -std=c++14 -nostdinc
+#include "headers/stdlib.h"
+
+using std::abort;
+using std::exit;
+using std::system;
+
+void qualified_library_calls() {
+  application::abort();    // COMPLIANT
+  application::exit(0);    // COMPLIANT
+  application::system(""); // COMPLIANT
+  abort();                 // NON_COMPLIANT
+  exit(0);                 // NON_COMPLIANT
+  system("");              // NON_COMPLIANT
+}

scripts/release/create_supported_rules_list.py

@@ -4,6 +4,20 @@
 import json
 from utils import *
 
+
+def get_applicable_standards(standard_name, query):
+    """Yield applicable standards, including unchanged queries reused by MISRA C:2025."""
+    if standard_name not in {"MISRA-C-2012", "MISRA-C-2025"}:
+        yield standard_name
+        return
+
+    tags = query["tags"]
+    if any(tag.startswith("external/misra/c/2012/") for tag in tags):
+        yield "MISRA-C-2012"
+    if "external/misra/legacy" not in tags:
+        yield "MISRA-C-2025"
+
+
 help_statement = """
 Usage: {script_name}
 
@@ -37,30 +51,19 @@
     rule_packages_file_path = repo_root.joinpath('rule_packages', language_name)
     for rule_package_file_name in os.listdir(rule_packages_file_path):
         try:
-            rule_package_file = open(rule_packages_file_path.joinpath(rule_package_file_name), "r")
+            package_definition = json.loads(
+                rule_packages_file_path.joinpath(rule_package_file_name).read_text()
+            )
         except PermissionError:
             print("Error: No permission to read the rule package file located at '" + str(rule_package_file_name) + "'")
             sys.exit(1)
-        else:
-            with rule_package_file:
-                package_definition = json.load(rule_package_file)
-                for standard_name, rules in package_definition.items():
-                    for rule_id, rule_details in rules.items():
-                        for query in rule_details["queries"]:
-                            if standard_name in {"MISRA-C-2012", "MISRA-C-2025"}:
-                                applicable_standards = []
-                                tags = query["tags"]
-                                if any(tag.startswith("external/misra/c/2012/") for tag in tags):
-                                    applicable_standards.append("MISRA-C-2012")
-                                # Current suites reuse unchanged queries but exclude legacy variants.
-                                if "external/misra/legacy" not in tags:
-                                    applicable_standards.append("MISRA-C-2025")
-                            else:
-                                applicable_standards = [standard_name]
-                            for applicable_standard in applicable_standards:
-                                queries = rules_covered[applicable_standard].setdefault(rule_id, [])
-                                if query["short_name"] not in queries:
-                                    queries.append(query["short_name"])
+        for standard_name, rules in package_definition.items():
+            for rule_id, rule_details in rules.items():
+                for query in rule_details["queries"]:
+                    for applicable_standard in get_applicable_standards(standard_name, query):
+                        queries = rules_covered[applicable_standard].setdefault(rule_id, [])
+                        if query["short_name"] not in queries:
+                            queries.append(query["short_name"])
 
 
 if is_csv: