commit 160146eba2e08602c8e066d6752c792a64afcb6e
author Ken Dyck <ken.dyck@onsemi.com> Wed Jan 27 17:10:57 2010 +0000
committer Ken Dyck <ken.dyck@onsemi.com> Wed Jan 27 17:10:57 2010 +0000
tree 1d1ad2e6436a6d91c628aa6c5168d4c653f1f5d0
parent b925f7707e82b830719220e081c3f11127173d19

Change the return type of ASTContext::getDeclAlignInBytes() to CharUnits and,
now that the "InBytes" part of the name is implied by the return type, rename
it to getDeclAlign().

llvm-svn: 94681

clang/lib/CodeGen/CGDebugInfo.cpp

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index cb8752e..3ef8718 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1333,10 +1333,11 @@
       FieldOffset += FieldSize;
     }
     
-    unsigned Align = CGM.getContext().getDeclAlignInBytes(Decl);
-    if (Align > CGM.getContext().Target.getPointerAlign(0) / 8) {
+    CharUnits Align = CGM.getContext().getDeclAlign(Decl);
+    if (Align > CharUnits::fromQuantity(
+          CGM.getContext().Target.getPointerAlign(0) / 8)) {
       unsigned AlignedOffsetInBytes
-        = llvm::RoundUpToAlignment(FieldOffset/8, Align);
+        = llvm::RoundUpToAlignment(FieldOffset/8, Align.getQuantity());
       unsigned NumPaddingBytes
         = AlignedOffsetInBytes - FieldOffset/8;
 
@@ -1359,7 +1360,7 @@
     FType = Type;
     FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
     FieldSize = CGM.getContext().getTypeSize(FType);
-    FieldAlign = Align*8;
+    FieldAlign = Align.getQuantity()*8;
     
     FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,
                                              Decl->getName(), DefUnit,
@@ -1510,10 +1511,11 @@
       FieldOffset += FieldSize;
     }
     
-    unsigned Align = CGM.getContext().getDeclAlignInBytes(Decl);
-    if (Align > CGM.getContext().Target.getPointerAlign(0) / 8) {
+    CharUnits Align = CGM.getContext().getDeclAlign(Decl);
+    if (Align > CharUnits::fromQuantity(
+          CGM.getContext().Target.getPointerAlign(0) / 8)) {
       unsigned AlignedOffsetInBytes
-        = llvm::RoundUpToAlignment(FieldOffset/8, Align);
+        = llvm::RoundUpToAlignment(FieldOffset/8, Align.getQuantity());
       unsigned NumPaddingBytes
         = AlignedOffsetInBytes - FieldOffset/8;
 
@@ -1536,7 +1538,7 @@
     FType = Type;
     FieldTy = CGDebugInfo::getOrCreateType(FType, Unit);
     FieldSize = CGM.getContext().getTypeSize(FType);
-    FieldAlign = Align*8;
+    FieldAlign = Align.getQuantity()*8;
     
     XOffset = FieldOffset;
     FieldTy = DebugFactory.CreateDerivedType(llvm::dwarf::DW_TAG_member, Unit,