From 7064f69c43296ca0200c7892422ea9411c322181 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 20 Jul 2018 18:43:46 +0200 Subject: [PATCH] Abort instead of UB if promotion fails --- src/librustc_codegen_llvm/mir/operand.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/librustc_codegen_llvm/mir/operand.rs b/src/librustc_codegen_llvm/mir/operand.rs index 5d36eef99af..52234af08c1 100644 --- a/src/librustc_codegen_llvm/mir/operand.rs +++ b/src/librustc_codegen_llvm/mir/operand.rs @@ -18,7 +18,7 @@ use rustc_data_structures::indexed_vec::Idx; use rustc_data_structures::sync::Lrc; use base; -use common::{CodegenCx, C_null, C_undef, C_usize}; +use common::{CodegenCx, C_undef, C_usize}; use builder::{Builder, MemFlags}; use value::Value; use type_of::LayoutLlvmExt; @@ -411,7 +411,10 @@ impl<'a, 'tcx> FunctionCx<'a, 'tcx> { .unwrap_or_else(|err| { match constant.literal { mir::Literal::Promoted { .. } => { - // FIXME: generate a panic here + // this is unreachable as long as runtime + // and compile-time agree on values + // With floats that won't always be true + // so we generate an abort below }, mir::Literal::Value { .. } => { err.report_as_error( @@ -420,10 +423,12 @@ impl<'a, 'tcx> FunctionCx<'a, 'tcx> { ); }, } + let fnname = bx.cx.get_intrinsic(&("llvm.trap")); + bx.call(fnname, &[], None); // We've errored, so we don't have to produce working code. let layout = bx.cx.layout_of(ty); PlaceRef::new_sized( - C_null(layout.llvm_type(bx.cx).ptr_to()), + C_undef(layout.llvm_type(bx.cx).ptr_to()), layout, layout.align, ).load(bx)