bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #45035 - alexcrichton:no-empty, r=michaelwoerister

Browse source 
rustc: Don't create empty codegen units

This'll end up just creating a bunch of object files that otherwise wouldn't
exist, so skip that extra work if possible.
This commit is contained in:
bors 2017-10-09 02:42:30 +00:00
commit dbed066d49
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_trans/base.rs
View file

@ -1231,9 +1231,6 @@ fn collect_and_partition_translation_items<'a, 'tcx>(
.collect::<Vec<_>>() .collect::<Vec<_>>()
}); });
assert!(tcx.sess.opts.codegen_units == codegen_units.len() ||
tcx.sess.opts.debugging_opts.incremental.is_some());
let translation_items: DefIdSet = items.iter().filter_map(|trans_item| { let translation_items: DefIdSet = items.iter().filter_map(|trans_item| {
match *trans_item { match *trans_item {
TransItem::Fn(ref instance) => Some(instance.def_id()), TransItem::Fn(ref instance) => Some(instance.def_id()),

9
src/librustc_trans/partitioning.rs
View file

@ -390,15 +390,6 @@ fn merge_codegen_units<'tcx>(initial_partitioning: &mut PreInliningPartitioning<
for (index, cgu) in codegen_units.iter_mut().enumerate() { for (index, cgu) in codegen_units.iter_mut().enumerate() {
cgu.set_name(numbered_codegen_unit_name(crate_name, index)); cgu.set_name(numbered_codegen_unit_name(crate_name, index));
} }
// If the initial partitioning contained less than target_cgu_count to begin
// with, we won't have enough codegen units here, so add a empty units until
// we reach the target count
while codegen_units.len() < target_cgu_count {
let index = codegen_units.len();
let name = numbered_codegen_unit_name(crate_name, index);
codegen_units.push(CodegenUnit::new(name));
}
} }
fn place_inlined_translation_items<'tcx>(initial_partitioning: PreInliningPartitioning<'tcx>, fn place_inlined_translation_items<'tcx>(initial_partitioning: PreInliningPartitioning<'tcx>,