Skip to content
This repository was archived by the owner on Mar 28, 2020. It is now read-only.

Commit 2229ea1

Browse files
committed
[APFloatTest] Use std::make_tuple to make GCC 4.8 happy
Differential Revision: https://reviews.llvm.org/D26817 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@289474 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 9def2dd commit 2229ea1

File tree

1 file changed

+38
-35
lines changed

1 file changed

+38
-35
lines changed

unittests/ADT/APFloatTest.cpp

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <cmath>
1616
#include <ostream>
1717
#include <string>
18+
#include <tuple>
1819

1920
using namespace llvm;
2021

@@ -3176,24 +3177,26 @@ TEST(APFloatTest, PPCDoubleDoubleAddSpecial) {
31763177
APFloat::fltCategory, APFloat::roundingMode>;
31773178
DataType Data[] = {
31783179
// (1 + 0) + (-1 + 0) = fcZero
3179-
{0x3ff0000000000000ull, 0, 0xbff0000000000000ull, 0, APFloat::fcZero,
3180-
APFloat::rmNearestTiesToEven},
3180+
std::make_tuple(0x3ff0000000000000ull, 0, 0xbff0000000000000ull, 0,
3181+
APFloat::fcZero, APFloat::rmNearestTiesToEven),
31813182
// LDBL_MAX + (1.1 >> (1023 - 106) + 0)) = fcInfinity
3182-
{0x7fefffffffffffffull, 0x7c8ffffffffffffeull, 0x7948000000000000ull,
3183-
0ull, APFloat::fcInfinity, APFloat::rmNearestTiesToEven},
3183+
std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
3184+
0x7948000000000000ull, 0ull, APFloat::fcInfinity,
3185+
APFloat::rmNearestTiesToEven),
31843186
// TODO: change the 4th 0x75effffffffffffe to 0x75efffffffffffff when
31853187
// PPCDoubleDoubleImpl is gone.
31863188
// LDBL_MAX + (1.011111... >> (1023 - 106) + (1.1111111...0 >> (1023 -
31873189
// 160))) = fcNormal
3188-
{0x7fefffffffffffffull, 0x7c8ffffffffffffeull, 0x7947ffffffffffffull,
3189-
0x75effffffffffffeull, APFloat::fcNormal, APFloat::rmNearestTiesToEven},
3190+
std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
3191+
0x7947ffffffffffffull, 0x75effffffffffffeull,
3192+
APFloat::fcNormal, APFloat::rmNearestTiesToEven),
31903193
// LDBL_MAX + (1.1 >> (1023 - 106) + 0)) = fcInfinity
3191-
{0x7fefffffffffffffull, 0x7c8ffffffffffffeull, 0x7fefffffffffffffull,
3192-
0x7c8ffffffffffffeull, APFloat::fcInfinity,
3193-
APFloat::rmNearestTiesToEven},
3194+
std::make_tuple(0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
3195+
0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
3196+
APFloat::fcInfinity, APFloat::rmNearestTiesToEven),
31943197
// NaN + (1 + 0) = fcNaN
3195-
{0x7ff8000000000000ull, 0, 0x3ff0000000000000ull, 0, APFloat::fcNaN,
3196-
APFloat::rmNearestTiesToEven},
3198+
std::make_tuple(0x7ff8000000000000ull, 0, 0x3ff0000000000000ull, 0,
3199+
APFloat::fcNaN, APFloat::rmNearestTiesToEven),
31973200
};
31983201

