diff options
| author | bors <bors@rust-lang.org> | 2019-05-24 00:21:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-24 00:21:00 +0000 |
| commit | fd8e23c6b2902299cb76e89d868fbb84f48035ab (patch) | |
| tree | 923ca6815de27674d8c5767f691c072eb369c74b /src/librustc_codegen_ssa/base.rs | |
| parent | 8869ee03d7f258e1b76a11c6fbb01b5708a9f504 (diff) | |
| parent | 92fda925e3c945dccb1e5b6c3f662bfd9aadedc3 (diff) | |
| download | rust-fd8e23c6b2902299cb76e89d868fbb84f48035ab.tar.gz rust-fd8e23c6b2902299cb76e89d868fbb84f48035ab.zip | |
Auto merge of #61105 - Centril:rollup-t9lemjf, r=Centril
Rollup of 6 pull requests Successful merges: - #59545 (Use arenas to avoid Lrc in queries #2) - #61054 (Suggest dereferencing on assignment to mutable borrow) - #61056 (tweak discriminant on non-nullary enum diagnostic) - #61082 (fix dangling reference in Vec::append) - #61086 (Box::into_unique: do the reborrow-to-raw *after* destroying the Box) - #61098 (Fix overflowing literal lint in loops) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_ssa/base.rs')
| -rw-r--r-- | src/librustc_codegen_ssa/base.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/base.rs b/src/librustc_codegen_ssa/base.rs index 3cd47dfbb29..0b037f87247 100644 --- a/src/librustc_codegen_ssa/base.rs +++ b/src/librustc_codegen_ssa/base.rs @@ -33,7 +33,6 @@ use rustc_mir::monomorphize::Instance; use rustc_mir::monomorphize::partitioning::{CodegenUnit, CodegenUnitExt}; use rustc::util::nodemap::FxHashMap; use rustc_data_structures::indexed_vec::Idx; -use rustc_data_structures::sync::Lrc; use rustc_codegen_utils::{symbol_names_test, check_for_rustc_errors_attr}; use rustc::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA}; use crate::mir::place::PlaceRef; @@ -916,7 +915,7 @@ pub fn provide_both(providers: &mut Providers<'_>) { .map(|id| &module_map[&id]) .flat_map(|module| module.foreign_items.iter().cloned()) .collect(); - Lrc::new(dllimports) + tcx.arena.alloc(dllimports) }; providers.is_dllimport_foreign_item = |tcx, def_id| { |