Only avoid shims for the local crate

Author: Zoxc

compiler/rustc_codegen_ssa/src/mir/mod.rs

@@ -175,7 +175,7 @@ impl<'tcx> MutVisitor<'tcx> for ReplaceThreadLocal<'tcx> {
 
     fn visit_rvalue(&mut self, rvalue: &mut mir::Rvalue<'tcx>, location: mir::Location) {
         if let mir::Rvalue::ThreadLocalRef(def_id) = *rvalue {
-            if self.tcx.is_in_upstream_dylib(def_id.krate) {
+            if !def_id.is_local() {
                 *rvalue = mir::Rvalue::Use(mir::Operand::Copy(mir::Place {
                     local: mir::Local::new(self.local_start + self.list.len()),
                     projection: self.tcx.intern_place_elems(&[]),

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -11,7 +11,6 @@ use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
 use rustc_hir::definitions::{DefKey, DefPath, DefPathHash};
 use rustc_middle::arena::ArenaAllocatable;
 use rustc_middle::metadata::ModChild;
-use rustc_middle::middle::dependency_format::Linkage;
 use rustc_middle::middle::exported_symbols::ExportedSymbol;
 use rustc_middle::middle::stability::DeprecationEntry;
 use rustc_middle::ty::fast_reject::SimplifiedType;
@@ -502,17 +501,6 @@ pub(in crate::rmeta) fn provide(providers: &mut Providers) {
             tcx.arena
                 .alloc_slice(&CStore::from_tcx(tcx).crate_dependencies_in_postorder(LOCAL_CRATE))
         },
-        is_in_upstream_dylib: |tcx, cnum| {
-            if cnum == LOCAL_CRATE {
-                return false;
-            }
-            tcx.dependency_formats(()).iter().any(|(_, linkage)| {
-                match linkage[cnum.as_usize() - 1] {
-                    Linkage::NotLinked | Linkage::Static => false,
-                    Linkage::IncludedFromDylib | Linkage::Dynamic => true,
-                }
-            })
-        },
         crates: |tcx, ()| tcx.arena.alloc_from_iter(CStore::from_tcx(tcx).crates_untracked()),
         ..*providers
     };

compiler/rustc_middle/src/query/mod.rs

@@ -1808,10 +1808,6 @@ rustc_queries! {
         eval_always
         desc { "generating a postorder list of CrateNums" }
     }
-    query is_in_upstream_dylib(_: CrateNum) -> bool {
-        eval_always
-        desc { "checking if a crate is placed in an upstream dylib" }
-    }
     /// Returns whether or not the crate with CrateNum 'cnum'
     /// is marked as a private dependency
     query is_private_dep(c: CrateNum) -> bool {