Improve fix for FP for issue 216

reintroduce omission wrappers

Author: knewbury01

cpp/autosar/src/rules/A5-1-1/LiteralValueUsedOutsideTypeInit.ql

@@ -26,6 +26,10 @@ where
   not exists(ConstructorCall cc | cc.getAnArgument() = l) and
   not exists(ConstructorFieldInit cf | cf.getExpr() = l) and
   not l = any(LoggingOperation logOp).getALoggedExpr().getAChild*() and
+  // Exclude arguments to wrapper functions (depth 1)
+  not exists(FunctionCall fc, LoggerOrStreamWrapperFunction w |
+    fc.getAnArgument() = l and w.getACallToThisFunction() = fc
+  ) and
   // Exclude Macros with names like *LOG
   not exists(MacroInvocation m | m.getMacroName().matches("%LOG") and m.getAnAffectedElement() = l) and
   // Exclude literal 0

cpp/autosar/test/rules/A5-1-1/LiteralValueUsedOutsideTypeInit.expected

@@ -1,3 +1,5 @@
 | test.cpp:5:9:5:25 | constant string | Literal value "constant string" used outside of type initialization StringLiteral |
 | test.cpp:14:23:14:25 | 100 | Literal value 100 used outside of type initialization Literal |
 | test.cpp:54:7:54:7 | 1 | Literal value 1 used outside of type initialization Literal |
+| test.cpp:75:23:75:28 | test | Literal value "test" used outside of type initialization StringLiteral |
+| test.cpp:76:19:76:28 | not okay | Literal value "not okay" used outside of type initialization StringLiteral |

cpp/autosar/test/rules/A5-1-1/test.cpp

@@ -72,10 +72,9 @@ void test_stream_two(std::ostream &os, const char *str,
 }
 
 void test_not_wrapper_stream(std::ostream &os, const char *str) noexcept {
-  test_stream_two(
-      os, "test",
-      "not okay"); // NON_COMPLIANT[FALSE_NEGATIVE] - test_stream_two is
-                   // not actually exclusively a wrapper
+  test_stream_two(os, "test",
+                  "not okay"); // NON_COMPLIANT - test_stream_two is
+                               // not actually exclusively a wrapper
 }
 
 #define MACRO_LOG(test_str)                                                    \

cpp/common/src/codingstandards/cpp/LoggingOperation.qll

@@ -20,10 +20,12 @@ class OutputWriteLogging extends LoggingOperation, OutputWrite {
 /**
  * A `FileStreamFunctionCall` operation is considered a log operation for Coding Standards purposes.
  */
-class FileStreamLogging extends LoggingOperation, FileStreamFunctionCall {
-  override Expr getALoggedExpr() { result = getAnArgument() }
+class FileStreamLogging extends LoggingOperation {
+  FileStreamLogging() { this instanceof FileStreamFunctionCall }
+
+  override Expr getALoggedExpr() { result = this.(FileStreamFunctionCall).getAnArgument() }
 
-  override Expr getFStream() { result = this.getQualifier() }
+  Expr getFStream() { result = this.(FileStreamFunctionCall).getQualifier() }
 }
 
 /** A call which looks like `printf`. */
@@ -39,14 +41,10 @@ class PrintfLikeCall extends LoggingOperation, Call {
  */
 class LoggerOrStreamWrapperFunction extends Function {
   LoggerOrStreamWrapperFunction() {
-    forall(Parameter p | p.getFunction() = this |
-      forall(VariableAccess va | va = p.getAnAccess() |
-        (
-          any(FileStreamFunctionCall fc).getAnArgument().getAChild*() = va
-          or
-          any(LoggingOperation logOp).getALoggedExpr().getAChild*() = va
-        )
-      )
+    forall(VariableAccess va |
+      exists(Parameter p | p.getFunction() = this and va = p.getAnAccess())
+    |
+      any(LoggingOperation logOp).getALoggedExpr().getAChild*() = va
     )
   }
 }