[CPP-340] Refactor MistypedFunctionArguments.ql further.

zlaski-semmle · zlaski-semmle · commit 61c91b67aa64 · 2019-04-14T11:31:10.000-07:00
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.ql b/cpp/ql/src/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.ql
@@ -15,8 +15,8 @@
 import cpp
 
 predicate arithTypesMatch(Type arg, Type parm) {
-  arg instanceof ArithmeticType and
-  parm instanceof ArithmeticType and
+  arg = parm
+  or
   arg.getSize() = parm.getSize() and
   (
     arg instanceof IntegralOrEnumType and
@@ -26,10 +26,9 @@ predicate arithTypesMatch(Type arg, Type parm) {
     parm instanceof FloatingPointType
   )
 }
+
 pragma[inline]
 predicate pointerArgTypeMayBeUsed(Type arg, Type parm) {
-  arg = parm
-  or
   // arithmetic types
   arithTypesMatch(arg, parm)
   or
@@ -41,8 +40,6 @@ predicate pointerArgTypeMayBeUsed(Type arg, Type parm) {
 
 pragma[inline]
 predicate argTypeMayBeUsed(Type arg, Type parm) {
-  arg = parm
-  or
   // arithmetic types
   arithTypesMatch(arg, parm)
   or
