Java: Fix semantic merge conflict.

aschackmull · aschackmull · commit 2d779f3a8cd6 · 2022-11-11T10:41:42.000+01:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll
@@ -64,7 +64,7 @@ DataFlowType getCallbackReturnType(DataFlowType t, ReturnKind rk) {
 /** Gets the type of synthetic global `sg`. */
 DataFlowType getSyntheticGlobalType(SummaryComponent::SyntheticGlobal sg) {
   exists(sg) and
-  result instanceof TypeObject
+  result.asType() instanceof TypeObject
 }
 
 bindingset[provenance]

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ DataFlowType getCallbackReturnType(DataFlowType t, ReturnKind rk) {`
`64`	`64`	/** Gets the type of synthetic global `sg`. */
`65`	`65`	`DataFlowType getSyntheticGlobalType(SummaryComponent::SyntheticGlobal sg) {`
`66`	`66`	`exists(sg) and`
`67`		`- result instanceof TypeObject`
	`67`	`+ result.asType() instanceof TypeObject`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`bindingset[provenance]`