diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-07-26 13:20:47 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-04 06:54:36 -0600 |
| commit | a9093a4dd80e617d50b26647ec2adcb727d2dd29 (patch) | |
| tree | e0eacc392922f831bd11a00c6d345bad50535dda /src/librustc_codegen_llvm | |
| parent | 5fcef251d3db36c334535d8f5d96b5b44f5eb75e (diff) | |
| download | rust-a9093a4dd80e617d50b26647ec2adcb727d2dd29.tar.gz rust-a9093a4dd80e617d50b26647ec2adcb727d2dd29.zip | |
Move share_generics getter onto options directly
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/back/symbol_export.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/callee.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/back/symbol_export.rs b/src/librustc_codegen_llvm/back/symbol_export.rs index 5ce0d45a9bc..02434b7be0b 100644 --- a/src/librustc_codegen_llvm/back/symbol_export.rs +++ b/src/librustc_codegen_llvm/back/symbol_export.rs @@ -242,7 +242,7 @@ fn exported_symbols_provider_local<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, symbols.push((exported_symbol, SymbolExportLevel::Rust)); } - if tcx.share_generics() && tcx.local_crate_exports_generics() { + if tcx.sess.opts.share_generics() && tcx.local_crate_exports_generics() { use rustc::mir::mono::{Linkage, Visibility, MonoItem}; use rustc::ty::InstanceDef; diff --git a/src/librustc_codegen_llvm/callee.rs b/src/librustc_codegen_llvm/callee.rs index e64dedac55a..3594351802f 100644 --- a/src/librustc_codegen_llvm/callee.rs +++ b/src/librustc_codegen_llvm/callee.rs @@ -133,7 +133,7 @@ pub fn get_fn( // This is a monomorphization. Its expected visibility depends // on whether we are in share-generics mode. - if cx.tcx.share_generics() { + if cx.tcx.sess.opts.share_generics() { // We are in share_generics mode. if instance_def_id.is_local() { |