From: Davide Italiano <davide@freebsd.org>
Date: Fri, 11 Nov 2016 03:00:00 +0000 (+0000)
Subject: [IR/DataLayout] Simplify the code using PowerOf2Ceil. NFCI.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30ebcd34f61b6c63359619e6ec5546a54d6d918b;p=llvm

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286554 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/IR/DataLayout.cpp b/lib/IR/DataLayout.cpp
index d7ed73015ee..3de1889996e 100644
--- a/lib/IR/DataLayout.cpp
+++ b/lib/IR/DataLayout.cpp
@@ -506,10 +506,7 @@ unsigned DataLayout::getAlignmentInfo(AlignTypeEnum AlignType,
       // 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(AlignTypeEnum AlignType,
   // layout.
   if (BestMatchIdx == -1) {
     unsigned Align = getTypeStoreSize(Ty);
-    if (Align & (Align-1))
-      Align = NextPowerOf2(Align);
+    Align = PowerOf2Ceil(Align);
     return Align;
   }