rename sub_ptr to offset_from_unsigned #137483

bend-n · 2025-02-23T13:27:41Z

i also made byte_sub_ptr byte_offset_from_unsigned

fixes #137121
tracking issue #95892

rustbot · 2025-02-23T13:27:49Z

rustbot has assigned @workingjubilee.
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 · 2025-02-23T13:27:51Z

The Miri subtree was changed

cc @rust-lang/miri

rustbot · 2025-02-23T13:28:34Z

Could not assign reviewer from: Noratrieb.
User(s) Noratrieb are either the PR author, already assigned, or on vacation. Please use r? to specify someone else to assign.

RalfJung · 2025-02-23T14:10:52Z

I guess this will also be a test whether GH and all our tooling can deal with an emoji branch name. There have been problems in the past.^^

src/tools/miri/tests/fail/intrinsics/ptr_offset_from_unsigned_neg.stderr

Noratrieb · 2025-02-23T14:43:09Z

yeahh, please add at least one ascii character to the branch name, or it will end badly probably

RalfJung · 2025-02-23T14:51:41Z

The branches a PR is on can't be changed, so that would require a new PR. But we can also just try?^^ So far it seems to work.

Noratrieb · 2025-02-23T18:54:14Z

let's see if this fails horribly due to the branch name ^^'. thanks for the PR!
@bors r+ rollup

bors · 2025-02-23T18:54:17Z

📌 Commit c813d8f has been approved by Noratrieb

It is now in the queue for this repository.

Rollup of 8 pull requests Successful merges: - rust-lang#136439 (Misc. `rustc_codegen_ssa` cleanups 🧹) - rust-lang#136543 (intrinsics: unify rint, roundeven, nearbyint in a single round_ties_even intrinsic) - rust-lang#136637 (Add binary_format to rustc target specs) - rust-lang#137099 (Fix rustdoc test directives that were accidentally ignored 🧐) - rust-lang#137297 (Update `compiler-builtins` to 0.1.147) - rust-lang#137451 (FIx `sym` -> `syn` typo in tail-expr-drop-order type opt-out) - rust-lang#137452 (bootstrap: add module docs for core:metadata) - rust-lang#137483 (rename sub_ptr to offset_from_unsigned) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137483 - bend-n:😅, r=Noratrieb rename sub_ptr to offset_from_unsigned i also made `byte_sub_ptr` `byte_offset_from_unsigned` fixes rust-lang#137121 tracking issue rust-lang#95892

