Skip to content

Commit 54ebe9a

Browse files
hvitvedhvitved
committed
Rust: Path resolution for inherited associated items
1 parent ab74d90 commit 54ebe9a

File tree

3 files changed

+187
-55
lines changed

3 files changed

+187
-55
lines changed

‎rust/ql/lib/codeql/rust/elements/internal/PathResolution.qll‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,15 @@ abstract class ItemNode extends AstNode {
131131
result = call.(ItemNode).getASuccessorRec(name)
132132
)
133133
or
134-
// an inherited function, either from a trait bound or from an `impl` block
134+
// a trait has access to the associated items of its supertraits
135+
result = this.(TraitItemNode).resolveABound().getASuccessorRec(name) and
136+
result instanceof AssocItemNode
137+
or
138+
// items made available by an implementation where `this` is the implementing type
135139
exists(ItemNode node |
136-
result = node.(ItemNode).getASuccessorRec(name) and
137-
result instanceof Function
138-
|
139-
node = this.(TraitItemNode).resolveABound()
140-
or
141-
this = node.(ImplItemNode).resolveSelfTy()
140+
this = node.(ImplItemNode).resolveSelfTy() and
141+
result = node.getASuccessorRec(name) and
142+
result instanceof AssocItemNode
142143
)
143144
}
144145

@@ -189,7 +190,10 @@ private class SourceFileItemNode extends ModuleLikeNode, SourceFile {
189190
override Visibility getVisibility() { none() }
190191
}
191192

