summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CodeGenModule.cpp
diff options
context:
space:
mode:
authorKen Dyck <ken.dyck@onsemi.com>2010-01-26 18:46:23 +0000
committerKen Dyck <ken.dyck@onsemi.com>2010-01-26 18:46:23 +0000
commita0f99ff2308e5d91d37562e04fd66fd1765843d3 (patch)
tree7c64242582b5810f7fdce921b71f3678f5b95b79 /clang/lib/CodeGen/CodeGenModule.cpp
parente5402e474907dfd9c2cdfe8eedeb97826dcb835d (diff)
downloadbcm5719-llvm-a0f99ff2308e5d91d37562e04fd66fd1765843d3.tar.gz
bcm5719-llvm-a0f99ff2308e5d91d37562e04fd66fd1765843d3.zip
Use CharUnits for alignment of UTF16 string in GetAddrOfConstantCFString().
llvm-svn: 94564
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
-rw-r--r--clang/lib/CodeGen/CodeGenModule.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index ebd3df1cf93..dc66f04c5ec 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -1501,8 +1501,8 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
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);
OpenPOWER on IntegriCloud