Address feedback.

Author: MichaelRFairhurst

c/misra/src/rules/RULE-7-5/IncorrectlySizedIntegerConstantMacroArgument.ql

@@ -21,13 +21,8 @@ predicate matchesSign(IntegerConstantMacro macro, PossiblyNegativeLiteral litera
 }
 
 predicate matchesSize(IntegerConstantMacro macro, PossiblyNegativeLiteral literal) {
-  // Wait for BigInt support to check 64 bit macro types.
-  (macro.getSize() < 64 and matchesSign(macro, literal))
-  implies
-  (
-    literal.getRawValue() <= macro.maxValue() and
-    literal.getRawValue() >= macro.minValue()
-  )
+  literal.getRawValue() <= macro.maxValue() and
+  literal.getRawValue() >= macro.minValue()
 }
 
 from
@@ -38,9 +33,13 @@ where
   invoke.getMacro() = macro and
   literal = invoke.getExpr() and
   (
-    not matchesSign(macro, invoke.getExpr()) and explanation = " cannot be negative"
+    not matchesSign(macro, literal) and
+    explanation = " cannot be negative"
     or
-    not matchesSize(macro, invoke.getExpr()) and
+    matchesSign(macro, literal) and
+    // Wait for BigInt support to check 64 bit macro types.
+    macro.getSize() < 64 and
+    not matchesSize(macro, literal) and
     explanation = " is outside of the allowed range " + macro.getRangeString()
   )
-select invoke.getExpr(), "Value provided to integer constant macro " + macro.getName() + explanation
+select literal, "Value provided to integer constant macro " + macro.getName() + explanation

c/misra/src/rules/RULE-7-5/IntegerConstantMacroArgumentUsesSuffix.ql

@@ -18,7 +18,7 @@ import codingstandards.cpp.IntegerConstantMacro
 import codingstandards.cpp.Literals
 
 string argumentSuffix(MacroInvocation invoke) {
-  // Compiler strips the suffix unless we look at the unexpanded argument text.
+  // Extractor strips the suffix unless we look at the unexpanded argument text.
   // Unexpanded argument text can be malformed in all sorts of ways, so make
   // this match relatively strict, to be safe.
   result = invoke.getUnexpandedArgument(0).regexpCapture("([0-9]+|0[xX][0-9A-F]+)([uUlL]+)$", 2)
@@ -30,6 +30,6 @@ where
   invoke.getMacro() instanceof IntegerConstantMacro and
   invoke.getExpr() = argument and
   suffix = argumentSuffix(invoke)
-select invoke.getExpr(),
+select argument,
   "Value suffix '" + suffix + "' is not allowed on provided argument to integer constant macro " +
     invoke.getMacroName() + "."

c/misra/src/rules/RULE-7-5/InvalidIntegerConstantMacroArgument.ql

@@ -17,19 +17,14 @@ import codingstandards.cpp.IntegerConstantMacro
 import codingstandards.cpp.Literals
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
-predicate containsMacroInvocation(MacroInvocation outer, MacroInvocation inner) {
-  outer.getExpr() = inner.getExpr() and
-  exists(outer.getUnexpandedArgument(0).indexOf(inner.getMacroName()))
-}
-
 from MacroInvocation invoke, IntegerConstantMacro macro
 where
   not isExcluded(invoke, Types2Package::invalidIntegerConstantMacroArgumentQuery()) and
   invoke.getMacro() = macro and
   (
     not invoke.getExpr() instanceof PossiblyNegativeLiteral
     or
-    containsMacroInvocation(invoke, _)
+    any(MacroInvocation inner).getParentInvocation() = invoke
   )
 select invoke.getExpr(),
   "Argument to integer constant macro " + macro.getName() + " must be an integer literal."

cpp/common/src/codingstandards/cpp/IntegerConstantMacro.qll

@@ -15,7 +15,7 @@ class IntegerConstantMacro extends Macro {
     signed = false and size = getName().regexpCapture("UINT(8|16|32|64)_C", 1).toInt()
   }
 
-  predicate isSmall() { size < 32 }
+  predicate isSmall() { size < any(IntType it | it.isSigned()).getSize() }
 
   int getSize() { result = size }
 

cpp/common/src/codingstandards/cpp/Literals.qll

@@ -4,7 +4,6 @@
 
 import cpp
 import codingstandards.cpp.Cpp14Literal
-import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
 
 class IntegerLiteral = Cpp14Literal::IntegerLiteral;
 
@@ -100,7 +99,7 @@ class NegativeLiteral extends PossiblyNegativeLiteral, UnaryMinusExpr {
 
   override Cpp14Literal::NumericLiteral getBaseLiteral() { result = literal }
 
-  override float getRawValue() { result = -lowerBound(literal) }
+  override float getRawValue() { result = -literal.getValue().toFloat() }
 }
 
 /**
@@ -112,5 +111,5 @@ class PositiveLiteral extends PossiblyNegativeLiteral, Cpp14Literal::NumericLite
 
   override Cpp14Literal::NumericLiteral getBaseLiteral() { result = this }
 
-  override float getRawValue() { result = lowerBound(this) }
+  override float getRawValue() { result = getValue().toFloat() }
 }