bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

cg_clif: use exclusively ABI alignment

Browse source
This commit is contained in:
Jubilee Young 2025-02-11 22:33:18 -08:00
parent ce36a966c7
commit 59e9eb9b2b
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_codegen_cranelift/src/abi/comments.rs
View file

@ -65,7 +65,7 @@ pub(super) fn add_locals_header_comment(fx: &mut FunctionCx<'_, '_, '_>) {
if fx.clif_comments.enabled() { if fx.clif_comments.enabled() {
fx.add_global_comment(String::new()); fx.add_global_comment(String::new());
fx.add_global_comment( fx.add_global_comment(
"kind local ty size align (abi,pref)".to_string(), "kind local ty size align (abi)".to_string(),
); );
} }
} }
@ -84,13 +84,12 @@ pub(super) fn add_local_place_comments<'tcx>(
let (kind, extra) = place.debug_comment(); let (kind, extra) = place.debug_comment();
fx.add_global_comment(format!( fx.add_global_comment(format!(
"{:<5} {:5} {:30} {:4}b {}, {}{}{}", "{:<5} {:5} {:30} {:4}b {}, {}{}",
kind, kind,
format!("{:?}", local), format!("{:?}", local),
format!("{:?}", ty), format!("{:?}", ty),
size.bytes(), size.bytes(),
align.abi.bytes(), align.abi.bytes(),
align.pref.bytes(),
if extra.is_empty() { "" } else { " " }, if extra.is_empty() { "" } else { " " },
extra, extra,
)); ));

2
compiler/rustc_codegen_cranelift/src/constant.rs
View file

@ -272,7 +272,7 @@ fn data_id_for_static(
.layout_of(ty::TypingEnv::fully_monomorphized().as_query_input(ty)) .layout_of(ty::TypingEnv::fully_monomorphized().as_query_input(ty))
.unwrap() .unwrap()
.align .align
.pref .abi
.bytes(); .bytes();
let linkage = if import_linkage == rustc_middle::mir::mono::Linkage::ExternalWeak let linkage = if import_linkage == rustc_middle::mir::mono::Linkage::ExternalWeak