From 7064f69c43296ca0200c7892422ea9411c322181 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 20 Jul 2018 18:43:46 +0200 Subject: [PATCH 1/5] 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 5d36eef99af2d..52234af08c1ab 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) From 92fad0fa9eb2de43e04ddd49a2478f2767e1ebf4 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 20 Jul 2018 19:35:08 +0200 Subject: [PATCH 2/5] Add test --- src/test/run-pass/invalid_const_promotion.rs | 35 ++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/test/run-pass/invalid_const_promotion.rs diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs new file mode 100644 index 0000000000000..eb6deb13993b4 --- /dev/null +++ b/src/test/run-pass/invalid_const_promotion.rs @@ -0,0 +1,35 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(const_fn)] +#![allow(const_err)] + +use std::env; +use std::process::{Command, Stdio}; + +const fn bar() -> usize { 0 - 1 } + +fn foo() { + let _: &'static _ = &bar(); +} + +fn main() { + let args: Vec = env::args().collect(); + if args.len() > 1 && args[1] == "test" { + foo(); + return; + } + + let mut p = Command::new(&args[0]) + .stdout(Stdio::piped()) + .stdin(Stdio::piped()) + .arg("test").output().unwrap(); + assert!(!p.status.success()); +} \ No newline at end of file From 297ad72f1201e401d7db84c3f3d78a08f26084ca Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 20 Jul 2018 19:55:16 +0200 Subject: [PATCH 3/5] Add trailing newline --- src/test/run-pass/invalid_const_promotion.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs index eb6deb13993b4..8f0ee51b5aae6 100644 --- a/src/test/run-pass/invalid_const_promotion.rs +++ b/src/test/run-pass/invalid_const_promotion.rs @@ -32,4 +32,4 @@ fn main() { .stdin(Stdio::piped()) .arg("test").output().unwrap(); assert!(!p.status.success()); -} \ No newline at end of file +} From 555a7b4e35401330750628aa2831ac36e606187d Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Sat, 21 Jul 2018 22:59:40 +0200 Subject: [PATCH 4/5] don't spawn processes on wasm --- src/test/run-pass/invalid_const_promotion.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs index 8f0ee51b5aae6..df2b7fc8e0054 100644 --- a/src/test/run-pass/invalid_const_promotion.rs +++ b/src/test/run-pass/invalid_const_promotion.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-wasm + #![feature(const_fn)] #![allow(const_err)] From 233a6e13ca2f6dec6590a6bf92dd73de303a9d00 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Sun, 22 Jul 2018 14:44:17 +0200 Subject: [PATCH 5/5] Use correct exclusion comment --- src/test/run-pass/invalid_const_promotion.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/run-pass/invalid_const_promotion.rs index df2b7fc8e0054..29a4b92199232 100644 --- a/src/test/run-pass/invalid_const_promotion.rs +++ b/src/test/run-pass/invalid_const_promotion.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-wasm +// ignore-wasm32 +// ignore-emscripten #![feature(const_fn)] #![allow(const_err)]