Skip to content

Commit 1de7b0e

Browse files
CopilotCopilot
authored
Merge PR #21873 branch to get files
2 parents 63646a1 + 0937133 commit 1de7b0e

24 files changed

Lines changed: 4333 additions & 3789 deletions

File tree

‎ruby/ql/lib/codeql/ruby/ast/Parameter.qll‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class BlockParameter extends NamedParameter, TBlockParameter {
134134
final override string getName() { result = g.getName().getValue() }
135135

136136
final override LocalVariable getVariable() {
137-
result = TLocalVariableReal(_, _, g.getName()) or
137+
result.(LocalVariableReal).getDefiningNode() = g.getName() or
138138
result = TLocalVariableSynth(this, 0)
139139
}
140140

@@ -164,7 +164,7 @@ class HashSplatParameter extends NamedParameter, THashSplatParameter {
164164
final override string getAPrimaryQlClass() { result = "HashSplatParameter" }
165165

166166
final override LocalVariable getVariable() {
167-
result = TLocalVariableReal(_, _, g.getName()) or
167+
result.(LocalVariableReal).getDefiningNode() = g.getName() or
168168
result = TLocalVariableSynth(this, 0)
169169
}
170170

@@ -212,7 +212,9 @@ class KeywordParameter extends NamedParameter, TKeywordParameter {
212212

213213
final override string getAPrimaryQlClass() { result = "KeywordParameter" }
214214

215-
final override LocalVariable getVariable() { result = TLocalVariableReal(_, _, g.getName()) }
215+
final override LocalVariable getVariable() {
216+
result.(LocalVariableReal).getDefiningNode() = g.getName()
217+
}
216218

217219
/**
218220
* Gets the default value, i.e. the value assigned to the parameter when one
@@ -262,7 +264,9 @@ class OptionalParameter extends NamedParameter, TOptionalParameter {
262264
*/
263265
final Expr getDefaultValue() { toGenerated(result) = g.getValue() }
264266

265-
final override LocalVariable getVariable() { result = TLocalVariableReal(_, _, g.getName()) }
267+
final override LocalVariable getVariable() {
268+
result.(LocalVariableReal).getDefiningNode() = g.getName()
269+
}
266270

267271
final override string toString() { result = this.getName() }
268272

@@ -293,7 +297,7 @@ class SplatParameter extends NamedParameter, TSplatParameter {
293297
final override string getAPrimaryQlClass() { result = "SplatParameter" }
294298

295299
final override LocalVariable getVariable() {
296-
result = TLocalVariableReal(_, _, g.getName()) or
300+
result.(LocalVariableReal).getDefiningNode() = g.getName() or
297301
result = TLocalVariableSynth(this, 0)
298302
}
299303

‎ruby/ql/lib/codeql/ruby/ast/internal/AST.qll‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,7 @@ private module Cached {
207207
TLambda(Ruby::Lambda g) or
208208
TLine(Ruby::Line g) or
209209
TLeftAssignmentList(Ruby::LeftAssignmentList g) or
210-
TLocalVariableAccessReal(Ruby::Identifier g, TLocalVariableReal v) {
211-
LocalVariableAccess::range(g, v)
212-
} or
210+
TLocalVariableAccessReal(Ruby::Identifier g, TLocalVariableReal v) { access(g, v) } or
213211
TLocalVariableAccessSynth(Ast::AstNode parent, int i, Ast::LocalVariable v) {
214212
mkSynthChild(LocalVariableAccessRealKind(v), parent, i)
215213
or

‎ruby/ql/lib/codeql/ruby/ast/internal/Parameter.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SimpleParameterRealImpl extends SimpleParameterImpl, TSimpleParameterReal
3333

3434
SimpleParameterRealImpl() { this = TSimpleParameterReal(g) }
3535

36-
override LocalVariable getVariableImpl() { result = TLocalVariableReal(_, _, g) }
36+
override LocalVariable getVariableImpl() { result.(LocalVariableReal).getDefiningNode() = g }
3737

3838
override string getNameImpl() { result = g.getValue() }
3939
}

‎ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private Ruby::AstNode specialParentOf(Ruby::AstNode n) {
118118
]
119119
}
120120

121-
private Ruby::AstNode parentOf(Ruby::AstNode n) {
121+
Ruby::AstNode parentOf(Ruby::AstNode n) {
122122
n = getHereDocBody(result)
123123
or
124124
result = specialParentOf(n).getParent()
@@ -172,13 +172,15 @@ private module Cached {
172172
}
173173
}
174174

175+
import Cached
176+
175177
bindingset[n]
176178
pragma[inline_late]
177-
Scope::Range scopeOf(Ruby::AstNode n) { result = Cached::scopeOfImpl(n) }
179+
Scope::Range scopeOf(Ruby::AstNode n) { result = scopeOfImpl(n) }
178180

179181
bindingset[n]
180182
pragma[inline_late]
181-
Scope scopeOfInclSynth(AstNode n) { result = Cached::scopeOfInclSynthImpl(n) }
183+
Scope scopeOfInclSynth(AstNode n) { result = scopeOfInclSynthImpl(n) }
182184

183185
abstract class ScopeImpl extends AstNode, TScopeType {
184186
final Scope getOuterScopeImpl() { result = scopeOfInclSynth(this) }

‎ruby/ql/lib/codeql/ruby/ast/internal/Synthesis.qll‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,12 @@ private predicate hasLocation(AstNode n, Location l) {
299299
private module ImplicitSelfSynthesis {
300300
pragma[nomagic]
301301
private predicate identifierMethodCallSelfSynthesis(AstNode mc, int i, Child child) {
302-
child = SynthChild(SelfKind(TSelfVariable(scopeOf(toGenerated(mc)).getEnclosingSelfScope()))) and
303-
mc = TIdentifierMethodCall(_) and
304-
i = 0
302+
exists(SelfVariableImpl self |
303+
self.getDeclaringScopeImpl() = scopeOf(toGenerated(mc)).getEnclosingSelfScope() and
304+
child = SynthChild(SelfKind(self)) and
305+
mc = TIdentifierMethodCall(_) and
306+
i = 0
307+
)
305308
}
306309

307310
private class IdentifierMethodCallSelfSynthesis extends Synthesis {
@@ -312,13 +315,14 @@ private module ImplicitSelfSynthesis {
312315

313316
pragma[nomagic]
314317
private predicate regularMethodCallSelfSynthesis(TRegularMethodCall mc, int i, Child child) {
315-
exists(Ruby::AstNode g |
318+
exists(Ruby::AstNode g, SelfVariableImpl self |
316319
mc = TRegularMethodCall(g) and
317320
// If there's no explicit receiver, then the receiver is implicitly `self`.
318-
not exists(g.(Ruby::Call).getReceiver())
319-
) and
320-
child = SynthChild(SelfKind(TSelfVariable(scopeOf(toGenerated(mc)).getEnclosingSelfScope()))) and
321-
i = 0
321+
not exists(g.(Ruby::Call).getReceiver()) and
322+
self.getDeclaringScopeImpl() = scopeOf(toGenerated(mc)).getEnclosingSelfScope() and
323+
child = SynthChild(SelfKind(self)) and
324+
i = 0
325+
)
322326
}
323327

324328
private class RegularMethodCallSelfSynthesis extends Synthesis {
@@ -341,9 +345,10 @@ private module ImplicitSelfSynthesis {
341345
*/
342346
pragma[nomagic]
343347
private SelfKind getSelfKind(InstanceVariableAccess var) {
344-
exists(Ruby::AstNode owner |
348+
exists(Ruby::AstNode owner, SelfVariableImpl self |
349+
self.getDeclaringScopeImpl() = scopeOf(owner).getEnclosingSelfScope() and
345350
owner = toGenerated(instanceVarAccessSynthParentStar(var)) and
346-
result = SelfKind(TSelfVariable(scopeOf(owner).getEnclosingSelfScope()))
351+
result = SelfKind(self)
347352
)
348353
}
349354

@@ -1566,20 +1571,20 @@ private module ForLoopDesugar {
15661571
* { a: a }
15671572
* ```
15681573
*/
1569-
private module ImplicitHashValueSynthesis {
1570-
private Ruby::AstNode keyWithoutValue(AstNode parent, int i) {
1574+
module ImplicitHashValueSynthesis {
1575+
Ruby::AstNode keyWithoutValue(Ruby::AstNode parent, int i) {
15711576
exists(Ruby::KeywordPattern pair |
15721577
result = pair.getKey() and
1573-
result = toGenerated(parent.(HashPattern).getKey(i)) and
1578+
result = parent.(Ruby::HashPattern).getChild(i).(Ruby::KeywordPattern).getKey() and
15741579
not exists(pair.getValue())
15751580
)
15761581
or
1577-
exists(Ruby::Pair pair |
1578-
i = 0 and
1579-
result = pair.getKey() and
1580-
pair = toGenerated(parent) and
1581-
not exists(pair.getValue())
1582-
)
1582+
parent =
1583+
any(Ruby::Pair pair |
1584+
i = 0 and
1585+
result = pair.getKey() and
1586+
not exists(pair.getValue())
1587+
)
15831588
}
15841589

15851590
private string keyName(Ruby::AstNode key) {
@@ -1589,7 +1594,7 @@ private module ImplicitHashValueSynthesis {
15891594

15901595
private class ImplicitHashValueSynthesis extends Synthesis {
15911596
final override predicate child(AstNode parent, int i, Child child) {
1592-
exists(Ruby::AstNode key | key = keyWithoutValue(parent, i) |
1597+
exists(Ruby::AstNode key | key = keyWithoutValue(toGenerated(parent), i) |
15931598
exists(TVariableReal variable |
15941599
access(key, variable) and
15951600
child = SynthChild(LocalVariableAccessRealKind(variable))
@@ -1616,7 +1621,7 @@ private module ImplicitHashValueSynthesis {
16161621
}
16171622

16181623
final override predicate location(AstNode n, Location l) {
1619-
exists(AstNode p, int i | l = keyWithoutValue(p, i).getLocation() |
1624+
exists(AstNode p, int i | l = keyWithoutValue(toGenerated(p), i).getLocation() |
16201625
n = p.(HashPattern).getValue(i)
16211626
or
16221627
i = 0 and n = p.(Pair).getValue()

0 commit comments

Comments
 (0)