31993202
for (auto Tp : Data) {
@@ -3215,35 +3218,35 @@ TEST(APFloatTest, PPCDoubleDoubleAdd) {
32153218
uint64_t, APFloat::roundingMode>;
32163219
DataType Data[] = {
32173220
// (1 + 0) + (1e-105 + 0) = (1 + 1e-105)
3218-
{0x3ff0000000000000ull, 0, 0x3960000000000000ull, 0,
3219-
0x3ff0000000000000ull, 0x3960000000000000ull,
3220-
APFloat::rmNearestTiesToEven},
3221+
std::make_tuple(0x3ff0000000000000ull, 0, 0x3960000000000000ull, 0,
3222+
0x3ff0000000000000ull, 0x3960000000000000ull,
3223+
APFloat::rmNearestTiesToEven),
32213224
// (1 + 0) + (1e-106 + 0) = (1 + 1e-106)
3222-
{0x3ff0000000000000ull, 0, 0x3950000000000000ull, 0,
3223-
0x3ff0000000000000ull, 0x3950000000000000ull,
3224-
APFloat::rmNearestTiesToEven},
3225+
std::make_tuple(0x3ff0000000000000ull, 0, 0x3950000000000000ull, 0,
3226+
0x3ff0000000000000ull, 0x3950000000000000ull,
3227+
APFloat::rmNearestTiesToEven),
32253228
// (1 + 1e-106) + (1e-106 + 0) = (1 + 1e-105)
3226-
{0x3ff0000000000000ull, 0x3950000000000000ull, 0x3950000000000000ull, 0,
3227-
0x3ff0000000000000ull, 0x3960000000000000ull,
3228-
APFloat::rmNearestTiesToEven},
3229+
std::make_tuple(0x3ff0000000000000ull, 0x3950000000000000ull,
3230+
0x3950000000000000ull, 0, 0x3ff0000000000000ull,
3231+
0x3960000000000000ull, APFloat::rmNearestTiesToEven),
32293232
// (1 + 0) + (epsilon + 0) = (1 + epsilon)
3230-
{0x3ff0000000000000ull, 0, 0x0000000000000001ull, 0,
3231-
0x3ff0000000000000ull, 0x0000000000000001ull,
3232-
APFloat::rmNearestTiesToEven},
3233+
std::make_tuple(0x3ff0000000000000ull, 0, 0x0000000000000001ull, 0,
3234+
0x3ff0000000000000ull, 0x0000000000000001ull,
3235+
APFloat::rmNearestTiesToEven),
32333236
// TODO: change 0xf950000000000000 to 0xf940000000000000, when
32343237
// PPCDoubleDoubleImpl is gone.
32353238
// (DBL_MAX - 1 << (1023 - 105)) + (1 << (1023 - 53) + 0) = DBL_MAX +
32363239
// 1.11111... << (1023 - 52)
3237-
{0x7fefffffffffffffull, 0xf950000000000000ull, 0x7c90000000000000ull, 0,
3238-
0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
3239-
APFloat::rmNearestTiesToEven},
3240+
std::make_tuple(0x7fefffffffffffffull, 0xf950000000000000ull,
3241+
0x7c90000000000000ull, 0, 0x7fefffffffffffffull,
3242+
0x7c8ffffffffffffeull, APFloat::rmNearestTiesToEven),
32403243
// TODO: change 0xf950000000000000 to 0xf940000000000000, when
32413244
// PPCDoubleDoubleImpl is gone.
32423245
// (1 << (1023 - 53) + 0) + (DBL_MAX - 1 << (1023 - 105)) = DBL_MAX +
32433246
// 1.11111... << (1023 - 52)
3244-
{0x7c90000000000000ull, 0, 0x7fefffffffffffffull, 0xf950000000000000ull,
3245-
0x7fefffffffffffffull, 0x7c8ffffffffffffeull,
3246-
APFloat::rmNearestTiesToEven},
3247+
std::make_tuple(0x7c90000000000000ull, 0, 0x7fefffffffffffffull,
3248+
0xf950000000000000ull, 0x7fefffffffffffffull,
3249+
0x7c8ffffffffffffeull, APFloat::rmNearestTiesToEven),
32473250
};
32483251

32493252
for (auto Tp : Data) {
@@ -3266,13 +3269,13 @@ TEST(APFloatTest, PPCDoubleDoubleSubtract) {
32663269
uint64_t, APFloat::roundingMode>;
32673270
DataType Data[] = {
32683271
// (1 + 0) - (-1e-105 + 0) = (1 + 1e-105)
3269-
{0x3ff0000000000000ull, 0, 0xb960000000000000ull, 0,
3270-
0x3ff0000000000000ull, 0x3960000000000000ull,
3271-
APFloat::rmNearestTiesToEven},
3272+
std::make_tuple(0x3ff0000000000000ull, 0, 0xb960000000000000ull, 0,
3273+
0x3ff0000000000000ull, 0x3960000000000000ull,
3274+
APFloat::rmNearestTiesToEven),
32723275
// (1 + 0) - (-1e-106 + 0) = (1 + 1e-106)
3273-
{0x3ff0000000000000ull, 0, 0xb950000000000000ull, 0,
3274-
0x3ff0000000000000ull, 0x3950000000000000ull,
3275-
APFloat::rmNearestTiesToEven},
3276+
std::make_tuple(0x3ff0000000000000ull, 0, 0xb950000000000000ull, 0,
3277+
0x3ff0000000000000ull, 0x3950000000000000ull,
3278+
APFloat::rmNearestTiesToEven),
32763279
};
32773280

32783281
for (auto Tp : Data) {

0 commit comments

Comments
 (0)