Skip to content

refactor: fix canonicalize_refs in libxml transforms #1450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2025
+13 −1
Merged

refactor: fix canonicalize_refs in libxml transforms #1450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion c2rust-refactor/src/transform/canonicalize_refs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,21 @@ struct CanonicalizeRefs;
impl Transform for CanonicalizeRefs {
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.
Copy link
Contributor

@ahomescu ahomescu Nov 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these expressions inside attributes? Otherwise how would we hit this for P<Expr>?

Copy link
Contributor Author

@oinoom oinoom Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, ones like #[c2rust::src_loc = "28:1"] have a rhs that's an expression

// We skip such nodes by probing with `opt_node_to_hir_id`; if we ever need an attribute-only
// walk we’d have to reimplement the traversal with an attribute-depth-aware visitor instead.
let Some(hir_id) = cx.hir_map().opt_node_to_hir_id(expr.id) else {
return;
};
let hir_expr = cx.hir_map().expect_expr(hir_id);
let parent = cx.hir_map().get_parent_item(hir_id);
if cx.hir_map().maybe_body_owned_by(parent).is_none() {
// `tcx.typeck(parent)` unwraps `primary_body_of` (rustc_typeck::check::mod.rs),
// so querying items without bodies (e.g. extern statics/functions) triggers a
// `span_bug!("can't type-check body ...")`. Skip any expressions owned by such
// items instead of poking the typeck tables.
return;
}
let tables = cx.ty_ctxt().typeck(parent);
for adjustment in tables.expr_adjustments(hir_expr) {
match adjustment.kind {
Expand Down