Merge pull request #9961 from MathiasVP/swift-cache-lastRefRedef

MathiasVP · web-flow · commit 9355f9132e2f · 2022-08-03T15:43:35.000+01:00
Swift: Cache `lastRefRedef`
diff --git a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
@@ -39,6 +39,11 @@ module Ssa {
         read2 = bb2.getNode(i2)
       )
     }
+
+    cached
+    predicate lastRefRedef(BasicBlock bb, int i, Definition next) {
+      SsaImplCommon::lastRefRedef(this, bb, i, next)
+    }
   }
 
   cached
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -5,7 +5,6 @@ private import codeql.swift.controlflow.ControlFlowGraph
 private import codeql.swift.controlflow.CfgNodes
 private import codeql.swift.dataflow.Ssa
 private import codeql.swift.controlflow.BasicBlocks
-private import codeql.swift.dataflow.internal.SsaImplCommon as SsaImpl
 private import codeql.swift.dataflow.FlowSummary as FlowSummary
 private import codeql.swift.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 
@@ -51,7 +50,7 @@ private class SsaDefinitionNodeImpl extends SsaDefinitionNode, NodeImpl {
 }
 
 private predicate localFlowSsaInput(Node nodeFrom, Ssa::Definition def, Ssa::Definition next) {
-  exists(BasicBlock bb, int i | SsaImpl::lastRefRedef(def, bb, i, next) |
+  exists(BasicBlock bb, int i | def.lastRefRedef(bb, i, next) |
     def.definesAt(_, bb, i) and
     def = nodeFrom.asDefinition()
   )

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,11 @@ module Ssa {`
`39`	`39`	`read2 = bb2.getNode(i2)`
`40`	`40`	`)`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ cached`
	`44`	`+ predicate lastRefRedef(BasicBlock bb, int i, Definition next) {`
	`45`	`+ SsaImplCommon::lastRefRedef(this, bb, i, next)`
	`46`	`+ }`
`42`	`47`	`}`
`43`	`48`
`44`	`49`	`cached`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ private import codeql.swift.controlflow.ControlFlowGraph`
`5`	`5`	`private import codeql.swift.controlflow.CfgNodes`
`6`	`6`	`private import codeql.swift.dataflow.Ssa`
`7`	`7`	`private import codeql.swift.controlflow.BasicBlocks`
`8`		`-private import codeql.swift.dataflow.internal.SsaImplCommon as SsaImpl`
`9`	`8`	`private import codeql.swift.dataflow.FlowSummary as FlowSummary`
`10`	`9`	`private import codeql.swift.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl`
`11`	`10`
`@@ -51,7 +50,7 @@ private class SsaDefinitionNodeImpl extends SsaDefinitionNode, NodeImpl {`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`private predicate localFlowSsaInput(Node nodeFrom, Ssa::Definition def, Ssa::Definition next) {`
`54`		`- exists(BasicBlock bb, int i \| SsaImpl::lastRefRedef(def, bb, i, next) \|`
	`53`	`+ exists(BasicBlock bb, int i \| def.lastRefRedef(bb, i, next) \|`
`55`	`54`	`def.definesAt(_, bb, i) and`
`56`	`55`	`def = nodeFrom.asDefinition()`
`57`	`56`	`)`