Java: Use Overlay dataflow in java.

Alex Eyers-Taylor · Alexander Eyers-Taylor · commit 542bdf079291 · 2025-10-07T17:52:12.000+01:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll
@@ -10,6 +10,6 @@ import java
 module DataFlow {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
-  import DataFlowMake<Location, JavaDataFlow>
+  import DataFlowMakeOverlay<Location, JavaDataFlow>
   import Public
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll b/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll
@@ -13,5 +13,5 @@ module TaintTracking {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<Location, JavaDataFlow, JavaTaintTracking>
+  import TaintFlowMakeOverlay<Location, JavaDataFlow, JavaTaintTracking>
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ import java`
`10`	`10`	`module DataFlow {`
`11`	`11`	`private import semmle.code.java.dataflow.internal.DataFlowImplSpecific`
`12`	`12`	`private import codeql.dataflow.DataFlow`
`13`		`- import DataFlowMake<Location, JavaDataFlow>`
	`13`	`+ import DataFlowMakeOverlay<Location, JavaDataFlow>`
`14`	`14`	`import Public`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ module TaintTracking {`
`13`	`13`	`private import semmle.code.java.dataflow.internal.DataFlowImplSpecific`
`14`	`14`	`private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific`
`15`	`15`	`private import codeql.dataflow.TaintTracking`
`16`		`- import TaintFlowMake<Location, JavaDataFlow, JavaTaintTracking>`
	`16`	`+ import TaintFlowMakeOverlay<Location, JavaDataFlow, JavaTaintTracking>`
`17`	`17`	`}`