commit 7ad11e70b65dabb7fbba8051a44d7cb612339a4a
author Ken Dyck <kd@kendyck.com> Tue Feb 15 02:32:40 2011 +0000
committer Ken Dyck <kd@kendyck.com> Tue Feb 15 02:32:40 2011 +0000
tree b0b4931331987749a8152f0d538be2d6d170545f
parent 4ea9004fe8a555849f12f67600f4d5d09016d1db

Convert RecordLayout::Alignment to CharUnits from bit units. No change in
functionality intended. 

llvm-svn: 125549

clang/lib/AST/RecordLayoutBuilder.cpp

diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp
index 7117a02..a9f9f10 100644
--- a/clang/lib/AST/RecordLayoutBuilder.cpp
+++ b/clang/lib/AST/RecordLayoutBuilder.cpp
@@ -1203,7 +1203,7 @@
   if (ObjCInterfaceDecl *SD = D->getSuperClass()) {
     const ASTRecordLayout &SL = Context.getASTObjCInterfaceLayout(SD);
 
-    UpdateAlignment(SL.getAlignment());
+    UpdateAlignment(Context.toBits(SL.getAlignment()));
 
     // We start laying out ivars not at the end of the superclass
     // structure, but at the next byte following the last field.
@@ -1683,7 +1683,8 @@
 
     CharUnits RecordSize = toCharUnitsFromBits(Builder->Size);
     NewEntry =
-      new (*this) ASTRecordLayout(*this, RecordSize, Builder->Alignment,
+      new (*this) ASTRecordLayout(*this, RecordSize, 
+                                  toCharUnitsFromBits(Builder->Alignment),
                                   toCharUnitsFromBits(DataSize), 
                                   Builder->FieldOffsets.data(),
                                   Builder->FieldOffsets.size(),
@@ -1700,7 +1701,8 @@
     CharUnits RecordSize = toCharUnitsFromBits(Builder.Size);
 
     NewEntry =
-      new (*this) ASTRecordLayout(*this, RecordSize, Builder.Alignment,
+      new (*this) ASTRecordLayout(*this, RecordSize, 
+                                  toCharUnitsFromBits(Builder.Alignment),
                                   toCharUnitsFromBits(Builder.Size),
                                   Builder.FieldOffsets.data(),
                                   Builder.FieldOffsets.size());
@@ -1760,7 +1762,8 @@
   CharUnits RecordSize = toCharUnitsFromBits(Builder.Size);
 
   const ASTRecordLayout *NewEntry =
-    new (*this) ASTRecordLayout(*this, RecordSize, Builder.Alignment,
+    new (*this) ASTRecordLayout(*this, RecordSize, 
+                                toCharUnitsFromBits(Builder.Alignment),
                                 toCharUnitsFromBits(Builder.DataSize),
                                 Builder.FieldOffsets.data(),
                                 Builder.FieldOffsets.size());
@@ -1859,7 +1862,7 @@
 
   OS << "  sizeof=" << Layout.getSize().getQuantity();
   OS << ", dsize=" << Layout.getDataSize().getQuantity();
-  OS << ", align=" << Layout.getAlignment() / 8 << '\n';
+  OS << ", align=" << Layout.getAlignment().getQuantity() << '\n';
   OS << "  nvsize=" << Layout.getNonVirtualSize().getQuantity();
   OS << ", nvalign=" << Layout.getNonVirtualAlign().getQuantity() << '\n';
   OS << '\n';
@@ -1880,7 +1883,7 @@
   OS << "<ASTRecordLayout\n";
   OS << "  Size:" << toBits(Info.getSize()) << "\n";
   OS << "  DataSize:" << toBits(Info.getDataSize()) << "\n";
-  OS << "  Alignment:" << Info.getAlignment() << "\n";
+  OS << "  Alignment:" << toBits(Info.getAlignment()) << "\n";
   OS << "  FieldOffsets: [";
   for (unsigned i = 0, e = Info.getFieldCount(); i != e; ++i) {
     if (i) OS << ", ";