Skip to content

Commit 59013cd

Browse files
committed
ast_lowering: Introduce lower_span for catching all spans entering HIR
1 parent 757a65b commit 59013cd

File tree

6 files changed

+330
-169
lines changed

6 files changed

+330
-169
lines changed

compiler/rustc_ast_lowering/src/asm.rs

+9-4
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
128128
hir::InlineAsmOperand::Sym { expr: self.lower_expr_mut(expr) }
129129
}
130130
};
131-
(op, *op_sp)
131+
(op, self.lower_span(*op_sp))
132132
})
133133
.collect();
134134

@@ -384,16 +384,21 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
384384
late: true,
385385
expr: None,
386386
},
387-
abi_span,
387+
self.lower_span(abi_span),
388388
));
389389
}
390390
}
391391
}
392392

393393
let operands = self.arena.alloc_from_iter(operands);
394394
let template = self.arena.alloc_from_iter(asm.template.iter().cloned());
395-
let template_strs = self.arena.alloc_from_iter(asm.template_strs.iter().cloned());
396-
let line_spans = self.arena.alloc_slice(&asm.line_spans[..]);
395+
let template_strs = self.arena.alloc_from_iter(
396+
asm.template_strs
397+
.iter()
398+
.map(|(sym, snippet, span)| (*sym, *snippet, self.lower_span(*span))),
399+
);
400+
let line_spans =
401+
self.arena.alloc_from_iter(asm.line_spans.iter().map(|span| self.lower_span(*span)));
397402
let hir_asm =
398403
hir::InlineAsm { template, template_strs, operands, options: asm.options, line_spans };
399404
self.arena.alloc(hir_asm)

0 commit comments

Comments
 (0)