Wip: test changes to fieldflowbranchlimit semantics

Author: aschackmull

java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll

@@ -1111,10 +1111,11 @@ private predicate flowOutOfCallNodeCand1(
   DataFlowCall call, RetNodeEx ret, NodeEx out, boolean allowsFieldFlow, Configuration config
 ) {
   flowOutOfCallNodeCand1(call, ret, out, config) and
-  exists(int b, int j |
-    b = branch(ret, config) and
+  exists(int j | //int b, 
+    //b = branch(ret, config) and
     j = join(out, config) and
-    if b.minimum(j) <= config.fieldFlowBranchLimit()
+    // if b.minimum(j) <= config.fieldFlowBranchLimit()
+    if j <= config.fieldFlowBranchLimit()
     then allowsFieldFlow = true
     else allowsFieldFlow = false
   )
@@ -1130,10 +1131,11 @@ private predicate flowIntoCallNodeCand1(
   DataFlowCall call, ArgNodeEx arg, ParamNodeEx p, boolean allowsFieldFlow, Configuration config
 ) {
   flowIntoCallNodeCand1(call, arg, p, config) and
-  exists(int b, int j |
+  exists(int b | //, int j |
     b = branch(arg, config) and
-    j = join(p, config) and
-    if b.minimum(j) <= config.fieldFlowBranchLimit()
+    // j = join(p, config) and
+    // if b.minimum(j) <= config.fieldFlowBranchLimit()
+    if b <= config.fieldFlowBranchLimit()
     then allowsFieldFlow = true
     else allowsFieldFlow = false
   )
@@ -1383,8 +1385,9 @@ private module MkStage<StageSig PrevStage> {
       exists(ArgNodeEx arg, boolean allowsFieldFlow |
         fwdFlow(arg, state, outercc, argAp, ap, config) and
         flowIntoCall(call, arg, p, allowsFieldFlow, config) and
-        innercc = getCallContextCall(call, p.getEnclosingCallable(), outercc) and
-        if allowsFieldFlow = false then ap instanceof ApNil else any()
+        innercc = getCallContextCall(call, p.getEnclosingCallable(), outercc)
+        // and
+        // if allowsFieldFlow = false then ap instanceof ApNil else any()
       )
     }
 
@@ -1399,8 +1402,9 @@ private module MkStage<StageSig PrevStage> {
         fwdFlow(ret, state, innercc, argAp, ap, config) and
         flowOutOfCall(call, ret, out, allowsFieldFlow, config) and
         inner = ret.getEnclosingCallable() and
-        ccOut = getCallContextReturn(inner, call, innercc) and
-        if allowsFieldFlow = false then ap instanceof ApNil else any()
+        ccOut = getCallContextReturn(inner, call, innercc)
+        // and
+        // if allowsFieldFlow = false then ap instanceof ApNil else any()
       )
     }
 
@@ -1411,7 +1415,7 @@ private module MkStage<StageSig PrevStage> {
       exists(RetNodeEx ret, boolean allowsFieldFlow, CcCall ccc |
         fwdFlow(ret, state, ccc, apSome(argAp), ap, config) and
         flowThroughOutOfCall(call, ccc, ret, out, allowsFieldFlow, config) and
-        if allowsFieldFlow = false then ap instanceof ApNil else any()
+        if allowsFieldFlow = false then ap instanceof ApNil and argAp instanceof ApNil else any()
       )
     }
 
@@ -1597,8 +1601,9 @@ private module MkStage<StageSig PrevStage> {
     ) {
       exists(NodeEx out, boolean allowsFieldFlow |
         revFlow(out, state, toReturn, returnAp, ap, config) and
-        flowOutOfCall(call, ret, out, allowsFieldFlow, config) and
-        if allowsFieldFlow = false then ap instanceof ApNil else any()
+        flowOutOfCall(call, ret, out, allowsFieldFlow, config)
+        // and
+        // if allowsFieldFlow = false then ap instanceof ApNil else any()
       )
     }
 
@@ -1608,8 +1613,9 @@ private module MkStage<StageSig PrevStage> {
     ) {
       exists(ParamNodeEx p, boolean allowsFieldFlow |
         revFlow(p, state, false, returnAp, ap, config) and
-        flowIntoCall(_, arg, p, allowsFieldFlow, config) and
-        if allowsFieldFlow = false then ap instanceof ApNil else any()
+        flowIntoCall(_, arg, p, allowsFieldFlow, config)
+        // and
+        // if allowsFieldFlow = false then ap instanceof ApNil else any()
       )
     }
 
@@ -1620,7 +1626,7 @@ private module MkStage<StageSig PrevStage> {
       exists(ParamNodeEx p, boolean allowsFieldFlow |
         revFlow(p, state, true, apSome(returnAp), ap, config) and
         flowThroughIntoCall(call, arg, p, allowsFieldFlow, config) and
-        if allowsFieldFlow = false then ap instanceof ApNil else any()
+        if allowsFieldFlow = false then ap instanceof ApNil and returnAp instanceof ApNil else any()
       )
     }