Skip to content

Abort if a promoted fails to be const evaluable and its runtime checks didn't trigger #52571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 5 commits into from
Jul 23, 2018
Merged

Abort if a promoted fails to be const evaluable and its runtime checks didn't trigger #52571

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7064f69
Abort instead of UB if promotion fails
oli-obk Jul 20, 2018
92fad0f
Add test
oli-obk Jul 20, 2018
297ad72
Add trailing newline
oli-obk Jul 20, 2018
555a7b4
don't spawn processes on wasm
oli-obk Jul 21, 2018
233a6e1
Use correct exclusion comment
oli-obk Jul 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test
  • Loading branch information
@oli-obk
oli-obk committed Jul 20, 2018
commit 92fad0fa9eb2de43e04ddd49a2478f2767e1ebf4
35 changes: 35 additions & 0 deletions src/test/run-pass/invalid_const_promotion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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<String> = 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());
Copy link
Member

@RalfJung RalfJung Jul 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test would also pass if the program SEGFAULTs (like some variants of this did) instead of SIGILLs... but I am not sure how to test for this properly, so whatever.^^

Copy link
Member

@eddyb eddyb Jul 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rust/src/test/run-pass/segfault-no-out-of-stack.rs

Lines 26 to 40 in a5c2d0f

#[cfg(unix)]
fn check_status(status: std::process::ExitStatus)
{
use libc;
use std::os::unix::process::ExitStatusExt;
assert!(status.signal() == Some(libc::SIGSEGV)
|| status.signal() == Some(libc::SIGBUS));
}
#[cfg(not(unix))]
fn check_status(status: std::process::ExitStatus)
{
assert!(!status.success());
}

Copy link
Member

@RalfJung RalfJung Jul 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So...? That's how this test could be improved, is what you are saying?

Copy link
Member

@eddyb eddyb Jul 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean we already have copy-pastable code that does the exact checking necessary here. We should avoid writing non-trivial tests by hand when there's already a good example.

}