use `#[naked]` for `__rust_probestack` by folkertdev · Pull Request #141992 · rust-lang/rust

folkertdev · 2025-06-03T23:46:50Z

Let's see if this works now.

Previously this change was in rust-lang/compiler-builtins#897, but we decided to wait until compiler-builtins was a subtree (and also cfg(bootstrap) is gone now).

r? @tgross35 cc @bjorn3

try-job: dist-various*
try-job: test-various*

rustbot · 2025-06-03T23:46:56Z

compiler-builtins is developed in its own repository. If possible, consider making this change to rust-lang/compiler-builtins instead.

cc @tgross35

tgross35 · 2025-06-03T23:48:52Z

It will most definitely work, in-tree compiler-builtins has no CI running and it is not yet used for anything :)

folkertdev · 2025-06-03T23:57:13Z

Me and my impatience...

Well, I'm happy to rebase this whenever to check whether things are working, and we'll see when everything is ready.

bors · 2025-06-05T20:47:23Z

☔ The latest upstream changes (presumably #142081) made this pull request unmergeable. Please resolve the merge conflicts.

tgross35 · 2025-06-05T23:45:19Z

#141993 will be the main relevant PR here, plus hopefully having some kind of testing in-tree.

@rustbot blocked

tgross35 · 2025-06-09T22:50:49Z

I'll kick off some jobs that should cover fortanix/sgx/uefi

@bors2 try
@bors2 delegate=try

rust-bors · 2025-06-09T22:50:53Z

⌛ Trying commit 601e479 with merge 98919d2…

To cancel the try build, run the command @bors2 try cancel.

rust-bors · 2025-06-09T22:50:53Z

@folkertdev can now perform try builds on this pull request

use `#[naked]` for `__rust_probestack` Let's see if this works now. Previously this change was in rust-lang/compiler-builtins#897, but we decided to wait until `compiler-builtins` was a subtree (and also `cfg(bootstrap)` is gone now). r? `@tgross35` cc `@bjorn3` try-job: `dist-various*` try-job: `test-various*`

tgross35 · 2025-06-09T22:52:52Z

library/compiler-builtins/compiler-builtins/src/probestack.rs

 // Our goal here is to touch each page between %rsp+8 and %rsp+8-%rax,
 // ensuring that if any pages are unmapped we'll make a page fault.
 //
+// This function is unsafe because it uses a custom ABI, it does not actually match `extern "C"`.


Mind making these FIXME(extern_c) since that should be a thing soon?

compiler/rustc_codegen_llvm/src/attributes.rs

rust-bors · 2025-06-10T00:23:34Z

☀️ Try build successful (CI)
Build commit: 98919d2 (98919d235b0bc249554b0ced4732020f6e247fe6)

tgross35

Lgtm, mind stuffing the last commit into the first?

tgross35 · 2025-06-10T05:15:45Z

@bors delegate+

bors · 2025-06-10T05:15:48Z

✌️ @folkertdev, you can now approve this pull request!

If @tgross35 told you to "r=me" after making some further change, please make that change, then do @bors r=@tgross35

folkertdev · 2025-06-10T09:58:15Z

@bors r=@tgross35

bors · 2025-06-10T09:58:17Z

📌 Commit b030442 has been approved by tgross35

It is now in the queue for this repository.

…on, r=tgross35 use `#[naked]` for `__rust_probestack` Let's see if this works now. Previously this change was in rust-lang/compiler-builtins#897, but we decided to wait until `compiler-builtins` was a subtree (and also `cfg(bootstrap)` is gone now). r? `@tgross35` cc `@bjorn3` try-job: `dist-various*` try-job: `test-various*`

Rollup of 14 pull requests Successful merges: - #134442 (Specify the behavior of `file!`) - #134841 (Look at proc-macro attributes when encountering unknown attribute) - #140372 (Exhaustively handle parsed attributes in CheckAttr) - #140766 (Stabilize keylocker) - #141642 (Note the version and PR of removed features when using it) - #141909 (Add central execution context to bootstrap) - #141992 (use `#[naked]` for `__rust_probestack`) - #142102 (docs: Small clarification on the usage of read_to_string and read_to_end trait methods) - #142124 (Allow transmute casts in pre-runtime-MIR) - #142240 (deduplicate the rest of AST walker functions) - #142258 (platform-support.md: Mention specific Linux kernel version or later) - #142262 (Mark `core::slice::memchr` as `#[doc(hidden)]`) - #142271 (compiler: fn ptrs should hit different lints based on ABI) - #142288 (const_eval: fix some outdated comments) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 16 pull requests Successful merges: - #134442 (Specify the behavior of `file!`) - #140372 (Exhaustively handle parsed attributes in CheckAttr) - #140766 (Stabilize keylocker) - #141642 (Note the version and PR of removed features when using it) - #141818 (Don't create .msi installer for gnullvm hosts) - #141909 (Add central execution context to bootstrap) - #141992 (use `#[naked]` for `__rust_probestack`) - #142101 (core::ptr: deduplicate more method docs) - #142102 (docs: Small clarification on the usage of read_to_string and read_to_end trait methods) - #142124 (Allow transmute casts in pre-runtime-MIR) - #142240 (deduplicate the rest of AST walker functions) - #142258 (platform-support.md: Mention specific Linux kernel version or later) - #142262 (Mark `core::slice::memchr` as `#[doc(hidden)]`) - #142271 (compiler: fn ptrs should hit different lints based on ABI) - #142275 (rustdoc: Refractor `clean_ty_generics`) - #142288 (const_eval: fix some outdated comments) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #141992 - folkertdev:probestack-naked-function, r=tgross35 use `#[naked]` for `__rust_probestack` Let's see if this works now. Previously this change was in rust-lang/compiler-builtins#897, but we decided to wait until `compiler-builtins` was a subtree (and also `cfg(bootstrap)` is gone now). r? ``@tgross35`` cc ``@bjorn3`` try-job: `dist-various*` try-job: `test-various*`

Rollup of 16 pull requests Successful merges: - rust-lang/rust#134442 (Specify the behavior of `file!`) - rust-lang/rust#140372 (Exhaustively handle parsed attributes in CheckAttr) - rust-lang/rust#140766 (Stabilize keylocker) - rust-lang/rust#141642 (Note the version and PR of removed features when using it) - rust-lang/rust#141818 (Don't create .msi installer for gnullvm hosts) - rust-lang/rust#141909 (Add central execution context to bootstrap) - rust-lang/rust#141992 (use `#[naked]` for `__rust_probestack`) - rust-lang/rust#142101 (core::ptr: deduplicate more method docs) - rust-lang/rust#142102 (docs: Small clarification on the usage of read_to_string and read_to_end trait methods) - rust-lang/rust#142124 (Allow transmute casts in pre-runtime-MIR) - rust-lang/rust#142240 (deduplicate the rest of AST walker functions) - rust-lang/rust#142258 (platform-support.md: Mention specific Linux kernel version or later) - rust-lang/rust#142262 (Mark `core::slice::memchr` as `#[doc(hidden)]`) - rust-lang/rust#142271 (compiler: fn ptrs should hit different lints based on ABI) - rust-lang/rust#142275 (rustdoc: Refractor `clean_ty_generics`) - rust-lang/rust#142288 (const_eval: fix some outdated comments) r? `@ghost` `@rustbot` modify labels: rollup

…on, r=tgross35 use `#[naked]` for `__rust_probestack` Let's see if this works now. Previously this change was in rust-lang/compiler-builtins#897, but we decided to wait until `compiler-builtins` was a subtree (and also `cfg(bootstrap)` is gone now). r? ``@tgross35`` cc ``@bjorn3`` try-job: `dist-various*` try-job: `test-various*`

Rollup of 16 pull requests Successful merges: - rust-lang/rust#134442 (Specify the behavior of `file!`) - rust-lang/rust#140372 (Exhaustively handle parsed attributes in CheckAttr) - rust-lang/rust#140766 (Stabilize keylocker) - rust-lang/rust#141642 (Note the version and PR of removed features when using it) - rust-lang/rust#141818 (Don't create .msi installer for gnullvm hosts) - rust-lang/rust#141909 (Add central execution context to bootstrap) - rust-lang/rust#141992 (use `#[naked]` for `__rust_probestack`) - rust-lang/rust#142101 (core::ptr: deduplicate more method docs) - rust-lang/rust#142102 (docs: Small clarification on the usage of read_to_string and read_to_end trait methods) - rust-lang/rust#142124 (Allow transmute casts in pre-runtime-MIR) - rust-lang/rust#142240 (deduplicate the rest of AST walker functions) - rust-lang/rust#142258 (platform-support.md: Mention specific Linux kernel version or later) - rust-lang/rust#142262 (Mark `core::slice::memchr` as `#[doc(hidden)]`) - rust-lang/rust#142271 (compiler: fn ptrs should hit different lints based on ABI) - rust-lang/rust#142275 (rustdoc: Refractor `clean_ty_generics`) - rust-lang/rust#142288 (const_eval: fix some outdated comments) r? `@ghost` `@rustbot` modify labels: rollup

…ack breakage (#5583) ## Motivation The bridge E2E CI has been failing on every `testnet_conway` push since at least Feb 28 with a linker error: rust-lld: error: undefined symbol: __rust_probestack referenced by linera_wasmer_vm PR #5582 pinned the bridge e2e toolchain to Rust 1.91 to satisfy alloy's MSRV, but Rust 1.89+ removed `__rust_probestack` as a linkable extern symbol ([rust-lang/rust#141992](rust-lang/rust#141992)), which breaks the linera wasmer fork (v4.4.0-linera.7) that still references it in `probestack.rs`. ## Proposal Use Rust 1.88 (the last version before the probestack removal) and cap alloy to `<1.7` (since alloy 1.7+ requires Rust 1.91): - **`rust-toolchain.toml`**: 1.91 → 1.88 - **`Cargo.toml`**: Set `rust-version = "1.88"`, cap alloy to `>=1.0.42, <1.7` - **`.cargo/config.toml`** (new): Enable MSRV-aware resolver (`incompatible-rust-versions = "fallback"`) so alloy sub-crates also resolve to 1.6.x - **`Cargo.lock`**: Regenerated (alloy 1.3 → 1.6.3 across all sub-crates) - **`bridge-e2e.yml`**: Added `pull_request` trigger targeting `testnet_conway` so the test runs on this PR The proper long-term fix is updating the linera wasmer fork with the upstream probestack fix ([wasmerio/wasmer#5690](wasmerio/wasmer#5690)). The alloy cap comment documents this. ## Test Plan - `cargo check` passes locally with Rust 1.88 - The `pull_request` trigger on this PR will run the bridge E2E test in CI (remove the trigger before merge) ## Release Plan - Nothing to do / These changes follow the usual release cycle. ## Links - Failed CI run: https://github.com/linera-io/linera-protocol/actions/runs/22633609986/job/65590305218 - Rust PR that removed the symbol: [rust-lang/rust#141992](rust-lang/rust#141992) - Upstream wasmer fix: [wasmerio/wasmer#5690](wasmerio/wasmer#5690) - PR that introduced Rust 1.91: [#5582](https://github.com/lera-io/linera-protocol/pull/5582)

rustbot assigned tgross35 Jun 3, 2025

folkertdev changed the title ~~Probestack naked function~~ use #[naked] for __rust_probestack Jun 3, 2025

folkertdev force-pushed the probestack-naked-function branch from be86dc8 to 79aa400 Compare June 5, 2025 21:34

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 5, 2025

folkertdev force-pushed the probestack-naked-function branch from 79aa400 to 6b6ad28 Compare June 9, 2025 21:29

This comment has been minimized.

Sign in to view

folkertdev force-pushed the probestack-naked-function branch from 6b6ad28 to a2da8e0 Compare June 9, 2025 21:50

This comment has been minimized.

Sign in to view

folkertdev force-pushed the probestack-naked-function branch from a2da8e0 to 601e479 Compare June 9, 2025 22:11

tgross35 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 9, 2025

tgross35 reviewed Jun 9, 2025

View reviewed changes

compiler/rustc_codegen_llvm/src/attributes.rs Show resolved Hide resolved

tgross35 approved these changes Jun 10, 2025

View reviewed changes

folkertdev added 4 commits June 10, 2025 10:08

add a fixme to use extern_custom when available

f3af860

use #[naked] for __rust_probestack

b6eb4f9

merge the sgx/fortanix __rust_probestack into the general x86_64 one

45d649e

indent the probestack inline assembly

b030442

folkertdev force-pushed the probestack-naked-function branch from fff42eb to b030442 Compare June 10, 2025 08:13

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 10, 2025

fmease mentioned this pull request Jun 10, 2025

Rollup of 14 pull requests #142290

Closed

fmease mentioned this pull request Jun 10, 2025

Rollup of 16 pull requests #142299

Merged

bors merged commit a55b610 into rust-lang:master Jun 10, 2025
10 checks passed

rustbot added this to the 1.89.0 milestone Jun 10, 2025

folkertdev mentioned this pull request Jun 10, 2025

use #[naked] for __rust_probestack rust-lang/compiler-builtins#897

Closed

jieyouxu mentioned this pull request Jun 17, 2025

wasmer relies on __rust_probestack #142612

Closed

juntyr mentioned this pull request Jun 17, 2025

undefined symbol: __rust_probestack on nightly wasmerio/wasmer#5610

Closed

folkertdev mentioned this pull request Jul 12, 2025

Regression: link fails with undefined reference to `__rust_probestack' #143835

Closed

ndr-ds mentioned this pull request Mar 3, 2026

Fix bridge E2E CI by downgrading Rust to 1.88 to avoid wasmer probestack breakage linera-io/linera-protocol#5583

Merged

Uh oh!

Conversation

folkertdev commented Jun 3, 2025 • edited by tgross35 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 3, 2025

Uh oh!

tgross35 commented Jun 3, 2025

Uh oh!

folkertdev commented Jun 3, 2025

Uh oh!

bors commented Jun 5, 2025

Uh oh!

tgross35 commented Jun 5, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

tgross35 commented Jun 9, 2025

Uh oh!

rust-bors bot commented Jun 9, 2025

Uh oh!

rust-bors bot commented Jun 9, 2025

Uh oh!

tgross35 Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rust-bors bot commented Jun 10, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

tgross35 commented Jun 10, 2025

Uh oh!

bors commented Jun 10, 2025

Uh oh!

folkertdev commented Jun 10, 2025

Uh oh!

bors commented Jun 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

folkertdev commented Jun 3, 2025 •

edited by tgross35

Loading