Auto merge of #146146 - saethlin:disable-incr-merging, r= · rust-lang/rust@7cb1a81 (original) (raw)

File tree

1 file changed

lines changed

1 file changed

lines changed

Original file line number Diff line number Diff line change
@@ -164,7 +164,7 @@ where
164 164 // Merge until we don't exceed the max CGU count.
165 165 // `merge_codegen_units` is responsible for updating the CGU size
166 166 // estimates.
167 -{
167 +if tcx.sess.opts.incremental.is_none() {
168 168 let _prof_timer = tcx.prof.generic_activity("cgu_partitioning_merge_cgus");
169 169 merge_codegen_units(cx, &mut codegen_units);
170 170 debug_dump(tcx, "MERGE", &codegen_units);