[llvm-commits] [llvm] r129428 - in /llvm/trunk: lib/Target/TargetData.cpp test/CodeGen/ARM/2011-04-12-AlignBug.ll

[Cameron Zwarich]

Author: zwarich
Date: Wed Apr 13 01:03:16 2011
New Revision: 129428

URL: http://llvm.org/viewvc/llvm-project?rev=129428&view=rev
Log:
If a global variable has a specified alignment that is less than the preferred
alignment for its type, use the minimum of the specified alignment and the ABI
alignment. This fixes <rdar://problem/9275290>.

Added:
    llvm/trunk/test/CodeGen/ARM/2011-04-12-AlignBug.ll
Modified:
    llvm/trunk/lib/Target/TargetData.cpp

Modified: llvm/trunk/lib/Target/TargetData.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetData.cpp?rev=129428&r1=129427&r2=129428&view=diff
==============================================================================
--- llvm/trunk/lib/Target/TargetData.cpp (original)
+++ llvm/trunk/lib/Target/TargetData.cpp Wed Apr 13 01:03:16 2011
@@ -617,8 +617,12 @@
 unsigned TargetData::getPreferredAlignment(const GlobalVariable *GV) const {
   const Type *ElemType = GV->getType()->getElementType();
   unsigned Alignment = getPrefTypeAlignment(ElemType);
-  if (GV->getAlignment() > Alignment)
-    Alignment = GV->getAlignment();
+  unsigned GVAlignment = GV->getAlignment();
+  if (GVAlignment >= Alignment) {
+    Alignment = GVAlignment;
+  } else if (GVAlignment != 0) {
+    Alignment = std::min(GVAlignment, getABITypeAlignment(ElemType));
+  }
 
   if (GV->hasInitializer()) {
     if (Alignment < 16) {

Added: llvm/trunk/test/CodeGen/ARM/2011-04-12-AlignBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2011-04-12-AlignBug.ll?rev=129428&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2011-04-12-AlignBug.ll (added)
+++ llvm/trunk/test/CodeGen/ARM/2011-04-12-AlignBug.ll Wed Apr 13 01:03:16 2011
@@ -0,0 +1,9 @@
+; RUN: llc < %s | FileCheck %s
+target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:64-v128:32:128-a0:0:32-n32"
+target triple = "thumbv7-apple-darwin10.0.0"
+
+; CHECK: align 2
+ at .strA = linker_private unnamed_addr constant [4 x i8] c"bar\00"
+; CHECK-NOT: align
+ at .strB = linker_private unnamed_addr constant [4 x i8] c"foo\00", align 1
+ at .strC = linker_private unnamed_addr constant [4 x i8] c"baz\00", section "__TEXT,__cstring,cstring_literals", align 1