[llvm-commits] [llvm] r158599 - /llvm/trunk/unittests/Support/AlignOfTest.cpp

[Chandler Carruth]

Author: chandlerc
Date: Sat Jun 16 04:44:00 2012
New Revision: 158599

URL: http://llvm.org/viewvc/llvm-project?rev=158599&view=rev
Log:
Relax one assertion -- long double has strange alignments on lots of
platforms.

Also, remove one assertion on MSVC because it produces a completely
preposterous result, claiming something needs 12-byte alignment.

Modified:
    llvm/trunk/unittests/Support/AlignOfTest.cpp

Modified: llvm/trunk/unittests/Support/AlignOfTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/AlignOfTest.cpp?rev=158599&r1=158598&r2=158599&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/AlignOfTest.cpp (original)
+++ llvm/trunk/unittests/Support/AlignOfTest.cpp Sat Jun 16 04:44:00 2012
@@ -139,7 +139,7 @@
   EXPECT_LE(alignOf<long>(),   alignOf<long long>());
   EXPECT_LE(alignOf<char>(),   alignOf<float>());
   EXPECT_LE(alignOf<float>(),  alignOf<double>());
-  EXPECT_LE(alignOf<double>(), alignOf<long double>());
+  EXPECT_LE(alignOf<char>(),   alignOf<long double>());
   EXPECT_LE(alignOf<char>(),   alignOf<void *>());
   EXPECT_EQ(alignOf<void *>(), alignOf<int *>());
   EXPECT_LE(alignOf<char>(),   alignOf<S1>());
@@ -246,7 +246,12 @@
   EXPECT_EQ(alignOf<V5>(), alignOf<AlignedCharArray<V5>::union_type>());
   EXPECT_EQ(alignOf<V6>(), alignOf<AlignedCharArray<V6>::union_type>());
   EXPECT_EQ(alignOf<V7>(), alignOf<AlignedCharArray<V7>::union_type>());
+
+  // Some versions of MSVC get this wrong somewhat disturbingly. The failure
+  // appears to be benign: alignOf<V8>() produces a preposterous value: 12
+#ifndef _MSC_VER
   EXPECT_EQ(alignOf<V8>(), alignOf<AlignedCharArray<V8>::union_type>());
+#endif
 }
 
 }