mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to get a ty for a nested allocation

Browse Source 
Fixes rust-lang/rustc_codegen_cranelift#1464
This commit is contained in:
bjorn3 2024-03-16 16:17:58 +00:00
parent 9f162c49cb
commit e775fdc9e9
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/std_example.rs
View File

@ -167,6 +167,14 @@ enum Never {}
transmute_fat_pointer(); transmute_fat_pointer();
rust_call_abi(); rust_call_abi();
const fn no_str() -> Option<Box<str>> {
None
}
static STATIC_WITH_MAYBE_NESTED_BOX: &Option<Box<str>> = &no_str();
println!("{:?}", STATIC_WITH_MAYBE_NESTED_BOX);
} }
fn panic(_: u128) { fn panic(_: u128) {

42
src/constant.rs
View File

@ -53,7 +53,11 @@ pub(crate) fn codegen_tls_ref<'tcx>(
let call = fx.bcx.ins().call(func_ref, &[]); let call = fx.bcx.ins().call(func_ref, &[]);
fx.bcx.func.dfg.first_result(call) fx.bcx.func.dfg.first_result(call)
} else { } else {
let data_id = data_id_for_static(fx.tcx, fx.module, def_id, false); let data_id = data_id_for_static(
fx.tcx, fx.module, def_id, false,
// For a declaration the stated mutability doesn't matter.
false,
);
let local_data_id = fx.module.declare_data_in_func(data_id, &mut fx.bcx.func); let local_data_id = fx.module.declare_data_in_func(data_id, &mut fx.bcx.func);
if fx.clif_comments.enabled() { if fx.clif_comments.enabled() {
fx.add_comment(local_data_id, format!("tls {:?}", def_id)); fx.add_comment(local_data_id, format!("tls {:?}", def_id));
@ -164,7 +168,11 @@ pub(crate) fn codegen_const_value<'tcx>(
} }
GlobalAlloc::Static(def_id) => { GlobalAlloc::Static(def_id) => {
assert!(fx.tcx.is_static(def_id)); assert!(fx.tcx.is_static(def_id));
let data_id = data_id_for_static(fx.tcx, fx.module, def_id, false); let data_id = data_id_for_static(
fx.tcx, fx.module, def_id, false,
// For a declaration the stated mutability doesn't matter.
false,
);
let local_data_id = let local_data_id =
fx.module.declare_data_in_func(data_id, &mut fx.bcx.func); fx.module.declare_data_in_func(data_id, &mut fx.bcx.func);
if fx.clif_comments.enabled() { if fx.clif_comments.enabled() {
@ -232,21 +240,19 @@ fn data_id_for_static(
module: &mut dyn Module, module: &mut dyn Module,
def_id: DefId, def_id: DefId,
definition: bool, definition: bool,
definition_writable: bool,
) -> DataId { ) -> DataId {
let attrs = tcx.codegen_fn_attrs(def_id); let attrs = tcx.codegen_fn_attrs(def_id);
let instance = Instance::mono(tcx, def_id).polymorphize(tcx); let instance = Instance::mono(tcx, def_id).polymorphize(tcx);
let symbol_name = tcx.symbol_name(instance).name; let symbol_name = tcx.symbol_name(instance).name;
let ty = instance.ty(tcx, ParamEnv::reveal_all());
let is_mutable = if tcx.is_mutable_static(def_id) {
true
} else {
!ty.is_freeze(tcx, ParamEnv::reveal_all())
};
let align = tcx.layout_of(ParamEnv::reveal_all().and(ty)).unwrap().align.pref.bytes();
if let Some(import_linkage) = attrs.import_linkage { if let Some(import_linkage) = attrs.import_linkage {
assert!(!definition); assert!(!definition);
assert!(!tcx.is_mutable_static(def_id));
let ty = instance.ty(tcx, ParamEnv::reveal_all());
let align = tcx.layout_of(ParamEnv::reveal_all().and(ty)).unwrap().align.pref.bytes();
let linkage = if import_linkage == rustc_middle::mir::mono::Linkage::ExternalWeak let linkage = if import_linkage == rustc_middle::mir::mono::Linkage::ExternalWeak
|| import_linkage == rustc_middle::mir::mono::Linkage::WeakAny || import_linkage == rustc_middle::mir::mono::Linkage::WeakAny
@ -259,7 +265,7 @@ fn data_id_for_static(
let data_id = match module.declare_data( let data_id = match module.declare_data(
symbol_name, symbol_name,
linkage, linkage,
is_mutable, false,
attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL), attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL),
) { ) {
Ok(data_id) => data_id, Ok(data_id) => data_id,
@ -307,7 +313,7 @@ fn data_id_for_static(
let data_id = match module.declare_data( let data_id = match module.declare_data(
symbol_name, symbol_name,
linkage, linkage,
is_mutable, definition_writable,
attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL), attrs.flags.contains(CodegenFnAttrFlags::THREAD_LOCAL),
) { ) {
Ok(data_id) => data_id, Ok(data_id) => data_id,
@ -341,7 +347,13 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut dyn Module, cx: &mut Constant
let alloc = tcx.eval_static_initializer(def_id).unwrap(); let alloc = tcx.eval_static_initializer(def_id).unwrap();
let data_id = data_id_for_static(tcx, module, def_id, true); let data_id = data_id_for_static(
tcx,
module,
def_id,
true,
alloc.inner().mutability == Mutability::Mut,
);
(data_id, alloc, section_name) (data_id, alloc, section_name)
} }
}; };
@ -421,7 +433,11 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut dyn Module, cx: &mut Constant
// Don't push a `TodoItem::Static` here, as it will cause statics used by // Don't push a `TodoItem::Static` here, as it will cause statics used by
// multiple crates to be duplicated between them. It isn't necessary anyway, // multiple crates to be duplicated between them. It isn't necessary anyway,
// as it will get pushed by `codegen_static` when necessary. // as it will get pushed by `codegen_static` when necessary.
data_id_for_static(tcx, module, def_id, false) data_id_for_static(
tcx, module, def_id, false,
// For a declaration the stated mutability doesn't matter.
false,
)
} }
}; };