Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add core::arch::breakpoint and test #133726

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Add core::arch::breakpoint and test #133726

merged 2 commits into from
Dec 4, 2024

Conversation

joshtriplett
Copy link
Member

Approved in ACP 491.

@joshtriplett joshtriplett added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Dec 2, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 2, 2024

r? @Noratrieb

rustbot has assigned @Noratrieb.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Dec 2, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 2, 2024

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

@joshtriplett joshtriplett removed the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 2, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@joshtriplett joshtriplett mentioned this pull request Dec 2, 2024
Open
4 tasks
@rust-log-analyzer

This comment has been minimized.

Sign in to view
oli-obk
oli-obk reviewed Dec 2, 2024
View reviewed changes
library/core/src/arch.rs Outdated Show resolved Hide resolved
@joshtriplett joshtriplett force-pushed the breakpoint branch 2 times, most recently from 4959ea0 to 5f8cc9a Compare December 2, 2024 04:13
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Dec 3, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@joshtriplett
Add core::arch::breakpoint and test
a030ffb 
Approved in [ACP 491](rust-lang/libs-team#491).

Remove the `unsafe` on `core::intrinsics::breakpoint()`, since it's a
safe intrinsic to call and has no prerequisites.

(Thanks to @zachs18 for figuring out the `bootstrap`/`not(bootstrap)`
logic.)
@joshtriplett
miri: Adapt for breakpoint becoming safe
cea0582
@oli-obk
Copy link
Contributor

oli-obk commented Dec 3, 2024

r? @oli-obk

bors r plus

@bors
Copy link
Contributor

bors commented Dec 3, 2024

📌 Commit cea0582 has been approved by oli-obk

It is now in the queue for this repository.

@rustbot rustbot assigned oli-obk and unassigned Noratrieb Dec 3, 2024
@bors 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 Dec 3, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 3, 2024
@matthiaskrgr
Rollup merge of rust-lang#133726 - joshtriplett:breakpoint, r=oli-obk
4c399dc 
Add `core::arch::breakpoint` and test

Approved in [ACP 491](rust-lang/libs-team#491).
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 3, 2024
Closed
bjorn3
bjorn3 reviewed Dec 3, 2024
View reviewed changes
library/core/src/arch.rs
/// normal execution with no debug tooling involved this will not continue executing.
///
/// - On x86 targets, this produces an `int3` instruction.
/// - On aarch64 targets, this produces a `brk #0xf000` instruction.
Copy link
Member

Choose a reason for hiding this comment

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

Cranelift emits brk #0. Should this be changed on the Cranelift side?

Copy link
Member Author

Choose a reason for hiding this comment

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

@bjorn3 Yes, I think so. Some debuggers on aarch64 recognize brk #0xf000 as a hint to skip past that instruction when resuming.

Copy link
Member

Choose a reason for hiding this comment

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

bytecodealliance/wasmtime#9726

@matthiaskrgr matthiaskrgr mentioned this pull request Dec 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 4, 2024
@bors
Auto merge of rust-lang#133818 - matthiaskrgr:rollup-iav1wq7, r=matth…
3b38264 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132937 (a release operation synchronizes with an acquire operation)
 - rust-lang#133681 (improve TagEncoding::Niche docs, sanity check, and UB checks)
 - rust-lang#133726 (Add `core::arch::breakpoint` and test)
 - rust-lang#133768 (Remove `generic_associated_types_extended` feature gate)
 - rust-lang#133811 ([AIX] change AIX default codemodel=large)
 - rust-lang#133812 (Update wasm-component-ld to 0.5.11)
 - rust-lang#133813 (compiletest: explain that UI tests are expected not to compile by default)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e66e632 into rust-lang:master Dec 4, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 4, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 4, 2024
@rust-timer
Unrolled build for rust-lang#133726
8e861ba 
Rollup merge of rust-lang#133726 - joshtriplett:breakpoint, r=oli-obk

Add `core::arch::breakpoint` and test

Approved in [ACP 491](rust-lang/libs-team#491).
@joshtriplett joshtriplett deleted the breakpoint branch December 4, 2024 09:29
@bjorn3 bjorn3 mentioned this pull request Dec 4, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@oli-obk oli-obk oli-obk left review comments

@RalfJung RalfJung RalfJung left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
8 participants
@joshtriplett @rustbot @rust-log-analyzer @oli-obk @bors @RalfJung @bjorn3 @Noratrieb