-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Don't emit landing pads with -Z no-landing-pads
Closes #11647
- Loading branch information
1 parent
f3f2e69
commit caa321a
Showing
2 changed files
with
33 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright 2014 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. | ||
|
||
// compile-flags: -Z no-landing-pads | ||
// xfail-fast | ||
|
||
use std::task; | ||
|
||
static mut HIT: bool = false; | ||
|
||
struct A; | ||
|
||
impl Drop for A { | ||
fn drop(&mut self) { | ||
unsafe { HIT = true; } | ||
} | ||
} | ||
|
||
fn main() { | ||
do task::try::<()> { | ||
let _a = A; | ||
fail!(); | ||
}; | ||
assert!(unsafe { !HIT }); | ||
} |
caa321a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from luqmana
at alexcrichton@caa321a
caa321a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging alexcrichton/rust/issue-11647 = caa321a into auto
caa321a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
alexcrichton/rust/issue-11647 = caa321a merged ok, testing candidate = 94236fc
caa321a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3690
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1532
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1534
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3691
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2791
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2797
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3705
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2793
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2799
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3707
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2793
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2798
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2867
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3697
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2798
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2803
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3468
caa321a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 94236fc