Skip to content

Commit 1341f83

Browse files
bjorn3bjorn3
committed
Share part of the global_asm!() implementation between cg_ssa and cg_clif
1 parent e287694 commit 1341f83

File tree

4 files changed

+73
-135
lines changed

4 files changed

+73
-135
lines changed

‎compiler/rustc_codegen_cranelift/src/driver/aot.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,10 @@ fn codegen_cgu_content(
560560
}
561561
}
562562
MonoItem::GlobalAsm(item_id) => {
563-
crate::global_asm::codegen_global_asm_item(tcx, &mut cx.global_asm, item_id);
563+
rustc_codegen_ssa::base::codegen_global_asm(
564+
&mut GlobalAsmContext { tcx, global_asm: &mut cx.global_asm },
565+
item_id,
566+
);
564567
}
565568
}
566569
}

‎compiler/rustc_codegen_cranelift/src/global_asm.rs

-62
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ use std::sync::Arc;
88

99
use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
1010
use rustc_codegen_ssa::traits::{AsmCodegenMethods, GlobalAsmOperandRef};
11-
use rustc_hir::{InlineAsmOperand, ItemId};
12-
use rustc_middle::mir::interpret::ErrorHandled;
1311
use rustc_middle::ty::TyCtxt;
1412
use rustc_middle::ty::layout::{
1513
FnAbiError, FnAbiOfHelpers, FnAbiRequest, HasTyCtxt, HasTypingEnv, LayoutError, LayoutOfHelpers,
@@ -91,66 +89,6 @@ impl<'tcx> HasTypingEnv<'tcx> for GlobalAsmContext<'_, 'tcx> {
9189
}
9290
}
9391

94-
pub(crate) fn codegen_global_asm_item(tcx: TyCtxt<'_>, global_asm: &mut String, item_id: ItemId) {
95-
let item = tcx.hir().item(item_id);
96-
let rustc_hir::ItemKind::GlobalAsm(asm) = item.kind else {
97-
bug!("Expected GlobalAsm found {:?}", item);
98-
};
99-
100-
// Adapted from rustc_codegen_ssa::mono_items::MonoItem::define
101-
let operands: Vec<_> = asm
102-
.operands
103-
.iter()
104-
.map(|(op, op_sp)| match *op {
105-
InlineAsmOperand::Const { ref anon_const } => {
106-
match tcx.const_eval_poly(anon_const.def_id.to_def_id()) {
107-
Ok(const_value) => {
108-
let ty = tcx.typeck_body(anon_const.body).node_type(anon_const.hir_id);
109-
let string = rustc_codegen_ssa::common::asm_const_to_str(
110-
tcx,
111-
*op_sp,
112-
const_value,
113-
FullyMonomorphizedLayoutCx(tcx).layout_of(ty),
114-
);
115-
GlobalAsmOperandRef::Const { string }
116-
}
117-
Err(ErrorHandled::Reported { .. }) => {
118-
// An error has already been reported and
119-
// compilation is guaranteed to fail if execution
120-
// hits this path. So an empty string instead of
121-
// a stringified constant value will suffice.
122-
GlobalAsmOperandRef::Const { string: String::new() }
123-
}
124-
Err(ErrorHandled::TooGeneric(_)) => {
125-
span_bug!(*op_sp, "asm const cannot be resolved; too generic")
126-
}
127-
}
128-
}
129-
InlineAsmOperand::SymFn { ref anon_const } => {
130-
let ty = tcx.typeck_body(anon_const.body).node_type(anon_const.hir_id);
131-
let instance = match ty.kind() {
132-
&ty::FnDef(def_id, args) => Instance::new(def_id, args),
133-
_ => span_bug!(*op_sp, "asm sym is not a function"),
134-
};
135-
136-
GlobalAsmOperandRef::SymFn { instance }
137-
}
138-
InlineAsmOperand::SymStatic { path: _, def_id } => {
139-
GlobalAsmOperandRef::SymStatic { def_id }
140-
}
141-
InlineAsmOperand::In { .. }
142-
| InlineAsmOperand::Out { .. }
143-
| InlineAsmOperand::InOut { .. }
144-
| InlineAsmOperand::SplitInOut { .. }
145-
| InlineAsmOperand::Label { .. } => {
146-
span_bug!(*op_sp, "invalid operand type for global_asm!")
147-
}
148-
})
149-
.collect();
150-
151-
codegen_global_asm_inner(tcx, global_asm, asm.template, &operands, asm.options, asm.line_spans);
152-
}
153-
15492
fn codegen_global_asm_inner<'tcx>(
15593
tcx: TyCtxt<'tcx>,
15694
global_asm: &mut String,

