rename 'overlay[caller]' => 'overlay[caller?]'

2025-12-16 08:43:11 +01:00 · 2025-06-20 11:02:45 +01:00
parent 5acb362523
commit 35abcde0b7
11 changed files with 29 additions and 29 deletions
--- a/java/ql/lib/semmle/code/java/Type.qll
+++ b/java/ql/lib/semmle/code/java/Type.qll
@@ -670,7 +670,7 @@ class RefType extends Type, Annotatable, Modifiable, @reftype {
   *
   * For the definition of the notion of *erasure* see JLS v8, section 4.6 (Type Erasure).
   */
-  overlay[caller]
+  overlay[caller?]
  pragma[inline]
  RefType commonSubtype(RefType other) {
    result.getASourceSupertype*() = erase(this) and
@@ -1260,7 +1260,7 @@ private Type erase(Type t) {
 *
 * For the definition of the notion of *erasure* see JLS v8, section 4.6 (Type Erasure).
 */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate haveIntersection(RefType t1, RefType t2) {
  exists(RefType e1, RefType e2 | e1 = erase(t1) and e2 = erase(t2) |
--- a/java/ql/lib/semmle/code/java/controlflow/Dominance.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Dominance.qll
@@ -95,7 +95,7 @@ predicate iDominates(ControlFlowNode dominator, ControlFlowNode node) {
 }

 /** Holds if `dom` strictly dominates `node`. */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate strictlyDominates(ControlFlowNode dom, ControlFlowNode node) {
  // This predicate is gigantic, so it must be inlined.
@@ -105,7 +105,7 @@ predicate strictlyDominates(ControlFlowNode dom, ControlFlowNode node) {
 }

 /** Holds if `dom` dominates `node`. (This is reflexive.) */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate dominates(ControlFlowNode dom, ControlFlowNode node) {
  // This predicate is gigantic, so it must be inlined.
@@ -115,7 +115,7 @@ predicate dominates(ControlFlowNode dom, ControlFlowNode node) {
 }

 /** Holds if `dom` strictly post-dominates `node`. */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate strictlyPostDominates(ControlFlowNode dom, ControlFlowNode node) {
  // This predicate is gigantic, so it must be inlined.
@@ -125,7 +125,7 @@ predicate strictlyPostDominates(ControlFlowNode dom, ControlFlowNode node) {
 }

 /** Holds if `dom` post-dominates `node`. (This is reflexive.) */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate postDominates(ControlFlowNode dom, ControlFlowNode node) {
  // This predicate is gigantic, so it must be inlined.
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowDispatch.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowDispatch.qll
@@ -213,7 +213,7 @@ private module DispatchImpl {
  }

  /** Holds if arguments at position `apos` match parameters at position `ppos`. */
-  overlay[caller]
+  overlay[caller?]
  pragma[inline]
  predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
 }
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -79,7 +79,7 @@ private module ThisFlow {
 * Holds if data can flow from `node1` to `node2` in zero or more
 * local (intra-procedural) steps.
 */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate localFlow(Node node1, Node node2) { node1 = node2 or localFlowStepPlus(node1, node2) }

@@ -89,7 +89,7 @@ private predicate localFlowStepPlus(Node node1, Node node2) = fastTC(localFlowSt
 * Holds if data can flow from `e1` to `e2` in zero or more
 * local (intra-procedural) steps.
 */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate localExprFlow(Expr e1, Expr e2) { localFlow(exprNode(e1), exprNode(e2)) }

--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -23,7 +23,7 @@ private import semmle.code.java.frameworks.JaxWS
 * Holds if taint can flow from `src` to `sink` in zero or more
 * local (intra-procedural) steps.
 */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate localTaint(DataFlow::Node src, DataFlow::Node sink) { localTaintStep*(src, sink) }

@@ -31,7 +31,7 @@ predicate localTaint(DataFlow::Node src, DataFlow::Node sink) { localTaintStep*(
 * Holds if taint can flow from `src` to `sink` in zero or more
 * local (intra-procedural) steps.
 */
-overlay[caller]
+overlay[caller?]
 pragma[inline]
 predicate localExprTaint(Expr src, Expr sink) {
  localTaint(DataFlow::exprNode(src), DataFlow::exprNode(sink))
@@ -74,7 +74,7 @@ module LocalTaintFlow<nodeSig/1 source, nodeSig/1 sink> {
   * (intra-procedural) steps that are restricted to be part of a path between
   * `source` and `sink`.
   */
-  overlay[caller]
+  overlay[caller?]
  pragma[inline]
  predicate hasFlow(DataFlow::Node n1, DataFlow::Node n2) { step*(n1, n2) }

@@ -83,7 +83,7 @@ module LocalTaintFlow<nodeSig/1 source, nodeSig/1 sink> {
   * (intra-procedural) steps that are restricted to be part of a path between
   * `source` and `sink`.
   */
-  overlay[caller]
+  overlay[caller?]
  pragma[inline]
  predicate hasExprFlow(Expr n1, Expr n2) {
    hasFlow(DataFlow::exprNode(n1), DataFlow::exprNode(n2))
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -744,7 +744,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
            viableImplNotCallContextReducedInlineLate(call, outercc)
          }

-          overlay[caller]
+          overlay[caller?]
          pragma[inline]
          private predicate fwdFlowInCand(
            Call call, ArgNd arg, Cc outercc, Callable inner, ParamNd p, SummaryCtx summaryCtx,
@@ -759,7 +759,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
            callEdgeArgParamRestrictedInlineLate(call, inner, arg, p, emptyAp)
          }

-          overlay[caller]
+          overlay[caller?]
          pragma[inline]
          private predicate fwdFlowInCandTypeFlowDisabled(
            Call call, ArgNd arg, Cc outercc, Callable inner, ParamNd p, SummaryCtx summaryCtx,
@@ -796,7 +796,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
            innercc = getCallContextCall(call, inner)
          }

-          overlay[caller]
+          overlay[caller?]
          pragma[inline]
          predicate fwdFlowIn(
            Call call, ArgNd arg, Callable inner, ParamNd p, Cc outercc, CcCall innercc,
@@ -2326,7 +2326,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
               * For more information, see
               * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
               */
-              overlay[caller]
+              overlay[caller?]
              pragma[inline]
              deprecated final predicate hasLocationInfo(
                string filepath, int startline, int startcolumn, int endline, int endcolumn
@@ -2530,7 +2530,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {

      class ApHeadContent = Unit;

-      overlay[caller]
+      overlay[caller?]
      pragma[inline]
      ApHeadContent getHeadContent(Ap ap) { exists(result) and ap = true }

--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -678,7 +678,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {

      class CcCall = CallContextCall;

-      overlay[caller]
+      overlay[caller?]
      pragma[inline]
      predicate matchesCall(CcCall cc, Call call) {
        cc = Input2::getSpecificCallContextCall(call, _) or
@@ -890,7 +890,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
    pragma[nomagic]
    private Callable getEnclosingCallable0() { nodeEnclosingCallable(this.projectToNode(), result) }

-    overlay[caller]
+    overlay[caller?]
    pragma[inline]
    Callable getEnclosingCallable() {
      pragma[only_bind_out](this).getEnclosingCallable0() = pragma[only_bind_into](result)
@@ -905,7 +905,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
      isTopType(result) and this.isImplicitReadNode(_)
    }

-    overlay[caller]
+    overlay[caller?]
    pragma[inline]
    Type getType() { pragma[only_bind_out](this).getType0() = pragma[only_bind_into](result) }

@@ -2417,14 +2417,14 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
   * predicate ensures that joins go from `n` to the result instead of the other
   * way around.
   */
-  overlay[caller]
+  overlay[caller?]
  pragma[inline]
  Callable getNodeEnclosingCallable(Node n) {
    nodeEnclosingCallable(pragma[only_bind_out](n), pragma[only_bind_into](result))
  }

  /** Gets the type of `n` used for type pruning. */
-  overlay[caller]
+  overlay[caller?]
  pragma[inline]
  Type getNodeDataFlowType(Node n) {
    nodeType(pragma[only_bind_out](n), pragma[only_bind_into](result))
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
@@ -1786,7 +1786,7 @@ module MakeImplStage1<LocationSig Location, InputSig<Location> Lang> {
           * For more information, see
           * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
           */
-          overlay[caller]
+          overlay[caller?]
          pragma[inline]
          deprecated predicate hasLocationInfo(
            string filepath, int startline, int startcolumn, int endline, int endcolumn
--- a/shared/regex/codeql/regex/nfa/SuperlinearBackTracking.qll
+++ b/shared/regex/codeql/regex/nfa/SuperlinearBackTracking.qll
@@ -101,7 +101,7 @@ module Make<RegexTreeViewSig TreeImpl> {
    /**
     * Holds if the tuple `(r1, r2, r3)` might be on path from a start-state to an end-state in the product automaton.
     */
-    overlay[caller]
+    overlay[caller?]
    pragma[inline]
    predicate isFeasibleTuple(State r1, State r2, State r3) {
      // The first element is either inside a repetition (or the start state itself)
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -851,7 +851,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        )
      }

-      overlay[caller]
+      overlay[caller?]
      pragma[inline]
      predicate baseTypeMentionHasNonTypeParameterAt(
        Type sub, TypeMention baseMention, TypePath path, Type t
@@ -859,7 +859,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        not t = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, t)
      }

-      overlay[caller]
+      overlay[caller?]
      pragma[inline]
      predicate baseTypeMentionHasTypeParameterAt(
        Type sub, TypeMention baseMention, TypePath path, TypeParameter tp
--- a/shared/typetracking/codeql/typetracking/internal/TypeTrackingImpl.qll
+++ b/shared/typetracking/codeql/typetracking/internal/TypeTrackingImpl.qll
@@ -512,7 +512,7 @@ module TypeTracking<LocationSig Location, TypeTrackingInput<Location> I> {
     * }
     * ```
     */
-    overlay[caller]
+    overlay[caller?]
    pragma[inline]
    TypeTracker smallstep(Node nodeFrom, Node nodeTo) {
      result = this.smallstepNoSimpleLocalFlowStep(nodeFrom, nodeTo)
@@ -657,7 +657,7 @@ module TypeTracking<LocationSig Location, TypeTrackingInput<Location> I> {
     * }
     * ```
     */
-    overlay[caller]
+    overlay[caller?]
    pragma[inline]
    TypeBackTracker smallstep(Node nodeFrom, Node nodeTo) {
      result = this.smallstepNoSimpleLocalFlowStep(nodeFrom, nodeTo)