Dataflow: Fix some perf issues.

aschackmull · aschackmull · commit 0addcfa7c50c · 2023-03-03T11:45:32.000+01:00
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll
@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {
     /**
      * Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
      */
+    pragma[assume_small_delta]
     pragma[nomagic]
     private predicate fwdFlowConsCand(Content c) {
       exists(NodeEx mid, NodeEx node, TypedContent tc |
@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {
       )
     }
 
+    pragma[nomagic]
     additional predicate revFlowState(FlowState state) {
       exists(NodeEx node |
         sinkNode(node, state) and
@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {
         fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)
       }
 
+      pragma[assume_small_delta]
       pragma[nomagic]
       private predicate fwdFlow0(
         NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,
@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {
     )
   }
 
+  pragma[assume_small_delta]
   pragma[nomagic]
   private predicate pathThroughCallable0(
     DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,7 @@ module Impl<FullStateConfigSig Config> {`
`565`	`565`	`/**`
`566`	`566`	* Holds if `c` is the target of a store in the flow covered by `fwdFlow`.
`567`	`567`	`*/`
	`568`	`+ pragma[assume_small_delta]`
`568`	`569`	`pragma[nomagic]`
`569`	`570`	`private predicate fwdFlowConsCand(Content c) {`
`570`	`571`	`exists(NodeEx mid, NodeEx node, TypedContent tc \|`
`@@ -784,6 +785,7 @@ module Impl<FullStateConfigSig Config> {`
`784`	`785`	`)`
`785`	`786`	`}`
`786`	`787`
	`788`	`+ pragma[nomagic]`
`787`	`789`	`additional predicate revFlowState(FlowState state) {`
`788`	`790`	`exists(NodeEx node \|`
`789`	`791`	`sinkNode(node, state) and`
`@@ -1187,6 +1189,7 @@ module Impl<FullStateConfigSig Config> {`
`1187`	`1189`	`fwdFlow(node, state, cc, summaryCtx, argAp, ap, _)`
`1188`	`1190`	`}`
`1189`	`1191`
	`1192`	`+ pragma[assume_small_delta]`
`1190`	`1193`	`pragma[nomagic]`
`1191`	`1194`	`private predicate fwdFlow0(`
`1192`	`1195`	`NodeEx node, FlowState state, Cc cc, ParamNodeOption summaryCtx, ApOption argAp, Ap ap,`
`@@ -3512,6 +3515,7 @@ module Impl<FullStateConfigSig Config> {`
`3512`	`3515`	`)`
`3513`	`3516`	`}`
`3514`	`3517`
	`3518`	`+ pragma[assume_small_delta]`
`3515`	`3519`	`pragma[nomagic]`
`3516`	`3520`	`private predicate pathThroughCallable0(`
`3517`	`3521`	`DataFlowCall call, PathNodeMid mid, ReturnKindExt kind, FlowState state, CallContext cc,`