Add check if span is from macro expansion

[Kivooeo]

The same thing I did in #147416, actually the same bug but in another place, I'm not really sure how this method is good for fixing such ICEs, but, it does work and not conflicting with any existing tests, so I guess, it's fine

Fixes #147408

r? compiler

[chenyukang]

Thanks!
@bors r=chenyukang

[bors]

📌 Commit e1b361c has been approved by chenyukang

It is now in the queue for this repository.

[matthiaskrgr]

@bors r-
#147684 (comment)

[Kivooeo]

Ngl I have no even close idea on why this could fail, like, is aarch64-pc-windows-msvc anyhow special from other targets? Or where specific I should take a look to understand reason of it

[Kivooeo]

@chenyukang could you take a look at this comment above, it's very confusingggg

[chenyukang]

I think this is caused by the diff in stderr:

-  WARN rustc_errors::emitter Invalid span $SRC_DIR/std/src/macros.rs:LL:COL (#11), 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 (#11), error=SourceNotAvailable { filename: Real(Remapped { local_path: None, virtual_name: "/rustc/FAKE_PREFIX/library/std/src/macros.rs" }) }

seems there is a difference in Windows.

To ignore them, maybe you can have a try with https://rustc-dev-guide.rust-lang.org/tests/ui.html#normalization

then retry it with:

@bors try jobs=aarch64-msvc-1

[chenyukang]

if that does not help, you may ask for help at:#t-compiler/help. 👉

[Kivooeo]

I already asked in zulip even before this message https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/Windows.20path.20normalization.20in.20tests/with/545323081, but unfortunately no answers

Could you do bors try just to make sure this isn't one-time random bug

[chenyukang]

@bors try jobs=aarch64-msvc-1

[rust-bors]

💔 Test for 9e2138d failed: CI. Failed jobs:

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

[bors]

☔ The latest upstream changes (presumably #148193) made this pull request unmergeable. Please resolve the merge conflicts.

[rustbot]

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

[Kivooeo]

@bors try jobs=aarch64-msvc-1

[rust-bors]

☀️ Try build successful (CI)
Build commit: 5c85e3f (5c85e3f013ca9c8dc0ed5b934916c6669809e0c7, parent: 5dbf4069dc98bbbca98dd600a65f50c258fbfd56)

[Kivooeo]

Yay, I used tech that @fmease told me here #147416 (comment)

If they were different, we could then simply tail_expr.span.find_ancestor_in_same_ctxt(stmt.span) and use that inside stmt.span.with_lo(_).

Since I do have different spans here I used it, I'm not actually how correct my usage was, but it seems that it does work

@rustbot ready