Skip to content

Commit

Permalink
Generate code for const- and inline-fns if -Clink-dead-code is specif…
Browse files Browse the repository at this point in the history
…ied.
  • Loading branch information
michaelwoerister committed Jan 4, 2018
1 parent de38f49 commit 238ed47
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/librustc_mir/monomorphize/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
4 changes: 3 additions & 1 deletion src/librustc_mir/monomorphize/partitioning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 7 additions & 1 deletion src/librustc_trans/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) =
Expand Down
27 changes: 27 additions & 0 deletions src/test/codegen/link-dead-code.rs
Original file line number Diff line number Diff line change
@@ -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 }

0 comments on commit 238ed47

Please sign in to comment.