Revert "[Alignment][NFC] Allow constexpr Align"

This reverts commit b3af236fb5fc6e50fcc1b54d868f0bff557f3fb1.

llvm-svn: 373619

2 files changed, 0 insertions, 29 deletions

diff --git a/llvm/unittests/Support/AlignmentTest.cpp b/llvm/unittests/Support/AlignmentTest.cpp
index 3d35a612b83..0b1435912b9 100644
--- a/llvm/unittests/Support/AlignmentTest.cpp
+++ b/llvm/unittests/Support/AlignmentTest.cpp
@@ -44,16 +44,6 @@ TEST(AlignmentTest, ValidCTors) {
   }
 }
 
-TEST(AlignmentTest, CompileTimeConstant) {
-  EXPECT_EQ(Align::Constant<1>(), Align(1));
-  EXPECT_EQ(Align::Constant<2>(), Align(2));
-  EXPECT_EQ(Align::Constant<4>(), Align(4));
-  EXPECT_EQ(Align::Constant<8>(), Align(8));
-  EXPECT_EQ(Align::Constant<16>(), Align(16));
-  EXPECT_EQ(Align::Constant<32>(), Align(32));
-  EXPECT_EQ(Align::Constant<64>(), Align(64));
-}
-
 TEST(AlignmentTest, CheckMaybeAlignHasValue) {
   EXPECT_TRUE(MaybeAlign(1));
   EXPECT_TRUE(MaybeAlign(1).hasValue());
diff --git a/llvm/unittests/Support/MathExtrasTest.cpp b/llvm/unittests/Support/MathExtrasTest.cpp
index 00d037ad110..01c83c9e14d 100644
--- a/llvm/unittests/Support/MathExtrasTest.cpp
+++ b/llvm/unittests/Support/MathExtrasTest.cpp
@@ -203,25 +203,6 @@ TEST(MathExtras, PowerOf2Floor) {
   EXPECT_EQ(4U, PowerOf2Floor(7U));
 }
 
-TEST(MathExtras, CTLog2) {
-  EXPECT_EQ(CTLog2<1ULL << 0>(), 0);
-  EXPECT_EQ(CTLog2<1ULL << 1>(), 1);
-  EXPECT_EQ(CTLog2<1ULL << 2>(), 2);
-  EXPECT_EQ(CTLog2<1ULL << 3>(), 3);
-  EXPECT_EQ(CTLog2<1ULL << 4>(), 4);
-  EXPECT_EQ(CTLog2<1ULL << 5>(), 5);
-  EXPECT_EQ(CTLog2<1ULL << 6>(), 6);
-  EXPECT_EQ(CTLog2<1ULL << 7>(), 7);
-  EXPECT_EQ(CTLog2<1ULL << 8>(), 8);
-  EXPECT_EQ(CTLog2<1ULL << 9>(), 9);
-  EXPECT_EQ(CTLog2<1ULL << 10>(), 10);
-  EXPECT_EQ(CTLog2<1ULL << 11>(), 11);
-  EXPECT_EQ(CTLog2<1ULL << 12>(), 12);
-  EXPECT_EQ(CTLog2<1ULL << 13>(), 13);
-  EXPECT_EQ(CTLog2<1ULL << 14>(), 14);
-  EXPECT_EQ(CTLog2<1ULL << 15>(), 15);
-}
-
 TEST(MathExtras, ByteSwap_32) {
   EXPECT_EQ(0x44332211u, ByteSwap_32(0x11223344));
   EXPECT_EQ(0xDDCCBBAAu, ByteSwap_32(0xAABBCCDD));