replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a regression caused by r102515 where explicit alignment on globals is 

ignored. There was a test to catch this, but it was just blindly updated in
a large change. This fixes another part of <rdar://problem/9275290>.

llvm-svn: 129466
This commit is contained in:
Cameron Zwarich 2011-04-13 20:36:04 +00:00
parent e72509c10c
commit 9398197ef1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Target/TargetData.cpp
View File

@ -624,7 +624,7 @@ unsigned TargetData::getPreferredAlignment(const GlobalVariable *GV) const {
Alignment = std::max(GVAlignment, getABITypeAlignment(ElemType)); Alignment = std::max(GVAlignment, getABITypeAlignment(ElemType));
} }
if (GV->hasInitializer()) { if (GV->hasInitializer() && GVAlignment == 0) {
if (Alignment < 16) { if (Alignment < 16) {
// If the global is not external, see if it is large. If so, give it a // If the global is not external, see if it is large. If so, give it a
// larger alignment. // larger alignment.

6
llvm/test/CodeGen/X86/alignment.ll
View File

@ -6,7 +6,7 @@
; CHECK: .bss ; CHECK: .bss
; CHECK: .globl GlobalA ; CHECK: .globl GlobalA
; CHECK: .align 16 ; CHECK: .align 8
; CHECK: GlobalA: ; CHECK: GlobalA:
; CHECK: .zero 384 ; CHECK: .zero 384
@ -15,12 +15,12 @@
; PR6921 ; PR6921
@GlobalB = common global { [384 x i8] } zeroinitializer, align 8 @GlobalB = common global { [384 x i8] } zeroinitializer, align 8
; CHECK: .comm GlobalB,384,16 ; CHECK: .comm GlobalB,384,8
@GlobalC = common global { [384 x i8] } zeroinitializer, align 2 @GlobalC = common global { [384 x i8] } zeroinitializer, align 2
; CHECK: .comm GlobalC,384,16 ; CHECK: .comm GlobalC,384,2

4
llvm/test/CodeGen/X86/unaligned-load.ll
View File

@ -29,8 +29,8 @@ return:
declare void @llvm.memcpy.i64(i8* nocapture, i8* nocapture, i64, i32) nounwind declare void @llvm.memcpy.i64(i8* nocapture, i8* nocapture, i64, i32) nounwind
; CORE2: .section ; CORE2: .section
; CORE2: .align 4 ; CORE2: .align 3
; CORE2-NEXT: _.str1: ; CORE2-NEXT: _.str1:
; CORE2-NEXT: .asciz "DHRYSTONE PROGRAM, SOME STRING" ; CORE2-NEXT: .asciz "DHRYSTONE PROGRAM, SOME STRING"
; CORE2: .align 4 ; CORE2: .align 3
; CORE2-NEXT: _.str3: ; CORE2-NEXT: _.str3: