about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-30 13:04:30 -0700
committerGitHub <noreply@github.com>2016-07-30 13:04:30 -0700
commit9dba50b0595be75852d27afa03c85622cdf03d6f (patch)
tree8ad36bb80828f9687f6386e39d068d36616aafbd
parent7f7969ef44af9e7f060e7a505366a7925e4470c2 (diff)
parent2dbf00e2bb60b6b3172002c7e00d516c94d9ee42 (diff)
downloadrust-9dba50b0595be75852d27afa03c85622cdf03d6f.tar.gz
rust-9dba50b0595be75852d27afa03c85622cdf03d6f.zip
Auto merge of #35069 - wesleywiser:too_many_symbols, r=alexcrichton
Only export #[no_mangle] extern symbols during LTO

Fixes #34985
-rw-r--r--src/librustc_metadata/decoder.rs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs
index 63345a15e6a..24e8b33f44c 100644
--- a/src/librustc_metadata/decoder.rs
+++ b/src/librustc_metadata/decoder.rs
@@ -55,7 +55,6 @@ use rustc_serialize::Decodable;
 use syntax::attr;
 use syntax::parse::token;
 use syntax::ast;
-use syntax::abi::Abi;
 use syntax::codemap;
 use syntax::print::pprust;
 use syntax::ptr::P;
@@ -1534,13 +1533,9 @@ pub fn is_extern_item<'a, 'tcx>(cdata: Cmd,
     let applicable = match item_family(item_doc) {
         ImmStatic | MutStatic => true,
         Fn => {
-            let ty::TypeScheme { generics, ty } = get_type(cdata, id, tcx);
+            let ty::TypeScheme { generics, .. } = get_type(cdata, id, tcx);
             let no_generics = generics.types.is_empty();
-            match ty.sty {
-                ty::TyFnDef(_, _, fn_ty) | ty::TyFnPtr(fn_ty)
-                    if fn_ty.abi != Abi::Rust => return no_generics,
-                _ => no_generics,
-            }
+            no_generics
         },
         _ => false,
     };