Fix dbg_macro ICE when used iterated by for loop
#16011
Open
+93
−50
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
Collaborator
|
r? @Alexendoo rustbot has assigned @Alexendoo. Use |
Alexendoo
reviewed
Nov 3, 2025
Comment on lines
190
to
192
| fn first_dbg_macro_in_expansion(cx: &LateContext<'_>, span: Span) -> Option<MacroCall> { | ||
| macro_backtrace(span).find(|mc| cx.tcx.is_diagnostic_item(sym::dbg_macro, mc.def_id)) | ||
| } |
Member
There was a problem hiding this comment.
Since it looks like the issue is that it's picking up the desugared into_iter call, we could change this to something like expn_backtrace(span).take_while(|(_, data)| !matches!(data.kind, ExpnKind::Desugaring(_))).find(...)
ada4a
reviewed
Nov 3, 2025
| macro_call | ||
| .span | ||
| .source_callsite() | ||
| .with_lo(macro_call.span.lo() + BytePos(5)) // after `dbg!(` |
Contributor
There was a problem hiding this comment.
what if the expression is poorly formatted, something like dbg ! { 0}?
Contributor
|
Opened a PR on the rust side to fix the spans there (rust-lang/rust#148465). I'll hold off on any changes here until that's dealt with. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #16008
changelog: [
dbg_macro] fix ICE when used iterated by for loop