Skip to content

Commit 8641acb

Browse files
zmodemcopybara-github
authored andcommitted
[rust] Define __rust_alloc_error_handler_should_panic_v2
rust-lang/rust#143387 made __rust_alloc_error_handler_should_panic a function. The new definition is needed when rolling Rust past that PR. We can remove the old symbol afterwards. Bug: 440481922 Change-Id: I3340edd6d96d76de14942af67939978140430424 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6875644 Commit-Queue: Arthur Eubanks <aeubanks@google.com> Reviewed-by: Arthur Eubanks <aeubanks@google.com> Auto-Submit: Hans Wennborg <hans@chromium.org> Commit-Queue: Hans Wennborg <hans@chromium.org> Cr-Commit-Position: refs/heads/main@{#1505162} NOKEYCHECK=True GitOrigin-RevId: 23d818d3c7fba4658248f17fd7b8993199242aa9
1 parent 28fc2a8 commit 8641acb

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

rust/allocator/lib.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,14 @@ mod both_allocators {
9090
#[linkage = "weak"]
9191
fn __rust_no_alloc_shim_is_unstable_v2() {}
9292

93+
#[rustc_std_internal_symbol]
94+
#[linkage = "weak"]
95+
fn __rust_alloc_error_handler_should_panic_v2() -> u8 {
96+
0
97+
}
98+
9399
// Mangle the symbol name as rustc expects.
100+
// TODO(crbug.com/440481922): Remove this after rolling past https://github.com/rust-lang/rust/pull/143387
94101
#[rustc_std_internal_symbol]
95102
#[allow(non_upper_case_globals)]
96103
#[linkage = "weak"]

0 commit comments

Comments
 (0)