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

Use information from allocation instead of from the static's type

Browse Source
This commit is contained in:
Oli Scherer 2023-10-06 14:39:23 +00:00
parent 6719a8ef95
commit fcb890ea0c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_codegen_llvm/src/consts.rs
View File

@ -358,6 +358,10 @@ impl<'ll> CodegenCx<'ll, '_> {
let instance = Instance::mono(self.tcx, def_id); let instance = Instance::mono(self.tcx, def_id);
let ty = instance.ty(self.tcx, ty::ParamEnv::reveal_all()); let ty = instance.ty(self.tcx, ty::ParamEnv::reveal_all());
if !is_mutable {
debug_assert_eq!(alloc.mutability.is_not(), self.type_is_freeze(ty));
}
debug_assert_eq!(alloc.align, self.align_of(ty));
let llty = self.layout_of(ty).llvm_type(self); let llty = self.layout_of(ty).llvm_type(self);
let g = self.get_static_inner(def_id, llty); let g = self.get_static_inner(def_id, llty);
@ -396,7 +400,7 @@ impl<'ll> CodegenCx<'ll, '_> {
self.statics_to_rauw.borrow_mut().push((g, new_g)); self.statics_to_rauw.borrow_mut().push((g, new_g));
new_g new_g
}; };
set_global_alignment(self, g, self.align_of(ty)); set_global_alignment(self, g, alloc.align);
llvm::LLVMSetInitializer(g, v); llvm::LLVMSetInitializer(g, v);
if self.should_assume_dso_local(g, true) { if self.should_assume_dso_local(g, true) {
@ -405,7 +409,7 @@ impl<'ll> CodegenCx<'ll, '_> {
// As an optimization, all shared statics which do not have interior // As an optimization, all shared statics which do not have interior
// mutability are placed into read-only memory. // mutability are placed into read-only memory.
if !is_mutable && self.type_is_freeze(ty) { if !is_mutable && alloc.mutability.is_not() {
llvm::LLVMSetGlobalConstant(g, llvm::True); llvm::LLVMSetGlobalConstant(g, llvm::True);
} }