‎compiler/rustc_codegen_ssa/src/base.rs

+66-1
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,21 @@ use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
1010
use rustc_data_structures::profiling::{get_resident_set_size, print_time_passes_entry};
1111
use rustc_data_structures::sync::par_map;
1212
use rustc_data_structures::unord::UnordMap;
13+
use rustc_hir::ItemId;
1314
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
1415
use rustc_hir::lang_items::LangItem;
1516
use rustc_metadata::EncodedMetadata;
16-
use rustc_middle::bug;
1717
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
1818
use rustc_middle::middle::debugger_visualizer::{DebuggerVisualizerFile, DebuggerVisualizerType};
1919
use rustc_middle::middle::exported_symbols::SymbolExportKind;
2020
use rustc_middle::middle::{exported_symbols, lang_items};
2121
use rustc_middle::mir::BinOp;
22+
use rustc_middle::mir::interpret::ErrorHandled;
2223
use rustc_middle::mir::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem, MonoItemPartitions};
2324
use rustc_middle::query::Providers;
2425
use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv, LayoutOf, TyAndLayout};
2526
use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
27+
use rustc_middle::{bug, span_bug};
2628
use rustc_session::Session;
2729
use rustc_session::config::{self, CrateType, EntryFnType, OptLevel, OutputType};
2830
use rustc_span::{DUMMY_SP, Symbol, sym};
@@ -421,6 +423,69 @@ pub(crate) fn codegen_instance<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
421423
mir::codegen_mir::<Bx>(cx, instance);
422424
}
423425

426+
pub fn codegen_global_asm<'tcx, Cx>(cx: &mut Cx, item_id: ItemId)
427+
where
428+
Cx: LayoutOf<'tcx, LayoutOfResult = TyAndLayout<'tcx>> + AsmCodegenMethods<'tcx>,
429+
{
430+
let item = cx.tcx().hir().item(item_id);
431+
if let rustc_hir::ItemKind::GlobalAsm(asm) = item.kind {
432+
let operands: Vec<_> = asm
433+
.operands
434+
.iter()
435+
.map(|(op, op_sp)| match *op {
436+
rustc_hir::InlineAsmOperand::Const { ref anon_const } => {
437+
match cx.tcx().const_eval_poly(anon_const.def_id.to_def_id()) {
438+
Ok(const_value) => {
439+
let ty =
440+
cx.tcx().typeck_body(anon_const.body).node_type(anon_const.hir_id);
441+
let string = common::asm_const_to_str(
442+
cx.tcx(),
443+
*op_sp,
444+
const_value,
445+
cx.layout_of(ty),
446+
);
447+
GlobalAsmOperandRef::Const { string }
448+
}
449+
Err(ErrorHandled::Reported { .. }) => {
450+
// An error has already been reported and
451+
// compilation is guaranteed to fail if execution
452+
// hits this path. So an empty string instead of
453+
// a stringified constant value will suffice.
454+
GlobalAsmOperandRef::Const { string: String::new() }
455+
}
456+
Err(ErrorHandled::TooGeneric(_)) => {
457+
span_bug!(*op_sp, "asm const cannot be resolved; too generic")
458+
}
459+
}
460+
}
461+
rustc_hir::InlineAsmOperand::SymFn { ref anon_const } => {
462+
let ty = cx.tcx().typeck_body(anon_const.body).node_type(anon_const.hir_id);
463+
let instance = match ty.kind() {
464+
&ty::FnDef(def_id, args) => Instance::new(def_id, args),
465+
_ => span_bug!(*op_sp, "asm sym is not a function"),
466+
};
467+
468+
GlobalAsmOperandRef::SymFn { instance }
469+
}
470+
rustc_hir::InlineAsmOperand::SymStatic { path: _, def_id } => {
471+
GlobalAsmOperandRef::SymStatic { def_id }
472+
}
473+
rustc_hir::InlineAsmOperand::In { .. }
474+
| rustc_hir::InlineAsmOperand::Out { .. }
475+
| rustc_hir::InlineAsmOperand::InOut { .. }
476+
| rustc_hir::InlineAsmOperand::SplitInOut { .. }
477+
| rustc_hir::InlineAsmOperand::Label { .. } => {
478+
span_bug!(*op_sp, "invalid operand type for global_asm!")
479+
}
480+
})
481+
.collect();
482+
483+
cx.codegen_global_asm(asm.template, &operands, asm.options, asm.line_spans);
484+
} else {
485+
span_bug!(item.span, "Mismatch between hir::Item type and MonoItem type")
486+
}
487+
}
488+
424489
/// Creates the `main` function which will initialize the rust runtime and call
425490
/// users main function.
426491
pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(

‎compiler/rustc_codegen_ssa/src/mono_item.rs

+3-71
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
use rustc_hir as hir;
21
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
3-
use rustc_middle::mir::interpret::ErrorHandled;
42
use rustc_middle::mir::mono::{Linkage, MonoItem, MonoItemData, Visibility};
5-
use rustc_middle::ty::Instance;
6-
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf};
7-
use rustc_middle::{span_bug, ty};
3+
use rustc_middle::ty::layout::HasTyCtxt;
84
use tracing::debug;
95

