Skip to content

Commit 622a394

Browse files
committed
Allow handle_alloc_error to unwind
1 parent ddabe07 commit 622a394

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

library/alloc/src/alloc.rs

-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ extern "Rust" {
344344
// This is the magic symbol to call the global alloc error handler. rustc generates
345345
// it to call `__rg_oom` if there is a `#[alloc_error_handler]`, or to call the
346346
// default implementations below (`__rdl_oom`) otherwise.
347-
#[rustc_allocator_nounwind]
348347
fn __rust_alloc_error_handler(size: usize, align: usize) -> !;
349348
}
350349

@@ -362,7 +361,6 @@ extern "Rust" {
362361
/// [`take_alloc_error_hook`]: ../../std/alloc/fn.take_alloc_error_hook.html
363362
#[stable(feature = "global_alloc", since = "1.28.0")]
364363
#[cfg(all(not(no_global_oom_handling), not(test)))]
365-
#[rustc_allocator_nounwind]
366364
#[cold]
367365
pub fn handle_alloc_error(layout: Layout) -> ! {
368366
unsafe {

0 commit comments

Comments
 (0)