Subzero: Rerun clang-format after LLVM 3.6 merge.

crosstest/test_bitmanip_main.cpp

Index: crosstest/test_bitmanip_main.cpp
diff --git a/crosstest/test_bitmanip_main.cpp b/crosstest/test_bitmanip_main.cpp
index 49014623e42747d62660fb4bd9fbd4430db5e0d0..dfb5d1a9bf538c6b6eb72e583b1deb6aa34b535e 100644
--- a/crosstest/test_bitmanip_main.cpp
+++ b/crosstest/test_bitmanip_main.cpp
@@ -28,31 +28,18 @@ namespace Subzero_ {
 }
 
 volatile uint64_t Values[] = {
-    0,                              1,
-    0x7e,                           0x7f,
-    0x80,                           0x81,
-    0xfe,                           0xff,
-    0x7ffe,                         0x7fff,
-    0x8000,                         0x8001,
-    0xfffe,                         0xffff,
-    0xc0de,                         0xabcd,
-    0xdcba,                         0x007fffff /*Max subnormal + */,
-    0x00800000 /*Min+ */,           0x7f7fffff /*Max+ */,
-    0x7f800000 /*+Inf*/,            0xff800000 /*-Inf*/,
-    0x7fa00000 /*SNaN*/,            0x7fc00000 /*QNaN*/,
-    0x7ffffffe,                     0x7fffffff,
-    0x80000000,                     0x80000001,
-    0xfffffffe,                     0xffffffff,
-    0x12345678,                     0xabcd1234,
-    0x1234dcba,                     0x100000000ll,
-    0x100000001ll,                  0x123456789abcdef1ll,
-    0x987654321ab1fedcll,           0x000fffffffffffffll /*Max subnormal + */,
+    0, 1, 0x7e, 0x7f, 0x80, 0x81, 0xfe, 0xff, 0x7ffe, 0x7fff, 0x8000, 0x8001,

[jvoung (off chromium), 2015/03/04 00:57:52]

ah... I guess there's no good workaround to keep the old layout

[Jim Stichnoth, 2015/03/04 01:06:10]

Yeah - probably the best layout would be 1 value per line, but it doesn't seem
important enough to fight it at this time...

+    0xfffe, 0xffff, 0xc0de, 0xabcd, 0xdcba, 0x007fffff /*Max subnormal + */,
+    0x00800000 /*Min+ */, 0x7f7fffff /*Max+ */, 0x7f800000 /*+Inf*/,
+    0xff800000 /*-Inf*/, 0x7fa00000 /*SNaN*/, 0x7fc00000 /*QNaN*/, 0x7ffffffe,
+    0x7fffffff, 0x80000000, 0x80000001, 0xfffffffe, 0xffffffff, 0x12345678,
+    0xabcd1234, 0x1234dcba, 0x100000000ll, 0x100000001ll, 0x123456789abcdef1ll,
+    0x987654321ab1fedcll, 0x000fffffffffffffll /*Max subnormal + */,
     0x0010000000000000ll /*Min+ */, 0x7fefffffffffffffll /*Max+ */,
-    0x7ff0000000000000ll /*+Inf*/,  0xfff0000000000000ll /*-Inf*/,
-    0x7ff0000000000001ll /*SNaN*/,  0x7ff8000000000000ll /*QNaN*/,
-    0x7ffffffffffffffell,           0x7fffffffffffffffll,
-    0x8000000000000000ll,           0x8000000000000001ll,
-    0xfffffffffffffffell,           0xffffffffffffffffll};
+    0x7ff0000000000000ll /*+Inf*/, 0xfff0000000000000ll /*-Inf*/,
+    0x7ff0000000000001ll /*SNaN*/, 0x7ff8000000000000ll /*QNaN*/,
+    0x7ffffffffffffffell, 0x7fffffffffffffffll, 0x8000000000000000ll,
+    0x8000000000000001ll, 0xfffffffffffffffell, 0xffffffffffffffffll};
 
 const static size_t NumValues = sizeof(Values) / sizeof(*Values);
 
@@ -68,9 +55,9 @@ void testBitManip(size_t &TotalTests, size_t &Passes, size_t &Failures) {
   { STR(inst), test_##inst, Subzero_::test_##inst }                            \
   , {STR(inst) "_alloca", test_alloca_##inst, Subzero_::test_alloca_##inst},   \
       {STR(inst) "_const", test_const_##inst, Subzero_::test_const_##inst},
-        BMI_OPS
+      BMI_OPS
 #undef X
-    };
+  };
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
 
   for (size_t f = 0; f < NumFuncs; ++f) {
@@ -100,8 +87,8 @@ void testByteSwap(size_t &TotalTests, size_t &Passes, size_t &Failures) {
     FuncType FuncLlc;
     FuncType FuncSz;
   } Funcs[] = {
-        {"bswap", test_bswap, Subzero_::test_bswap},
-        {"bswap_alloca", test_bswap_alloca, Subzero_::test_bswap_alloca}};
+      {"bswap", test_bswap, Subzero_::test_bswap},
+      {"bswap_alloca", test_bswap_alloca, Subzero_::test_bswap_alloca}};
   const static size_t NumFuncs = sizeof(Funcs) / sizeof(*Funcs);
   for (size_t f = 0; f < NumFuncs; ++f) {
     for (size_t i = 0; i < NumValues; ++i) {