refactor: fix canonicalize_refs in libxml transforms
#1450
Merged
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
…o canonicalize_refs can see ExprIds whose owners lack bodies or typeck tables. Gate the visitor with opt_node_to_hir_id() and skip expressions whose parent items don't own bodies to avoid span bugs when calling typeck(parent).
ahomescu
approved these changes
Nov 15, 2025
| fn transform(&self, krate: &mut Crate, _st: &CommandState, cx: &RefactorCtxt) { | ||
| MutVisitNodes::visit(krate, |expr: &mut P<Expr>| { | ||
| let hir_id = cx.hir_map().node_to_hir_id(expr.id); | ||
| // `MutVisitNodes` walks into attributes even though rustc never lowers their bodies to HIR. |
Contributor
There was a problem hiding this comment.
Are these expressions inside attributes? Otherwise how would we hit this for P<Expr>?
Contributor
Author
There was a problem hiding this comment.
Yeah, ones like #[c2rust::src_loc = "28:1"] have a rhs that's an expression
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
canonicalize_refsusedcx.hir_map().node_to_hir_idand unconditionally calledtypeck(parent). WhenMutVisitNodesdescends into attribute tokens or items without bodies (e.g.,externdecls) the HIR map lacks a node or typeck tables, so the walk panicked withspan_bug!("can't type-check body …").This PR swaps to
opt_node_to_hir_idso attribute-only nodes short-circuit before we ever try to fetch HIR expressions, keeping the transform aligned with what rustc actually lowers, and checksmaybe_body_owned_by(parent)before querying typeck tables; this skips extern items and other definitions without bodies, avoiding theprimary_body_ofunwrap panic while still running the transform over real bodies.