8000 Rollup of 12 pull requests by Centril · Pull Request #65382 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Rollup of 12 pull requests #65382

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

Closed
wants to merge 33 commits into from
Closed

Rollup of 12 pull requests #65382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
dfe76a1
Split non-CAS atomic support off into target_has_atomic_load_store
Amanieu Oct 8, 2019
6afc509
vxWorks: implement get_path() and get_mode() for File fmt::Debug
BaoshanPang Oct 9, 2019
e8af4c1
resolve: Mark macros starting with an underscore as used
petrochenkov Oct 9, 2019
1270140
expand: Simplify expansion of derives
petrochenkov Oct 9, 2019
57aae75
improve performance of signed saturating_mul
tspiteri Oct 11, 2019
e5daab8
Fix typo
Oct 12, 2019
9a0b9c6
remove old branch of unwind logic
RalfJung Oct 12, 2019
a1a8f33
update test for nounwind on FFI imports
RalfJung Oct 12, 2019
63af27f
also (properly) test nounwind on function definitions
RalfJung Oct 12, 2019
79c623f
some typography
RalfJung Oct 12, 2019
a010652
fix #[unwind(abort)] for Rust ABIs
RalfJung Oct 12, 2019
df93351
test unwind(abort) with Rust ABI
RalfJung Oct 12, 2019
09d7be3
make tests more robust
RalfJung Oct 12, 2019
cd0e4c3
Implement Error::source on IntoStringError
faern Oct 13, 2019
8000
d488500
Don't discard value names when using address or memory sanitizer
tmiasko Oct 13, 2019
37018e0
Fix typos in error.rs
Oct 13, 2019
b8e7f76
Remove Error::cause impls equal to deafult impl
faern Oct 13, 2019
cfda050
Add `dyn` to `Any` documentation
Cerber-Ursi Oct 13, 2019
0510bbf
Added code element
Cerber-Ursi Oct 13, 2019
4a0c487
syntax: consolidate function parsing in `item.rs`
Centril Oct 11, 2019
e67fa77
Fix typo in docs for `Rc`
kalabukdima Oct 13, 2019
82add0f
Rollup merge of #65214 - Amanieu:cfg_atomic, r=alexcrichton
Centril Oct 13, 2019
e56ba54
Rollup merge of #65246 - Wind-River:real_master_2, r=kennytm
Centril Oct 13, 2019
f22a784
Rollup merge of #65252 - petrochenkov:deriveholders2, r=matthewjasper
Centril Oct 13, 2019
ddad134
Rollup merge of #65312 - tspiteri:signed-sat-mul, r=dtolnay
Centril Oct 13, 2019
1a2835b
Rollup merge of #65336 - BO41:typo, r=petrochenkov
Centril Oct 13, 2019
a53028e
Rollup merge of #65346 - RalfJung:nounwind-tests, r=nagisa
Centril Oct 13, 2019
24d57be
Rollup merge of #65347 - RalfJung:unwind-abort-rust, r=varkor
Centril Oct 13, 2019
fad7ed0
Rollup merge of #65362 - Centril:extract_fun, r=petrochenkov
Centril Oct 13, 2019
a927c83
Rollup merge of #65366 - faern:source-on-intostringerror, r=bluss
Centril Oct 13, 2019
45a6cc0
Rollup merge of #65369 - tmiasko:sanitizers-keep-names, r=varkor
Centril Oct 13, 2019
dd2c0db
Rollup merge of #65370 - Cerberuser:patch-1, r=jonas-schievink
Centril Oct 13, 2019
813d4c3
Rollup merge of #65373 - kalabukdima:patch-1, r=jonas-schievink
Centril Oct 13, 2019
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
update test for nounwind on FFI imports
  • Loading branch information
@RalfJung
RalfJung committed Oct 12, 2019
commit a1a8f33abbf5ee00e6918246f4525c6e4458225f
19 changes: 0 additions & 19 deletions src/test/codegen/extern-functions.rs
View file
Open in desktop

This file was deleted.

41 changes: 41 additions & 0 deletions src/test/codegen/unwind-extern-imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// compile-flags: -C no-prepopulate-passes

#![crate_type = "lib"]
#![feature(unwind_attributes)]

extern {
// CHECK: Function Attrs: nounwind
// CHECK-NEXT: declare void @extern_fn
fn extern_fn();
// CHECK-NOT: Function Attrs: nounwind
// CHECK: declare void @unwinding_extern_fn
#[unwind(allowed)]
fn unwinding_extern_fn();
// CHECK-NOT: nounwind
// CHECK: declare void @aborting_extern_fn
#[unwind(aborts)]
fn aborting_extern_fn(); // FIXME: we want to have the attribute here
}

extern "Rust" {
// CHECK-NOT: nounwind
// CHECK: declare void @rust_extern_fn
fn rust_extern_fn();
// CHECK-NOT: nounwind
// CHECK: declare void @rust_unwinding_extern_fn
#[unwind(allowed)]
fn rust_unwinding_extern_fn();
// CHECK-NOT: nounwind
// CHECK: declare void @rust_aborting_extern_fn
#[unwind(aborts)]
fn rust_aborting_extern_fn(); // FIXME: we want to have the attribute here
}

pub unsafe fn force_declare() {
extern_fn();
unwinding_extern_fn();
aborting_extern_fn();
rust_extern_fn();
rust_unwinding_extern_fn();
rust_aborting_extern_fn();
}
0