bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #110107 - cjgillot:const-prop-lint-junk, r=oli-obk

Browse source 
Ensure mir_drops_elaborated_and_const_checked when requiring codegen.

mir_drops_elaborated_and_const_checked may emit errors while codegen has started, and the compiler would exit leaving object code files around.

Found by `@cuviper` in https://github.com/rust-lang/rust/issues/109731
This commit is contained in:
bors 2023-04-21 17:28:37 +00:00
commit fa4cc63a6b
12 changed files with 65 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_interface/src/passes.rs
View file

@ -794,8 +794,14 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
}
tcx.ensure().has_ffi_unwind_calls(def_id);
if tcx.hir().body_const_context(def_id).is_some() {
// If we need to codegen, ensure that we emit all errors from
// `mir_drops_elaborated_and_const_checked` now, to avoid discovering
// them later during codegen.
if tcx.sess.opts.output_types.should_codegen()
|| tcx.hir().body_const_context(def_id).is_some()
{
tcx.ensure().mir_drops_elaborated_and_const_checked(def_id);
tcx.ensure().unused_generic_params(ty::InstanceDef::Item(def_id.to_def_id()));
}
}
});