From 238ed47d290849cb5d37f18dbf15c2433fc88c80 Mon Sep 17 00:00:00 2001
From: Michael Woerister <michaelwoerister@posteo>
Date: Thu, 21 Dec 2017 17:49:24 +0100
Subject: [PATCH] Generate code for const- and inline-fns if -Clink-dead-code
 is specified.

---
 src/librustc_mir/monomorphize/item.rs         |  2 +-
 src/librustc_mir/monomorphize/partitioning.rs |  4 ++-
 src/librustc_trans/base.rs                    |  8 +++++-
 src/test/codegen/link-dead-code.rs            | 27 +++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 src/test/codegen/link-dead-code.rs

diff --git a/src/librustc_mir/monomorphize/item.rs b/src/librustc_mir/monomorphize/item.rs
index c3fb126ea1822..1f463cea7643b 100644
--- a/src/librustc_mir/monomorphize/item.rs
+++ b/src/librustc_mir/monomorphize/item.rs
@@ -115,7 +115,7 @@ pub trait MonoItemExt<'a, 'tcx>: fmt::Debug {
         let inline_in_all_cgus =
             tcx.sess.opts.debugging_opts.inline_in_all_cgus.unwrap_or_else(|| {
                 tcx.sess.opts.optimize != OptLevel::No
-            });
+            }) && !tcx.sess.opts.cg.link_dead_code;
 
         match *self.as_mono_item() {
             MonoItem::Fn(ref instance) => {
diff --git a/src/librustc_mir/monomorphize/partitioning.rs b/src/librustc_mir/monomorphize/partitioning.rs
index e2640d695c6d0..7da47551a4078 100644
--- a/src/librustc_mir/monomorphize/partitioning.rs
+++ b/src/librustc_mir/monomorphize/partitioning.rs
@@ -236,7 +236,9 @@ pub fn partition<'a, 'tcx, I>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
 
     // Next we try to make as many symbols "internal" as possible, so LLVM has
     // more freedom to optimize.
-    internalize_symbols(tcx, &mut post_inlining, inlining_map);
+    if !tcx.sess.opts.cg.link_dead_code {
+        internalize_symbols(tcx, &mut post_inlining, inlining_map);
+    }
 
     // Finally, sort by codegen unit name, so that we get deterministic results
     let PostInliningPartitioning {
diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
index ea68925705f52..eee08650e816b 100644
--- a/src/librustc_trans/base.rs
+++ b/src/librustc_trans/base.rs
@@ -1014,7 +1014,13 @@ fn collect_and_partition_translation_items<'a, 'tcx>(
                 MonoItemCollectionMode::Lazy
             }
         }
-        None => MonoItemCollectionMode::Lazy
+        None => {
+            if tcx.sess.opts.cg.link_dead_code {
+                MonoItemCollectionMode::Eager
+            } else {
+                MonoItemCollectionMode::Lazy
+            }
+        }
     };
 
     let (items, inlining_map) =
diff --git a/src/test/codegen/link-dead-code.rs b/src/test/codegen/link-dead-code.rs
new file mode 100644
index 0000000000000..9cabcd9157a6a
--- /dev/null
+++ b/src/test/codegen/link-dead-code.rs
@@ -0,0 +1,27 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags:-Clink-dead-code
+
+#![feature(const_fn)]
+#![crate_type = "rlib"]
+
+// This test makes sure that, when -Clink-dead-code is specified, we generate
+// code for functions that would otherwise be skipped.
+
+// CHECK-LABEL: define hidden i32 @_ZN14link_dead_code8const_fn
+const fn const_fn() -> i32 { 1 }
+
+// CHECK-LABEL: define hidden i32 @_ZN14link_dead_code9inline_fn
+#[inline]
+fn inline_fn() -> i32 { 2 }
+
+// CHECK-LABEL: define hidden i32 @_ZN14link_dead_code10private_fn
+fn private_fn() -> i32 { 3 }