C++: Implement new data flow interface

hvitved · hvitved · commit cd7789374adb · 2024-03-11T09:23:30.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll
@@ -28,6 +28,6 @@ import cpp
 deprecated module DataFlow {
   private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
-  import DataFlowMake<CppOldDataFlow>
+  import DataFlowMake<Location, CppOldDataFlow>
   import semmle.code.cpp.dataflow.internal.DataFlowImpl1
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
@@ -29,6 +29,6 @@ deprecated module TaintTracking {
   private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.cpp.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<CppOldDataFlow, CppOldTaintTracking>
+  import TaintFlowMake<Location, CppOldDataFlow, CppOldTaintTracking>
   import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -2,6 +2,7 @@
  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow` instead.
  */
 
+private import semmle.code.cpp.Location
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImpl
-import MakeImpl<CppOldDataFlow>
+import MakeImpl<Location, CppOldDataFlow>
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
@@ -2,6 +2,7 @@
  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow` instead.
  */
 
+private import semmle.code.cpp.Location
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImplCommon
-import MakeImplCommon<CppOldDataFlow>
+import MakeImplCommon<Location, CppOldDataFlow>
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll
@@ -10,7 +10,7 @@ private import DataFlowImplSpecific
 private import TaintTrackingImplSpecific
 private import codeql.dataflow.internal.DataFlowImplConsistency
 
-private module Input implements InputSig<CppOldDataFlow> {
+private module Input implements InputSig<Location, CppOldDataFlow> {
   predicate argHasPostUpdateExclude(Private::ArgumentNode n) {
     // Is the null pointer (or something that's not really a pointer)
     exists(n.asExpr().getValue())
@@ -26,4 +26,4 @@ private module Input implements InputSig<CppOldDataFlow> {
   }
 }
 
-module Consistency = MakeConsistency<CppOldDataFlow, CppOldTaintTracking, Input>;
+module Consistency = MakeConsistency<Location, CppOldDataFlow, CppOldTaintTracking, Input>;
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplSpecific.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplSpecific.qll
@@ -4,6 +4,7 @@
  * Provides C++-specific definitions for use in the data flow library.
  */
 
+private import semmle.code.cpp.Location
 private import codeql.dataflow.DataFlow
 
 module Private {
@@ -15,7 +16,7 @@ module Public {
   import DataFlowUtil
 }
 
-module CppOldDataFlow implements InputSig {
+module CppOldDataFlow implements InputSig<Location> {
   import Private
   import Public
 
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
@@ -105,7 +105,7 @@ class Node extends TNode {
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(
+  deprecated predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
     this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/TaintTrackingImplSpecific.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/TaintTrackingImplSpecific.qll
@@ -4,9 +4,10 @@
  * Provides C++-specific definitions for use in the taint tracking library.
  */
 
+private import semmle.code.cpp.Location
 private import codeql.dataflow.TaintTracking
 private import DataFlowImplSpecific
 
-module CppOldTaintTracking implements InputSig<CppOldDataFlow> {
+module CppOldTaintTracking implements InputSig<Location, CppOldDataFlow> {
   import TaintTrackingUtil
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow.qll
@@ -28,6 +28,6 @@ import cpp
 module DataFlow {
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
-  import DataFlowMake<CppDataFlow>
+  import DataFlowMake<Location, CppDataFlow>
   import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl1
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking.qll
@@ -27,6 +27,7 @@ module TaintTracking {
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<CppDataFlow, CppTaintTracking>
+  private import semmle.code.cpp.Location
+  import TaintFlowMake<Location, CppDataFlow, CppTaintTracking>
   import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow.qll
@@ -24,6 +24,6 @@ import cpp
 module DataFlow {
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
-  import DataFlowMake<CppDataFlow>
+  import DataFlowMake<Location, CppDataFlow>
   import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl1
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll
@@ -23,6 +23,6 @@ module TaintTracking {
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<CppDataFlow, CppTaintTracking>
+  import TaintFlowMake<Location, CppDataFlow, CppTaintTracking>
   import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -1,3 +1,4 @@
+private import semmle.code.cpp.Location
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImpl
-import MakeImpl<CppDataFlow>
+import MakeImpl<Location, CppDataFlow>
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
@@ -1,3 +1,4 @@
+private import semmle.code.cpp.Location
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImplCommon
-import MakeImplCommon<CppDataFlow>
+import MakeImplCommon<Location, CppDataFlow>
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll
@@ -8,12 +8,12 @@ private import DataFlowImplSpecific
 private import TaintTrackingImplSpecific
 private import codeql.dataflow.internal.DataFlowImplConsistency
 
-private module Input implements InputSig<CppDataFlow> {
+private module Input implements InputSig<Location, CppDataFlow> {
   predicate argHasPostUpdateExclude(Private::ArgumentNode n) {
     // The rules for whether an IR argument gets a post-update node are too
     // complex to model here.
     any()
   }
 }
 
-module Consistency = MakeConsistency<CppDataFlow, CppTaintTracking, Input>;
+module Consistency = MakeConsistency<Location, CppDataFlow, CppTaintTracking, Input>;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplSpecific.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplSpecific.qll
@@ -3,6 +3,7 @@
  */
 
 private import codeql.dataflow.DataFlow
+private import semmle.code.cpp.Location
 
 module Private {
   import DataFlowPrivate
@@ -13,7 +14,7 @@ module Public {
   import DataFlowUtil
 }
 
-module CppDataFlow implements InputSig {
+module CppDataFlow implements InputSig<Location> {
   import Private
   import Public
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -448,7 +448,7 @@ class Node extends TIRDataFlowNode {
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(
+  deprecated predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
     this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingImplSpecific.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingImplSpecific.qll
@@ -4,7 +4,8 @@
 
 private import codeql.dataflow.TaintTracking
 private import DataFlowImplSpecific
+private import semmle.code.cpp.Location
 
-module CppTaintTracking implements InputSig<CppDataFlow> {
+module CppTaintTracking implements InputSig<Location, CppDataFlow> {
   import TaintTrackingUtil
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ import cpp`
`28`	`28`	`deprecated module DataFlow {`
`29`	`29`	`private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific`
`30`	`30`	`private import codeql.dataflow.DataFlow`
`31`		`- import DataFlowMake<CppOldDataFlow>`
	`31`	`+ import DataFlowMake<Location, CppOldDataFlow>`
`32`	`32`	`import semmle.code.cpp.dataflow.internal.DataFlowImpl1`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ deprecated module TaintTracking {`
`29`	`29`	`private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific`
`30`	`30`	`private import semmle.code.cpp.dataflow.internal.TaintTrackingImplSpecific`
`31`	`31`	`private import codeql.dataflow.TaintTracking`
`32`		`- import TaintFlowMake<CppOldDataFlow, CppOldTaintTracking>`
	`32`	`+ import TaintFlowMake<Location, CppOldDataFlow, CppOldTaintTracking>`
`33`	`33`	`import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingImpl`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ private import DataFlowImplSpecific`
`10`	`10`	`private import TaintTrackingImplSpecific`
`11`	`11`	`private import codeql.dataflow.internal.DataFlowImplConsistency`
`12`	`12`
`13`		`-private module Input implements InputSig<CppOldDataFlow> {`
	`13`	`+private module Input implements InputSig<Location, CppOldDataFlow> {`
`14`	`14`	`predicate argHasPostUpdateExclude(Private::ArgumentNode n) {`
`15`	`15`	`// Is the null pointer (or something that's not really a pointer)`
`16`	`16`	`exists(n.asExpr().getValue())`
`@@ -26,4 +26,4 @@ private module Input implements InputSig<CppOldDataFlow> {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-module Consistency = MakeConsistency<CppOldDataFlow, CppOldTaintTracking, Input>;`
	`29`	`+module Consistency = MakeConsistency<Location, CppOldDataFlow, CppOldTaintTracking, Input>;`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ module TaintTracking {`
`27`	`27`	`private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific`
`28`	`28`	`private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific`
`29`	`29`	`private import codeql.dataflow.TaintTracking`
`30`		`- import TaintFlowMake<CppDataFlow, CppTaintTracking>`
	`30`	`+ private import semmle.code.cpp.Location`
	`31`	`+ import TaintFlowMake<Location, CppDataFlow, CppTaintTracking>`
`31`	`32`	`import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ import cpp`
`24`	`24`	`module DataFlow {`
`25`	`25`	`private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific`
`26`	`26`	`private import codeql.dataflow.DataFlow`
`27`		`- import DataFlowMake<CppDataFlow>`
	`27`	`+ import DataFlowMake<Location, CppDataFlow>`
`28`	`28`	`import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl1`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ module TaintTracking {`
`23`	`23`	`private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific`
`24`	`24`	`private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific`
`25`	`25`	`private import codeql.dataflow.TaintTracking`
`26`		`- import TaintFlowMake<CppDataFlow, CppTaintTracking>`
	`26`	`+ import TaintFlowMake<Location, CppDataFlow, CppTaintTracking>`
`27`	`27`	`import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ private import DataFlowImplSpecific`
`8`	`8`	`private import TaintTrackingImplSpecific`
`9`	`9`	`private import codeql.dataflow.internal.DataFlowImplConsistency`
`10`	`10`
`11`		`-private module Input implements InputSig<CppDataFlow> {`
	`11`	`+private module Input implements InputSig<Location, CppDataFlow> {`
`12`	`12`	`predicate argHasPostUpdateExclude(Private::ArgumentNode n) {`
`13`	`13`	`// The rules for whether an IR argument gets a post-update node are too`
`14`	`14`	`// complex to model here.`
`15`	`15`	`any()`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-module Consistency = MakeConsistency<CppDataFlow, CppTaintTracking, Input>;`
	`19`	`+module Consistency = MakeConsistency<Location, CppDataFlow, CppTaintTracking, Input>;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`
`5`	`5`	`private import codeql.dataflow.TaintTracking`
`6`	`6`	`private import DataFlowImplSpecific`
	`7`	`+private import semmle.code.cpp.Location`
`7`	`8`
`8`		`-module CppTaintTracking implements InputSig<CppDataFlow> {`
	`9`	`+module CppTaintTracking implements InputSig<Location, CppDataFlow> {`
`9`	`10`	`import TaintTrackingUtil`
`10`	`11`	`}`