…hlin Tighten `str-to-string-128690.rs``CHECK{,-NOT}`s to make it less likely to incorrectly fail with symbol name mangling The `invoke` to match on to `CHECK` or `CHECK-NOT` (latest master) looks like ```llvm %_0.i.i.i.i.i.i.i.i.i.i.i.i.i1.i = invoke noundef zeroext i1 `@"_ZN42_$LT$str$u20$as$u20$core..fmt..Display$GT$3fmt17ha18033e7fb4f14fcE"(ptr` noalias noundef nonnull readonly align 1 %_3.val.i.i.i.i.i.i.i.i.i.i.i.i.i, i64 noundef %_3.val1.i.i.i.i.i.i.i.i.i.i.i.i.i, ptr noalias noundef nonnull align 8 dereferenceable(64) %formatter.i) to label %bb1.i unwind label %cleanup.i, !noalias !80 ``` in the local `.ll` output. This test incorrectly failed in rust-lang#137483 (comment) due to ``` // CHECK-NOT: {{(call|invoke).*}}fmt ``` matching against the unrelated call ```llvm tail call void `@_RNvNtCseLfmtnDCoTB_5alloc7raw_vec12handle_error` ``` It's not pretty by any means, but... r? `@saethlin`

…hlin Tighten `str-to-string-128690.rs``CHECK{,-NOT}`s to make it less likely to incorrectly fail with symbol name mangling The `invoke` to match on to `CHECK` or `CHECK-NOT` (latest master) looks like ```llvm %_0.i.i.i.i.i.i.i.i.i.i.i.i.i1.i = invoke noundef zeroext i1 ``@"_ZN42_$LT$str$u20$as$u20$core..fmt..Display$GT$3fmt17ha18033e7fb4f14fcE"(ptr`` noalias noundef nonnull readonly align 1 %_3.val.i.i.i.i.i.i.i.i.i.i.i.i.i, i64 noundef %_3.val1.i.i.i.i.i.i.i.i.i.i.i.i.i, ptr noalias noundef nonnull align 8 dereferenceable(64) %formatter.i) to label %bb1.i unwind label %cleanup.i, !noalias !80 ``` in the local `.ll` output. This test incorrectly failed in rust-lang#137483 (comment) due to ``` // CHECK-NOT: {{(call|invoke).*}}fmt ``` matching against the unrelated call ```llvm tail call void ``@_RNvNtCseLfmtnDCoTB_5alloc7raw_vec12handle_error`` ``` It's not pretty by any means, but... r? ``@saethlin``

Rollup merge of rust-lang#137491 - jieyouxu:mango-less-likely, r=saethlin Tighten `str-to-string-128690.rs``CHECK{,-NOT}`s to make it less likely to incorrectly fail with symbol name mangling The `invoke` to match on to `CHECK` or `CHECK-NOT` (latest master) looks like ```llvm %_0.i.i.i.i.i.i.i.i.i.i.i.i.i1.i = invoke noundef zeroext i1 ``@"_ZN42_$LT$str$u20$as$u20$core..fmt..Display$GT$3fmt17ha18033e7fb4f14fcE"(ptr`` noalias noundef nonnull readonly align 1 %_3.val.i.i.i.i.i.i.i.i.i.i.i.i.i, i64 noundef %_3.val1.i.i.i.i.i.i.i.i.i.i.i.i.i, ptr noalias noundef nonnull align 8 dereferenceable(64) %formatter.i) to label %bb1.i unwind label %cleanup.i, !noalias !80 ``` in the local `.ll` output. This test incorrectly failed in rust-lang#137483 (comment) due to ``` // CHECK-NOT: {{(call|invoke).*}}fmt ``` matching against the unrelated call ```llvm tail call void ``@_RNvNtCseLfmtnDCoTB_5alloc7raw_vec12handle_error`` ``` It's not pretty by any means, but... r? ``@saethlin``

Rename `sub_ptr` to `offset_from_unsigned`. The feature gate is still `ptr_sub_ptr`.

Propagate changes from rust-lang/rust#137483 The feature gate is still `ptr_sub_ptr`.

Changes to attribute parsing and representation rust-lang/rust#135726 Map methods moved to `TyCtx` rust-lang/rust#137162 rust-lang/rust#137397 Remove `BackendRepr::Unihabited` rust-lang/rust#136985 Intrinsics rint, roundeven, nearbyint replaced by `round_ties_even`. rust-lang/rust#136543. Use `__sort_of_CPROVER_round_to_integral` to model `round_ties_even`. Rename `sub_ptr` to `offset_from_unsigned`. The feature gate is still `ptr_sub_ptr`. rust-lang/rust#137483. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses. --------- Co-authored-by: Remi Delmas <[email protected]>

rustbot assigned workingjubilee Feb 23, 2025

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 Feb 23, 2025

rustbot assigned Noratrieb and unassigned workingjubilee Feb 23, 2025

This comment has been minimized.

Sign in to view

bend-n force-pushed the 😅 branch 2 times, most recently from b83ae9a to 4e23cbe Compare February 23, 2025 14:05

RalfJung reviewed Feb 23, 2025

View reviewed changes

src/tools/miri/tests/fail/intrinsics/ptr_offset_from_unsigned_neg.stderr Outdated Show resolved Hide resolved

bend-n force-pushed the 😅 branch 3 times, most recently from 0869572 to c37e497 Compare February 23, 2025 14:24

This comment has been minimized.

Sign in to view

bend-n force-pushed the 😅 branch from c37e497 to 82e85f8 Compare February 23, 2025 15:05

This comment has been minimized.

Sign in to view

rename sub_ptr 😅

c813d8f

bend-n force-pushed the 😅 branch from 82e85f8 to c813d8f Compare February 23, 2025 16:11

jieyouxu mentioned this pull request Feb 23, 2025

Tighten str-to-string-128690.rsCHECK{,-NOT}s to make it less likely to incorrectly fail with symbol name mangling #137491

Merged

Noratrieb mentioned this pull request Feb 23, 2025

Tracking Issue for offset_from_unsigned (feature ptr_sub_ptr) #95892

Closed

5 tasks

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 Feb 23, 2025

tgross35 mentioned this pull request Feb 23, 2025

Rollup of 8 pull requests #137497

Merged

bors merged commit 18ffee2 into rust-lang:master Feb 24, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Feb 24, 2025

carolynzech mentioned this pull request Feb 27, 2025

Update toolchain to 2025-03-02 model-checking/kani#3911

Merged

remi-delmas-3000 pushed a commit to remi-delmas-3000/kani that referenced this pull request Feb 27, 2025

Propagate changes from rust-lang/rust#137483

2b3bdfd

Rename `sub_ptr` to `offset_from_unsigned`. The feature gate is still `ptr_sub_ptr`.

remi-delmas-3000 pushed a commit to remi-delmas-3000/kani that referenced this pull request Feb 27, 2025

Rename sub_ptr to offset_from_unsigned.

b73773f

Propagate changes from rust-lang/rust#137483 The feature gate is still `ptr_sub_ptr`.

remi-delmas-3000 pushed a commit to remi-delmas-3000/kani that referenced this pull request Feb 27, 2025

Rename sub_ptr to offset_from_unsigned.

80fd315

Propagate changes from rust-lang/rust#137483 The feature gate is still `ptr_sub_ptr`.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rename sub_ptr to offset_from_unsigned #137483

rename sub_ptr to offset_from_unsigned #137483

bend-n commented Feb 23, 2025 •

edited

Loading

rustbot commented Feb 23, 2025

rustbot commented Feb 23, 2025

rustbot commented Feb 23, 2025

This comment has been minimized.

RalfJung commented Feb 23, 2025

Noratrieb commented Feb 23, 2025

This comment has been minimized.

RalfJung commented Feb 23, 2025 •

edited

Loading

This comment has been minimized.

Noratrieb commented Feb 23, 2025

bors commented Feb 23, 2025

rename sub_ptr to offset_from_unsigned #137483

rename sub_ptr to offset_from_unsigned #137483

Conversation

bend-n commented Feb 23, 2025 • edited Loading

rustbot commented Feb 23, 2025

rustbot commented Feb 23, 2025

rustbot commented Feb 23, 2025

This comment has been minimized.

RalfJung commented Feb 23, 2025

Noratrieb commented Feb 23, 2025

This comment has been minimized.

RalfJung commented Feb 23, 2025 • edited Loading

This comment has been minimized.

Noratrieb commented Feb 23, 2025

bors commented Feb 23, 2025

bend-n commented Feb 23, 2025 •

edited

Loading

RalfJung commented Feb 23, 2025 •

edited

Loading