Fix ICE caused by invalid spans for shrink_file by chenyukang · Pull Request #148735 · rust-lang/rust

chenyukang · 2025-11-09T08:37:53Z

Fixes #148732

There are two issues in this function:

the original issue is caused by a typo error, which is fixed in the first commit
another different ice(Patch span 7..7 is beyond the end of buffer 0) will be reported after fixing the first one, is caused by spans cross file boundaries due to macro expansion. It is fixed in the second commit.

r? @nnethercote

edited: also fixes #148684, added a new testcase for it in the last commit.

rustbot · 2025-11-09T08:37:56Z

rustc_errors::annotate_snippet_emitter_writer was changed

cc @Muscraft

Kivooeo · 2025-11-09T09:29:02Z

tests/ui/delegation/ice-line-bounds-issue-148732.stderr

+ WARN rustc_errors::emitter Invalid span $SRC_DIR/std/src/macros.rs:LL:COL (#4), error=SourceNotAvailable { filename: Real(Remapped { local_path: None, virtual_name: "$SRC_DIR/std/src/macros.rs" }) }
+ WARN rustc_errors::emitter Invalid span $SRC_DIR/std/src/macros.rs:LL:COL (#4), error=SourceNotAvailable { filename: Real(Remapped { local_path: None, virtual_name: "$SRC_DIR/std/src/macros.rs" }) }
+ WARN rustc_errors::emitter Invalid span $SRC_DIR/std/src/macros.rs:LL:COL (#4), error=SourceNotAvailable { filename: Real(Remapped { local_path: None, virtual_name: "$SRC_DIR/std/src/macros.rs" }) }


I have worries that this will not pass aarch64-msvc-1 the same way it was in my PR

cc: #general > Windows path normalization in tests

ah, it do have the same issue.

so, I read the discussion on zulip, seems there is another standalone bug. so is it a temprary way we skip Windows for this testcase(and add it back after that bug is fixed)?

These warnings are coming from this call to is_different. The reason this is happening with AnnotateSnippetEmitter and not HumanEmitter is because HumanEmitter checks for source code availability before it calls is_different. Changing lines 353 to 368 in annotate_snippet_emitter_writer.rs to the following fixes the issue:

let lo = subst.parts.iter().map(|part| part.span.lo()).min()?; let lo_file = sm.lookup_source_file(lo); let hi = subst.parts.iter().map(|part| part.span.hi()).max()?; let hi_file = sm.lookup_source_file(hi); // The different spans might belong to different contexts, if so ignore suggestion. if lo_file.stable_id != hi_file.stable_id { return None; } // We can't splice anything if the source is unavailable. if !sm.ensure_source_file_source_present(&lo_file) { return None; } // Account for cases where we are suggesting the same code that's already // there. This shouldn't happen often, but in some cases for multipart // suggestions it's much easier to handle it here than in the origin. subst.parts.retain(|p| is_different(sm, &p.snippet, p.span)); if subst.parts.is_empty() { None } else { Some(subst) }

yes, this can fix the issue.
I have a question, the old code invoke should_show_source_code to check with ignored_directories_in_source_blocks, we don't need this anymore?

updated the code and tests.
@Kivooeo i'm not sure whether your PR could be unblocked by this commit, you can have a try.

Thanks, I'll try later today

yes, this can fix the issue. I have a question, the old code invoke should_show_source_code to check with ignored_directories_in_source_blocks, we don't need this anymore?

I switched it so that it would match splice_lines, which is where I got the solution from. Going back to using should_show_source_code to maintain consistency with the old code would be a perfectly reasonable thing to do.

Kivooeo · 2025-11-09T10:54:01Z

@bors try jobs=aarch64-msvc-1

Fix ICE caused by invalid spans for shrink_file try-job: aarch64-msvc-1

rust-bors · 2025-11-09T12:13:25Z

💔 Test for eca91bd failed: CI. Failed jobs:

try - aarch64-msvc-1 (web logs, extended logs)

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

nnethercote · 2025-11-09T21:43:01Z

r=me once the comments are addressed.

@rustbot author

…=Muscraft Prefer to use file.stable_id over file.name from source map From rust-lang#148735 (comment) r? `@Muscraft`

Rollup merge of #148792 - chenyukang:yukang-fix-file-name, r=Muscraft Prefer to use file.stable_id over file.name from source map From #148735 (comment) r? `@Muscraft`

Prefer to use file.stable_id over file.name from source map From rust-lang/rust#148735 (comment) r? `@Muscraft`

chenyukang · 2025-11-13T00:31:46Z

@bors r=nnethercote

bors · 2025-11-13T00:31:50Z

📌 Commit 4a2c9a1 has been approved by nnethercote

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - #147701 (rustdoc: don't ignore path distance for doc aliases) - #148735 (Fix ICE caused by invalid spans for shrink_file) - #148839 (fix rtsan_nonblocking_async lint closure ICE) - #148846 (add a test for combining RPIT with explicit tail calls) - #148872 (fix: Do not ICE when missing match arm with ill-formed subty is met) - #148880 (Remove explicit install of `eslint` inside of `tidy`'s Dockerfile) - #148883 (bootstrap: dont require cmake if local-rebuild is enabled) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-11-13T05:50:17Z

⌛ Testing commit 4a2c9a1 with merge 5dbf406...

Rollup merge of #148735 - chenyukang:yukang-fix-ice-148732, r=nnethercote Fix ICE caused by invalid spans for shrink_file Fixes #148732 There are two issues in this function: 1. the original issue is caused by a typo error, which is fixed in the first commit 2. another different ice(Patch span `7..7` is beyond the end of buffer `0`) will be reported after fixing the first one, is caused by spans cross file boundaries due to macro expansion. It is fixed in the second commit. r? `@nnethercote` edited: also fixes #148684, added a new testcase for it in the last commit.

Zalathar · 2025-11-16T06:57:24Z

Bors no, this is already merged.

@bors r- retry

Prefer to use file.stable_id over file.name from source map From rust-lang/rust#148735 (comment) r? `@Muscraft`

chenyukang added 2 commits November 9, 2025 16:11

Fix the typo error caused span ice

0006737

Fix ICE caused by span boundaries due to macro expansion

8573ee6

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. labels Nov 9, 2025

rustbot assigned nnethercote Nov 9, 2025

Kivooeo reviewed Nov 9, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Nov 9, 2025

Auto merge of #148735 - chenyukang:yukang-fix-ice-148732, r=<try>

eca91bd

Fix ICE caused by invalid spans for shrink_file try-job: aarch64-msvc-1

This comment has been minimized.

Sign in to view

Muscraft reviewed Nov 9, 2025

View reviewed changes

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs Outdated Show resolved Hide resolved

nnethercote approved these changes Nov 9, 2025

View reviewed changes

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 Nov 9, 2025

add regression test for 148684

725b213

chenyukang force-pushed the yukang-fix-ice-148732 branch from 7262408 to 725b213 Compare November 10, 2025 01:23

chenyukang mentioned this pull request Nov 10, 2025

Prefer to use file.stable_id over file.name from source map #148792

Merged

Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 11, 2025

Rollup merge of rust-lang#148792 - chenyukang:yukang-fix-file-name, r…

a929960

…=Muscraft Prefer to use file.stable_id over file.name from source map From rust-lang#148735 (comment) r? `@Muscraft`

rust-timer added a commit that referenced this pull request Nov 11, 2025

Unrolled build for #148792

ee3db78

Rollup merge of #148792 - chenyukang:yukang-fix-file-name, r=Muscraft Prefer to use file.stable_id over file.name from source map From #148735 (comment) r? `@Muscraft`

github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Nov 12, 2025

Rollup merge of #148792 - chenyukang:yukang-fix-file-name, r=Muscraft

be505a4

Prefer to use file.stable_id over file.name from source map From rust-lang/rust#148735 (comment) r? `@Muscraft`

skip invalid span in error emitter

4a2c9a1

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 13, 2025

Zalathar mentioned this pull request Nov 13, 2025

Rollup of 7 pull requests #148885

Merged

bors merged commit 06b18db into rust-lang:main Nov 13, 2025
11 checks passed

rustbot added this to the 1.93.0 milestone Nov 13, 2025

Muscraft mentioned this pull request Nov 13, 2025

ICE: Multi-file diagnostic: Patch span is beyond the end of buffer #148643

Closed

Muscraft mentioned this pull request Dec 2, 2025

Use annotate-snippets as the default emitter rust-lang/compiler-team#947

Closed

3 tasks

Kobzol pushed a commit to Kobzol/rustc_codegen_cranelift that referenced this pull request Dec 29, 2025

Rollup merge of #148792 - chenyukang:yukang-fix-file-name, r=Muscraft

bcaa93b

Prefer to use file.stable_id over file.name from source map From rust-lang/rust#148735 (comment) r? `@Muscraft`

Uh oh!

Conversation

chenyukang commented Nov 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Nov 9, 2025

Uh oh!

Kivooeo Nov 9, 2025

Choose a reason for hiding this comment

Uh oh!

chenyukang Nov 9, 2025

Choose a reason for hiding this comment

Uh oh!

chenyukang Nov 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Muscraft Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

chenyukang Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

chenyukang Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

Kivooeo Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

Muscraft Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

Kivooeo commented Nov 9, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Nov 9, 2025

Uh oh!

Uh oh!

nnethercote commented Nov 9, 2025

Uh oh!

chenyukang commented Nov 13, 2025

Uh oh!

bors commented Nov 13, 2025

Uh oh!

Uh oh!

bors commented Nov 13, 2025

Uh oh!

Zalathar commented Nov 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

chenyukang commented Nov 9, 2025 •

edited

Loading

chenyukang Nov 10, 2025 •

edited

Loading