diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs index c08fe187f99bf..62d2fe79b2171 100644 --- a/src/librustc/traits/mod.rs +++ b/src/librustc/traits/mod.rs @@ -842,14 +842,3 @@ pub fn provide(providers: &mut ty::maps::Providers) { ..*providers }; } - -pub fn provide_extern(providers: &mut ty::maps::Providers) { - *providers = ty::maps::Providers { - is_object_safe: object_safety::is_object_safe_provider, - specialization_graph_of: specialize::specialization_graph_provider, - specializes: specialize::specializes, - trans_fulfill_obligation: trans::trans_fulfill_obligation, - vtable_methods, - ..*providers - }; -} diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs index 0deababd21829..bf1cc682a8aac 100644 --- a/src/librustc/ty/mod.rs +++ b/src/librustc/ty/mod.rs @@ -2605,17 +2605,6 @@ pub fn provide(providers: &mut ty::maps::Providers) { }; } -pub fn provide_extern(providers: &mut ty::maps::Providers) { - *providers = ty::maps::Providers { - adt_sized_constraint, - adt_dtorck_constraint, - trait_impls_of: trait_def::trait_impls_of_provider, - param_env, - ..*providers - }; -} - - /// A map for the local crate mapping each type to a vector of its /// inherent impls. This is not meant to be used outside of coherence; /// rather, you should request the vector for a specific type via diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 855362cf645d2..640e80c04b90f 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -970,7 +970,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, mir::provide(&mut local_providers); reachable::provide(&mut local_providers); rustc_privacy::provide(&mut local_providers); - DefaultTransCrate::provide_local(&mut local_providers); + DefaultTransCrate::provide(&mut local_providers); typeck::provide(&mut local_providers); ty::provide(&mut local_providers); traits::provide(&mut local_providers); @@ -978,16 +978,12 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session, rustc_const_eval::provide(&mut local_providers); rustc_passes::provide(&mut local_providers); middle::region::provide(&mut local_providers); - cstore::provide_local(&mut local_providers); + cstore::provide(&mut local_providers); lint::provide(&mut local_providers); - let mut extern_providers = ty::maps::Providers::default(); - cstore::provide(&mut extern_providers); + let mut extern_providers = local_providers; + cstore::provide_extern(&mut extern_providers); DefaultTransCrate::provide_extern(&mut extern_providers); - ty::provide_extern(&mut extern_providers); - traits::provide_extern(&mut extern_providers); - // FIXME(eddyb) get rid of this once we replace const_eval with miri. - rustc_const_eval::provide(&mut extern_providers); // Setup the MIR passes that we want to run. let mut passes = Passes::new(); diff --git a/src/librustc_metadata/cstore.rs b/src/librustc_metadata/cstore.rs index a86b55e269d41..3a4ba6768a716 100644 --- a/src/librustc_metadata/cstore.rs +++ b/src/librustc_metadata/cstore.rs @@ -34,7 +34,7 @@ pub use rustc::middle::cstore::{NativeLibrary, NativeLibraryKind, LinkagePrefere pub use rustc::middle::cstore::NativeLibraryKind::*; pub use rustc::middle::cstore::{CrateSource, LibSource}; -pub use cstore_impl::{provide, provide_local}; +pub use cstore_impl::{provide, provide_extern}; // A map from external crate numbers (as decoded from some crate file) to // local crate numbers (as generated during this session). Each external diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/cstore_impl.rs index 8dcfb4c34b5b2..b26ebfd6121b4 100644 --- a/src/librustc_metadata/cstore_impl.rs +++ b/src/librustc_metadata/cstore_impl.rs @@ -45,7 +45,7 @@ use rustc::hir; macro_rules! provide { (<$lt:tt> $tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $($name:ident => $compute:block)*) => { - pub fn provide<$lt>(providers: &mut Providers<$lt>) { + pub fn provide_extern<$lt>(providers: &mut Providers<$lt>) { $(fn $name<'a, $lt:$lt, T>($tcx: TyCtxt<'a, $lt, $lt>, def_id_arg: T) -> <ty::queries::$name<$lt> as QueryConfig>::Value @@ -243,7 +243,7 @@ provide! { <'tcx> tcx, def_id, other, cdata, has_clone_closures => { cdata.has_clone_closures(tcx.sess) } } -pub fn provide_local<'tcx>(providers: &mut Providers<'tcx>) { +pub fn provide<'tcx>(providers: &mut Providers<'tcx>) { fn is_const_fn<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> bool { let node_id = tcx.hir.as_local_node_id(def_id) .expect("Non-local call to local provider is_const_fn"); diff --git a/src/librustc_trans/back/symbol_export.rs b/src/librustc_trans/back/symbol_export.rs index 23890905718a8..132b8fa7acfb0 100644 --- a/src/librustc_trans/back/symbol_export.rs +++ b/src/librustc_trans/back/symbol_export.rs @@ -60,7 +60,7 @@ pub fn crates_export_threshold(crate_types: &[config::CrateType]) } } -pub fn provide_local(providers: &mut Providers) { +pub fn provide(providers: &mut Providers) { providers.exported_symbol_ids = |tcx, cnum| { let export_threshold = threshold(tcx); Rc::new(tcx.exported_symbols(cnum) diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs index 5ad3a7d26558a..69bcd0aa50b99 100644 --- a/src/librustc_trans/base.rs +++ b/src/librustc_trans/base.rs @@ -1384,7 +1384,7 @@ fn compile_codegen_unit<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, } } -pub fn provide_local(providers: &mut Providers) { +pub fn provide(providers: &mut Providers) { providers.collect_and_partition_translation_items = collect_and_partition_translation_items; @@ -1400,10 +1400,6 @@ pub fn provide_local(providers: &mut Providers) { providers.compile_codegen_unit = compile_codegen_unit; } -pub fn provide_extern(providers: &mut Providers) { - providers.is_translated_function = is_translated_function; -} - pub fn linkage_to_llvm(linkage: Linkage) -> llvm::Linkage { match linkage { Linkage::External => llvm::Linkage::ExternalLinkage, diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs index 29394af33969f..96e11d366423a 100644 --- a/src/librustc_trans/lib.rs +++ b/src/librustc_trans/lib.rs @@ -81,7 +81,6 @@ use rustc::middle::cstore::MetadataLoader; use rustc::middle::cstore::{NativeLibrary, CrateSource, LibSource}; use rustc::session::Session; use rustc::session::config::{OutputFilenames, OutputType}; -use rustc::ty::maps::Providers; use rustc::ty::{self, TyCtxt}; use rustc::util::nodemap::{FxHashSet, FxHashMap}; @@ -167,12 +166,14 @@ impl rustc_trans_utils::trans_crate::TransCrate for LlvmTransCrate { box metadata::LlvmMetadataLoader } - fn provide_local(providers: &mut ty::maps::Providers) { - provide_local(providers); + fn provide(providers: &mut ty::maps::Providers) { + back::symbol_names::provide(providers); + back::symbol_export::provide(providers); + base::provide(providers); } fn provide_extern(providers: &mut ty::maps::Providers) { - provide_extern(providers); + back::symbol_export::provide_extern(providers); } fn trans_crate<'a, 'tcx>( @@ -332,15 +333,3 @@ pub struct CrateInfo { } __build_diagnostic_array! { librustc_trans, DIAGNOSTICS } - -pub fn provide_local(providers: &mut Providers) { - back::symbol_names::provide(providers); - back::symbol_export::provide_local(providers); - base::provide_local(providers); -} - -pub fn provide_extern(providers: &mut Providers) { - back::symbol_names::provide(providers); - back::symbol_export::provide_extern(providers); - base::provide_extern(providers); -} diff --git a/src/librustc_trans_utils/trans_crate.rs b/src/librustc_trans_utils/trans_crate.rs index f51a463fcc23e..8dc81a3d687dc 100644 --- a/src/librustc_trans_utils/trans_crate.rs +++ b/src/librustc_trans_utils/trans_crate.rs @@ -51,7 +51,7 @@ pub trait TransCrate { type TranslatedCrate; fn metadata_loader() -> Box<MetadataLoaderTrait>; - fn provide_local(_providers: &mut Providers); + fn provide(_providers: &mut Providers); fn provide_extern(_providers: &mut Providers); fn trans_crate<'a, 'tcx>( tcx: TyCtxt<'a, 'tcx, 'tcx>, @@ -77,8 +77,8 @@ impl TransCrate for DummyTransCrate { box DummyMetadataLoader(()) } - fn provide_local(_providers: &mut Providers) { - bug!("DummyTransCrate::provide_local"); + fn provide(_providers: &mut Providers) { + bug!("DummyTransCrate::provide"); } fn provide_extern(_providers: &mut Providers) { @@ -185,7 +185,7 @@ impl TransCrate for MetadataOnlyTransCrate { box NoLlvmMetadataLoader } - fn provide_local(_providers: &mut Providers) {} + fn provide(_providers: &mut Providers) {} fn provide_extern(_providers: &mut Providers) {} fn trans_crate<'a, 'tcx>(