mirror of
https://github.com/github/codeql.git
synced 2025-12-20 02:44:30 +01:00
11c71fdd18
This commit removes SSA nodes from the data flow graph. Specifically, for a definition and use such as ```python x = expr y = x + 2 ``` we used to have flow from `expr` to an SSA variable representing x and from that SSA variable to the use of `x` in the definition of `y`. Now we instead have flow from `expr` to the control flow node for `x` at line 1 and from there to the control flow node for `x` at line 2. Specific changes: - `EssaNode` from the data flow layer no longer exists. - Several glue steps between `EssaNode`s and `CfgNode`s have been deleted. - Entry nodes are now admitted as `CfgNodes` in the data flow layer (they were filtered out before). - Entry nodes now have a new `toString` taking into account that the module name may be ambigous. - Some tests have been rewritten to accomodate the changes, but only `python/ql/test/experimental/dataflow/basic/maximalFlowsConfig.qll` should have semantic changes. - Comments have been updated - Test output has been updated, but apart from `python/ql/test/experimental/dataflow/basic/maximalFlows.expected` only `python/ql/test/experimental/dataflow/typetracking-summaries/summaries.py` should have a semantic change. This is a bonus fix, probably meaning that something was never connected up correctly.
38 lines
1.5 KiB
Plaintext
38 lines
1.5 KiB
Plaintext
// This query should be more focused yet.
|
|
import python
|
|
import experimental.dataflow.TestUtil.FlowTest
|
|
private import semmle.python.dataflow.new.internal.PrintNode
|
|
private import semmle.python.dataflow.new.internal.DataFlowPrivate as DP
|
|
|
|
module ImportTimeLocalFlowTest implements FlowTestSig {
|
|
string flowTag() { result = "importTimeFlow" }
|
|
|
|
predicate relevantFlow(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
|
|
nodeFrom.getLocation().getFile().getBaseName() = "multiphase.py" and
|
|
// results are displayed next to `nodeTo`, so we need a line to write on
|
|
nodeTo.getLocation().getStartLine() > 0 and
|
|
exists(GlobalSsaVariable g |
|
|
nodeTo.asCfgNode() = g.getDefinition().(EssaNodeDefinition).getDefiningNode()
|
|
) and
|
|
// nodeTo.asVar() instanceof GlobalSsaVariable and
|
|
DP::PhaseDependentFlow<DP::LocalFlow::localFlowStep/2>::importTimeStep(nodeFrom, nodeTo)
|
|
}
|
|
}
|
|
|
|
module RuntimeLocalFlowTest implements FlowTestSig {
|
|
string flowTag() { result = "runtimeFlow" }
|
|
|
|
predicate relevantFlow(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
|
|
nodeFrom.getLocation().getFile().getBaseName() = "multiphase.py" and
|
|
// results are displayed next to `nodeTo`, so we need a line to write on
|
|
nodeTo.getLocation().getStartLine() > 0 and
|
|
(
|
|
nodeFrom instanceof DataFlow::ModuleVariableNode or
|
|
nodeTo instanceof DataFlow::ModuleVariableNode
|
|
) and
|
|
DP::runtimeJumpStep(nodeFrom, nodeTo)
|
|
}
|
|
}
|
|
|
|
import MakeTest<MergeTests<MakeTestSig<ImportTimeLocalFlowTest>, MakeTestSig<RuntimeLocalFlowTest>>>
|