Java: Fix semantic merge conflict.

aschackmull · aschackmull · commit 75ebc098bb64 · 2019-10-07T15:42:26.000+02:00
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
@@ -468,13 +468,16 @@ private module ImplCommon {
         int i, ArgumentNode arg, CallContext outercc, DataFlowCall call
       ) {
         exists(DataFlowCallable c | argumentOf(call, i, arg, c) |
-          outercc = TAnyCallContext()
-          or
-          outercc = TSomeCall(getAParameter(c), _)
-          or
-          exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
-            reducedViableImplInCallContext(_, c, other)
-          )
+          (
+            outercc = TAnyCallContext()
+            or
+            outercc = TSomeCall(getAParameter(c), _)
+            or
+            exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
+              recordDataFlowCallSite(other, c)
+            )
+          ) and
+          not isUnreachableInCall(arg, outercc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -500,7 +503,7 @@ private module ImplCommon {
         exists(int i, DataFlowCallable callable |
           viableParamArg1(p, callable, i, arg, outercc, call)
         |
-          if reducedViableImplInCallContext(_, callable, call)
+          if recordDataFlowCallSite(call, callable)
           then innercc = TSpecificCall(call, i, true)
           else innercc = TSomeCall(p, true)
         )
@@ -512,7 +515,7 @@ private module ImplCommon {
         exists(DataFlowCall call, int i, DataFlowCallable callable |
           result = TSpecificCall(call, i, _) and
           p.isParameterOf(callable, i) and
-          reducedViableImplInCallContext(_, callable, call)
+          recordDataFlowCallSite(call, callable)
         )
       }
 
@@ -528,14 +531,16 @@ private module ImplCommon {
         exists(Node mid |
           parameterValueFlow(p, mid, cc) and
           step(mid, node) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
         or
         // flow through a callable
         exists(Node arg |
           parameterValueFlow(p, arg, cc) and
           argumentValueFlowsThrough(arg, node, cc) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -568,6 +573,7 @@ private module ImplCommon {
           argumentValueFlowsThrough0(call, arg, kind, cc)
         |
           out = getAnOutNode(call, kind) and
+          not isUnreachableInCall(out, cc.(CallContextSpecificCall).getCall()) and
           compatibleTypes(arg.getType(), out.getType())
         )
       }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
@@ -468,13 +468,16 @@ private module ImplCommon {
         int i, ArgumentNode arg, CallContext outercc, DataFlowCall call
       ) {
         exists(DataFlowCallable c | argumentOf(call, i, arg, c) |
-          outercc = TAnyCallContext()
-          or
-          outercc = TSomeCall(getAParameter(c), _)
-          or
-          exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
-            reducedViableImplInCallContext(_, c, other)
-          )
+          (
+            outercc = TAnyCallContext()
+            or
+            outercc = TSomeCall(getAParameter(c), _)
+            or
+            exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
+              recordDataFlowCallSite(other, c)
+            )
+          ) and
+          not isUnreachableInCall(arg, outercc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -500,7 +503,7 @@ private module ImplCommon {
         exists(int i, DataFlowCallable callable |
           viableParamArg1(p, callable, i, arg, outercc, call)
         |
-          if reducedViableImplInCallContext(_, callable, call)
+          if recordDataFlowCallSite(call, callable)
           then innercc = TSpecificCall(call, i, true)
           else innercc = TSomeCall(p, true)
         )
@@ -512,7 +515,7 @@ private module ImplCommon {
         exists(DataFlowCall call, int i, DataFlowCallable callable |
           result = TSpecificCall(call, i, _) and
           p.isParameterOf(callable, i) and
-          reducedViableImplInCallContext(_, callable, call)
+          recordDataFlowCallSite(call, callable)
         )
       }
 
@@ -528,14 +531,16 @@ private module ImplCommon {
         exists(Node mid |
           parameterValueFlow(p, mid, cc) and
           step(mid, node) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
         or
         // flow through a callable
         exists(Node arg |
           parameterValueFlow(p, arg, cc) and
           argumentValueFlowsThrough(arg, node, cc) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -568,6 +573,7 @@ private module ImplCommon {
           argumentValueFlowsThrough0(call, arg, kind, cc)
         |
           out = getAnOutNode(call, kind) and
+          not isUnreachableInCall(out, cc.(CallContextSpecificCall).getCall()) and
           compatibleTypes(arg.getType(), out.getType())
         )
       }
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
@@ -468,13 +468,16 @@ private module ImplCommon {
         int i, ArgumentNode arg, CallContext outercc, DataFlowCall call
       ) {
         exists(DataFlowCallable c | argumentOf(call, i, arg, c) |
-          outercc = TAnyCallContext()
-          or
-          outercc = TSomeCall(getAParameter(c), _)
-          or
-          exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
-            reducedViableImplInCallContext(_, c, other)
-          )
+          (
+            outercc = TAnyCallContext()
+            or
+            outercc = TSomeCall(getAParameter(c), _)
+            or
+            exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
+              recordDataFlowCallSite(other, c)
+            )
+          ) and
+          not isUnreachableInCall(arg, outercc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -500,7 +503,7 @@ private module ImplCommon {
         exists(int i, DataFlowCallable callable |
           viableParamArg1(p, callable, i, arg, outercc, call)
         |
-          if reducedViableImplInCallContext(_, callable, call)
+          if recordDataFlowCallSite(call, callable)
           then innercc = TSpecificCall(call, i, true)
           else innercc = TSomeCall(p, true)
         )
@@ -512,7 +515,7 @@ private module ImplCommon {
         exists(DataFlowCall call, int i, DataFlowCallable callable |
           result = TSpecificCall(call, i, _) and
           p.isParameterOf(callable, i) and
-          reducedViableImplInCallContext(_, callable, call)
+          recordDataFlowCallSite(call, callable)
         )
       }
 
@@ -528,14 +531,16 @@ private module ImplCommon {
         exists(Node mid |
           parameterValueFlow(p, mid, cc) and
           step(mid, node) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
         or
         // flow through a callable
         exists(Node arg |
           parameterValueFlow(p, arg, cc) and
           argumentValueFlowsThrough(arg, node, cc) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -568,6 +573,7 @@ private module ImplCommon {
           argumentValueFlowsThrough0(call, arg, kind, cc)
         |
           out = getAnOutNode(call, kind) and
+          not isUnreachableInCall(out, cc.(CallContextSpecificCall).getCall()) and
           compatibleTypes(arg.getType(), out.getType())
         )
       }
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
@@ -468,13 +468,16 @@ private module ImplCommon {
         int i, ArgumentNode arg, CallContext outercc, DataFlowCall call
       ) {
         exists(DataFlowCallable c | argumentOf(call, i, arg, c) |
-          outercc = TAnyCallContext()
-          or
-          outercc = TSomeCall(getAParameter(c), _)
-          or
-          exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
-            reducedViableImplInCallContext(_, c, other)
-          )
+          (
+            outercc = TAnyCallContext()
+            or
+            outercc = TSomeCall(getAParameter(c), _)
+            or
+            exists(DataFlowCall other | outercc = TSpecificCall(other, _, _) |
+              recordDataFlowCallSite(other, c)
+            )
+          ) and
+          not isUnreachableInCall(arg, outercc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -500,7 +503,7 @@ private module ImplCommon {
         exists(int i, DataFlowCallable callable |
           viableParamArg1(p, callable, i, arg, outercc, call)
         |
-          if reducedViableImplInCallContext(_, callable, call)
+          if recordDataFlowCallSite(call, callable)
           then innercc = TSpecificCall(call, i, true)
           else innercc = TSomeCall(p, true)
         )
@@ -512,7 +515,7 @@ private module ImplCommon {
         exists(DataFlowCall call, int i, DataFlowCallable callable |
           result = TSpecificCall(call, i, _) and
           p.isParameterOf(callable, i) and
-          reducedViableImplInCallContext(_, callable, call)
+          recordDataFlowCallSite(call, callable)
         )
       }
 
@@ -528,14 +531,16 @@ private module ImplCommon {
         exists(Node mid |
           parameterValueFlow(p, mid, cc) and
           step(mid, node) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
         or
         // flow through a callable
         exists(Node arg |
           parameterValueFlow(p, arg, cc) and
           argumentValueFlowsThrough(arg, node, cc) and
-          compatibleTypes(p.getType(), node.getType())
+          compatibleTypes(p.getType(), node.getType()) and
+          not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())
         )
       }
 
@@ -568,6 +573,7 @@ private module ImplCommon {
           argumentValueFlowsThrough0(call, arg, kind, cc)
         |
           out = getAnOutNode(call, kind) and
+          not isUnreachableInCall(out, cc.(CallContextSpecificCall).getCall()) and
           compatibleTypes(arg.getType(), out.getType())
         )
       }
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowPrivate.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
@@ -1,6 +1,6 @@
 private import java
 private import DataFlowUtil
-private import DataFlowImplCommon
+private import DataFlowImplCommon::Public
 private import DataFlowDispatch
 private import semmle.code.java.controlflow.Guards
 private import semmle.code.java.dataflow.SSA

Original file line number	Diff line number	Diff line change
`@@ -468,13 +468,16 @@ private module ImplCommon {`
`468`	`468`	`int i, ArgumentNode arg, CallContext outercc, DataFlowCall call`
`469`	`469`	`) {`
`470`	`470`	`exists(DataFlowCallable c \| argumentOf(call, i, arg, c) \|`
`471`		`- outercc = TAnyCallContext()`
`472`		`- or`
`473`		`- outercc = TSomeCall(getAParameter(c), _)`
`474`		`- or`
`475`		`- exists(DataFlowCall other \| outercc = TSpecificCall(other, _, _) \|`
`476`		`- reducedViableImplInCallContext(_, c, other)`
`477`		`- )`
	`471`	`+ (`
	`472`	`+ outercc = TAnyCallContext()`
	`473`	`+ or`
	`474`	`+ outercc = TSomeCall(getAParameter(c), _)`
	`475`	`+ or`
	`476`	`+ exists(DataFlowCall other \| outercc = TSpecificCall(other, _, _) \|`
	`477`	`+ recordDataFlowCallSite(other, c)`
	`478`	`+ )`
	`479`	`+ ) and`
	`480`	`+ not isUnreachableInCall(arg, outercc.(CallContextSpecificCall).getCall())`
`478`	`481`	`)`
`479`	`482`	`}`
`480`	`483`
`@@ -500,7 +503,7 @@ private module ImplCommon {`
`500`	`503`	`exists(int i, DataFlowCallable callable \|`
`501`	`504`	`viableParamArg1(p, callable, i, arg, outercc, call)`
`502`	`505`	`\|`
`503`		`- if reducedViableImplInCallContext(_, callable, call)`
	`506`	`+ if recordDataFlowCallSite(call, callable)`
`504`	`507`	`then innercc = TSpecificCall(call, i, true)`
`505`	`508`	`else innercc = TSomeCall(p, true)`
`506`	`509`	`)`
`@@ -512,7 +515,7 @@ private module ImplCommon {`
`512`	`515`	`exists(DataFlowCall call, int i, DataFlowCallable callable \|`
`513`	`516`	`result = TSpecificCall(call, i, _) and`
`514`	`517`	`p.isParameterOf(callable, i) and`
`515`		`- reducedViableImplInCallContext(_, callable, call)`
	`518`	`+ recordDataFlowCallSite(call, callable)`
`516`	`519`	`)`
`517`	`520`	`}`
`518`	`521`
`@@ -528,14 +531,16 @@ private module ImplCommon {`
`528`	`531`	`exists(Node mid \|`
`529`	`532`	`parameterValueFlow(p, mid, cc) and`
`530`	`533`	`step(mid, node) and`
`531`		`- compatibleTypes(p.getType(), node.getType())`
	`534`	`+ compatibleTypes(p.getType(), node.getType()) and`
	`535`	`+ not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())`
`532`	`536`	`)`
`533`	`537`	`or`
`534`	`538`	`// flow through a callable`
`535`	`539`	`exists(Node arg \|`
`536`	`540`	`parameterValueFlow(p, arg, cc) and`
`537`	`541`	`argumentValueFlowsThrough(arg, node, cc) and`
`538`		`- compatibleTypes(p.getType(), node.getType())`
	`542`	`+ compatibleTypes(p.getType(), node.getType()) and`
	`543`	`+ not isUnreachableInCall(node, cc.(CallContextSpecificCall).getCall())`
`539`	`544`	`)`
`540`	`545`	`}`
`541`	`546`
`@@ -568,6 +573,7 @@ private module ImplCommon {`
`568`	`573`	`argumentValueFlowsThrough0(call, arg, kind, cc)`
`569`	`574`	`\|`
`570`	`575`	`out = getAnOutNode(call, kind) and`
	`576`	`+ not isUnreachableInCall(out, cc.(CallContextSpecificCall).getCall()) and`
`571`	`577`	`compatibleTypes(arg.getType(), out.getType())`
`572`	`578`	`)`
`573`	`579`	`}`