From 46f251129695f9e768bb444dd20a6cce8f2bfbc9 Mon Sep 17 00:00:00 2001 From: John Kåre Alsaker Date: Sat, 1 Dec 2018 16:30:42 +0100 Subject: Update wasm_import_module_map and target_features_whitelist --- src/librustc_codegen_llvm/attributes.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/librustc_codegen_llvm') diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs index f26684d9ef0..9d0e7dde34d 100644 --- a/src/librustc_codegen_llvm/attributes.rs +++ b/src/librustc_codegen_llvm/attributes.rs @@ -10,7 +10,6 @@ use rustc::ty::{self, TyCtxt, PolyFnSig}; use rustc::ty::layout::HasTyCtxt; use rustc::ty::query::Providers; use rustc_data_structures::small_c_str::SmallCStr; -use rustc_data_structures::sync::Lrc; use rustc_data_structures::fx::FxHashMap; use rustc_target::spec::PanicStrategy; use rustc_codegen_ssa::traits::*; @@ -320,11 +319,11 @@ pub fn provide(providers: &mut Providers<'_>) { if tcx.sess.opts.actually_rustdoc { // rustdoc needs to be able to document functions that use all the features, so // whitelist them all - Lrc::new(llvm_util::all_known_features() + tcx.arena.alloc(llvm_util::all_known_features() .map(|(a, b)| (a.to_string(), b)) .collect()) } else { - Lrc::new(llvm_util::target_feature_whitelist(tcx.sess) + tcx.arena.alloc(llvm_util::target_feature_whitelist(tcx.sess) .iter() .map(|&(a, b)| (a.to_string(), b)) .collect()) @@ -364,7 +363,7 @@ pub fn provide_extern(providers: &mut Providers<'_>) { })); } - Lrc::new(ret) + tcx.arena.alloc(ret) }; } -- cgit 1.4.1-3-g733a5