user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some typography

Browse source
This commit is contained in:
Ralf Jung 2019-10-12 20:40:10 +02:00
parent 63af27f9ea
commit 79c623f146
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_codegen_llvm/attributes.rs
View file

@ -270,10 +270,10 @@ pub fn from_fn_attrs(
// optimize based on this!
false
} else if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::UNWIND) {
// If a specific #[unwind] attribute is present, use that
// If a specific #[unwind] attribute is present, use that.
true
} else if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::RUSTC_ALLOCATOR_NOUNWIND) {
// Special attribute for allocator functions, which can't unwind
// Special attribute for allocator functions, which can't unwind.
false
} else {
let sig = cx.tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), &sig);

4
src/test/codegen/unwind-extern-exports.rs
View file

@ -12,8 +12,8 @@
#[unwind(allowed)]
pub extern fn foo_allowed() {}
// "Rust" ABI (`extrn "Rust"` could be removed as all `fn` get it implicitly; we leave it
// in for clarity.)
// "Rust"
// (`extern "Rust"` could be removed as all `fn` get it implicitly; we leave it in for clarity.)
pub extern "Rust" fn bar() {}
#[unwind(allowed)]
pub extern "Rust" fn bar_allowed() {}