diff options
| author | bors <bors@rust-lang.org> | 2019-01-14 13:03:24 +0000 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-14 13:03:24 +0000 | 
| commit | d10680818b2a0aabb76e6a07098e031b31707fcc (patch) | |
| tree | 441a29928ac1f0af09beac0f604ddd3125246fb2 /src/librustc_codegen_utils/codegen_backend.rs | |
| parent | 1a3a3dfcdd7faf0b8ab266a79a4a35ab30e5136a (diff) | |
| parent | 47ccf2a7fc2fa17c7316e29a05f0a0b432253743 (diff) | |
| download | rust-d10680818b2a0aabb76e6a07098e031b31707fcc.tar.gz rust-d10680818b2a0aabb76e6a07098e031b31707fcc.zip | |
Auto merge of #57592 - Centril:rollup, r=Centril
Rollup of 6 pull requests Successful merges: - #57232 (Parallelize and optimize parts of HIR map creation) - #57418 (MetadataOnlyCodegenBackend: run the collector only once) - #57465 (Stabilize cfg_target_vendor) - #57477 (clarify resolve typo suggestion) - #57556 (privacy: Fix private-in-public check for existential types) - #57584 (Remove the `connect_timeout_unroutable` test.) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_utils/codegen_backend.rs')
| -rw-r--r-- | src/librustc_codegen_utils/codegen_backend.rs | 17 | 
1 files changed, 3 insertions, 14 deletions
| diff --git a/src/librustc_codegen_utils/codegen_backend.rs b/src/librustc_codegen_utils/codegen_backend.rs index 09adaf848be..8981c542961 100644 --- a/src/librustc_codegen_utils/codegen_backend.rs +++ b/src/librustc_codegen_utils/codegen_backend.rs @@ -31,7 +31,6 @@ use rustc::middle::cstore::EncodedMetadata; use rustc::middle::cstore::MetadataLoader; use rustc::dep_graph::DepGraph; use rustc_target::spec::Target; -use rustc_mir::monomorphize::collector; use link::out_filename; pub use rustc_data_structures::sync::MetadataRef; @@ -136,25 +135,15 @@ impl CodegenBackend for MetadataOnlyCodegenBackend { ::symbol_names_test::report_symbol_names(tcx); ::rustc_incremental::assert_dep_graph(tcx); ::rustc_incremental::assert_module_sources::assert_module_sources(tcx); - ::rustc_mir::monomorphize::assert_symbols_are_distinct(tcx, - collector::collect_crate_mono_items( - tcx, - collector::MonoItemCollectionMode::Eager - ).0.iter() - ); // FIXME: Fix this // ::rustc::middle::dependency_format::calculate(tcx); let _ = tcx.link_args(LOCAL_CRATE); let _ = tcx.native_libraries(LOCAL_CRATE); - for mono_item in - collector::collect_crate_mono_items( - tcx, - collector::MonoItemCollectionMode::Eager - ).0 { + let (_, cgus) = tcx.collect_and_partition_mono_items(LOCAL_CRATE); + for (mono_item, _) in cgus.iter().flat_map(|cgu| cgu.items().iter()) { if let MonoItem::Fn(inst) = mono_item { let def_id = inst.def_id(); - if def_id.is_local() { - let _ = inst.def.is_inline(tcx); + if def_id.is_local() { let _ = tcx.codegen_fn_attrs(def_id); } } | 
