Merge pull request #2266 from tausbn/python-multiple-calls-to-init-join-order-fix

RasmusWL · web-flow · commit 9ffb67a4606b · 2019-11-07T15:38:43.000+01:00
Python: Fix bad join order for `py/multiple-calls-to-init`.
diff --git a/python/ql/src/Classes/MethodCallOrder.qll b/python/ql/src/Classes/MethodCallOrder.qll
@@ -3,11 +3,16 @@ import python
 // Helper predicates for multiple call to __init__/__del__ queries.
 
 pragma [noinline]
-private predicate multiple_invocation_paths(FunctionInvocation top, FunctionInvocation i1, FunctionInvocation i2, FunctionObject multi) {
+private predicate multiple_invocation_paths_helper(FunctionInvocation top, FunctionInvocation i1, FunctionInvocation i2, FunctionObject multi) {
     i1 != i2 and
     i1 = top.getACallee+() and
     i2 = top.getACallee+() and
-    i1.getFunction() = multi and
+    i1.getFunction() = multi
+}
+
+pragma [noinline]
+private predicate multiple_invocation_paths(FunctionInvocation top, FunctionInvocation i1, FunctionInvocation i2, FunctionObject multi) {
+    multiple_invocation_paths_helper(top, i1, i2, multi) and
     i2.getFunction() = multi
 }
 
