Merge M17-0-5 and ERR52-CPP

Author: mbaluda

cpp/autosar/src/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.ql

@@ -15,20 +15,10 @@
 
 import cpp
 import codingstandards.cpp.autosar
+import codingstandards.cpp.rules.donotusesetjmporlongjmpshared.DoNotUseSetjmpOrLongjmpShared
 
-predicate isLongJumpCall(Locatable fc) {
-  fc.(FunctionCall).getTarget().hasGlobalOrStdName("longjmp") or
-  fc.(MacroInvocation).getMacroName() = "longjmp"
+class SetjmpMacroAndTheLongjmpFunctionUsedQuery extends DoNotUseSetjmpOrLongjmpSharedSharedQuery {
+  SetjmpMacroAndTheLongjmpFunctionUsedQuery() {
+    this = BannedFunctionsPackage::setjmpMacroAndTheLongjmpFunctionUsedQuery()
+  }
 }
-
-predicate isSetJumpCall(MacroInvocation mi) { mi.getMacroName() = "setjmp" }
-
-from Element jmp, string callType
-where
-  not isExcluded(jmp, BannedFunctionsPackage::setjmpMacroAndTheLongjmpFunctionUsedQuery()) and
-  (
-    isLongJumpCall(jmp) and callType = "longjmp function"
-    or
-    isSetJumpCall(jmp) and callType = "setjmp macro"
-  )
-select jmp, "Use of banned " + callType + "."

cpp/autosar/test/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.qlref

@@ -0,0 +1 @@
+cpp/common/test/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.ql

cpp/autosar/test/rules/M17-0-5/SetjmpMacroAndTheLongjmpFunctionUsed.testref

@@ -13,17 +13,10 @@
 
 import cpp
 import codingstandards.cpp.cert
+import codingstandards.cpp.rules.donotusesetjmporlongjmpshared.DoNotUseSetjmpOrLongjmpShared
 
-predicate isLongJumpCall(FunctionCall fc) { fc.getTarget().hasGlobalOrStdName("longjmp") }
-
-predicate isSetJumpCall(MacroInvocation mi) { mi.getMacroName() = "setjmp" }
-
-from Element jmp, string callType
-where
-  not isExcluded(jmp, BannedFunctionsPackage::doNotUseSetjmpOrLongjmpQuery()) and
-  (
-    isLongJumpCall(jmp) and callType = "longjmp function"
-    or
-    isSetJumpCall(jmp) and callType = "setjmp macro"
-  )
-select jmp, "Use of banned " + callType + "."
+class DoNotUseSetjmpOrLongjmpQuery extends DoNotUseSetjmpOrLongjmpSharedSharedQuery {
+  DoNotUseSetjmpOrLongjmpQuery() {
+    this = BannedFunctionsPackage::doNotUseSetjmpOrLongjmpQuery()
+  }
+}

cpp/cert/src/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.ql

@@ -0,0 +1 @@
+cpp/common/test/rules/donotusesetjmporlongjmpshared/DoNotUseSetjmpOrLongjmpShared.ql

cpp/cert/test/rules/ERR52-CPP/DoNotUseSetjmpOrLongjmp.expected

@@ -0,0 +1,30 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class DoNotUseSetjmpOrLongjmpSharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof DoNotUseSetjmpOrLongjmpSharedSharedQuery }
+
+predicate isLongJumpCall(Locatable fc) {
+  fc.(FunctionCall).getTarget().hasGlobalOrStdName("longjmp") or
+  fc.(MacroInvocation).getMacroName() = "longjmp"
+}
+
+predicate isSetJumpCall(MacroInvocation mi) { mi.getMacroName() = "setjmp" }
+
+query predicate problems(Element jmp, string message) {
+  exists(string callType |
+    not isExcluded(jmp, getQuery()) and
+    message = "Use of banned " + callType + "." and
+    (
+      isLongJumpCall(jmp) and callType = "longjmp function"
+      or
+      isSetJumpCall(jmp) and callType = "setjmp macro"
+    )
+  )
+}