From f62903b74a8630fa62e721f69e6621d1d441e7f1 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <me@nathancorbyn.com>
Date: Fri, 5 Jun 2020 16:47:37 +0100
Subject: [PATCH 1/7] Export `#[inline] #[no_mangle]` fns in cdylibs and
 staticlibs

---
 src/librustc_codegen_ssa/back/symbol_export.rs      |  9 +++++----
 src/librustc_middle/mir/mono.rs                     |  1 +
 src/librustc_middle/query/mod.rs                    |  4 ++++
 src/librustc_typeck/collect.rs                      | 12 ++++++++++++
 src/test/codegen/cdylib-external-no-mangle-fns.rs   | 13 +++++++++++++
 .../codegen/staticlib-external-no-mangle-fns.rs     | 13 +++++++++++++
 6 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 src/test/codegen/cdylib-external-no-mangle-fns.rs
 create mode 100644 src/test/codegen/staticlib-external-no-mangle-fns.rs

diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs
index 970d13b30c04e..bf8693f3547a4 100644
--- a/src/librustc_codegen_ssa/back/symbol_export.rs
+++ b/src/librustc_codegen_ssa/back/symbol_export.rs
@@ -89,10 +89,11 @@ fn reachable_non_generics_provider(tcx: TyCtxt<'_>, cnum: CrateNum) -> DefIdMap<
                 | Node::ImplItem(&hir::ImplItem { kind: hir::ImplItemKind::Fn(..), .. }) => {
                     let def_id = tcx.hir().local_def_id(hir_id);
                     let generics = tcx.generics_of(def_id);
-                    if !generics.requires_monomorphization(tcx) &&
-                        // Functions marked with #[inline] are only ever codegened
-                        // with "internal" linkage and are never exported.
-                        !Instance::mono(tcx, def_id.to_def_id()).def.generates_cgu_internal_copy(tcx)
+                    if !generics.requires_monomorphization(tcx)
+                        && (!Instance::mono(tcx, def_id.to_def_id())
+                            .def
+                            .generates_cgu_internal_copy(tcx)
+                            || tcx.inline_exportable(def_id.to_def_id()))
                     {
                         Some(def_id)
                     } else {
diff --git a/src/librustc_middle/mir/mono.rs b/src/librustc_middle/mir/mono.rs
index c889dbc0a4498..d8dcf0dea8a5f 100644
--- a/src/librustc_middle/mir/mono.rs
+++ b/src/librustc_middle/mir/mono.rs
@@ -95,6 +95,7 @@ impl<'tcx> MonoItem<'tcx> {
                 // linkage, then we'll be creating a globally shared version.
                 if self.explicit_linkage(tcx).is_some()
                     || !instance.def.generates_cgu_internal_copy(tcx)
+                    || tcx.inline_exportable(instance.def_id())
                     || Some(instance.def_id()) == entry_def_id.map(LocalDefId::to_def_id)
                 {
                     return InstantiationMode::GloballyShared { may_conflict: false };
diff --git a/src/librustc_middle/query/mod.rs b/src/librustc_middle/query/mod.rs
index be15e6c576f69..20487fdb6696d 100644
--- a/src/librustc_middle/query/mod.rs
+++ b/src/librustc_middle/query/mod.rs
@@ -697,6 +697,10 @@ rustc_queries! {
             storage(ArenaCacheSelector<'tcx>)
             cache_on_disk_if { true }
         }
+
+        query inline_exportable(def_id: DefId) -> bool {
+            desc { |tcx| "computing whether `{}` should be explicitly exported", tcx.def_path_str(def_id) }
+        }
     }
 
     Other {
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 1d59d749634ee..08a6330e718e6 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -40,6 +40,7 @@ use rustc_middle::ty::util::Discr;
 use rustc_middle::ty::util::IntTypeExt;
 use rustc_middle::ty::{self, AdtKind, Const, ToPolyTraitRef, Ty, TyCtxt};
 use rustc_middle::ty::{ReprOptions, ToPredicate, WithConstness};
+use rustc_session::config::CrateType;
 use rustc_session::lint;
 use rustc_session::parse::feature_err;
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
@@ -79,6 +80,7 @@ pub fn provide(providers: &mut Providers<'_>) {
         static_mutability,
         generator_kind,
         codegen_fn_attrs,
+        inline_exportable,
         collect_mod_item_types,
         ..*providers
     };
@@ -2599,6 +2601,16 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
     codegen_fn_attrs
 }
 
+fn inline_exportable(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
+    // Functions marked with #[inline] are only ever codegened
+    // with "internal" linkage and are never exported unless we're
+    // building a `staticlib` or `cdylib` and they are marked
+    // `#[no_mangle]`.
+    tcx.codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::NO_MANGLE)
+        && (tcx.sess.crate_types().contains(&CrateType::Cdylib)
+            || tcx.sess.crate_types().contains(&CrateType::Staticlib))
+}
+
 /// Checks if the provided DefId is a method in a trait impl for a trait which has track_caller
 /// applied to the method prototype.
 fn should_inherit_track_caller(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
diff --git a/src/test/codegen/cdylib-external-no-mangle-fns.rs b/src/test/codegen/cdylib-external-no-mangle-fns.rs
new file mode 100644
index 0000000000000..827de7e5c11d9
--- /dev/null
+++ b/src/test/codegen/cdylib-external-no-mangle-fns.rs
@@ -0,0 +1,13 @@
+// compile-flags: -C no-prepopulate-passes
+
+#![crate_type = "cdylib"]
+
+// CHECK: define void @a()
+#[no_mangle]
+#[inline]
+pub extern "C" fn a() {
+    // side effect to keep `a` around
+    unsafe {
+        core::ptr::read_volatile(&42);
+    }
+}
diff --git a/src/test/codegen/staticlib-external-no-mangle-fns.rs b/src/test/codegen/staticlib-external-no-mangle-fns.rs
new file mode 100644
index 0000000000000..0b4a37febb209
--- /dev/null
+++ b/src/test/codegen/staticlib-external-no-mangle-fns.rs
@@ -0,0 +1,13 @@
+// compile-flags: -C no-prepopulate-passes
+
+#![crate_type = "staticlib"]
+
+// CHECK: define void @a()
+#[no_mangle]
+#[inline]
+pub extern "C" fn a() {
+    // side effect to keep `a` around
+    unsafe {
+        core::ptr::read_volatile(&42);
+    }
+}

From 6b7cacb2c99567a76cf0d5ce6833a129c8bb8814 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <me@nathancorbyn.com>
Date: Mon, 8 Jun 2020 09:37:11 +0100
Subject: [PATCH 2/7] Export all fns with extern indicator

---
 .../back/symbol_export.rs                     |  9 ++++----
 src/librustc_middle/mir/mono.rs               | 12 ++++++----
 src/librustc_middle/query/mod.rs              |  4 ----
 src/librustc_typeck/collect.rs                | 12 ----------
 .../codegen/cdylib-external-inline-fns.rs     | 23 +++++++++++++++++++
 .../codegen/cdylib-external-no-mangle-fns.rs  | 13 -----------
 src/test/codegen/export-no-mangle.rs          |  5 ++++
 src/test/codegen/external-no-mangle-fns.rs    | 10 ++++++++
 .../codegen/staticlib-external-inline-fns.rs  | 23 +++++++++++++++++++
 .../staticlib-external-no-mangle-fns.rs       | 13 -----------
 10 files changed, 74 insertions(+), 50 deletions(-)
 create mode 100644 src/test/codegen/cdylib-external-inline-fns.rs
 delete mode 100644 src/test/codegen/cdylib-external-no-mangle-fns.rs
 create mode 100644 src/test/codegen/staticlib-external-inline-fns.rs
 delete mode 100644 src/test/codegen/staticlib-external-no-mangle-fns.rs

diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs
index bf8693f3547a4..98f7da8361cc4 100644
--- a/src/librustc_codegen_ssa/back/symbol_export.rs
+++ b/src/librustc_codegen_ssa/back/symbol_export.rs
@@ -90,10 +90,11 @@ fn reachable_non_generics_provider(tcx: TyCtxt<'_>, cnum: CrateNum) -> DefIdMap<
                     let def_id = tcx.hir().local_def_id(hir_id);
                     let generics = tcx.generics_of(def_id);
                     if !generics.requires_monomorphization(tcx)
-                        && (!Instance::mono(tcx, def_id.to_def_id())
-                            .def
-                            .generates_cgu_internal_copy(tcx)
-                            || tcx.inline_exportable(def_id.to_def_id()))
+                        // Functions marked with #[inline] are codegened with "internal"
+                        // linkage and are not exported unless marked with an extern
+                        // inidicator
+                        && (!Instance::mono(tcx, def_id.to_def_id()).def.generates_cgu_internal_copy(tcx)
+                            || tcx.codegen_fn_attrs(def_id.to_def_id()).contains_extern_indicator())
                     {
                         Some(def_id)
                     } else {
diff --git a/src/librustc_middle/mir/mono.rs b/src/librustc_middle/mir/mono.rs
index d8dcf0dea8a5f..886690da212d3 100644
--- a/src/librustc_middle/mir/mono.rs
+++ b/src/librustc_middle/mir/mono.rs
@@ -92,10 +92,10 @@ impl<'tcx> MonoItem<'tcx> {
             MonoItem::Fn(ref instance) => {
                 let entry_def_id = tcx.entry_fn(LOCAL_CRATE).map(|(id, _)| id);
                 // If this function isn't inlined or otherwise has explicit
-                // linkage, then we'll be creating a globally shared version.
+                // linkage or an extern indicator, then we'll be creating a
+                // globally shared version.
                 if self.explicit_linkage(tcx).is_some()
                     || !instance.def.generates_cgu_internal_copy(tcx)
-                    || tcx.inline_exportable(instance.def_id())
                     || Some(instance.def_id()) == entry_def_id.map(LocalDefId::to_def_id)
                 {
                     return InstantiationMode::GloballyShared { may_conflict: false };
@@ -103,8 +103,12 @@ impl<'tcx> MonoItem<'tcx> {
 
                 // At this point we don't have explicit linkage and we're an
                 // inlined function. If we're inlining into all CGUs then we'll
-                // be creating a local copy per CGU
-                if generate_cgu_internal_copies {
+                // be creating a local copy per CGU. We need to watch out here
+                // for an extern indicator as we don't want to optimise away
+                // inlined functions that should be exported.
+                if generate_cgu_internal_copies
+                    && !tcx.codegen_fn_attrs(instance.def_id()).contains_extern_indicator()
+                {
                     return InstantiationMode::LocalCopy;
                 }
 
diff --git a/src/librustc_middle/query/mod.rs b/src/librustc_middle/query/mod.rs
index 20487fdb6696d..be15e6c576f69 100644
--- a/src/librustc_middle/query/mod.rs
+++ b/src/librustc_middle/query/mod.rs
@@ -697,10 +697,6 @@ rustc_queries! {
             storage(ArenaCacheSelector<'tcx>)
             cache_on_disk_if { true }
         }
-
-        query inline_exportable(def_id: DefId) -> bool {
-            desc { |tcx| "computing whether `{}` should be explicitly exported", tcx.def_path_str(def_id) }
-        }
     }
 
     Other {
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 08a6330e718e6..1d59d749634ee 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -40,7 +40,6 @@ use rustc_middle::ty::util::Discr;
 use rustc_middle::ty::util::IntTypeExt;
 use rustc_middle::ty::{self, AdtKind, Const, ToPolyTraitRef, Ty, TyCtxt};
 use rustc_middle::ty::{ReprOptions, ToPredicate, WithConstness};
-use rustc_session::config::CrateType;
 use rustc_session::lint;
 use rustc_session::parse::feature_err;
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
@@ -80,7 +79,6 @@ pub fn provide(providers: &mut Providers<'_>) {
         static_mutability,
         generator_kind,
         codegen_fn_attrs,
-        inline_exportable,
         collect_mod_item_types,
         ..*providers
     };
@@ -2601,16 +2599,6 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
     codegen_fn_attrs
 }
 
-fn inline_exportable(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
-    // Functions marked with #[inline] are only ever codegened
-    // with "internal" linkage and are never exported unless we're
-    // building a `staticlib` or `cdylib` and they are marked
-    // `#[no_mangle]`.
-    tcx.codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::NO_MANGLE)
-        && (tcx.sess.crate_types().contains(&CrateType::Cdylib)
-            || tcx.sess.crate_types().contains(&CrateType::Staticlib))
-}
-
 /// Checks if the provided DefId is a method in a trait impl for a trait which has track_caller
 /// applied to the method prototype.
 fn should_inherit_track_caller(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
diff --git a/src/test/codegen/cdylib-external-inline-fns.rs b/src/test/codegen/cdylib-external-inline-fns.rs
new file mode 100644
index 0000000000000..58f806b5a1f34
--- /dev/null
+++ b/src/test/codegen/cdylib-external-inline-fns.rs
@@ -0,0 +1,23 @@
+// compile-flags: -C no-prepopulate-passes
+
+#![crate_type = "cdylib"]
+
+// CHECK: define void @a()
+#[no_mangle]
+#[inline]
+pub extern "C" fn a() {}
+
+// CHECK: define void @b()
+#[export_name = "b"]
+#[inline]
+pub extern "C" fn b() {}
+
+// CHECK: define void @c()
+#[no_mangle]
+#[inline]
+extern "C" fn c() {}
+
+// CHECK: define void @d()
+#[export_name = "d"]
+#[inline]
+extern "C" fn d() {}
diff --git a/src/test/codegen/cdylib-external-no-mangle-fns.rs b/src/test/codegen/cdylib-external-no-mangle-fns.rs
deleted file mode 100644
index 827de7e5c11d9..0000000000000
--- a/src/test/codegen/cdylib-external-no-mangle-fns.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// compile-flags: -C no-prepopulate-passes
-
-#![crate_type = "cdylib"]
-
-// CHECK: define void @a()
-#[no_mangle]
-#[inline]
-pub extern "C" fn a() {
-    // side effect to keep `a` around
-    unsafe {
-        core::ptr::read_volatile(&42);
-    }
-}
diff --git a/src/test/codegen/export-no-mangle.rs b/src/test/codegen/export-no-mangle.rs
index 78d41e4be0ae9..793636bb1b030 100644
--- a/src/test/codegen/export-no-mangle.rs
+++ b/src/test/codegen/export-no-mangle.rs
@@ -18,4 +18,9 @@ mod private {
     // CHECK: void @bar()
     #[export_name = "bar"]
     extern fn bar() {}
+    
+    // CHECK: void @baz()
+    #[export_name = "baz"]
+    #[inline]
+    extern fn baz() {}
 }
diff --git a/src/test/codegen/external-no-mangle-fns.rs b/src/test/codegen/external-no-mangle-fns.rs
index 902882144996f..aefa9ce21c3ee 100644
--- a/src/test/codegen/external-no-mangle-fns.rs
+++ b/src/test/codegen/external-no-mangle-fns.rs
@@ -53,3 +53,13 @@ fn x() {
         core::ptr::read_volatile(&42);
     }
 }
+
+// CHECK: define void @i()
+#[no_mangle]
+#[inline]
+fn i() {}
+
+// CHECK: define void @j()
+#[no_mangle]
+#[inline]
+pub fn j() {}
diff --git a/src/test/codegen/staticlib-external-inline-fns.rs b/src/test/codegen/staticlib-external-inline-fns.rs
new file mode 100644
index 0000000000000..8f55a5303311c
--- /dev/null
+++ b/src/test/codegen/staticlib-external-inline-fns.rs
@@ -0,0 +1,23 @@
+// compile-flags: -C no-prepopulate-passes
+
+#![crate_type = "staticlib"]
+
+// CHECK: define void @a()
+#[no_mangle]
+#[inline]
+pub extern "C" fn a() {}
+
+// CHECK: define void @b()
+#[export_name = "b"]
+#[inline]
+pub extern "C" fn b() {}
+
+// CHECK: define void @c()
+#[no_mangle]
+#[inline]
+extern "C" fn c() {}
+
+// CHECK: define void @d()
+#[export_name = "d"]
+#[inline]
+extern "C" fn d() {}
diff --git a/src/test/codegen/staticlib-external-no-mangle-fns.rs b/src/test/codegen/staticlib-external-no-mangle-fns.rs
deleted file mode 100644
index 0b4a37febb209..0000000000000
--- a/src/test/codegen/staticlib-external-no-mangle-fns.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// compile-flags: -C no-prepopulate-passes
-
-#![crate_type = "staticlib"]
-
-// CHECK: define void @a()
-#[no_mangle]
-#[inline]
-pub extern "C" fn a() {
-    // side effect to keep `a` around
-    unsafe {
-        core::ptr::read_volatile(&42);
-    }
-}

From d23bedd13d70597a7db70ef5ea549fc7a4063d10 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <me@nathancorbyn.com>
Date: Mon, 8 Jun 2020 09:54:33 +0100
Subject: [PATCH 3/7] Fix whitespace

---
 src/test/codegen/export-no-mangle.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/codegen/export-no-mangle.rs b/src/test/codegen/export-no-mangle.rs
index 793636bb1b030..a52fac37021dd 100644
--- a/src/test/codegen/export-no-mangle.rs
+++ b/src/test/codegen/export-no-mangle.rs
@@ -18,7 +18,7 @@ mod private {
     // CHECK: void @bar()
     #[export_name = "bar"]
     extern fn bar() {}
-    
+
     // CHECK: void @baz()
     #[export_name = "baz"]
     #[inline]

From ee810a75e41368387918759ed191657f05650f05 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <me@nathancorbyn.com>
Date: Tue, 9 Jun 2020 15:49:59 +0100
Subject: [PATCH 4/7] Fix exports with `#[inline(always)]`

---
 src/librustc_middle/mir/mono.rs               | 15 +++++--------
 .../codegen/cdylib-external-inline-fns.rs     | 20 ++++++++++++++++++
 src/test/codegen/export-no-mangle.rs          | 21 ++++++++++++-------
 src/test/codegen/external-no-mangle-fns.rs    | 10 +++++++++
 .../codegen/staticlib-external-inline-fns.rs  | 20 ++++++++++++++++++
 5 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/src/librustc_middle/mir/mono.rs b/src/librustc_middle/mir/mono.rs
index 886690da212d3..24d324ff09c4c 100644
--- a/src/librustc_middle/mir/mono.rs
+++ b/src/librustc_middle/mir/mono.rs
@@ -91,10 +91,9 @@ impl<'tcx> MonoItem<'tcx> {
         match *self {
             MonoItem::Fn(ref instance) => {
                 let entry_def_id = tcx.entry_fn(LOCAL_CRATE).map(|(id, _)| id);
-                // If this function isn't inlined or otherwise has explicit
-                // linkage or an extern indicator, then we'll be creating a
-                // globally shared version.
-                if self.explicit_linkage(tcx).is_some()
+                // If this function isn't inlined or otherwise has an extern
+                // indicator, then we'll be creating a globally shared version.
+                if tcx.codegen_fn_attrs(instance.def_id()).contains_extern_indicator()
                     || !instance.def.generates_cgu_internal_copy(tcx)
                     || Some(instance.def_id()) == entry_def_id.map(LocalDefId::to_def_id)
                 {
@@ -103,12 +102,8 @@ impl<'tcx> MonoItem<'tcx> {
 
                 // At this point we don't have explicit linkage and we're an
                 // inlined function. If we're inlining into all CGUs then we'll
-                // be creating a local copy per CGU. We need to watch out here
-                // for an extern indicator as we don't want to optimise away
-                // inlined functions that should be exported.
-                if generate_cgu_internal_copies
-                    && !tcx.codegen_fn_attrs(instance.def_id()).contains_extern_indicator()
-                {
+                // be creating a local copy per CGU. 
+                if generate_cgu_internal_copies {
                     return InstantiationMode::LocalCopy;
                 }
 
diff --git a/src/test/codegen/cdylib-external-inline-fns.rs b/src/test/codegen/cdylib-external-inline-fns.rs
index 58f806b5a1f34..519be6b6a99a4 100644
--- a/src/test/codegen/cdylib-external-inline-fns.rs
+++ b/src/test/codegen/cdylib-external-inline-fns.rs
@@ -21,3 +21,23 @@ extern "C" fn c() {}
 #[export_name = "d"]
 #[inline]
 extern "C" fn d() {}
+
+// CHECK: define void @e()
+#[no_mangle]
+#[inline(always)]
+pub extern "C" fn e() {}
+
+// CHECK: define void @f()
+#[export_name = "f"]
+#[inline(always)]
+pub extern "C" fn f() {}
+
+// CHECK: define void @g()
+#[no_mangle]
+#[inline(always)]
+extern "C" fn g() {}
+
+// CHECK: define void @h()
+#[export_name = "h"]
+#[inline(always)]
+extern "C" fn h() {}
diff --git a/src/test/codegen/export-no-mangle.rs b/src/test/codegen/export-no-mangle.rs
index a52fac37021dd..11427ae38822f 100644
--- a/src/test/codegen/export-no-mangle.rs
+++ b/src/test/codegen/export-no-mangle.rs
@@ -11,16 +11,21 @@ mod private {
     #[export_name = "BAR"]
     static BAR: u32 = 3;
 
-    // CHECK: void @foo()
+    // CHECK: void @a()
     #[no_mangle]
-    pub extern fn foo() {}
+    pub extern fn a() {}
 
-    // CHECK: void @bar()
-    #[export_name = "bar"]
-    extern fn bar() {}
+    // CHECK: void @b()
+    #[export_name = "b"]
+    extern fn b() {}
 
-    // CHECK: void @baz()
-    #[export_name = "baz"]
+    // CHECK: void @c()
+    #[export_name = "c"]
     #[inline]
-    extern fn baz() {}
+    extern fn c() {}
+    
+    // CHECK: void @d()
+    #[export_name = "d"]
+    #[inline(always)]
+    extern fn d() {}
 }
diff --git a/src/test/codegen/external-no-mangle-fns.rs b/src/test/codegen/external-no-mangle-fns.rs
index aefa9ce21c3ee..41820b057f1ef 100644
--- a/src/test/codegen/external-no-mangle-fns.rs
+++ b/src/test/codegen/external-no-mangle-fns.rs
@@ -63,3 +63,13 @@ fn i() {}
 #[no_mangle]
 #[inline]
 pub fn j() {}
+
+// CHECK: define void @k()
+#[no_mangle]
+#[inline(always)]
+fn k() {}
+
+// CHECK: define void @l()
+#[no_mangle]
+#[inline(always)]
+pub fn l() {}
diff --git a/src/test/codegen/staticlib-external-inline-fns.rs b/src/test/codegen/staticlib-external-inline-fns.rs
index 8f55a5303311c..8876ab7376afe 100644
--- a/src/test/codegen/staticlib-external-inline-fns.rs
+++ b/src/test/codegen/staticlib-external-inline-fns.rs
@@ -21,3 +21,23 @@ extern "C" fn c() {}
 #[export_name = "d"]
 #[inline]
 extern "C" fn d() {}
+
+// CHECK: define void @e()
+#[no_mangle]
+#[inline(always)]
+pub extern "C" fn e() {}
+
+// CHECK: define void @f()
+#[export_name = "f"]
+#[inline(always)]
+pub extern "C" fn f() {}
+
+// CHECK: define void @g()
+#[no_mangle]
+#[inline(always)]
+extern "C" fn g() {}
+
+// CHECK: define void @h()
+#[export_name = "h"]
+#[inline(always)]
+extern "C" fn h() {}

From 11b56fbfb63ef8e2494b8631488e478794c80ed4 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <me@nathancorbyn.com>
Date: Tue, 9 Jun 2020 15:54:34 +0100
Subject: [PATCH 5/7] Fix whitespace

---
 src/librustc_middle/mir/mono.rs      | 2 +-
 src/test/codegen/export-no-mangle.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librustc_middle/mir/mono.rs b/src/librustc_middle/mir/mono.rs
index 24d324ff09c4c..f1c1b962ab997 100644
--- a/src/librustc_middle/mir/mono.rs
+++ b/src/librustc_middle/mir/mono.rs
@@ -102,7 +102,7 @@ impl<'tcx> MonoItem<'tcx> {
 
                 // At this point we don't have explicit linkage and we're an
                 // inlined function. If we're inlining into all CGUs then we'll
-                // be creating a local copy per CGU. 
+                // be creating a local copy per CGU.
                 if generate_cgu_internal_copies {
                     return InstantiationMode::LocalCopy;
                 }
diff --git a/src/test/codegen/export-no-mangle.rs b/src/test/codegen/export-no-mangle.rs
index 11427ae38822f..59e97601c838d 100644
--- a/src/test/codegen/export-no-mangle.rs
+++ b/src/test/codegen/export-no-mangle.rs
@@ -23,7 +23,7 @@ mod private {
     #[export_name = "c"]
     #[inline]
     extern fn c() {}
-    
+
     // CHECK: void @d()
     #[export_name = "d"]
     #[inline(always)]

From babda9470ea1e5932d238b7f805e76379f01d37c Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <me@nathancorbyn.com>
Date: Mon, 15 Jun 2020 10:21:19 +0100
Subject: [PATCH 6/7] Fix sanitizer test

---
 src/test/codegen/sanitizer-no-sanitize-inlining.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/codegen/sanitizer-no-sanitize-inlining.rs b/src/test/codegen/sanitizer-no-sanitize-inlining.rs
index d96e76618d325..86e58c3c9bb17 100644
--- a/src/test/codegen/sanitizer-no-sanitize-inlining.rs
+++ b/src/test/codegen/sanitizer-no-sanitize-inlining.rs
@@ -13,7 +13,7 @@
 #![feature(no_sanitize)]
 
 // ASAN-LABEL: define void @test
-// ASAN:         tail call fastcc void @random_inline
+// ASAN:         tail call fastcc
 // ASAN:       }
 //
 // LSAN-LABEL: define void @test
@@ -26,7 +26,6 @@ pub fn test(n: &mut u32) {
 
 #[no_sanitize(address)]
 #[inline]
-#[no_mangle]
 pub fn random_inline(n: &mut u32) {
     *n = 42;
 }

From e8e0a0e4e220533db31bc6a572ed9f1b99b31289 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <me@nathancorbyn.com>
Date: Mon, 15 Jun 2020 11:12:19 +0100
Subject: [PATCH 7/7] Update sanitizer test

---
 src/test/codegen/sanitizer-no-sanitize-inlining.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/codegen/sanitizer-no-sanitize-inlining.rs b/src/test/codegen/sanitizer-no-sanitize-inlining.rs
index 86e58c3c9bb17..48231d6f7208d 100644
--- a/src/test/codegen/sanitizer-no-sanitize-inlining.rs
+++ b/src/test/codegen/sanitizer-no-sanitize-inlining.rs
@@ -13,7 +13,7 @@
 #![feature(no_sanitize)]
 
 // ASAN-LABEL: define void @test
-// ASAN:         tail call fastcc
+// ASAN:         call {{.*}} @random_inline
 // ASAN:       }
 //
 // LSAN-LABEL: define void @test
@@ -26,6 +26,7 @@ pub fn test(n: &mut u32) {
 
 #[no_sanitize(address)]
 #[inline]
+#[no_mangle]
 pub fn random_inline(n: &mut u32) {
     *n = 42;
 }