use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc::middle::exported_symbols::{metadata_symbol_name, ExportedSymbol, SymbolExportLevel};
-use rustc::session::config;
+use rustc::session::config::{self, Sanitizer};
use rustc::ty::query::Providers;
-use rustc::ty::subst::SubstsRef;
+use rustc::ty::subst::{GenericArgKind, SubstsRef};
use rustc::ty::Instance;
use rustc::ty::{SymbolName, TyCtxt};
use rustc_codegen_utils::symbol_names;
use rustc_index::vec::IndexVec;
use syntax::expand::allocator::ALLOCATOR_METHODS;
-pub type ExportedSymbols = FxHashMap<CrateNum, Arc<Vec<(String, SymbolExportLevel)>>>;
-
pub fn threshold(tcx: TyCtxt<'_>) -> SymbolExportLevel {
crates_export_threshold(&tcx.sess.crate_types.borrow())
}
if !generics.requires_monomorphization(tcx) &&
// Functions marked with #[inline] are only ever codegened
// with "internal" linkage and are never exported.
- !Instance::mono(tcx, def_id).def.requires_local(tcx)
+ !Instance::mono(tcx, def_id).def.generates_cgu_internal_copy(tcx)
{
Some(def_id)
} else {
}));
}
+ if let Some(Sanitizer::Memory) = tcx.sess.opts.debugging_opts.sanitizer {
+ // Similar to profiling, preserve weak msan symbol during LTO.
+ const MSAN_WEAK_SYMBOLS: [&str; 2] = ["__msan_track_origins", "__msan_keep_going"];
+
+ symbols.extend(MSAN_WEAK_SYMBOLS.iter().map(|sym| {
+ let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new(sym));
+ (exported_symbol, SymbolExportLevel::C)
+ }));
+ }
+
if tcx.sess.crate_types.borrow().contains(&config::CrateType::Dylib) {
let symbol_name = metadata_symbol_name(tcx);
let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new(&symbol_name));
continue;
}
- if let &MonoItem::Fn(Instance { def: InstanceDef::Item(def_id), substs }) = mono_item {
- if substs.non_erasable_generics().next().is_some() {
- symbols
- .push((ExportedSymbol::Generic(def_id, substs), SymbolExportLevel::Rust));
+ match *mono_item {
+ MonoItem::Fn(Instance { def: InstanceDef::Item(def_id), substs }) => {
+ if substs.non_erasable_generics().next().is_some() {
+ let symbol = ExportedSymbol::Generic(def_id, substs);
+ symbols.push((symbol, SymbolExportLevel::Rust));
+ }
+ }
+ MonoItem::Fn(Instance { def: InstanceDef::DropGlue(def_id, Some(ty)), substs }) => {
+ // A little sanity-check
+ debug_assert_eq!(
+ substs.non_erasable_generics().next(),
+ Some(GenericArgKind::Type(ty))
+ );
+ let symbol = ExportedSymbol::Generic(def_id, substs);
+ symbols.push((symbol, SymbolExportLevel::Rust));
+ }
+ _ => {
+ // Any other symbols don't qualify for sharing
}
}
}
}
// Sort so we get a stable incr. comp. hash.
- symbols.sort_unstable_by(|&(ref symbol1, ..), &(ref symbol2, ..)| {
- symbol1.compare_stable(tcx, symbol2)
- });
+ symbols.sort_by_cached_key(|s| s.0.symbol_name_for_local_instance(tcx));
Arc::new(symbols)
}