Skip to content

try using #[cfg(bootstrap)] for #[unsafe(naked)] #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

folkertdev
Copy link
Contributor

Based on #t-compiler/help > Does `#[cfg(bootstrap)]` get set in dependencies? this should resolve the error we see in rust-lang/rust#139934.

It's probably a good idea to validate that this will actually work, but I'm not sure how to do that.

@folkertdev folkertdev force-pushed the naked-unsafe-attribute-bootstrap branch from acb349a to 8e2a72a Compare April 17, 2025 09:06
@tgross35
Copy link
Contributor

The failures are probably from the intrinsics! macro not handling things well. I'll try to get the chance to figure that out tomorrow.

@folkertdev folkertdev force-pushed the naked-unsafe-attribute-bootstrap branch from 8e2a72a to 86ae34e Compare April 17, 2025 10:27
@folkertdev
Copy link
Contributor Author

I think I got it, I just failed to actually read the code before.

Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't had a chance to test this all the way through, but might as well try it

@tgross35 tgross35 enabled auto-merge (rebase) April 17, 2025 18:52
@tgross35 tgross35 force-pushed the naked-unsafe-attribute-bootstrap branch from 86ae34e to cd167cf Compare April 17, 2025 18:52
@tgross35 tgross35 merged commit 7db4d8b into rust-lang:master Apr 17, 2025
27 checks passed
tgross35 added a commit to tgross35/rust that referenced this pull request Apr 17, 2025
Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 17, 2025
Update `compiler-builtins` to 0.1.155

Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various
folkertdev pushed a commit to folkertdev/rust that referenced this pull request Apr 17, 2025
Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 18, 2025
Update `compiler-builtins` to 0.1.155

Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2025
Rollup merge of rust-lang#139934 - tgross35:update-builtins, r=tgross35

Update `compiler-builtins` to 0.1.155

Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Apr 19, 2025
Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Apr 19, 2025
Update `compiler-builtins` to 0.1.155

Includes the following changes:

* Replace `#[naked]` with `#[unsafe(naked)]` [1] [2]
* Replace `bl!` with `asm_sym` [3]

[1]: rust-lang/compiler-builtins#817
[2]: rust-lang/compiler-builtins#821
[3]: rust-lang/compiler-builtins#820

try-job: armhf-gnu
try-job: aarch64-apple
try-job: dist-apple-various
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants