commit 9a6486934c6ce7d6a46f4f465c683a8a15f05d5d
author Ken Dyck <ken.dyck@onsemi.com> Tue Jan 18 02:01:14 2011 +0000
committer Ken Dyck <ken.dyck@onsemi.com> Tue Jan 18 02:01:14 2011 +0000
tree c8d31fb025f6a2399365b979035a44d4b4b2f404
parent 8dfa5f1776c2703bba757c388acf90c7fd8551b4

Replace calls to CharUnits::fromQuantity() with ones to 
ASTContext::toCharUnitsFromBits() when converting from bit sizes to char units.

llvm-svn: 123720

clang/lib/CodeGen/CGDecl.cpp

diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 16a3a19..8270e84 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -355,7 +355,7 @@
 
   bool Packed = false;
   CharUnits Align = getContext().getDeclAlign(D);
-  if (Align > CharUnits::fromQuantity(Target.getPointerAlign(0) / 8)) {
+  if (Align > getContext().toCharUnitsFromBits(Target.getPointerAlign(0))) {
     // We have to insert padding.
     
     // The struct above has 2 32-bit integers.
@@ -657,7 +657,7 @@
         Align = getContext().getDeclAlign(&D);
         if (isByRef)
           Align = std::max(Align, 
-              CharUnits::fromQuantity(Target.getPointerAlign(0) / 8));
+              getContext().toCharUnitsFromBits(Target.getPointerAlign(0)));
         Alloc->setAlignment(Align.getQuantity());
         DeclPtr = Alloc;
       }