Rustfmt

[rust.git] / src / linkage.rs

diff --git a/src/linkage.rs b/src/linkage.rs
index 3edfba61e33738d3cd624b1c279c29046f06ed28..ca853aac15892285208581ed6884e4835babf864 100644 (file)
--- a/src/linkage.rs
+++ b/src/linkage.rs
@@ -1,19 +1,24 @@
-use rustc::mir::mono::{MonoItem, Linkage as RLinkage, Visibility};
+use rustc_middle::mir::mono::{Linkage as RLinkage, MonoItem, Visibility};
 
 use crate::prelude::*;
 
-pub fn get_clif_linkage(mono_item: MonoItem, linkage: RLinkage, visibility: Visibility) -> Linkage {
+pub(crate) fn get_clif_linkage(
+    mono_item: MonoItem<'_>,
+    linkage: RLinkage,
+    visibility: Visibility,
+    is_compiler_builtins: bool,
+) -> Linkage {
     match (linkage, visibility) {
+        (RLinkage::External, Visibility::Default) if is_compiler_builtins => Linkage::Hidden,
         (RLinkage::External, Visibility::Default) => Linkage::Export,
         (RLinkage::Internal, Visibility::Default) => Linkage::Local,
-        // FIXME this should get external linkage, but hidden visibility,
-        // not internal linkage and default visibility
-        (RLinkage::External, Visibility::Hidden) => Linkage::Export,
+        (RLinkage::External, Visibility::Hidden) => Linkage::Hidden,
+        (RLinkage::WeakAny, Visibility::Default) => Linkage::Preemptible,
         _ => panic!("{:?} = {:?} {:?}", mono_item, linkage, visibility),
     }
 }
 
-pub fn get_static_ref_linkage(tcx: TyCtxt, def_id: DefId) -> Linkage {
+pub(crate) fn get_static_linkage(tcx: TyCtxt<'_>, def_id: DefId) -> Linkage {
     let fn_attrs = tcx.codegen_fn_attrs(def_id);
 
     if let Some(linkage) = fn_attrs.linkage {
@@ -23,7 +28,9 @@ pub fn get_static_ref_linkage(tcx: TyCtxt, def_id: DefId) -> Linkage {
             RLinkage::ExternalWeak | RLinkage::WeakAny => Linkage::Preemptible,
             _ => panic!("{:?}", linkage),
         }
+    } else if tcx.is_reachable_non_generic(def_id) {
+        Linkage::Export
     } else {
-        Linkage::Import
+        Linkage::Hidden
     }
 }