summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGClass.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2011-12-03 02:13:40 +0000
committerEli Friedman <eli.friedman@gmail.com>2011-12-03 02:13:40 +0000
commit38cd36dbdb8c7ee8faccc9c9ac8d57d185553fde (patch)
tree2c0f9c7e739718bdcf80b10fa03936f53afb0d19 /clang/lib/CodeGen/CGClass.cpp
parent25f66700038aecf35396c15ee6bdedc98ea04e8f (diff)
downloadbcm5719-llvm-38cd36dbdb8c7ee8faccc9c9ac8d57d185553fde.tar.gz
bcm5719-llvm-38cd36dbdb8c7ee8faccc9c9ac8d57d185553fde.zip
Switch the Alignment argument on AggValueSlot over to CharUnits, per John's review comment.
llvm-svn: 145741
Diffstat (limited to 'clang/lib/CodeGen/CGClass.cpp')
-rw-r--r--clang/lib/CodeGen/CGClass.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index b3d41fca9c3..eabc201cc47 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -397,8 +397,7 @@ static void EmitBaseInitializer(CodeGenFunction &CGF,
CGF.GetAddressOfDirectBaseInCompleteClass(ThisPtr, ClassDecl,
BaseClassDecl,
isBaseVirtual);
- unsigned Alignment =
- CGF.getContext().getTypeAlignInChars(BaseType).getQuantity();
+ CharUnits Alignment = CGF.getContext().getTypeAlignInChars(BaseType);
AggValueSlot AggSlot =
AggValueSlot::forAddr(V, Alignment, Qualifiers(),
AggValueSlot::IsDestructed,
@@ -1345,7 +1344,7 @@ CodeGenFunction::EmitDelegatingCXXConstructorCall(const CXXConstructorDecl *Ctor
llvm::Value *ThisPtr = LoadCXXThis();
QualType Ty = getContext().getTagDeclType(Ctor->getParent());
- unsigned Alignment = getContext().getTypeAlignInChars(Ty).getQuantity();
+ CharUnits Alignment = getContext().getTypeAlignInChars(Ty);
AggValueSlot AggSlot =
AggValueSlot::forAddr(ThisPtr, Alignment, Qualifiers(),
AggValueSlot::IsDestructed,
OpenPOWER on IntegriCloud