6+
use crate::base;
107
use crate::mir::naked_asm;
118
use crate::traits::*;
12-
use crate::{base, common};
139

1410
pub trait MonoItemExt<'a, 'tcx> {
1511
fn define<Bx: BuilderMethods<'a, 'tcx>>(
@@ -44,71 +40,7 @@ impl<'a, 'tcx: 'a> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {
4440
cx.codegen_static(def_id);
4541
}
4642
MonoItem::GlobalAsm(item_id) => {
47-
let item = cx.tcx().hir().item(item_id);
48-
if let hir::ItemKind::GlobalAsm(asm) = item.kind {
49-
let operands: Vec<_> = asm
50-
.operands
51-
.iter()
52-
.map(|(op, op_sp)| match *op {
53-
hir::InlineAsmOperand::Const { ref anon_const } => {
54-
match cx.tcx().const_eval_poly(anon_const.def_id.to_def_id()) {
55-
Ok(const_value) => {
56-
let ty = cx
57-
.tcx()
58-
.typeck_body(anon_const.body)
59-
.node_type(anon_const.hir_id);
60-
let string = common::asm_const_to_str(
61-
cx.tcx(),
62-
*op_sp,
63-
const_value,
64-
cx.layout_of(ty),
65-
);
66-
GlobalAsmOperandRef::Const { string }
67-
}
68-
Err(ErrorHandled::Reported { .. }) => {
69-
// An error has already been reported and
70-
// compilation is guaranteed to fail if execution
71-
// hits this path. So an empty string instead of
72-
// a stringified constant value will suffice.
73-
GlobalAsmOperandRef::Const { string: String::new() }
74-
}
75-
Err(ErrorHandled::TooGeneric(_)) => {
76-
span_bug!(
77-
*op_sp,
78-
"asm const cannot be resolved; too generic"
79-
)
80-
}
81-
}
82-
}
83-
hir::InlineAsmOperand::SymFn { ref anon_const } => {
84-
let ty = cx
85-
.tcx()
86-
.typeck_body(anon_const.body)
87-
.node_type(anon_const.hir_id);
88-
let instance = match ty.kind() {
89-
&ty::FnDef(def_id, args) => Instance::new(def_id, args),
90-
_ => span_bug!(*op_sp, "asm sym is not a function"),
91-
};
92-
93-
GlobalAsmOperandRef::SymFn { instance }
94-
}
95-
hir::InlineAsmOperand::SymStatic { path: _, def_id } => {
96-
GlobalAsmOperandRef::SymStatic { def_id }
97-
}
98-
hir::InlineAsmOperand::In { .. }
99-
| hir::InlineAsmOperand::Out { .. }
100-
| hir::InlineAsmOperand::InOut { .. }
101-
| hir::InlineAsmOperand::SplitInOut { .. }
102-
| hir::InlineAsmOperand::Label { .. } => {
103-
span_bug!(*op_sp, "invalid operand type for global_asm!")
104-
}
105-
})
106-
.collect();
107-
108-
cx.codegen_global_asm(asm.template, &operands, asm.options, asm.line_spans);
109-
} else {
110-
span_bug!(item.span, "Mismatch between hir::Item type and MonoItem type")
111-
}
43+
base::codegen_global_asm(cx, item_id);
11244
}
11345
MonoItem::Fn(instance) => {
11446
if cx

0 commit comments

Comments
 (0)