Apply suggestions from code review

Co-authored-by: Anders Schack-Mulligen <[email protected]>
github · Feb 10, 2025 · b093ae9 · b093ae9
1 parent f8c0c6f
commit b093ae9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/java/ql/lib/semmle/code/java/dataflow/SSA.qll b/java/ql/lib/semmle/code/java/dataflow/SSA.qll
@@ -144,13 +144,14 @@ class SsaVariable extends Definition {
   SsaSourceVariable getSourceVariable() { result = super.getSourceVariable() }
 
   /** Gets the `ControlFlowNode` at which this SSA variable is defined. */
+  pragma[nomagic]
   ControlFlowNode getCfgNode() {
     exists(BasicBlock bb, int i, int j |
       this.definesAt(_, bb, i) and
       // untracked definitions are inserted just before reads
       (if this instanceof UntrackedDef then j = i + 1 else j = i) and
       // phi nodes are inserted at position `-1`
-      result = bb.getNode(max([j, 0]))
+      result = bb.getNode(0.maximum(j))
     )
   }
 

diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -465,10 +465,16 @@ private module Cached {
     )
   }
 
+  bindingset[call, f]
+  pragma[inline_late]
+  private predicate updatesNamedField0(Call call, TrackedField f, Callable setter) {
+    updatesNamedField(call, f, setter)
+  }
+
   cached
   predicate defUpdatesNamedField(SsaImplicitUpdate def, TrackedField f, Callable setter) {
     f = def.getSourceVariable() and
-    updatesNamedField(def.getCfgNode().asCall(), f, setter)
+    updatesNamedField0(def.getCfgNode().asCall(), f, setter)
   }
 
   cached