Skip to content

Commit 9c3de34

Browse files
ZoxcZoxc
committed
Update inherent_impls
1 parent c168cc7 commit 9c3de34

File tree

6 files changed

+21
-27
lines changed

6 files changed

+21
-27
lines changed

‎src/librustc/arena.rs

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ macro_rules! arena_types {
1616
)>,
1717
[few] mir_keys: rustc::util::nodemap::DefIdSet,
1818
[decode] specialization_graph: rustc::traits::specialization_graph::Graph,
19+
[few] crate_inherent_impls: rustc::ty::CrateInherentImpls,
1920
], $tcx);
2021
)
2122
}

‎src/librustc/query/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ rustc_queries! {
274274
/// Maps a DefId of a type to a list of its inherent impls.
275275
/// Contains implementations of methods that are inherent to a type.
276276
/// Methods in these implementations don't need to be exported.
277-
query inherent_impls(_: DefId) -> Lrc<Vec<DefId>> {
277+
query inherent_impls(_: DefId) -> &'tcx [DefId] {
278278
eval_always
279279
}
280280
}
@@ -380,7 +380,7 @@ rustc_queries! {
380380
/// Not meant to be used directly outside of coherence.
381381
/// (Defined only for `LOCAL_CRATE`.)
382382
query crate_inherent_impls(k: CrateNum)
383-
-> Lrc<CrateInherentImpls> {
383+
-> &'tcx CrateInherentImpls {
384384
eval_always
385385
desc { "all inherent impls defined in crate `{:?}`", k }
386386
}

‎src/librustc/ty/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3378,7 +3378,7 @@ pub fn provide(providers: &mut ty::query::Providers<'_>) {
33783378
/// (constructing this map requires touching the entire crate).
33793379
#[derive(Clone, Debug, Default, HashStable)]
33803380
pub struct CrateInherentImpls {
3381-
pub inherent_impls: DefIdMap<Lrc<Vec<DefId>>>,
3381+
pub inherent_impls: DefIdMap<Vec<DefId>>,
33823382
}
33833383

33843384
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, RustcEncodable, RustcDecodable)]

‎src/librustc_metadata/cstore_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ provide! { <'tcx> tcx, def_id, other, cdata,
134134
(cdata.mir_const_qualif(def_id.index), Lrc::new(BitSet::new_empty(0)))
135135
}
136136
fn_sig => { cdata.fn_sig(def_id.index, tcx) }
137-
inherent_impls => { Lrc::new(cdata.get_inherent_implementations_for_type(def_id.index)) }
137+
inherent_impls => { cdata.get_inherent_implementations_for_type(tcx, def_id.index) }
138138
is_const_fn_raw => { cdata.is_const_fn_raw(def_id.index) }
139139
is_foreign_item => { cdata.is_foreign_item(def_id.index) }
140140
describe_def => { cdata.get_def(def_id.index) }

‎src/librustc_metadata/decoder.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,15 @@ impl<'a, 'tcx> CrateMetadata {
998998
None
999999
}
10001000

1001-
pub fn get_inherent_implementations_for_type(&self, id: DefIndex) -> Vec<DefId> {
1002-
self.entry(id)
1003-
.inherent_impls
1004-
.decode(self)
1005-
.map(|index| self.local_def_id(index))
1006-
.collect()
1001+
pub fn get_inherent_implementations_for_type(
1002+
&self,
1003+
tcx: TyCtxt<'_, 'tcx, '_>,
1004+
id: DefIndex
1005+
) -> &'tcx [DefId] {
1006+
tcx.arena.alloc_from_iter(self.entry(id)
1007+
.inherent_impls
1008+
.decode(self)
1009+
.map(|index| self.local_def_id(index)))
10071010
}
10081011

10091012
pub fn get_implementations_for_trait(&self,

‎src/librustc_typeck/coherence/inherent_impls.rs

+7-17
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ use rustc::hir;
1313
use rustc::hir::itemlikevisit::ItemLikeVisitor;
1414
use rustc::ty::{self, CrateInherentImpls, TyCtxt};
1515

16-
use rustc_data_structures::sync::Lrc;
1716
use syntax::ast;
1817
use syntax_pos::Span;
1918

2019
/// On-demand query: yields a map containing all types mapped to their inherent impls.
2120
pub fn crate_inherent_impls<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
2221
crate_num: CrateNum)
23-
-> Lrc<CrateInherentImpls> {
22+
-> &'tcx CrateInherentImpls {
2423
assert_eq!(crate_num, LOCAL_CRATE);
2524

2625
let krate = tcx.hir().krate();
@@ -29,13 +28,13 @@ pub fn crate_inherent_impls<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
2928
impls_map: Default::default(),
3029
};
3130
krate.visit_all_item_likes(&mut collect);
32-
Lrc::new(collect.impls_map)
31+
tcx.arena.alloc(collect.impls_map)
3332
}
3433

3534
/// On-demand query: yields a vector of the inherent impls for a specific type.
3635
pub fn inherent_impls<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
3736
ty_def_id: DefId)
38-
-> Lrc<Vec<DefId>> {
37+
-> &'tcx [DefId] {
3938
assert!(ty_def_id.is_local());
4039

4140
// NB. Until we adopt the red-green dep-tracking algorithm (see
@@ -53,15 +52,11 @@ pub fn inherent_impls<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
5352
//
5453
// [the plan]: https://github.com/rust-lang/rust-roadmap/issues/4
5554

56-
thread_local! {
57-
static EMPTY_DEF_ID_VEC: Lrc<Vec<DefId>> = Lrc::new(vec![])
58-
}
59-
6055
let result = tcx.dep_graph.with_ignore(|| {
6156
let crate_map = tcx.crate_inherent_impls(ty_def_id.krate);
6257
match crate_map.inherent_impls.get(&ty_def_id) {
63-
Some(v) => v.clone(),
64-
None => EMPTY_DEF_ID_VEC.with(|v| v.clone())
58+
Some(v) => &v[..],
59+
None => &[],
6560
}
6661
});
6762

@@ -289,13 +284,8 @@ impl<'a, 'tcx> InherentCollect<'a, 'tcx> {
289284
// type def ID, if there is a base type for this implementation and
290285
// the implementation does not have any associated traits.
291286
let impl_def_id = self.tcx.hir().local_def_id_from_hir_id(item.hir_id);
292-
let mut rc_vec = self.impls_map.inherent_impls
293-
.entry(def_id)
294-
.or_default();
295-
296-
// At this point, there should not be any clones of the
297-
// `Lrc`, so we can still safely push into it in place:
298-
Lrc::get_mut(&mut rc_vec).unwrap().push(impl_def_id);
287+
let vec = self.impls_map.inherent_impls.entry(def_id).or_default();
288+
vec.push(impl_def_id);
299289
} else {
300290
struct_span_err!(self.tcx.sess,
301291
item.span,

0 commit comments

Comments
 (0)