java

Author: hvitved

java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll

@@ -199,8 +199,7 @@ predicate jumpStep(Node node1, Node node2) {
   any(AdditionalValueStep a).step(node1, node2) and
   node1.getEnclosingCallable() != node2.getEnclosingCallable()
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(node1.(FlowSummaryNode).getSummaryNode(),
-    node2.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(node1, node2)
 }
 
 /**

java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll

@@ -247,8 +247,7 @@ private predicate simpleLocalFlowStep0(Node node1, Node node2, string model) {
   or
   cloneStep(node1, node2) and model = "CloneStep"
   or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(node1, node2.(FlowSummaryNode).getSummaryNode(),
-    true, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(node1, node2, true, model)
 }
 
 /**

java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll

@@ -125,15 +125,20 @@ private module Input2 implements Impl::Private::InputSig2 {
     DataFlowCallable getEnclosingCallable() { none() }
   }
 
-  bindingset[source, s]
   SourceSinkReportingElement getSourceEntryElement(
-    Impl::Public::SourceElement source, Impl::Private::SummaryComponentStack s
+    Impl::Public::SourceElement source, Impl::Private::SummaryComponent sc
   ) {
     none()
   }
 
-  bindingset[e, s]
-  Node getSourceExitNode(SourceSinkReportingElement e, Impl::Private::SummaryComponentStack s) {
+  SourceSinkReportingElement getNextElement(
+    SourceSinkReportingElement prev, Impl::Private::SummaryComponent sc
+  ) {
+    none()
+  }
+
+  bindingset[e, sc]
+  Node getSourceExitNode(SourceSinkReportingElement e, Impl::Private::SummaryComponent sc) {
     none()
   }
 
@@ -177,11 +182,7 @@ private module TypesInput implements Impl2::TypesInputSig {
     exists(rk)
   }
 
-  DataFlowType getSourceType(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
-    none()
-  }
-
-  DataFlowType getSinkType(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
+  DataFlowType getSourceSinkType(Input2::SourceSinkReportingElement e) { none() }
 }
 
 private module StepsInput implements Impl2::StepsInputSig {

java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll

@@ -145,8 +145,7 @@ private module Cached {
       )
     )
     or
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(src,
-      sink.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(src, sink, false, model)
   }
 
   /**