Skip to content

Commit c3bd20a

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of rust-lang#68911 - jonas-schievink:inherent-overlap, r=petrochenkov
Speed up the inherent impl overlap check This gives a ~7% improvement in compile times for the stm32f0(x2) crate. Also addresses @eddyb's comment in rust-lang#68837 (comment).
2 parents 3a8f125 + 58a9284 commit c3bd20a

28 files changed

+129
-99
lines changed

‎src/librustc/query/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ rustc_queries! {
323323
query associated_item(_: DefId) -> ty::AssocItem {}
324324

325325
/// Collects the associated items defined on a trait or impl.
326-
query associated_items(key: DefId) -> ty::AssocItemsIterator<'tcx> {
326+
query associated_items(key: DefId) -> &'tcx [ty::AssocItem] {
327327
desc { |tcx| "collecting associated items of {}", tcx.def_path_str(key) }
328328
}
329329

‎src/librustc/traits/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ fn vtable_methods<'tcx>(
539539
tcx.arena.alloc_from_iter(supertraits(tcx, trait_ref).flat_map(move |trait_ref| {
540540
let trait_methods = tcx
541541
.associated_items(trait_ref.def_id())
542+
.iter()
542543
.filter(|item| item.kind == ty::AssocKind::Method);
543544

544545
// Now list each method's DefId and InternalSubsts (for within its trait).

‎src/librustc/traits/object_safety.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ fn object_safety_violations_for_trait(
212212
// Check methods for violations.
213213
let mut violations: Vec<_> = tcx
214214
.associated_items(trait_def_id)
215+
.iter()
215216
.filter(|item| item.kind == ty::AssocKind::Method)
216217
.filter_map(|item| {
217218
object_safety_violation_for_method(tcx, trait_def_id, &item)
@@ -277,6 +278,7 @@ fn object_safety_violations_for_trait(
277278

278279
violations.extend(
279280
tcx.associated_items(trait_def_id)
281+
.iter()
280282
.filter(|item| item.kind == ty::AssocKind::Const)
281283
.map(|item| ObjectSafetyViolation::AssocConst(item.ident.name, item.ident.span)),
282284
);
@@ -632,7 +634,9 @@ fn object_ty_for_trait<'tcx>(
632634

633635
let mut associated_types = traits::supertraits(tcx, ty::Binder::dummy(trait_ref))
634636
.flat_map(|super_trait_ref| {
635-
tcx.associated_items(super_trait_ref.def_id()).map(move |item| (super_trait_ref, item))
637+
tcx.associated_items(super_trait_ref.def_id())
638+
.iter()
639+
.map(move |item| (super_trait_ref, item))
636640
})
637641
.filter(|(_, item)| item.kind == ty::AssocKind::Type)
638642
.collect::<Vec<_>>();

‎src/librustc/traits/project.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ fn assoc_ty_def(
14361436
{
14371437
return specialization_graph::NodeItem {
14381438
node: specialization_graph::Node::Impl(impl_def_id),
1439-
item,
1439+
item: *item,
14401440
};
14411441
}
14421442
}

‎src/librustc/traits/types/specialization_graph.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl<'tcx> Node {
8181
}
8282

8383
/// Iterate over the items defined directly by the given (impl or trait) node.
84-
pub fn items(&self, tcx: TyCtxt<'tcx>) -> ty::AssocItemsIterator<'tcx> {
84+
pub fn items(&self, tcx: TyCtxt<'tcx>) -> &'tcx [ty::AssocItem] {
8585
tcx.associated_items(self.def_id())
8686
}
8787

@@ -98,8 +98,10 @@ impl<'tcx> Node {
9898
) -> Option<ty::AssocItem> {
9999
use crate::ty::AssocKind::*;
100100

101-
tcx.associated_items(self.def_id()).find(move |impl_item| {
102-
match (trait_item_kind, impl_item.kind) {
101+
tcx.associated_items(self.def_id())
102+
.iter()
103+
.find(move |impl_item| {
104+
match (trait_item_kind, impl_item.kind) {
103105
| (Const, Const)
104106
| (Method, Method)
105107
| (Type, Type)
@@ -112,7 +114,8 @@ impl<'tcx> Node {
112114
| (OpaqueTy, _)
113115
=> false,
114116
}
115-
})
117+
})
118+
.copied()
116119
}
117120

118121
pub fn def_id(&self) -> DefId {

‎src/librustc/traits/wf.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
166166
let extend_cause_with_original_assoc_item_obligation =
167167
|cause: &mut traits::ObligationCause<'_>,
168168
pred: &ty::Predicate<'_>,
169-
trait_assoc_items: ty::AssocItemsIterator<'_>| {
169+
trait_assoc_items: &[ty::AssocItem]| {
170170
let trait_item = tcx
171171
.hir()
172172
.as_local_hir_id(trait_ref.def_id)
@@ -283,6 +283,7 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
283283
) = (&proj.skip_binder().self_ty().kind, item.map(|i| &i.kind))
284284
{
285285
if let Some((impl_item, trait_assoc_item)) = trait_assoc_items
286+
.iter()
286287
.filter(|i| i.def_id == *item_def_id)
287288
.next()
288289
.and_then(|trait_assoc_item| {
@@ -325,7 +326,7 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
325326
extend_cause_with_original_assoc_item_obligation(
326327
&mut cause,
327328
&pred,
328-
trait_assoc_items.clone(),
329+
trait_assoc_items,
329330
);
330331
traits::Obligation::new(cause, param_env, pred)
331332
});

‎src/librustc/ty/adjustment.rs

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ impl<'tcx> OverloadedDeref<'tcx> {
122122
};
123123
let method_def_id = tcx
124124
.associated_items(trait_def_id.unwrap())
125+
.iter()
125126
.find(|m| m.kind == ty::AssocKind::Method)
126127
.unwrap()
127128
.def_id;

‎src/librustc/ty/instance.rs

+1
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ impl<'tcx> Instance<'tcx> {
376376
let fn_once = tcx.lang_items().fn_once_trait().unwrap();
377377
let call_once = tcx
378378
.associated_items(fn_once)
379+
.iter()
379380
.find(|it| it.kind == ty::AssocKind::Method)
380381
.unwrap()
381382
.def_id;

‎src/librustc/ty/mod.rs

+3-22
Original file line numberDiff line numberDiff line change
@@ -2705,14 +2705,14 @@ impl<'tcx> TyCtxt<'tcx> {
27052705
.for_each(|&body_id| f(self.hir().body_owner_def_id(body_id)));
27062706
}
27072707

2708-
pub fn provided_trait_methods(self, id: DefId) -> Vec<AssocItem> {
2708+
pub fn provided_trait_methods(self, id: DefId) -> impl Iterator<Item = &'tcx AssocItem> {
27092709
self.associated_items(id)
2710+
.iter()
27102711
.filter(|item| item.kind == AssocKind::Method && item.defaultness.has_value())
2711-
.collect()
27122712
}
27132713

27142714
pub fn trait_relevant_for_never(self, did: DefId) -> bool {
2715-
self.associated_items(did).any(|item| item.relevant_for_never())
2715+
self.associated_items(did).iter().any(|item| item.relevant_for_never())
27162716
}
27172717

27182718
pub fn opt_item_name(self, def_id: DefId) -> Option<Ident> {
@@ -2974,25 +2974,6 @@ impl<'tcx> TyCtxt<'tcx> {
29742974
}
29752975
}
29762976

2977-
#[derive(Copy, Clone, HashStable)]
2978-
pub struct AssocItemsIterator<'tcx> {
2979-
pub items: &'tcx [AssocItem],
2980-
}
2981-
2982-
impl<'tcx> Iterator for AssocItemsIterator<'tcx> {
2983-
type Item = AssocItem;
2984-
2985-
#[inline]
2986-
fn next(&mut self) -> Option<AssocItem> {
2987-
if let Some((first, rest)) = self.items.split_first() {
2988-
self.items = rest;
2989-
Some(*first)
2990-
} else {
2991-
None
2992-
}
2993-
}
2994-
}
2995-
29962977
#[derive(Clone, HashStable)]
29972978
pub struct AdtSizedConstraint<'tcx>(pub &'tcx [Ty<'tcx>]);
29982979

‎src/librustc/ty/sty.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,7 @@ impl<'tcx> ProjectionTy<'tcx> {
10661066
) -> ProjectionTy<'tcx> {
10671067
let item_def_id = tcx
10681068
.associated_items(trait_ref.def_id)
1069+
.iter()
10691070
.find(|item| {
10701071
item.kind == ty::AssocKind::Type
10711072
&& tcx.hygienic_eq(item_name, item.ident, trait_ref.def_id)

‎src/librustc/ty/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ impl<'tcx> TyCtxt<'tcx> {
355355
let mut dtor_did = None;
356356
let ty = self.type_of(adt_did);
357357
self.for_each_relevant_impl(drop_trait, ty, |impl_did| {
358-
if let Some(item) = self.associated_items(impl_did).next() {
358+
if let Some(item) = self.associated_items(impl_did).first() {
359359
if validate(self, impl_did).is_ok() {
360360
dtor_did = Some(item.def_id);
361361
}

‎src/librustc_mir/shim.rs

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ fn make_shim<'tcx>(tcx: TyCtxt<'tcx>, instance: ty::InstanceDef<'tcx>) -> &'tcx
6868
let fn_mut = tcx.lang_items().fn_mut_trait().unwrap();
6969
let call_mut = tcx
7070
.associated_items(fn_mut)
71+
.iter()
7172
.find(|it| it.kind == ty::AssocKind::Method)
7273
.unwrap()
7374
.def_id;

‎src/librustc_mir/util/elaborate_drops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ where
539539
debug!("destructor_call_block({:?}, {:?})", self, succ);
540540
let tcx = self.tcx();
541541
let drop_trait = tcx.lang_items().drop_trait().unwrap();
542-
let drop_fn = tcx.associated_items(drop_trait).next().unwrap();
542+
let drop_fn = tcx.associated_items(drop_trait)[0];
543543
let ty = self.place_ty(self.place);
544544
let substs = tcx.mk_substs_trait(ty, &[]);
545545

‎src/librustc_passes/reachable.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -362,12 +362,12 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for CollectPrivateImplItemsVisitor<'a, 'tcx
362362
return;
363363
}
364364

365-
let provided_trait_methods = self.tcx.provided_trait_methods(trait_def_id);
366-
self.worklist.reserve(provided_trait_methods.len());
367-
for default_method in provided_trait_methods {
368-
let hir_id = self.tcx.hir().as_local_hir_id(default_method.def_id).unwrap();
369-
self.worklist.push(hir_id);
370-
}
365+
// FIXME(#53488) remove `let`
366+
let tcx = self.tcx;
367+
self.worklist.extend(
368+
tcx.provided_trait_methods(trait_def_id)
369+
.map(|assoc| tcx.hir().as_local_hir_id(assoc.def_id).unwrap()),
370+
);
371371
}
372372
}
373373
}

‎src/librustc_passes/stability.rs

+1
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ impl Visitor<'tcx> for Checker<'tcx> {
468468
let trait_item_def_id = self
469469
.tcx
470470
.associated_items(trait_did)
471+
.iter()
471472
.find(|item| item.ident.name == impl_item.ident.name)
472473
.map(|item| item.def_id);
473474
if let Some(def_id) = trait_item_def_id {

‎src/librustc_save_analysis/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
423423
qualname.push_str(&self.tcx.def_path_str(def_id));
424424
self.tcx
425425
.associated_items(def_id)
426+
.iter()
426427
.find(|item| item.ident.name == ident.name)
427428
.map(|item| decl_id = Some(item.def_id));
428429
}
@@ -717,6 +718,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
717718
let ti = self.tcx.associated_item(decl_id);
718719
self.tcx
719720
.associated_items(ti.container.id())
721+
.iter()
720722
.find(|item| {
721723
item.ident.name == ti.ident.name && item.defaultness.has_value()
722724
})

‎src/librustc_ty/ty.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,10 @@ fn associated_item_def_ids(tcx: TyCtxt<'_>, def_id: DefId) -> &[DefId] {
206206
}
207207
}
208208

209-
fn associated_items<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> ty::AssocItemsIterator<'tcx> {
210-
ty::AssocItemsIterator {
211-
items: tcx.arena.alloc_from_iter(
212-
tcx.associated_item_def_ids(def_id).iter().map(|did| tcx.associated_item(*did)),
213-
),
214-
}
209+
fn associated_items<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> &'tcx [ty::AssocItem] {
210+
tcx.arena.alloc_from_iter(
211+
tcx.associated_item_def_ids(def_id).iter().map(|did| tcx.associated_item(*did)),
212+
)
215213
}
216214

217215
fn def_span(tcx: TyCtxt<'_>, def_id: DefId) -> Span {

‎src/librustc_typeck/astconv.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
11091109
trait_def_id: DefId,
11101110
assoc_name: ast::Ident,
11111111
) -> bool {
1112-
self.tcx().associated_items(trait_def_id).any(|item| {
1112+
self.tcx().associated_items(trait_def_id).iter().any(|item| {
11131113
item.kind == ty::AssocKind::Type
11141114
&& self.tcx().hygienic_eq(assoc_name, item.ident, trait_def_id)
11151115
})
@@ -1347,6 +1347,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
13471347
tcx.adjust_ident_and_get_scope(binding.item_name, candidate.def_id(), hir_ref_id);
13481348
let assoc_ty = tcx
13491349
.associated_items(candidate.def_id())
1350+
.iter()
13501351
.find(|i| i.kind == ty::AssocKind::Type && i.ident.modern() == assoc_ident)
13511352
.expect("missing associated type");
13521353

@@ -1512,6 +1513,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
15121513
ty::Predicate::Trait(pred, _) => {
15131514
associated_types.entry(span).or_default().extend(
15141515
tcx.associated_items(pred.def_id())
1516+
.iter()
15151517
.filter(|item| item.kind == ty::AssocKind::Type)
15161518
.map(|item| item.def_id),
15171519
);
@@ -1969,6 +1971,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
19691971
let bound_span = self
19701972
.tcx()
19711973
.associated_items(bound.def_id())
1974+
.iter()
19721975
.find(|item| {
19731976
item.kind == ty::AssocKind::Type
19741977
&& self.tcx().hygienic_eq(assoc_name, item.ident, bound.def_id())
@@ -2198,6 +2201,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
21982201
tcx.adjust_ident_and_get_scope(assoc_ident, trait_did, hir_ref_id);
21992202
let item = tcx
22002203
.associated_items(trait_did)
2204+
.iter()
22012205
.find(|i| Namespace::from(i.kind) == Namespace::Type && i.ident.modern() == assoc_ident)
22022206
.expect("missing associated type");
22032207

‎src/librustc_typeck/check/closure.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
248248
if is_gen {
249249
// Check that we deduce the signature from the `<_ as std::ops::Generator>::Return`
250250
// associated item and not yield.
251-
let return_assoc_item = self.tcx.associated_items(gen_trait).nth(1).unwrap().def_id;
251+
let return_assoc_item = self.tcx.associated_items(gen_trait)[1].def_id;
252252
if return_assoc_item != projection.projection_def_id() {
253253
debug!("deduce_sig_from_projection: not return assoc item of generator");
254254
return None;
@@ -673,7 +673,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
673673

674674
// The `Future` trait has only one associted item, `Output`,
675675
// so check that this is what we see.
676-
let output_assoc_item = self.tcx.associated_items(future_trait).nth(0).unwrap().def_id;
676+
let output_assoc_item = self.tcx.associated_items(future_trait)[0].def_id;
677677
if output_assoc_item != predicate.projection_ty.item_def_id {
678678
span_bug!(
679679
cause_span,

‎src/librustc_typeck/check/demand.rs

+1
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
536536
let item_def_id = self
537537
.tcx
538538
.associated_items(deref_trait)
539+
.iter()
539540
.find(|item| item.kind == ty::AssocKind::Type)
540541
.unwrap()
541542
.def_id;

‎src/librustc_typeck/check/method/mod.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
474474
item_name: ast::Ident,
475475
ns: Namespace,
476476
) -> Option<ty::AssocItem> {
477-
self.tcx.associated_items(def_id).find(|item| {
478-
Namespace::from(item.kind) == ns && self.tcx.hygienic_eq(item_name, item.ident, def_id)
479-
})
477+
self.tcx
478+
.associated_items(def_id)
479+
.iter()
480+
.find(|item| {
481+
Namespace::from(item.kind) == ns
482+
&& self.tcx.hygienic_eq(item_name, item.ident, def_id)
483+
})
484+
.copied()
480485
}
481486
}

‎src/librustc_typeck/check/method/probe.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1696,18 +1696,20 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
16961696
let max_dist = max(name.as_str().len(), 3) / 3;
16971697
self.tcx
16981698
.associated_items(def_id)
1699+
.iter()
16991700
.filter(|x| {
17001701
let dist = lev_distance(&*name.as_str(), &x.ident.as_str());
17011702
Namespace::from(x.kind) == Namespace::Value && dist > 0 && dist <= max_dist
17021703
})
1704+
.copied()
17031705
.collect()
17041706
} else {
17051707
self.fcx
17061708
.associated_item(def_id, name, Namespace::Value)
17071709
.map_or(Vec::new(), |x| vec![x])
17081710
}
17091711
} else {
1710-
self.tcx.associated_items(def_id).collect()
1712+
self.tcx.associated_items(def_id).to_vec()
17111713
}
17121714
}
17131715
}

0 commit comments

Comments
 (0)