Skip to content

Commit 68ebe7a

Browse files
zmodemcopybara-github
authored andcommitted
[rust] Define __rust_no_alloc_shim_is_unstable_v2
rust-lang/rust#141061 renames and changes the type of __rust_no_alloc_shim_is_unstable. Bug: 422538133 Change-Id: I23e6f8fcafafd310e5df7169a32887063d92cd40 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6624733 Commit-Queue: Hans Wennborg <[email protected]> Reviewed-by: Łukasz Anforowicz <[email protected]> Cr-Commit-Position: refs/heads/main@{#1476082} NOKEYCHECK=True GitOrigin-RevId: 6aae0e2353c857d98980ff677bf304288d7c58de
1 parent e678b3f commit 68ebe7a

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

rust/allocator/lib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ mod both_allocators {
8686
/// As part of rustc's contract for using `#[global_allocator]` without
8787
/// rustc-generated shims we must define this symbol, since we are opting in
8888
/// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
89+
#[rustc_std_internal_symbol]
90+
#[linkage = "weak"]
91+
fn __rust_no_alloc_shim_is_unstable_v2() {}
92+
93+
// TODO(crbug.com/422538133) Remove after rolling past
94+
// https://github.com/rust-lang/rust/pull/141061
8995
#[no_mangle]
9096
#[linkage = "weak"]
9197
static __rust_no_alloc_shim_is_unstable: u8 = 0;

0 commit comments

Comments
 (0)