Skip to content

Commit 81b677a

Browse files
kaspersvkaspersv
committed
rename overlay[caller] to overlay[caller?]
1 parent 2da8d61 commit 81b677a

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎java/ql/lib/semmle/code/java/Type.qll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ class RefType extends Type, Annotatable, Modifiable, @reftype {
670670
*
671671
* For the definition of the notion of *erasure* see JLS v8, section 4.6 (Type Erasure).
672672
*/
673-
overlay[caller]
673+
overlay[caller?]
674674
pragma[inline]
675675
RefType commonSubtype(RefType other) {
676676
result.getASourceSupertype*() = erase(this) and
@@ -1260,7 +1260,7 @@ private Type erase(Type t) {
12601260
*
12611261
* For the definition of the notion of *erasure* see JLS v8, section 4.6 (Type Erasure).
12621262
*/
1263-
overlay[caller]
1263+
overlay[caller?]
12641264
pragma[inline]
12651265
predicate haveIntersection(RefType t1, RefType t2) {
12661266
exists(RefType e1, RefType e2 | e1 = erase(t1) and e2 = erase(t2) |

‎java/ql/lib/semmle/code/java/controlflow/Dominance.qll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ predicate iDominates(ControlFlowNode dominator, ControlFlowNode node) {
9595
}
9696

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

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

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

127127
/** Holds if `dom` post-dominates `node`. (This is reflexive.) */
128-
overlay[caller]
128+
overlay[caller?]
129129
pragma[inline]
130130
predicate postDominates(ControlFlowNode dom, ControlFlowNode node) {
131131
// This predicate is gigantic, so it must be inlined.

‎java/ql/lib/semmle/code/java/dataflow/internal/DataFlowDispatch.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private module DispatchImpl {
213213
}
214214

215215
/** Holds if arguments at position `apos` match parameters at position `ppos`. */
216-
overlay[caller]
216+
overlay[caller?]
217217
pragma[inline]
218218
predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
219219
}

‎java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private module ThisFlow {
7979
* Holds if data can flow from `node1` to `node2` in zero or more
8080
* local (intra-procedural) steps.
8181
*/
82-
overlay[caller]
82+
overlay[caller?]
8383
pragma[inline]
8484
predicate localFlow(Node node1, Node node2) { node1 = node2 or localFlowStepPlus(node1, node2) }
8585

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

‎java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ private import semmle.code.java.frameworks.JaxWS
2323
* Holds if taint can flow from `src` to `sink` in zero or more
2424
* local (intra-procedural) steps.
2525
*/
26-
overlay[caller]
26+
overlay[caller?]
2727
pragma[inline]
2828
predicate localTaint(DataFlow::Node src, DataFlow::Node sink) { localTaintStep*(src, sink) }
2929

3030
/**
3131
* Holds if taint can flow from `src` to `sink` in zero or more
3232
* local (intra-procedural) steps.
3333
*/
34-
overlay[caller]
34+
overlay[caller?]
3535
pragma[inline]
3636
predicate localExprTaint(Expr src, Expr sink) {
3737
localTaint(DataFlow::exprNode(src), DataFlow::exprNode(sink))
@@ -74,7 +74,7 @@ module LocalTaintFlow<nodeSig/1 source, nodeSig/1 sink> {
7474
* (intra-procedural) steps that are restricted to be part of a path between
7575
* `source` and `sink`.
7676
*/
77-
overlay[caller]
77+
overlay[caller?]
7878
pragma[inline]
7979
predicate hasFlow(DataFlow::Node n1, DataFlow::Node n2) { step*(n1, n2) }
8080

@@ -83,7 +83,7 @@ module LocalTaintFlow<nodeSig/1 source, nodeSig/1 sink> {
8383
* (intra-procedural) steps that are restricted to be part of a path between
8484
* `source` and `sink`.
8585
*/
86-
overlay[caller]
86+
overlay[caller?]
8787
pragma[inline]
8888
predicate hasExprFlow(Expr n1, Expr n2) {
8989
hasFlow(DataFlow::exprNode(n1), DataFlow::exprNode(n2))

‎shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
794794
innercc = getCallContextCall(call, inner)
795795
}
796796

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

25292529
class ApHeadContent = Unit;
25302530

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

‎shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
677677

678678
class CcCall = CallContextCall;
679679

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

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

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

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

24252425
/** Gets the type of `n` used for type pruning. */
2426-
overlay[caller]
2426+
overlay[caller?]
24272427
pragma[inline]
24282428
Type getNodeDataFlowType(Node n) {
24292429
nodeType(pragma[only_bind_out](n), pragma[only_bind_into](result))

‎shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1786,7 +1786,7 @@ module MakeImplStage1<LocationSig Location, InputSig<Location> Lang> {
17861786
* For more information, see
17871787
* [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
17881788
*/
1789-
overlay[caller]
1789+
overlay[caller?]
17901790
pragma[inline]
17911791
deprecated predicate hasLocationInfo(
17921792
string filepath, int startline, int startcolumn, int endline, int endcolumn

‎shared/regex/codeql/regex/nfa/SuperlinearBackTracking.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ module Make<RegexTreeViewSig TreeImpl> {
101101
/**
102102
* Holds if the tuple `(r1, r2, r3)` might be on path from a start-state to an end-state in the product automaton.
103103
*/
104-
overlay[caller]
104+
overlay[caller?]
105105
pragma[inline]
106106
predicate isFeasibleTuple(State r1, State r2, State r3) {
107107
// The first element is either inside a repetition (or the start state itself)

‎shared/typeinference/codeql/typeinference/internal/TypeInference.qll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,15 +851,15 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
851851
)
852852
}
853853

854-
overlay[caller]
854+
overlay[caller?]
855855
pragma[inline]
856856
predicate baseTypeMentionHasNonTypeParameterAt(
857857
Type sub, TypeMention baseMention, TypePath path, Type t
858858
) {
859859
not t = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, t)
860860
}
861861

862-
overlay[caller]
862+
overlay[caller?]
863863
pragma[inline]
864864
predicate baseTypeMentionHasTypeParameterAt(
865865
Type sub, TypeMention baseMention, TypePath path, TypeParameter tp

0 commit comments

Comments
 (0)