Skip to content

Commit 2a0097e

Browse files
committed
C#/Java/Rust: Use Mixed flow from capture summary models queries and adjust other queries to the re-factored implementation.
1 parent f78be91 commit 2a0097e

24 files changed

+18
-93
lines changed

csharp/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql

Lines changed: 0 additions & 13 deletions
This file was deleted.

csharp/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql

Lines changed: 0 additions & 13 deletions
This file was deleted.

csharp/ql/src/utils/modelgenerator/CaptureNeutralModels.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
import internal.CaptureModels
1010

1111
from DataFlowSummaryTargetApi api, string noflow
12-
where noflow = captureNoFlow(api)
12+
where noflow = captureNeutral(api)
1313
select noflow order by noflow

csharp/ql/src/utils/modelgenerator/CaptureSinkModels.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
import internal.CaptureModels
1010

1111
from DataFlowSinkTargetApi api, string sink
12-
where sink = captureSink(api)
12+
where sink = Heuristic::captureSink(api)
1313
select sink order by sink

csharp/ql/src/utils/modelgenerator/CaptureSourceModels.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
import internal.CaptureModels
1010

1111
from DataFlowSourceTargetApi api, string source
12-
where source = captureSource(api)
12+
where source = Heuristic::captureSource(api)
1313
select source order by source

csharp/ql/src/utils/modelgenerator/CaptureSummaryModels.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
import internal.CaptureModels
1010

1111
from DataFlowSummaryTargetApi api, string flow
12-
where flow = captureFlow(api)
12+
where flow = captureFlow(api, _)
1313
select flow order by flow

csharp/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPartialPath.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import PartialFlow::PartialPathGraph
1414

1515
int explorationLimit() { result = 3 }
1616

17-
module PartialFlow = PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
17+
module PartialFlow = Heuristic::PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
1818

1919
from
2020
PartialFlow::PartialPathNode source, PartialFlow::PartialPathNode sink,

csharp/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import csharp
1212
import utils.modelgenerator.internal.CaptureModels
13+
import Heuristic
1314
import PropagateFlow::PathGraph
1415

1516
from

java/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql

Lines changed: 0 additions & 13 deletions
This file was deleted.

java/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)