diff options
| author | bors <bors@rust-lang.org> | 2023-08-06 22:02:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-06 22:02:12 +0000 |
| commit | f3623871cfa0763c95ebd6ceafaa6dc2e44ca68f (patch) | |
| tree | 29d1698c42995342cea8e31cb34cfb2a466a86ee /compiler/rustc_mir_transform/src | |
| parent | 85fbb571497d13cfb828de9b0d3e78656b9203c1 (diff) | |
| parent | 02e10a054eb4b3d49dc9adf164a064e187654ad3 (diff) | |
| download | rust-f3623871cfa0763c95ebd6ceafaa6dc2e44ca68f.tar.gz rust-f3623871cfa0763c95ebd6ceafaa6dc2e44ca68f.zip | |
Auto merge of #114502 - cjgillot:steal-ctfe, r=oli-obk
Steal MIR for CTFE when possible. Some bodies, like constants, have CTFE MIR but no optimized MIR. In that case, have `mir_for_ctfe` steal the MIR instead of cloning it.
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/lib.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs index 1ffc4597772..ccb67248822 100644 --- a/compiler/rustc_mir_transform/src/lib.rs +++ b/compiler/rustc_mir_transform/src/lib.rs @@ -338,7 +338,14 @@ fn inner_mir_for_ctfe(tcx: TyCtxt<'_>, def: LocalDefId) -> Body<'_> { return shim::build_adt_ctor(tcx, def.to_def_id()); } - let body = tcx.mir_drops_elaborated_and_const_checked(def).borrow().clone(); + let body = tcx.mir_drops_elaborated_and_const_checked(def); + let body = match tcx.hir().body_const_context(def) { + // consts and statics do not have `optimized_mir`, so we can steal the body instead of + // cloning it. + Some(hir::ConstContext::Const | hir::ConstContext::Static(_)) => body.steal(), + Some(hir::ConstContext::ConstFn) => body.borrow().clone(), + None => bug!("`mir_for_ctfe` called on non-const {def:?}"), + }; let mut body = remap_mir_for_const_eval_select(tcx, body, hir::Constness::Const); pm::run_passes(tcx, &mut body, &[&ctfe_limit::CtfeLimit], None); |
