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

always add align attributes

Browse Source
This commit is contained in:
Erik Desjardins 2022-02-19 09:59:36 -05:00
parent dcbdc8c19b
commit 6e740ae934
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/rustc_codegen_llvm/src/abi.rs
View File

@ -59,6 +59,9 @@ impl ArgAttributesExt for ArgAttributes {
llattr.apply_llfn(idx, llfn); llattr.apply_llfn(idx, llfn);
} }
} }
if let Some(align) = self.pointee_align {
llvm::LLVMRustAddAlignmentAttr(llfn, idx.as_uint(), align.bytes() as u32);
}
match self.arg_ext { match self.arg_ext {
ArgExtension::None => {} ArgExtension::None => {}
ArgExtension::Zext => llvm::Attribute::ZExt.apply_llfn(idx, llfn), ArgExtension::Zext => llvm::Attribute::ZExt.apply_llfn(idx, llfn),
@ -77,9 +80,6 @@ impl ArgAttributesExt for ArgAttributes {
} }
regular -= ArgAttribute::NonNull; regular -= ArgAttribute::NonNull;
} }
if let Some(align) = self.pointee_align {
llvm::LLVMRustAddAlignmentAttr(llfn, idx.as_uint(), align.bytes() as u32);
}
for (attr, llattr) in OPTIMIZATION_ATTRIBUTES { for (attr, llattr) in OPTIMIZATION_ATTRIBUTES {
if regular.contains(attr) { if regular.contains(attr) {
llattr.apply_llfn(idx, llfn); llattr.apply_llfn(idx, llfn);
@ -105,6 +105,13 @@ impl ArgAttributesExt for ArgAttributes {
llattr.apply_callsite(idx, callsite); llattr.apply_callsite(idx, callsite);
} }
} }
if let Some(align) = self.pointee_align {
llvm::LLVMRustAddAlignmentCallSiteAttr(
callsite,
idx.as_uint(),
align.bytes() as u32,
);
}
match self.arg_ext { match self.arg_ext {
ArgExtension::None => {} ArgExtension::None => {}
ArgExtension::Zext => llvm::Attribute::ZExt.apply_callsite(idx, callsite), ArgExtension::Zext => llvm::Attribute::ZExt.apply_callsite(idx, callsite),
@ -127,13 +134,6 @@ impl ArgAttributesExt for ArgAttributes {
} }
regular -= ArgAttribute::NonNull; regular -= ArgAttribute::NonNull;
} }
if let Some(align) = self.pointee_align {
llvm::LLVMRustAddAlignmentCallSiteAttr(
callsite,
idx.as_uint(),
align.bytes() as u32,
);
}
for (attr, llattr) in OPTIMIZATION_ATTRIBUTES { for (attr, llattr) in OPTIMIZATION_ATTRIBUTES {
if regular.contains(attr) { if regular.contains(attr) {
llattr.apply_callsite(idx, callsite); llattr.apply_callsite(idx, callsite);

4
src/test/codegen/function-arguments-noopt.rs
View File

@ -23,7 +23,7 @@ pub fn boolean_call(x: bool, f: fn(bool) -> bool) -> bool {
f(x) f(x)
} }
// CHECK: define i32* @borrow(i32* %x) // CHECK: define align 4 i32* @borrow(i32* align 4 %x)
#[no_mangle] #[no_mangle]
pub fn borrow(x: &i32) -> &i32 { pub fn borrow(x: &i32) -> &i32 {
x x
@ -32,7 +32,7 @@ pub fn borrow(x: &i32) -> &i32 {
// CHECK-LABEL: @borrow_call // CHECK-LABEL: @borrow_call
#[no_mangle] #[no_mangle]
pub fn borrow_call(x: &i32, f: fn(&i32) -> &i32) -> &i32 { pub fn borrow_call(x: &i32, f: fn(&i32) -> &i32) -> &i32 {
// CHECK: call i32* %f(i32* %x) // CHECK: call align 4 i32* %f(i32* align 4 %x)
f(x) f(x)
} }