Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Shared: Model generator cleanup. #19311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Apr 28, 2025
Merged

Shared: Model generator cleanup. #19311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2a8fe53
Shared: Remove --with-mixed-summaries logic.
michaelnebel Apr 15, 2025
fa5162f
Shared: Remove the backwards compatbility flag.
michaelnebel Apr 15, 2025
ae70c76
Shared: Use the CaptureSummaryModels instead of CaptureMixedSummaryMo…
michaelnebel Apr 15, 2025
2357a69
Shared: Remove the --with-mixed-neutrals logic.
michaelnebel Apr 15, 2025
f78be91
Shared: Re-factor the model generator and put the heuristic queries i…
michaelnebel Apr 15, 2025
2a0097e
C#/Java/Rust: Use Mixed flow from capture summary models queries and …
michaelnebel Apr 15, 2025
7801fc3
C#: Re-factor tests to use the new implementations.
michaelnebel Apr 15, 2025
da99c75
C#: Rename some of the model generator tests.
michaelnebel Apr 15, 2025
539a06d
C#: Re-factor the heuristic summary test to use heuristic-summary tag…
michaelnebel Apr 15, 2025
1d6c367
C#: Change the capture neutral model test to use the content/heuristi…
michaelnebel Apr 16, 2025
08f7caa
Java: Adjust model generator test cases to the new implementation.
michaelnebel Apr 16, 2025
7e51dae
Java: Change the heuristic summary test tag to heuristic-summary.
michaelnebel Apr 16, 2025
71d0409
Java: Convert the model generator neutral test to use the combined ne…
michaelnebel Apr 16, 2025
2155396
Rust: Adjust tests.
michaelnebel Apr 16, 2025
32125d2
C#/Java/Rust: Add change notes.
michaelnebel Apr 16, 2025
d187a7d
Java: Update integration test that tracks queries not included in a q…
michaelnebel Apr 22, 2025
f6135d5
Shared: Address review comments.
michaelnebel Apr 23, 2025
d05f604
C++: Adjust the model generator queries to the new shared implementat…
michaelnebel Apr 24, 2025
a589014
C++: Update model generator tests.
michaelnebel Apr 24, 2025
de12222
C#/Rust: Update integration test expected output.
michaelnebel Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
C#/Java/Rust: Use Mixed flow from capture summary models queries and … 
…adjust other queries to the re-factored implementation.
  • Loading branch information
@michaelnebel
michaelnebel committed Apr 25, 2025
commit 2a0097ea56354f9f141fdd1b51335e8b9eade1e9
13 changes: 0 additions & 13 deletions 13 csharp/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions 13 csharp/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 2 csharp/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSummaryTargetApi api, string noflow
where noflow = captureNoFlow(api)
where noflow = captureNeutral(api)
select noflow order by noflow
2 changes: 1 addition & 1 deletion 2 csharp/ql/src/utils/modelgenerator/CaptureSinkModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSinkTargetApi api, string sink
where sink = captureSink(api)
where sink = Heuristic::captureSink(api)
select sink order by sink
2 changes: 1 addition & 1 deletion 2 csharp/ql/src/utils/modelgenerator/CaptureSourceModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSourceTargetApi api, string source
where source = captureSource(api)
where source = Heuristic::captureSource(api)
select source order by source
2 changes: 1 addition & 1 deletion 2 csharp/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSummaryTargetApi api, string flow
where flow = captureFlow(api)
where flow = captureFlow(api, _)
select flow order by flow
2 changes: 1 addition & 1 deletion 2 csharp/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPartialPath.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import PartialFlow::PartialPathGraph

int explorationLimit() { result = 3 }

module PartialFlow = PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
module PartialFlow = Heuristic::PropagateFlow::FlowExplorationFwd<explorationLimit/0>;

from
PartialFlow::PartialPathNode source, PartialFlow::PartialPathNode sink,
Expand Down
1 change: 1 addition & 0 deletions 1 csharp/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import csharp
import utils.modelgenerator.internal.CaptureModels
import Heuristic
import PropagateFlow::PathGraph

from
Expand Down
13 changes: 0 additions & 13 deletions 13 java/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions 13 java/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 2 java/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSummaryTargetApi api, string noflow
where noflow = captureNoFlow(api)
where noflow = captureNeutral(api)
select noflow order by noflow
2 changes: 1 addition & 1 deletion 2 java/ql/src/utils/modelgenerator/CaptureSinkModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSinkTargetApi api, string sink
where sink = captureSink(api)
where sink = Heuristic::captureSink(api)
select sink order by sink
2 changes: 1 addition & 1 deletion 2 java/ql/src/utils/modelgenerator/CaptureSourceModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSourceTargetApi api, string source
where source = captureSource(api)
where source = Heuristic::captureSource(api)
select source order by source
2 changes: 1 addition & 1 deletion 2 java/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSummaryTargetApi api, string flow
where flow = captureFlow(api)
where flow = captureFlow(api, _)
select flow order by flow
2 changes: 1 addition & 1 deletion 2 java/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPartialPath.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import PartialFlow::PartialPathGraph

int explorationLimit() { result = 3 }

module PartialFlow = PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
module PartialFlow = Heuristic::PropagateFlow::FlowExplorationFwd<explorationLimit/0>;

from
PartialFlow::PartialPathNode source, PartialFlow::PartialPathNode sink,
Expand Down
1 change: 1 addition & 0 deletions 1 java/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java
import semmle.code.java.dataflow.DataFlow
import utils.modelgenerator.internal.CaptureModels
import Heuristic
import PropagateFlow::PathGraph

from
Expand Down
13 changes: 0 additions & 13 deletions 13 rust/ql/src/utils/modelgenerator/CaptureMixedNeutralModels.ql
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions 13 rust/ql/src/utils/modelgenerator/CaptureMixedSummaryModels.ql
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion 2 rust/ql/src/utils/modelgenerator/CaptureNeutralModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSummaryTargetApi api, string noflow
where noflow = captureNoFlow(api)
where noflow = Heuristic::captureNoFlow(api)
select noflow order by noflow
2 changes: 1 addition & 1 deletion 2 rust/ql/src/utils/modelgenerator/CaptureSinkModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSinkTargetApi api, string sink
where sink = captureSink(api)
where sink = Heuristic::captureSink(api)
select sink order by sink
2 changes: 1 addition & 1 deletion 2 rust/ql/src/utils/modelgenerator/CaptureSourceModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSourceTargetApi api, string source
where source = captureSource(api)
where source = Heuristic::captureSource(api)
select source order by source
2 changes: 1 addition & 1 deletion 2 rust/ql/src/utils/modelgenerator/CaptureSummaryModels.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
import internal.CaptureModels

from DataFlowSummaryTargetApi api, string flow
where flow = captureFlow(api)
where flow = captureFlow(api, _)
select flow order by flow
2 changes: 1 addition & 1 deletion 2 rust/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPartialPath.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import PartialFlow::PartialPathGraph

int explorationLimit() { result = 3 }

module PartialFlow = PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
module PartialFlow = Heuristic::PropagateFlow::FlowExplorationFwd<explorationLimit/0>;

from
PartialFlow::PartialPathNode source, PartialFlow::PartialPathNode sink,
Expand Down
1 change: 1 addition & 0 deletions 1 rust/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

private import codeql.rust.dataflow.DataFlow
import utils.modelgenerator.internal.CaptureModels
import Heuristic
import PropagateFlow::PathGraph

from
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.