M5-14-1: refactor expr extension

Author: knewbury01

cpp/autosar/src/rules/M5-14-1/RightHandOperandOfALogicalAndOperatorsContainSideEffects.ql

@@ -18,13 +18,13 @@ import cpp
 import codingstandards.cpp.autosar
 import codingstandards.cpp.SideEffect
 import codingstandards.cpp.sideeffect.DefaultEffects
+import codingstandards.cpp.Expr
 
 from BinaryLogicalOperation op, Expr rhs
 where
   not isExcluded(op,
     SideEffects1Package::rightHandOperandOfALogicalAndOperatorsContainSideEffectsQuery()) and
   rhs = op.getRightOperand() and
   hasSideEffect(rhs) and
-  not rhs.(NoExceptExpr).getExpr().isUnevaluated() and
-  not rhs.(SizeofExprOperator).getExprOperand().isUnevaluated()
+  not rhs instanceof UnevaluatedExprExtension
 select op, "The $@ may have a side effect that is not always evaluated.", rhs, "right-hand operand"

cpp/common/src/codingstandards/cpp/Expr.qll

@@ -189,3 +189,17 @@ module MisraExpr {
     CValue() { isCValue(this) }
   }
 }
+
+/**
+ * an operator that does not evaluate its operand
+ */
+class UnevaluatedExprExtension extends Expr {
+  UnevaluatedExprExtension() {
+    this.getChild(_).isUnevaluated()
+    or
+    exists(FunctionCall declval |
+      declval.getTarget().hasQualifiedName("std", "declval") and
+      declval.getAChild() = this
+    )
+  }
+}