Fix tests broken by removal of de-anonyomizing structs.

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

34 files changed, 48 insertions, 47 deletions

diff --git a/test/Unit/absvti2_test.c b/test/Unit/absvti2_test.c
index 3dd39e61..fac79e74 100644
--- a/test/Unit/absvti2_test.c
+++ b/test/Unit/absvti2_test.c
@@ -38,7 +38,8 @@ int test__absvti2(ti_int a)
         expectedt.all = expected;
         printf("error in __absvti2(0x%llX%.16llX) = "
                "0x%llX%.16llX, expected positive 0x%llX%.16llX\n",
-               at.high, at.low, xt.high, xt.low, expectedt.high, expectedt.low);
+               at.s.high, at.s.low, xt.s.high, xt.s.low,
+               expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/addvti3_test.c b/test/Unit/addvti3_test.c
index 14158e01..17a88649 100644
--- a/test/Unit/addvti3_test.c
+++ b/test/Unit/addvti3_test.c
@@ -38,8 +38,8 @@ int test__addvti3(ti_int a, ti_int b)
         expectedt.all = expected;
         printf("error in test__addvti3(0x%llX%.16llX, 0x%llX%.16llX) = "
                "0x%llX%.16llX, expected 0x%llX%.16llX\n",
-                at.high, at.low, bt.high, bt.low, xt.high, xt.low,
-                expectedt.high, expectedt.low);
+                at.s.high, at.s.low, bt.s.high, bt.s.low, xt.s.high, xt.s.low,
+                expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/ashlti3_test.c b/test/Unit/ashlti3_test.c
index 43e9245e..2921a6aa 100644
--- a/test/Unit/ashlti3_test.c
+++ b/test/Unit/ashlti3_test.c
@@ -37,8 +37,8 @@ int test__ashlti3(ti_int a, si_int b, ti_int expected)
         expectedt.all = expected;
         printf("error in __ashlti3: 0x%llX%.16llX << %d = 0x%llX%.16llX,"
                " expected 0x%llX%.16llX\n",
-                at.high, at.low, b, xt.high, xt.low,
-                expectedt.high, expectedt.low);
+                at.s.high, at.s.low, b, xt.s.high, xt.s.low,
+                expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/ashrti3_test.c b/test/Unit/ashrti3_test.c
index 55a271ba..aaef120a 100644
--- a/test/Unit/ashrti3_test.c
+++ b/test/Unit/ashrti3_test.c
@@ -35,8 +35,8 @@ int test__ashrti3(ti_int a, si_int b, ti_int expected)
         expectedt.all = expected;
         printf("error in __ashrti3: 0x%llX%.16llX >> %d = 0x%llX%.16llX,"
                " expected 0x%llX%.16llX\n",
-                at.high, at.low, b, xt.high, xt.low,
-                expectedt.high, expectedt.low);
+                at.s.high, at.s.low, b, xt.s.high, xt.s.low,
+                expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/clzti2_test.c b/test/Unit/clzti2_test.c
index 5aa2eb76..e1229f1c 100644
--- a/test/Unit/clzti2_test.c
+++ b/test/Unit/clzti2_test.c
@@ -30,7 +30,7 @@ int test__clzti2(ti_int a, si_int expected)
         twords at;
         at.all = a;
         printf("error in __clzti2(0x%llX%.16llX) = %d, expected %d\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/cmpti2_test.c b/test/Unit/cmpti2_test.c
index ef0e1923..f590ddfe 100644
--- a/test/Unit/cmpti2_test.c
+++ b/test/Unit/cmpti2_test.c
@@ -32,7 +32,7 @@ int test__cmpti2(ti_int a, ti_int b, si_int expected)
         twords bt;
         bt.all = b;
         printf("error in __cmpti2(0x%llX%.16llX, 0x%llX%.16llX) = %d, expected %d\n",
-               at.high, at.low, bt.high, bt.low, x, expected);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/ctzti2_test.c b/test/Unit/ctzti2_test.c
index cbad510e..ad18b44e 100644
--- a/test/Unit/ctzti2_test.c
+++ b/test/Unit/ctzti2_test.c
@@ -30,7 +30,7 @@ int test__ctzti2(ti_int a, si_int expected)
         twords at;
         at.all = a;
         printf("error in __ctzti2(0x%llX%.16llX) = %d, expected %d\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/divti3_test.c b/test/Unit/divti3_test.c
index 891927bb..b5546caf 100644
--- a/test/Unit/divti3_test.c
+++ b/test/Unit/divti3_test.c
@@ -35,8 +35,8 @@ int test__divti3(ti_int a, ti_int b, ti_int expected)
         expectedt.all = expected;
         printf("error in __divti3: 0x%llX%.16llX / 0x%llX%.16llX = "
                "0x%llX%.16llX, expected 0x%llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, xt.high, xt.low,
-               expectedt.high, expectedt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, xt.s.high, xt.s.low,
+               expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/ffsti2_test.c b/test/Unit/ffsti2_test.c
index 5d9b7d5b..19da16a4 100644
--- a/test/Unit/ffsti2_test.c
+++ b/test/Unit/ffsti2_test.c
@@ -29,7 +29,7 @@ int test__ffsti2(ti_int a, si_int expected)
         twords at;
         at.all = a;
         printf("error in __ffsti2(0x%llX%.16llX) = %d, expected %d\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/fixdfti_test.c b/test/Unit/fixdfti_test.c
index d8276f91..97619638 100644
--- a/test/Unit/fixdfti_test.c
+++ b/test/Unit/fixdfti_test.c
@@ -36,7 +36,7 @@ int test__fixdfti(double a, ti_int expected)
         twords expectedt;
         expectedt.all = expected;
         printf("error in __fixdfti(%A) = 0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-        a, xt.high, xt.low, expectedt.high, expectedt.low);
+        a, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/fixsfti_test.c b/test/Unit/fixsfti_test.c
index a8c0d563..06853072 100644
--- a/test/Unit/fixsfti_test.c
+++ b/test/Unit/fixsfti_test.c
@@ -36,7 +36,7 @@ int test__fixsfti(float a, ti_int expected)
         twords expectedt;
         expectedt.all = expected;
         printf("error in __fixsfti(%A) = 0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-        a, xt.high, xt.low, expectedt.high, expectedt.low);
+        a, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/fixunsdfti_test.c b/test/Unit/fixunsdfti_test.c
index 24452b34..5b524666 100644
--- a/test/Unit/fixunsdfti_test.c
+++ b/test/Unit/fixunsdfti_test.c
@@ -38,7 +38,7 @@ int test__fixunsdfti(double a, tu_int expected)
         utwords expectedt;
         expectedt.all = expected;
         printf("error in __fixunsdfti(%A) = 0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               a, xt.high, xt.low, expectedt.high, expectedt.low);
+               a, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/fixunssfti_test.c b/test/Unit/fixunssfti_test.c
index 39bef8b3..33f0596c 100644
--- a/test/Unit/fixunssfti_test.c
+++ b/test/Unit/fixunssfti_test.c
@@ -38,7 +38,7 @@ int test__fixunssfti(float a, tu_int expected)
         utwords expectedt;
         expectedt.all = expected;
         printf("error in __fixunssfti(%A) = 0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               a, xt.high, xt.low, expectedt.high, expectedt.low);
+               a, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/fixunsxfti_test.c b/test/Unit/fixunsxfti_test.c
index ccbcbb04..ae5ba08e 100644
--- a/test/Unit/fixunsxfti_test.c
+++ b/test/Unit/fixunsxfti_test.c
@@ -39,7 +39,7 @@ int test__fixunsxfti(long double a, tu_int expected)
         utwords expectedt;
         expectedt.all = expected;
         printf("error in __fixunsxfti(%LA) = 0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               a, xt.high, xt.low, expectedt.high, expectedt.low);
+               a, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/fixxfti_test.c b/test/Unit/fixxfti_test.c
index 86fdcc08..0d3d182b 100644
--- a/test/Unit/fixxfti_test.c
+++ b/test/Unit/fixxfti_test.c
@@ -37,7 +37,7 @@ int test__fixxfti(long double a, ti_int expected)
         utwords expectedt;
         expectedt.all = expected;
         printf("error in __fixxfti(%LA) = 0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               a, xt.high, xt.low, expectedt.high, expectedt.low);
+               a, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/floattidf_test.c b/test/Unit/floattidf_test.c
index 5d001c50..fff51aee 100644
--- a/test/Unit/floattidf_test.c
+++ b/test/Unit/floattidf_test.c
@@ -34,7 +34,7 @@ int test__floattidf(ti_int a, double expected)
         twords at;
         at.all = a;
         printf("error in __floattidf(0x%.16llX%.16llX) = %a, expected %a\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/floattisf_test.c b/test/Unit/floattisf_test.c
index 403dd610..e4c99801 100644
--- a/test/Unit/floattisf_test.c
+++ b/test/Unit/floattisf_test.c
@@ -34,7 +34,7 @@ int test__floattisf(ti_int a, float expected)
         twords at;
         at.all = a;
         printf("error in __floattisf(0x%.16llX%.16llX) = %a, expected %a\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/floattixf_test.c b/test/Unit/floattixf_test.c
index a96f15d5..ada9594c 100644
--- a/test/Unit/floattixf_test.c
+++ b/test/Unit/floattixf_test.c
@@ -35,7 +35,7 @@ int test__floattixf(ti_int a, long double expected)
         twords at;
         at.all = a;
         printf("error in __floattixf(0x%.16llX%.16llX) = %LA, expected %LA\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/floatuntidf_test.c b/test/Unit/floatuntidf_test.c
index 82c6006e..dff3ca67 100644
--- a/test/Unit/floatuntidf_test.c
+++ b/test/Unit/floatuntidf_test.c
@@ -34,7 +34,7 @@ int test__floatuntidf(tu_int a, double expected)
         utwords at;
         at.all = a;
         printf("error in __floatuntidf(0x%.16llX%.16llX) = %a, expected %a\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/floatuntisf_test.c b/test/Unit/floatuntisf_test.c
index bd458c13..668e727e 100644
--- a/test/Unit/floatuntisf_test.c
+++ b/test/Unit/floatuntisf_test.c
@@ -34,7 +34,7 @@ int test__floatuntisf(tu_int a, float expected)
         utwords at;
         at.all = a;
         printf("error in __floatuntisf(0x%.16llX%.16llX) = %a, expected %a\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/floatuntixf_test.c b/test/Unit/floatuntixf_test.c
index a62cb53b..ec4c3ead 100644
--- a/test/Unit/floatuntixf_test.c
+++ b/test/Unit/floatuntixf_test.c
@@ -35,7 +35,7 @@ int test__floatuntixf(tu_int a, long double expected)
         utwords at;
         at.all = a;
         printf("error in __floatuntixf(0x%.16llX%.16llX) = %LA, expected %LA\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/lshrti3_test.c b/test/Unit/lshrti3_test.c
index b9f82a2d..5d68c525 100644
--- a/test/Unit/lshrti3_test.c
+++ b/test/Unit/lshrti3_test.c
@@ -35,8 +35,8 @@ int test__lshrti3(ti_int a, si_int b, ti_int expected)
         expectedt.all = expected;
         printf("error in __lshrti3: 0x%llX%.16llX >> %d = 0x%llX%.16llX,"
                " expected 0x%llX%.16llX\n",
-                at.high, at.low, b, xt.high, xt.low,
-                expectedt.high, expectedt.low);
+                at.s.high, at.s.low, b, xt.s.high, xt.s.low,
+                expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/modti3_test.c b/test/Unit/modti3_test.c
index 523d84a7..3cbccbe3 100644
--- a/test/Unit/modti3_test.c
+++ b/test/Unit/modti3_test.c
@@ -35,8 +35,8 @@ int test__modti3(ti_int a, ti_int b, ti_int expected)
         expectedt.all = expected;
         printf("error in __modti3: 0x%.16llX%.16llX %% 0x%.16llX%.16llX = "
                "0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, xt.high, xt.low,
-               expectedt.high, expectedt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, xt.s.high, xt.s.low,
+               expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/multi3_test.c b/test/Unit/multi3_test.c
index 9a166a5b..4fa27965 100644
--- a/test/Unit/multi3_test.c
+++ b/test/Unit/multi3_test.c
@@ -33,8 +33,8 @@ int test__multi3(ti_int a, ti_int b, ti_int expected)
         expectedt.all = expected;
         printf("error in __multi3: 0x%.16llX%.16llX * 0x%.16llX%.16llX = "
                "0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, xt.high, xt.low,
-               expectedt.high, expectedt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, xt.s.high, xt.s.low,
+               expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/mulvti3_test.c b/test/Unit/mulvti3_test.c
index 2961dead..509b2673 100644
--- a/test/Unit/mulvti3_test.c
+++ b/test/Unit/mulvti3_test.c
@@ -37,8 +37,8 @@ int test__mulvti3(ti_int a, ti_int b, ti_int expected)
         expectedt.all = expected;
         printf("error in __mulvti3: 0x%.16llX%.16llX * 0x%.16llX%.16llX = "
                "0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, xt.high, xt.low,
-               expectedt.high, expectedt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, xt.s.high, xt.s.low,
+               expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/negti2_test.c b/test/Unit/negti2_test.c
index ba4844e1..13c28e6a 100644
--- a/test/Unit/negti2_test.c
+++ b/test/Unit/negti2_test.c
@@ -33,7 +33,7 @@ int test__negti2(ti_int a, ti_int expected)
         expectedt.all = expected;
         printf("error in __negti2: -0x%.16llX%.16llX = 0x%.16llX%.16llX, "
                "expected 0x%.16llX%.16llX\n",
-               at.high, at.low, xt.high, xt.low, expectedt.high, expectedt.low);
+               at.s.high, at.s.low, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/negvti2_test.c b/test/Unit/negvti2_test.c
index 32a55858..7772c08f 100644
--- a/test/Unit/negvti2_test.c
+++ b/test/Unit/negvti2_test.c
@@ -37,7 +37,7 @@ int test__negvti2(ti_int a)
         expectedt.all = expected;
         printf("error in __negvti2(0x%.16llX%.16llX) = 0x%.16llX%.16llX, "
                "expected 0x%.16llX%.16llX\n",
-               at.high, at.low, xt.high, xt.low, expectedt.high, expectedt.low);
+               at.s.high, at.s.low, xt.s.high, xt.s.low, expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/parityti2_test.c b/test/Unit/parityti2_test.c
index 7f0a946c..6fe1cf65 100644
--- a/test/Unit/parityti2_test.c
+++ b/test/Unit/parityti2_test.c
@@ -38,7 +38,7 @@ int test__parityti2(ti_int a)
         twords at;
         at.all = a;
         printf("error in __parityti2(0x%.16llX%.16llX) = %d, expected %d\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/popcountti2_test.c b/test/Unit/popcountti2_test.c
index 0031ebfc..917b5cb7 100644
--- a/test/Unit/popcountti2_test.c
+++ b/test/Unit/popcountti2_test.c
@@ -38,7 +38,7 @@ int test__popcountti2(ti_int a)
         twords at;
         at.all = a;
         printf("error in __popcountti2(0x%.16llX%.16llX) = %d, expected %d\n",
-               at.high, at.low, x, expected);
+               at.s.high, at.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/subvti3_test.c b/test/Unit/subvti3_test.c
index 4794c2d7..11d81750 100644
--- a/test/Unit/subvti3_test.c
+++ b/test/Unit/subvti3_test.c
@@ -39,8 +39,8 @@ int test__subvti3(ti_int a, ti_int b)
         expectedt.all = expected;
         printf("error in test__subvsi3(0x%.16llX%.16llX, 0x%.16llX%.16llX) = "
                "0x%.16llX%.16llX, expected 0x%.16llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, xt.high, xt.low,
-               expectedt.high, expectedt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, xt.s.high, xt.s.low,
+               expectedt.s.high, expectedt.s.low);
     }
     return x != expected;
 }
diff --git a/test/Unit/ucmpti2_test.c b/test/Unit/ucmpti2_test.c
index c65531dd..cb6b4b74 100644
--- a/test/Unit/ucmpti2_test.c
+++ b/test/Unit/ucmpti2_test.c
@@ -33,7 +33,7 @@ int test__ucmpti2(tu_int a, tu_int b, si_int expected)
         bt.all = b;
         printf("error in __ucmpti2(0x%.16llX%.16llX, 0x%.16llX%.16llX) = %d, "
                "expected %d\n",
-               at.high, at.low, bt.high, bt.low, x, expected);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, x, expected);
     }
     return x != expected;
 }
diff --git a/test/Unit/udivmodti4_test.c b/test/Unit/udivmodti4_test.c
index cd510473..d16002c7 100644
--- a/test/Unit/udivmodti4_test.c
+++ b/test/Unit/udivmodti4_test.c
@@ -42,9 +42,9 @@ int test__udivmodti4(tu_int a, tu_int b, tu_int expected_q, tu_int expected_r)
         printf("error in __udivmodti4: 0x%.16llX%.16llX / 0x%.16llX%.16llX = "
                "0x%.16llX%.16llX, R = 0x%.16llX%.16llX, expected 0x%.16llX%.16llX, "
                "0x%.16llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, qt.high, qt.low,
-               rt.high, rt.low, expected_qt.high, expected_qt.low,
-               expected_rt.high, expected_rt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, qt.s.high, qt.s.low,
+               rt.s.high, rt.s.low, expected_qt.s.high, expected_qt.s.low,
+               expected_rt.s.high, expected_rt.s.low);
     }
     return !(q == expected_q && r == expected_r);
 }
diff --git a/test/Unit/udivti3_test.c b/test/Unit/udivti3_test.c
index 6c67fc5f..3b7846ea 100644
--- a/test/Unit/udivti3_test.c
+++ b/test/Unit/udivti3_test.c
@@ -35,8 +35,8 @@ int test__udivti3(tu_int a, tu_int b, tu_int expected_q)
         expected_qt.all = expected_q;
         printf("error in __udivti3: 0x%llX%.16llX / 0x%llX%.16llX = "
                "0x%llX%.16llX, expected 0x%llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, qt.high, qt.low,
-               expected_qt.high, expected_qt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, qt.s.high, qt.s.low,
+               expected_qt.s.high, expected_qt.s.low);
     }
     return q != expected_q;
 }
diff --git a/test/Unit/umodti3_test.c b/test/Unit/umodti3_test.c
index affeaced..3f6696ac 100644
--- a/test/Unit/umodti3_test.c
+++ b/test/Unit/umodti3_test.c
@@ -35,8 +35,8 @@ int test__umodti3(tu_int a, tu_int b, tu_int expected_r)
         expected_rt.all = expected_r;
         printf("error in __umodti3: 0x%llX%.16llX %% 0x%llX%.16llX = "
                "0x%llX%.16llX, expected 0x%llX%.16llX\n",
-               at.high, at.low, bt.high, bt.low, rt.high, rt.low,
-               expected_rt.high, expected_rt.low);
+               at.s.high, at.s.low, bt.s.high, bt.s.low, rt.s.high, rt.s.low,
+               expected_rt.s.high, expected_rt.s.low);
     }
     return r != expected_r;
 }