[llvm] r286554 - [IR/DataLayout] Simplify the code using PowerOf2Ceil. NFCI.

[Davide Italiano via llvm-commits]

Author: davide
Date: Thu Nov 10 21:00:00 2016
New Revision: 286554

URL: http://llvm.org/viewvc/llvm-project?rev=286554&view=rev
Log:
[IR/DataLayout] Simplify the code using PowerOf2Ceil. NFCI.

Modified:
    llvm/trunk/lib/IR/DataLayout.cpp

Modified: llvm/trunk/lib/IR/DataLayout.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DataLayout.cpp?rev=286554&r1=286553&r2=286554&view=diff
==============================================================================
--- llvm/trunk/lib/IR/DataLayout.cpp (original)
+++ llvm/trunk/lib/IR/DataLayout.cpp Thu Nov 10 21:00:00 2016
@@ -506,10 +506,7 @@ unsigned DataLayout::getAlignmentInfo(Al
       // with what clang and llvm-gcc do.
       unsigned Align = getTypeAllocSize(cast<VectorType>(Ty)->getElementType());
       Align *= cast<VectorType>(Ty)->getNumElements();
-      // If the alignment is not a power of 2, round up to the next power of 2.
-      // This happens for non-power-of-2 length vectors.
-      if (Align & (Align-1))
-        Align = NextPowerOf2(Align);
+      Align = PowerOf2Ceil(Align);
       return Align;
     }
   }
@@ -522,8 +519,7 @@ unsigned DataLayout::getAlignmentInfo(Al
   // layout.
   if (BestMatchIdx == -1) {
     unsigned Align = getTypeStoreSize(Ty);
-    if (Align & (Align-1))
-      Align = NextPowerOf2(Align);
+    Align = PowerOf2Ceil(Align);
     return Align;
   }