[cfe-commits] r94564 - /cfe/trunk/lib/CodeGen/CodeGenModule.cpp

[Ken Dyck]

Author: kjdyck
Date: Tue Jan 26 12:46:23 2010
New Revision: 94564

URL: http://llvm.org/viewvc/llvm-project?rev=94564&view=rev
Log:
Use CharUnits for alignment of UTF16 string in GetAddrOfConstantCFString().

Modified:
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=94564&r1=94563&r2=94564&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Tue Jan 26 12:46:23 2010
@@ -1501,8 +1501,8 @@
   if (Sect)
     GV->setSection(Sect);
   if (isUTF16) {
-    unsigned Align = getContext().getTypeAlign(getContext().ShortTy)/8;
-    GV->setAlignment(Align);
+    CharUnits Align = getContext().getTypeAlignInChars(getContext().ShortTy);
+    GV->setAlignment(Align.getQuantity());
   }
   Fields[2] = llvm::ConstantExpr::getGetElementPtr(GV, Zeros, 2);