From 98c83d21f55b5b66e55f6908f31dbd0cd1a96f59 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Wed, 24 Jun 2020 11:54:11 +0200 Subject: [PATCH] Remove leftover of removed hack --- src/abi/mod.rs | 15 +++++---------- src/base.rs | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/abi/mod.rs b/src/abi/mod.rs index dbfca15ead9..4bf06a7490a 100644 --- a/src/abi/mod.rs +++ b/src/abi/mod.rs @@ -306,7 +306,6 @@ fn local_place<'tcx>( pub(crate) fn codegen_fn_prelude<'tcx>( fx: &mut FunctionCx<'_, 'tcx, impl Backend>, start_block: Block, - should_codegen_locals: bool, ) { let ssa_analyzed = crate::analyze::analyze(fx); @@ -424,17 +423,13 @@ pub(crate) fn codegen_fn_prelude<'tcx>( } } - // HACK should_codegen_locals required for the ``implement ` as FnOnce>::call_once` - // without `alloca``` hack in `base::trans_fn`. - if should_codegen_locals { - for local in fx.mir.vars_and_temps_iter() { - let ty = fx.monomorphize(&fx.mir.local_decls[local].ty); - let layout = fx.layout_of(ty); + for local in fx.mir.vars_and_temps_iter() { + let ty = fx.monomorphize(&fx.mir.local_decls[local].ty); + let layout = fx.layout_of(ty); - let is_ssa = ssa_analyzed[local] == crate::analyze::SsaKind::Ssa; + let is_ssa = ssa_analyzed[local] == crate::analyze::SsaKind::Ssa; - local_place(fx, local, layout, is_ssa); - } + local_place(fx, local, layout, is_ssa); } fx.bcx diff --git a/src/base.rs b/src/base.rs index 54aa409de11..a205a0525fb 100644 --- a/src/base.rs +++ b/src/base.rs @@ -61,7 +61,7 @@ pub(crate) fn trans_fn<'tcx, B: Backend + 'static>( crate::trap::trap_unreachable(&mut fx, "function has uninhabited argument"); } else { tcx.sess.time("codegen clif ir", || { - tcx.sess.time("codegen prelude", || crate::abi::codegen_fn_prelude(&mut fx, start_block, true)); + tcx.sess.time("codegen prelude", || crate::abi::codegen_fn_prelude(&mut fx, start_block)); codegen_fn_content(&mut fx); }); }