Data flow: Move FlowThrough module into TypeTrackingInput

github · Dec 20, 2024 · e7df00a · e7df00a
1 parent 828ba23
commit e7df00a
Show file tree

Hide file tree

Showing 4 changed files with 566 additions and 572 deletions.
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowPrivate.qll
@@ -1436,7 +1436,7 @@ private predicate localFlowStepWithSummaries(Node node1, Node node2) {
   or
   readStep(node1, _, node2)
   or
-  DataFlowImplCommon::argumentValueFlowsThrough(node1, _, node2, _)
+  DataFlowImplCommon::argumentValueFlowsThroughExposedForCppOnly(node1, _, node2, _)
 }
 
 /** Holds if `node` flows to a node that is used in a `SwitchInstruction`. */

diff --git a/java/ql/test/library-tests/dataflow/getter/getter.expected b/java/ql/test/library-tests/dataflow/getter/getter.expected
@@ -1,5 +1,3 @@
 | A.java:5:12:5:15 | this | A.java:5:12:5:19 | this.foo | A.java:2:7:2:9 | foo |
-| A.java:21:13:21:13 | a | A.java:21:13:21:22 | getFoo(...) | A.java:2:7:2:9 | foo |
-| A.java:23:9:23:9 | a | A.java:23:9:23:19 | aGetter(...) | A.java:2:7:2:9 | foo |
 | A.java:45:12:45:38 | maybeIdWrap(...) | A.java:45:12:45:42 | maybeIdWrap(...).foo | A.java:2:7:2:9 | foo |
 | A.java:49:12:49:38 | maybeIdWrap(...) | A.java:49:12:49:42 | maybeIdWrap(...).foo | A.java:2:7:2:9 | foo |
diff --git a/java/ql/test/library-tests/dataflow/getter/getter.ql b/java/ql/test/library-tests/dataflow/getter/getter.ql
@@ -5,9 +5,6 @@ import semmle.code.java.dataflow.internal.DataFlowImplSpecific::Private
 
 from Node n1, ContentSet f, Node n2
 where
-  (
-    readSet(n1, f, n2) or
-    getterStep(n1, f, n2)
-  ) and
+  readSet(n1, f, n2) and
   n1.getEnclosingCallable().fromSource()
 select n1, n2, f