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

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

Merged

bors merged 2 commits into rust-lang:master from joshtriplett:breakpoint

Dec 4, 2024

Member

joshtriplett commented Dec 2, 2024

Approved in ACP 491.

joshtriplett added the T-libs-api label

rustbot assigned Noratrieb

Collaborator

rustbot commented Dec 2, 2024

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 added S-waiting-on-review T-compiler T-libs labels

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 removed the T-compiler label

This comment has been minimized.

Sign in to view

joshtriplett mentioned this pull request

Tracking Issue for breakpoint feature (core::arch::breakpoint) #133724

Open

4 tasks

joshtriplett force-pushed the breakpoint branch from f6b34bd to 70de878 Compare

December 2, 2024 03:15

This comment has been minimized.

Sign in to view

oli-obk reviewed

View reviewed changes

library/core/src/arch.rs Outdated Show resolved Hide resolved

joshtriplett force-pushed the breakpoint branch 2 times, most recently from 4959ea0 to 5f8cc9a Compare

December 2, 2024 04:13

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the breakpoint branch from 5f8cc9a to 1fc2831 Compare

December 2, 2024 04:29

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the breakpoint branch from 1fc2831 to 6d14285 Compare

December 2, 2024 07:15

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the breakpoint branch from 6d14285 to 2018889 Compare

December 2, 2024 07:54

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the breakpoint branch from 2018889 to 7c2bf39 Compare

December 2, 2024 22:03

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the breakpoint branch from 7c2bf39 to 1be35f1 Compare

December 3, 2024 02:09

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the breakpoint branch from 1be35f1 to 87fb6ca Compare

December 3, 2024 04:18

This comment has been minimized.

Sign in to view

Collaborator

rustbot commented Dec 3, 2024

The Miri subtree was changed

cc @rust-lang/miri

This comment has been minimized.

Sign in to view

joshtriplett force-pushed the breakpoint branch from f043ae7 to afca178 Compare

December 3, 2024 06:22

This comment has been minimized.

Sign in to view

RalfJung reviewed

View reviewed changes

src/tools/miri/tests/fail/breakpoint.rs Outdated Show resolved Hide resolved

joshtriplett force-pushed the breakpoint branch from afca178 to a5c107b Compare

December 3, 2024 06:49

RalfJung reviewed

View reviewed changes

src/tools/miri/tests/fail/breakpoint.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

joshtriplett added 2 commits

December 2, 2024 23:56


          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.)


          miri: Adapt for breakpoint becoming safe

cea0582

joshtriplett force-pushed the breakpoint branch from a5c107b to cea0582 Compare

December 3, 2024 08:02

Contributor

oli-obk commented Dec 3, 2024

Collaborator

bors commented Dec 3, 2024

📌 Commit cea0582 has been approved by oli-obk

It is now in the queue for this repository.

rustbot assigned oli-obk and unassigned Noratrieb

bors added S-waiting-on-bors and removed S-waiting-on-review labels

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          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 mentioned this pull request

Rollup of 8 pull requests #133814

Closed

bjorn3 reviewed

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.

Member

bjorn3 Dec 3, 2024

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

Member Author

joshtriplett Dec 4, 2024

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

Member

bjorn3 Dec 4, 2024

bytecodealliance/wasmtime#9726

matthiaskrgr mentioned this pull request

Rollup of 7 pull requests #133818

Merged

bors merged commit e66e632 into rust-lang:master

6 checks passed

rustbot added this to the 1.85.0 milestone

joshtriplett deleted the breakpoint branch

December 4, 2024 09:29

bjorn3 mentioned this pull request

Use brk #0xf000 on arm64 for debug_trap bytecodealliance/wasmtime#9726

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors T-libs T-libs-api