192-
private class ConstItemNode extends ItemNode instanceof Const {
193+
/** An item that can occur in a trait or an `impl` block. */
194+
abstract private class AssocItemNode extends ItemNode { }
195+
196+
private class ConstItemNode extends AssocItemNode instanceof Const {
193197
override string getName() { result = Const.super.getName().getText() }
194198

195199
override Namespace getNamespace() { result.isValue() }
@@ -215,7 +219,7 @@ private class VariantItemNode extends ItemNode instanceof Variant {
215219
override Visibility getVisibility() { result = Variant.super.getVisibility() }
216220
}
217221

218-
private class FunctionItemNode extends ItemNode instanceof Function {
222+
private class FunctionItemNode extends AssocItemNode instanceof Function {
219223
override string getName() { result = Function.super.getName().getText() }
220224

221225
override Namespace getNamespace() { result.isValue() }
@@ -249,7 +253,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
249253
override Visibility getVisibility() { result = Impl.super.getVisibility() }
250254
}
251255

252-
private class MacroCallItemNode extends ItemNode instanceof MacroCall {
256+
private class MacroCallItemNode extends AssocItemNode instanceof MacroCall {
253257
override string getName() { result = "(macro call)" }
254258

255259
override Namespace getNamespace() { none() }
@@ -293,7 +297,7 @@ class TraitItemNode extends ImplOrTraitItemNode instanceof Trait {
293297
override Visibility getVisibility() { result = Trait.super.getVisibility() }
294298
}
295299

296-
class TypeAliasItemNode extends ItemNode instanceof TypeAlias {
300+
class TypeAliasItemNode extends AssocItemNode instanceof TypeAlias {
297301
override string getName() { result = TypeAlias.super.getName().getText() }
298302

299303
override Namespace getNamespace() { result.isType() }

‎rust/ql/test/library-tests/path-resolution/main.rs‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,93 @@ mod m15 {
347347
} // I75
348348
}
349349

350+
mod m16 {
351+
#[rustfmt::skip]
352+
trait Trait1<
353+
T // I84
354+
> {
355+
fn f(&self) -> T; // $ item=I84
356+
357+
fn g(&self) -> T // $ item=I84
358+
; // I85
359+
360+
const c: T // $ item=I84
361+
; // I94
362+
} // I86
363+
364+
#[rustfmt::skip]
365+
trait Trait2<
366+
T // I87
367+
> // I88
368+
: Trait1<
369+
T // $ item=I87
370+
> { // $ item=I86
371+
fn f(&self) -> T { // $ item=I87
372+
println!("m16::Trait2::f");
373+
Self::g(self); // $ item=I85
374+
self.g(); // $ MISSING: item=I85
375+
Self::c // $ item=I94
376+
}
377+
} // I89
378+
379+
struct S; // I90
380+
381+
#[rustfmt::skip]
382+
impl Trait1<
383+
S // $ item=I90
384+
> // $ item=I86
385+
for S { // $ item=I90
386+
fn f(&self) -> S { // $ item=I90
387+
println!("m16::<S as Trait1<S>>::f");
388+
Self::g(self); // $ item=I92
389+
self.g() // $ MISSING: item=I92
390+
} // I91
391+
392+
fn g(&self) -> S { // $ item=I90
393+
println!("m16::<S as Trait1<S>>::g");
394+
Self::c // $ item=I95
395+
} // I92
396+
397+
const c: S = S // $ item=I90
398+
; // I95
399+
}
400+
401+
#[rustfmt::skip]
402+
impl Trait2<
403+
S // $ item=I90
404+
> // $ item=I89
405+
for S { // $ item=I90
406+
fn f(&self) -> S { // $ item=I90
407+
println!("m16::<S as Trait2<S>>::f");
408+
Self::c // $ MISSING: item=I95
409+
} // I93
410+
}
411+
412+
#[rustfmt::skip]
413+
pub fn f() {
414+
println!("m16::f");
415+
let x = S; // $ item=I90
416+
<S // $ item=I90
417+
as Trait1<
418+
S // $ item=I90
419+
> // $ MISSING: item=I86
420+
>::f(&x); // $ MISSING: item=I91
421+
<S // $ item=I90
422+
as Trait2<
423+
S // $ item=I90
424+
> // MISSING: item=I89
425+
>::f(&x); // $ MISSING: item=I93
426+
S::g(&x); // $ item=I92
427+
x.g(); // $ MISSING: item=I92
428+
S::c; // $ item=I95
429+
<S // $ item=I90
430+
as Trait1<
431+
S // $ item=I90
432+
> // $ MISSING: item=I86
433+
>::c; // $ MISSING: item=I95
434+
} // I83
435+
}
436+
350437
fn main() {
351438
my::nested::nested1::nested2::f(); // $ item=I4
352439
my::f(); // $ item=I38
@@ -367,4 +454,5 @@ fn main() {
367454
m9::f(); // $ item=I57
368455
m11::f(); // $ item=I63
369456
m15::f(); // $ item=I75
457+
m16::f(); // $ item=I83
370458
}

‎rust/ql/test/library-tests/path-resolution/path-resolution.expected‎

Lines changed: 84 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ mod
1919
| main.rs:279:1:292:1 | mod m13 |
2020
| main.rs:283:5:291:5 | mod m14 |
2121
| main.rs:294:1:348:1 | mod m15 |
22+
| main.rs:350:1:435:1 | mod m16 |
2223
| my2/mod.rs:1:1:1:16 | mod nested2 |
2324
| my2/nested2.rs:1:1:11:1 | mod nested3 |
2425
| my2/nested2.rs:2:5:10:5 | mod nested4 |
@@ -44,7 +45,7 @@ resolvePath
4445
| main.rs:30:17:30:21 | super | main.rs:18:5:36:5 | mod m2 |
4546
| main.rs:30:17:30:24 | ...::f | main.rs:19:9:21:9 | fn f |
4647
| main.rs:33:17:33:17 | f | main.rs:19:9:21:9 | fn f |
47-
| main.rs:40:9:40:13 | super | main.rs:1:1:370:2 | SourceFile |
48+
| main.rs:40:9:40:13 | super | main.rs:1:1:458:2 | SourceFile |
4849
| main.rs:40:9:40:17 | ...::m1 | main.rs:13:1:37:1 | mod m1 |
4950
| main.rs:40:9:40:21 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
5051
| main.rs:40:9:40:24 | ...::g | main.rs:23:9:27:9 | fn g |
@@ -56,7 +57,7 @@ resolvePath
5657
| main.rs:61:17:61:19 | Foo | main.rs:59:9:59:21 | struct Foo |
5758
| main.rs:64:13:64:15 | Foo | main.rs:53:5:53:17 | struct Foo |
5859
| main.rs:66:5:66:5 | f | main.rs:55:5:62:5 | fn f |
59-
| main.rs:68:5:68:8 | self | main.rs:1:1:370:2 | SourceFile |
60+
| main.rs:68:5:68:8 | self | main.rs:1:1:458:2 | SourceFile |
6061
| main.rs:68:5:68:11 | ...::i | main.rs:71:1:83:1 | fn i |
6162
| main.rs:74:13:74:15 | Foo | main.rs:48:1:48:13 | struct Foo |
6263
| main.rs:81:17:81:19 | Foo | main.rs:77:9:79:9 | struct Foo |
@@ -70,7 +71,7 @@ resolvePath
7071
| main.rs:87:57:87:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
7172
| main.rs:87:80:87:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
7273
| main.rs:100:5:100:22 | f_defined_in_macro | main.rs:99:18:99:42 | fn f_defined_in_macro |
73-
| main.rs:117:13:117:17 | super | main.rs:1:1:370:2 | SourceFile |
74+
| main.rs:117:13:117:17 | super | main.rs:1:1:458:2 | SourceFile |
7475
| main.rs:117:13:117:21 | ...::m5 | main.rs:103:1:107:1 | mod m5 |
7576
| main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
7677
| main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
@@ -125,7 +126,7 @@ resolvePath
125126
| main.rs:274:16:274:16 | T | main.rs:268:7:268:7 | T |
126127
| main.rs:275:14:275:17 | Self | main.rs:266:5:276:5 | trait MyParamTrait |
127128
| main.rs:275:14:275:33 | ...::AssociatedType | main.rs:270:9:270:28 | TypeAlias |
128-
| main.rs:284:13:284:17 | crate | main.rs:1:1:370:2 | SourceFile |
129+
| main.rs:284:13:284:17 | crate | main.rs:1:1:458:2 | SourceFile |
129130
| main.rs:284:13:284:22 | ...::m13 | main.rs:279:1:292:1 | mod m13 |
130131
| main.rs:284:13:284:25 | ...::f | main.rs:280:5:280:17 | fn f |
131132
| main.rs:284:13:284:25 | ...::f | main.rs:280:19:281:19 | struct f |
@@ -148,46 +149,85 @@ resolvePath
148149
| main.rs:342:10:342:10 | S | main.rs:311:5:311:13 | struct S |
149150
| main.rs:345:9:345:9 | S | main.rs:311:5:311:13 | struct S |
150151
| main.rs:345:9:345:12 | ...::g | main.rs:322:9:324:9 | fn g |
151-
| main.rs:351:5:351:6 | my | main.rs:1:1:1:7 | mod my |
152-
| main.rs:351:5:351:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
153-
| main.rs:351:5:351:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
154-
| main.rs:351:5:351:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
155-
| main.rs:351:5:351:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
156-
| main.rs:352:5:352:6 | my | main.rs:1:1:1:7 | mod my |
157-
| main.rs:352:5:352:9 | ...::f | my.rs:5:1:7:1 | fn f |
158-
| main.rs:353:5:353:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
159-
| main.rs:353:5:353:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
160-
| main.rs:353:5:353:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
161-
| main.rs:353:5:353:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
162-
| main.rs:354:5:354:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
163-
| main.rs:355:5:355:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
164-
| main.rs:356:5:356:9 | crate | main.rs:1:1:370:2 | SourceFile |
165-
| main.rs:356:5:356:12 | ...::h | main.rs:50:1:69:1 | fn h |
166-
| main.rs:357:5:357:6 | m1 | main.rs:13:1:37:1 | mod m1 |
167-
| main.rs:357:5:357:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
168-
| main.rs:357:5:357:13 | ...::g | main.rs:23:9:27:9 | fn g |
169-
| main.rs:358:5:358:6 | m1 | main.rs:13:1:37:1 | mod m1 |
170-
| main.rs:358:5:358:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
171-
| main.rs:358:5:358:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
172-
| main.rs:358:5:358:17 | ...::h | main.rs:30:27:34:13 | fn h |
173-
| main.rs:359:5:359:6 | m4 | main.rs:39:1:46:1 | mod m4 |
174-
| main.rs:359:5:359:9 | ...::i | main.rs:42:5:45:5 | fn i |
175-
| main.rs:360:5:360:5 | h | main.rs:50:1:69:1 | fn h |
176-
| main.rs:361:5:361:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
177-
| main.rs:362:5:362:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
178-
| main.rs:363:5:363:5 | j | main.rs:97:1:101:1 | fn j |
179-
| main.rs:364:5:364:6 | m6 | main.rs:109:1:120:1 | mod m6 |
180-
| main.rs:364:5:364:9 | ...::g | main.rs:114:5:119:5 | fn g |
181-
| main.rs:365:5:365:6 | m7 | main.rs:122:1:137:1 | mod m7 |
182-
| main.rs:365:5:365:9 | ...::f | main.rs:129:5:136:5 | fn f |
183-
| main.rs:366:5:366:6 | m8 | main.rs:139:1:193:1 | mod m8 |
184-
| main.rs:366:5:366:9 | ...::g | main.rs:177:5:192:5 | fn g |
185-
| main.rs:367:5:367:6 | m9 | main.rs:195:1:203:1 | mod m9 |
186-
| main.rs:367:5:367:9 | ...::f | main.rs:198:5:202:5 | fn f |
187-
| main.rs:368:5:368:7 | m11 | main.rs:226:1:263:1 | mod m11 |
188-
| main.rs:368:5:368:10 | ...::f | main.rs:231:5:234:5 | fn f |
189-
| main.rs:369:5:369:7 | m15 | main.rs:294:1:348:1 | mod m15 |
190-
| main.rs:369:5:369:10 | ...::f | main.rs:335:5:347:5 | fn f |
152+
| main.rs:355:24:355:24 | T | main.rs:353:7:353:7 | T |
153+
| main.rs:357:24:357:24 | T | main.rs:353:7:353:7 | T |
154+
| main.rs:360:18:360:18 | T | main.rs:353:7:353:7 | T |
155+
| main.rs:368:9:370:9 | Trait1::<...> | main.rs:351:5:362:5 | trait Trait1 |
156+
| main.rs:369:11:369:11 | T | main.rs:366:7:366:7 | T |
157+
| main.rs:371:24:371:24 | T | main.rs:366:7:366:7 | T |
158+
| main.rs:373:13:373:16 | Self | main.rs:364:5:377:5 | trait Trait2 |
159+
| main.rs:373:13:373:19 | ...::g | main.rs:357:9:358:9 | fn g |
160+
| main.rs:375:13:375:16 | Self | main.rs:364:5:377:5 | trait Trait2 |
161+
| main.rs:375:13:375:19 | ...::c | main.rs:360:9:361:9 | Const |
162+
| main.rs:382:10:384:5 | Trait1::<...> | main.rs:351:5:362:5 | trait Trait1 |
163+
| main.rs:383:7:383:7 | S | main.rs:379:5:379:13 | struct S |
164+
| main.rs:385:11:385:11 | S | main.rs:379:5:379:13 | struct S |
165+
| main.rs:386:24:386:24 | S | main.rs:379:5:379:13 | struct S |
166+
| main.rs:388:13:388:16 | Self | main.rs:381:5:399:5 | impl Trait1::<...> for S { ... } |
167+
| main.rs:388:13:388:19 | ...::g | main.rs:392:9:395:9 | fn g |
168+
| main.rs:392:24:392:24 | S | main.rs:379:5:379:13 | struct S |
169+
| main.rs:394:13:394:16 | Self | main.rs:381:5:399:5 | impl Trait1::<...> for S { ... } |
170+
| main.rs:394:13:394:19 | ...::c | main.rs:397:9:398:9 | Const |
171+
| main.rs:397:18:397:18 | S | main.rs:379:5:379:13 | struct S |
172+
| main.rs:397:22:397:22 | S | main.rs:379:5:379:13 | struct S |
173+
| main.rs:402:10:404:5 | Trait2::<...> | main.rs:364:5:377:5 | trait Trait2 |
174+
| main.rs:403:7:403:7 | S | main.rs:379:5:379:13 | struct S |
175+
| main.rs:405:11:405:11 | S | main.rs:379:5:379:13 | struct S |
176+
| main.rs:406:24:406:24 | S | main.rs:379:5:379:13 | struct S |
177+
| main.rs:408:13:408:16 | Self | main.rs:401:5:410:5 | impl Trait2::<...> for S { ... } |
178+
| main.rs:415:17:415:17 | S | main.rs:379:5:379:13 | struct S |
179+
| main.rs:416:10:416:10 | S | main.rs:379:5:379:13 | struct S |
180+
| main.rs:416:10:416:10 | S | main.rs:379:5:379:13 | struct S |
181+
| main.rs:421:10:421:10 | S | main.rs:379:5:379:13 | struct S |
182+
| main.rs:421:10:421:10 | S | main.rs:379:5:379:13 | struct S |
183+
| main.rs:426:9:426:9 | S | main.rs:379:5:379:13 | struct S |
184+
| main.rs:426:9:426:12 | ...::g | main.rs:392:9:395:9 | fn g |
185+
| main.rs:428:9:428:9 | S | main.rs:379:5:379:13 | struct S |
186+
| main.rs:428:9:428:12 | ...::c | main.rs:397:9:398:9 | Const |
187+
| main.rs:429:10:429:10 | S | main.rs:379:5:379:13 | struct S |
188+
| main.rs:429:10:429:10 | S | main.rs:379:5:379:13 | struct S |
189+
| main.rs:438:5:438:6 | my | main.rs:1:1:1:7 | mod my |
190+
| main.rs:438:5:438:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
191+
| main.rs:438:5:438:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
192+
| main.rs:438:5:438:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
193+
| main.rs:438:5:438:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
194+
| main.rs:439:5:439:6 | my | main.rs:1:1:1:7 | mod my |
195+
| main.rs:439:5:439:9 | ...::f | my.rs:5:1:7:1 | fn f |
196+
| main.rs:440:5:440:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
197+
| main.rs:440:5:440:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
198+
| main.rs:440:5:440:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
199+
| main.rs:440:5:440:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
200+
| main.rs:441:5:441:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
201+
| main.rs:442:5:442:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
202+
| main.rs:443:5:443:9 | crate | main.rs:1:1:458:2 | SourceFile |
203+
| main.rs:443:5:443:12 | ...::h | main.rs:50:1:69:1 | fn h |
204+
| main.rs:444:5:444:6 | m1 | main.rs:13:1:37:1 | mod m1 |
205+
| main.rs:444:5:444:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
206+
| main.rs:444:5:444:13 | ...::g | main.rs:23:9:27:9 | fn g |
207+
| main.rs:445:5:445:6 | m1 | main.rs:13:1:37:1 | mod m1 |
208+
| main.rs:445:5:445:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
209+
| main.rs:445:5:445:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
210+
| main.rs:445:5:445:17 | ...::h | main.rs:30:27:34:13 | fn h |
211+
| main.rs:446:5:446:6 | m4 | main.rs:39:1:46:1 | mod m4 |
212+
| main.rs:446:5:446:9 | ...::i | main.rs:42:5:45:5 | fn i |
213+
| main.rs:447:5:447:5 | h | main.rs:50:1:69:1 | fn h |
214+
| main.rs:448:5:448:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
215+
| main.rs:449:5:449:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
216+
| main.rs:450:5:450:5 | j | main.rs:97:1:101:1 | fn j |
217+
| main.rs:451:5:451:6 | m6 | main.rs:109:1:120:1 | mod m6 |
218+
| main.rs:451:5:451:9 | ...::g | main.rs:114:5:119:5 | fn g |
219+
| main.rs:452:5:452:6 | m7 | main.rs:122:1:137:1 | mod m7 |
220+
| main.rs:452:5:452:9 | ...::f | main.rs:129:5:136:5 | fn f |
221+
| main.rs:453:5:453:6 | m8 | main.rs:139:1:193:1 | mod m8 |
222+
| main.rs:453:5:453:9 | ...::g | main.rs:177:5:192:5 | fn g |
223+
| main.rs:454:5:454:6 | m9 | main.rs:195:1:203:1 | mod m9 |
224+
| main.rs:454:5:454:9 | ...::f | main.rs:198:5:202:5 | fn f |
225+
| main.rs:455:5:455:7 | m11 | main.rs:226:1:263:1 | mod m11 |
226+
| main.rs:455:5:455:10 | ...::f | main.rs:231:5:234:5 | fn f |
227+
| main.rs:456:5:456:7 | m15 | main.rs:294:1:348:1 | mod m15 |
228+
| main.rs:456:5:456:10 | ...::f | main.rs:335:5:347:5 | fn f |
229+
| main.rs:457:5:457:7 | m16 | main.rs:350:1:435:1 | mod m16 |
230+
| main.rs:457:5:457:10 | ...::f | main.rs:412:5:434:5 | fn f |
191231
| my2/mod.rs:5:5:5:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
192232
| my2/mod.rs:5:5:5:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
193233
| my2/mod.rs:5:5:5:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |

0 commit comments

Comments
 (0)