Go: Summarized Callable

owen-mc · owen-mc · commit 83a3af2ffff2 · 2022-11-17T14:27:04.000Z
Corresponds to github#9270
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -108,7 +108,7 @@ predicate localFlowStep(Node nodeFrom, Node nodeTo) {
   or
   // Simple flow through library code is included in the exposed local
   // step relation, even though flow is technically inter-procedural
-  FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo)
+  FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo, _)
 }
 
 /**
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -27,7 +27,7 @@ predicate localTaintStep(DataFlow::Node src, DataFlow::Node sink) {
   localAdditionalTaintStep(src, sink) or
   // Simple flow through library code is included in the exposed local
   // step relation, even though flow is technically inter-procedural
-  FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(src, sink)
+  FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(src, sink, _)
 }
 
 private Type getElementType(Type containerType) {
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlow/steps.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlow/steps.ql
@@ -22,5 +22,5 @@ class SummaryModelTest extends SummaryModelCsv {
 }
 
 from DataFlow::Node node1, DataFlow::Node node2
-where FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(node1, node2)
+where FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(node1, node2, _)
 select node1, node2

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ predicate localFlowStep(Node nodeFrom, Node nodeTo) {`
`108`	`108`	`or`
`109`	`109`	`// Simple flow through library code is included in the exposed local`
`110`	`110`	`// step relation, even though flow is technically inter-procedural`
`111`		`- FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo)`
	`111`	`+ FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo, _)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ predicate localTaintStep(DataFlow::Node src, DataFlow::Node sink) {`
`27`	`27`	`localAdditionalTaintStep(src, sink) or`
`28`	`28`	`// Simple flow through library code is included in the exposed local`
`29`	`29`	`// step relation, even though flow is technically inter-procedural`
`30`		`- FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(src, sink)`
	`30`	`+ FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(src, sink, _)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`private Type getElementType(Type containerType) {`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ class SummaryModelTest extends SummaryModelCsv {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`from DataFlow::Node node1, DataFlow::Node node2`
`25`		`-where FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(node1, node2)`
	`25`	`+where FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(node1, node2, _)`
`26`	`26`	`select node1, node2`