From 4e867535f3c1ba7c8bbac2d75b7ac39e869fe8f3 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 24 Feb 2020 16:42:26 +0100 Subject: [PATCH] no more codegen for miri_start_panic --- src/librustc_codegen_ssa/mir/block.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/librustc_codegen_ssa/mir/block.rs b/src/librustc_codegen_ssa/mir/block.rs index d684f842ddc6..a1b54607b809 100644 --- a/src/librustc_codegen_ssa/mir/block.rs +++ b/src/librustc_codegen_ssa/mir/block.rs @@ -515,12 +515,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { return; } - // For normal codegen, this Miri-specific intrinsic is just a NOP. + // For normal codegen, this Miri-specific intrinsic should never occur. if intrinsic == Some("miri_start_panic") { - let target = destination.as_ref().unwrap().1; - helper.maybe_sideeffect(self.mir, &mut bx, &[target]); - helper.funclet_br(self, &mut bx, target); - return; + bug!("`miri_start_panic` should never end up in compiled code"); } // Emit a panic or a no-op for `panic_if_uninhabited`.