Fix `SourceFile::normalized_byte_pos` #151455

eggyal · 2026-01-21T12:59:51Z

This method was broken by 258ace6, which changed self.normalized_pos to use relative offsets however this method continued to compare against an absolute offset.

Also adds a regression test for the issue that this method was originally introduced to fix.

Closes #149568
Fixes regression of #110885

r? cjgillot (as author of the breaking commit)

eggyal · 2026-01-21T13:44:37Z

@rustbot author

rustbot · 2026-01-21T13:44:42Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

eggyal · 2026-01-21T17:04:15Z

The test was failing on aarch64 because it uses a different asm syntax/language, so my # prefixed comments were rejected. This has been fixed by replacing with // prefixed comments, which are valid in both the Intel and Arm asm syntaxes.

However, differences in the precise error output required manual normalization. I suspect we should instead enable this test just for Intel architectures? Otherwise there will no doubt be other syntax/normalization failures on other targets?

@rustbot ready

This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset. Also adds a regression test for the issue that this method was originally introduced to fix.

rustbot · 2026-01-21T18:42:20Z

Some changes occurred in src/tools/compiletest

cc @jieyouxu

eggyal · 2026-01-21T18:47:26Z

Okay, so it was then failing on gcc which again isn't a surprise. So I've reverted the test normalization and restricted it to x86_64 on llvm; however the needs-backends directive (introduced in #144125) wasn't being recognised—hence 7e39015 (which should probably be in a separate PR? but it's soooo minor....).

Zalathar · 2026-01-25T11:00:56Z

(which should probably be in a separate PR? but it's soooo minor....).

Fixing it in this PR is fine. 👍

cjgillot · 2026-02-08T02:51:30Z

r=me on the main change. As you prefer for the needs-backends change.

eggyal · 2026-02-08T03:26:01Z

Then I guess I'll leave it here!

eggyal · 2026-02-08T09:05:15Z

Not sure if you're expecting me to r= it now, but if so I don't have permission:

@bors r=cjgillot

rust-bors · 2026-02-08T09:05:18Z

@eggyal: 🔑 Insufficient privileges: not in review users

Zalathar · 2026-02-08T09:23:34Z

@bors r=cjgillot

rust-bors · 2026-02-08T09:23:37Z

📌 Commit 01290cc has been approved by cjgillot

It is now in the queue for this repository.

…llot Fix `SourceFile::normalized_byte_pos` This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset. Also adds a regression test for the issue that this method was originally introduced to fix. Closes rust-lang#149568 Fixes regression of rust-lang#110885 r? cjgillot (as author of the breaking commit)

…uwer Rollup of 7 pull requests Successful merges: - #151455 (Fix `SourceFile::normalized_byte_pos`) - #152250 (Remove support for slugs in diagnostic messages) - #152322 (Replace some `feature(core_intrinsics)` with stable hints) - #152328 (Fix a few diagnostics) - #151640 (Cleanup offload datatransfer) - #152212 (Port some attributes to the attr parser) - #152309 (Fix bound var resolution for trait aliases)

…llot Fix `SourceFile::normalized_byte_pos` This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset. Also adds a regression test for the issue that this method was originally introduced to fix. Closes rust-lang#149568 Fixes regression of rust-lang#110885 r? cjgillot (as author of the breaking commit)

…uwer Rollup of 8 pull requests Successful merges: - #151455 (Fix `SourceFile::normalized_byte_pos`) - #152250 (Remove support for slugs in diagnostic messages) - #152322 (Replace some `feature(core_intrinsics)` with stable hints) - #151640 (Cleanup offload datatransfer) - #152212 (Port some attributes to the attr parser) - #152309 (Fix bound var resolution for trait aliases) - #152339 (diagnostics: fix ICE in closure signature mismatch) - #152341 (`cfg_select!`: allow optional comma after `{ /* ... */ }`)

rust-bors · 2026-02-08T18:11:59Z

⌛ Testing commit 01290cc with merge 36ce3b6...

Workflow: https://github.com/rust-lang/rust/actions/runs/21802915755

Fix `SourceFile::normalized_byte_pos` This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset. Also adds a regression test for the issue that this method was originally introduced to fix. Closes #149568 Fixes regression of #110885 r? cjgillot (as author of the breaking commit)

JonathanBrouwer · 2026-02-08T18:16:46Z

@bors yield
Yielding to enclosing rollup

rust-bors · 2026-02-08T18:16:50Z

Auto build cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/21802915755

The next pull request likely to be tested is #152358.

…uwer Rollup of 9 pull requests Successful merges: - #151455 (Fix `SourceFile::normalized_byte_pos`) - #152250 (Remove support for slugs in diagnostic messages) - #152322 (Replace some `feature(core_intrinsics)` with stable hints) - #152328 (Fix a few diagnostics) - #151640 (Cleanup offload datatransfer) - #152212 (Port some attributes to the attr parser) - #152309 (Fix bound var resolution for trait aliases) - #152339 (diagnostics: fix ICE in closure signature mismatch) - #152341 (`cfg_select!`: allow optional comma after `{ /* ... */ }`)

Rollup merge of #151455 - eggyal:normalized-byte-pos, r=cjgillot Fix `SourceFile::normalized_byte_pos` This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset. Also adds a regression test for the issue that this method was originally introduced to fix. Closes #149568 Fixes regression of #110885 r? cjgillot (as author of the breaking commit)

rustbot assigned cjgillot Jan 21, 2026

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 21, 2026

eggyal marked this pull request as draft January 21, 2026 13:44

eggyal force-pushed the normalized-byte-pos branch 4 times, most recently from 14cd5b1 to d4d3476 Compare January 21, 2026 16:59

eggyal marked this pull request as ready for review January 21, 2026 17:00

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 21, 2026

This comment has been minimized.

Sign in to view

eggyal added 2 commits January 21, 2026 18:40

Fix @needs-backends compiletest directive

7e39015

eggyal force-pushed the normalized-byte-pos branch from d4d3476 to 01290cc Compare January 21, 2026 18:42

rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc labels Jan 21, 2026

rust-bors bot 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 8, 2026

JonathanBrouwer mentioned this pull request Feb 8, 2026

Rollup of 3 pull requests #152333

Closed

JonathanBrouwer mentioned this pull request Feb 8, 2026

Rollup of 5 pull requests #152343

Closed

JonathanBrouwer mentioned this pull request Feb 8, 2026

Rollup of 7 pull requests #152345

Closed

JonathanBrouwer mentioned this pull request Feb 8, 2026

Rollup of 8 pull requests #152352

Closed

JonathanBrouwer mentioned this pull request Feb 8, 2026

Rollup of 9 pull requests #152358

Merged

rust-bors bot merged commit 329353e into rust-lang:main Feb 8, 2026
11 of 12 checks passed

rustbot added this to the 1.95.0 milestone Feb 8, 2026

Uh oh!

Fix SourceFile::normalized_byte_pos #151455

Fix SourceFile::normalized_byte_pos #151455

Conversation

eggyal commented Jan 21, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

eggyal commented Jan 21, 2026

Uh oh!

rustbot commented Jan 21, 2026

Uh oh!

eggyal commented Jan 21, 2026

Uh oh!

This comment has been minimized.

rustbot commented Jan 21, 2026

Uh oh!

eggyal commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zalathar commented Jan 25, 2026

Uh oh!

cjgillot commented Feb 8, 2026

Uh oh!

eggyal commented Feb 8, 2026

Uh oh!

eggyal commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026

Uh oh!

Zalathar commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JonathanBrouwer commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Fix `SourceFile::normalized_byte_pos` #151455

Fix `SourceFile::normalized_byte_pos` #151455

eggyal commented Jan 21, 2026 •

edited by rustbot

Loading

eggyal commented Jan 21, 2026 •

edited

Loading

rust-bors bot commented Feb 8, 2026 •

edited

Loading