diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-03 11:00:04 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-11-03 11:00:04 +0100 |
| commit | 216c4ae46352330bc7962f132fe226a7e73ab8fa (patch) | |
| tree | c1d7af49fa1f27f325f090cff3f2d8861972fec9 /compiler/rustc_codegen_cranelift/src/linkage.rs | |
| parent | a6403b0f04b58a35cb9f3e544b2847ee09bcf3a4 (diff) | |
| parent | 03f01bbe901d60b71cf2c5ec766aef5e532ab79d (diff) | |
| download | rust-216c4ae46352330bc7962f132fe226a7e73ab8fa.tar.gz rust-216c4ae46352330bc7962f132fe226a7e73ab8fa.zip | |
Merge commit '03f01bbe901d60b71cf2c5ec766aef5e532ab79d' into update_cg_clif-2020-11-01
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/linkage.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/linkage.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/linkage.rs b/compiler/rustc_codegen_cranelift/src/linkage.rs index fe5d1d64443..dc1e2107ce7 100644 --- a/compiler/rustc_codegen_cranelift/src/linkage.rs +++ b/compiler/rustc_codegen_cranelift/src/linkage.rs @@ -25,11 +25,9 @@ pub(crate) fn get_static_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 { - if tcx.is_reachable_non_generic(def_id) { - Linkage::Export - } else { - Linkage::Hidden - } + Linkage::Hidden } } |