Skip to content

Commit 3b90f1b

Browse files
linkrenlinkren
committed
Merge from 'main' to 'sycl-web' (#10)
 CONFLICT (content): Merge conflict in clang/lib/Frontend/CompilerInvocation.cpp
2 parents 3b41e3b + 741978d commit 3b90f1b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+622
-686
lines changed

‎clang/include/clang/Driver/Options.td

Lines changed: 392 additions & 280 deletions
Large diffs are not rendered by default.

‎clang/lib/Frontend/CompilerInvocation.cpp

Lines changed: 7 additions & 215 deletions
Large diffs are not rendered by default.

‎clang/unittests/Frontend/CompilerInvocationTest.cpp

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,55 @@ TEST_F(CommandLineTest, BoolOptionDefaultArbitraryTwoFlagsPresentReset) {
238238
ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerChangedByFlag))));
239239
}
240240

241+
// Boolean option that gets the CC1Option flag from a let statement (which
242+
// is applied **after** the record is defined):
243+
//
244+
// let Flags = [CC1Option] in {
245+
// defm option : BoolOption<...>;
246+
// }
247+
248+
TEST_F(CommandLineTest, BoolOptionCC1ViaLetPresentNone) {
249+
const char *Args[] = {""};
250+
251+
CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
252+
253+
ASSERT_FALSE(Diags->hasErrorOccurred());
254+
ASSERT_FALSE(Invocation.getCodeGenOpts().DebugPassManager);
255+
256+
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
257+
258+
ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fdebug-pass-manager"))));
259+
ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-debug-pass-manager"))));
260+
}
261+
262+
TEST_F(CommandLineTest, BoolOptionCC1ViaLetPresentPos) {
263+
const char *Args[] = {"-fdebug-pass-manager"};
264+
265+
CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
266+
267+
ASSERT_FALSE(Diags->hasErrorOccurred());
268+
ASSERT_TRUE(Invocation.getCodeGenOpts().DebugPassManager);
269+
270+
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
271+
272+
ASSERT_EQ(count(GeneratedArgs, StringRef("-fdebug-pass-manager")), 1);
273+
ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-debug-pass-manager"))));
274+
}
275+
276+
TEST_F(CommandLineTest, BoolOptionCC1ViaLetPresentNeg) {
277+
const char *Args[] = {"-fno-debug-pass-manager"};
278+
279+
CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
280+
281+
ASSERT_FALSE(Diags->hasErrorOccurred());
282+
ASSERT_FALSE(Invocation.getCodeGenOpts().DebugPassManager);
283+
284+
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
285+
286+
ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-debug-pass-manager"))));
287+
ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fdebug-pass-manager"))));
288+
}
289+
241290
TEST_F(CommandLineTest, CanGenerateCC1CommandLineFlag) {
242291
const char *Args[] = {"-fmodules-strict-context-hash"};
243292

‎compiler-rt/lib/builtins/aarch64/lse.S

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ HIDDEN(__aarch64_have_lse_atomics)
113113
.endm
114114

115115
#ifdef L_cas
116-
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(cas))
117-
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(cas))
116+
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas))
118117
JUMP_IF_NOT_LSE 8f
119118
#if SIZE < 16
120119
#ifdef HAS_ASM_LSE
@@ -167,8 +166,7 @@ END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas))
167166
#else
168167
#define SWP .inst 0x38208020 + B + N
169168
#endif
170-
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(swp))
171-
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(swp))
169+
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp))
172170
JUMP_IF_NOT_LSE 8f
173171
SWP // s(0), s(0), [x1]
174172
ret
@@ -211,8 +209,7 @@ END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp))
211209
#define LDOP .inst 0x38200020 + OPN + B + N
212210
#endif
213211

214-
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(NAME(LDNM))
215-
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(NAME(LDNM))
212+
DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM))
216213
JUMP_IF_NOT_LSE 8f
217214
LDOP // s(0), s(0), [x1]
218215
ret

‎compiler-rt/lib/builtins/assembly.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef COMPILERRT_ASSEMBLY_H
1515
#define COMPILERRT_ASSEMBLY_H
1616

17-
#if defined(__POWERPC__) || defined(__powerpc__) || defined(__ppc__)
18-
#define SEPARATOR @
17+
#if defined(__APPLE__) && defined(__aarch64__)
18+
#define SEPARATOR %%
1919
#else
2020
#define SEPARATOR ;
2121
#endif
@@ -243,16 +243,12 @@
243243
DECLARE_FUNC_ENCODING \
244244
name:
245245

246-
// TODO(ilinpv) START & END parts will be merged when assembly parser bug
247-
// (kristina) in MasmParser::parseDirectiveCFIStartProc() is fixed.
248-
#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_START(name) \
246+
#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(name) \
249247
DEFINE_CODE_STATE \
250248
FUNC_ALIGN \
251249
.globl name SEPARATOR \
252250
SYMBOL_IS_FUNC(name) SEPARATOR \
253-
DECLARE_SYMBOL_VISIBILITY(name)
254-
255-
#define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED_END(name) \
251+
DECLARE_SYMBOL_VISIBILITY(name) SEPARATOR \
256252
CFI_START SEPARATOR \
257253
DECLARE_FUNC_ENCODING \
258254
name: SEPARATOR BTI_C

‎libc/test/src/math/HypotTest.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
#ifndef LLVM_LIBC_TEST_SRC_MATH_HYPOTTEST_H
1010
#define LLVM_LIBC_TEST_SRC_MATH_HYPOTTEST_H
1111

12-
#include "include/math.h"
1312
#include "utils/FPUtil/FPBits.h"
1413
#include "utils/FPUtil/Hypot.h"
1514
#include "utils/FPUtil/TestHelpers.h"
1615
#include "utils/MPFRWrapper/MPFRUtils.h"
1716
#include "utils/UnitTest/Test.h"
1817

18+
#include <math.h>
19+
1920
namespace mpfr = __llvm_libc::testing::mpfr;
2021

2122
template <typename T>

‎libc/test/src/math/LdExpTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class LdExpTestTemplate : public __llvm_libc::testing::Test {
4444
ASSERT_FP_EQ(negZero, func(negZero, exp));
4545
ASSERT_FP_EQ(inf, func(inf, exp));
4646
ASSERT_FP_EQ(negInf, func(negInf, exp));
47-
ASSERT_NE(isnan(func(nan, exp)), 0);
47+
ASSERT_FP_EQ(nan, func(nan, exp));
4848
}
4949
}
5050

‎libc/test/src/math/RoundToIntegerTest.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "src/fenv/feclearexcept.h"
1414
#include "src/fenv/feraiseexcept.h"
1515
#include "src/fenv/fetestexcept.h"
16-
#include "utils/CPP/TypeTraits.h"
1716
#include "utils/FPUtil/FPBits.h"
1817
#include "utils/MPFRWrapper/MPFRUtils.h"
1918
#include "utils/UnitTest/Test.h"

‎libc/test/src/math/ceil_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ TEST(CeilTest, SpecialNumbers) {
2626
EXPECT_FP_EQ(inf, __llvm_libc::ceil(inf));
2727
EXPECT_FP_EQ(negInf, __llvm_libc::ceil(negInf));
2828

29-
ASSERT_NE(isnan(nan), 0);
30-
ASSERT_NE(isnan(__llvm_libc::ceil(nan)), 0);
29+
EXPECT_FP_EQ(aNaN, __llvm_libc::ceil(aNaN));
3130
}
3231

3332
TEST(CeilTest, RoundedNumbers) {

‎libc/test/src/math/ceilf_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ TEST(CeilfTest, SpecialNumbers) {
2626
EXPECT_FP_EQ(inf, __llvm_libc::ceilf(inf));
2727
EXPECT_FP_EQ(negInf, __llvm_libc::ceilf(negInf));
2828

29-
ASSERT_NE(isnan(nan), 0);
30-
ASSERT_NE(isnan(__llvm_libc::ceilf(nan)), 0);
29+
EXPECT_FP_EQ(aNaN, __llvm_libc::ceilf(aNaN));
3130
}
3231

3332
TEST(CeilfTest, RoundedNumbers) {

‎libc/test/src/math/ceill_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ TEST(CeillTest, SpecialNumbers) {
2626
EXPECT_FP_EQ(inf, __llvm_libc::ceill(inf));
2727
EXPECT_FP_EQ(negInf, __llvm_libc::ceill(negInf));
2828

29-
ASSERT_NE(isnan(nan), 0);
30-
ASSERT_NE(isnan(__llvm_libc::ceill(nan)), 0);
29+
EXPECT_FP_EQ(aNaN, __llvm_libc::ceill(aNaN));
3130
}
3231

3332
TEST(CeillTest, RoundedNumbers) {

‎libc/test/src/math/copysign_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ using FPBits = __llvm_libc::fputil::FPBits<double>;
1717
DECLARE_SPECIAL_CONSTANTS(double)
1818

1919
TEST(CopySignTest, SpecialNumbers) {
20-
EXPECT_FP_EQ(nan, __llvm_libc::copysign(nan, -1.0));
21-
EXPECT_FP_EQ(nan, __llvm_libc::copysign(nan, 1.0));
20+
EXPECT_FP_EQ(aNaN, __llvm_libc::copysign(aNaN, -1.0));
21+
EXPECT_FP_EQ(aNaN, __llvm_libc::copysign(aNaN, 1.0));
2222

2323
EXPECT_FP_EQ(negInf, __llvm_libc::copysign(inf, -1.0));
2424
EXPECT_FP_EQ(inf, __llvm_libc::copysign(negInf, 1.0));

‎libc/test/src/math/copysignf_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ using FPBits = __llvm_libc::fputil::FPBits<float>;
1717
DECLARE_SPECIAL_CONSTANTS(float)
1818

1919
TEST(CopySinfTest, SpecialNumbers) {
20-
EXPECT_FP_EQ(nan, __llvm_libc::copysignf(nan, -1.0));
21-
EXPECT_FP_EQ(nan, __llvm_libc::copysignf(nan, 1.0));
20+
EXPECT_FP_EQ(aNaN, __llvm_libc::copysignf(aNaN, -1.0));
21+
EXPECT_FP_EQ(aNaN, __llvm_libc::copysignf(aNaN, 1.0));
2222

2323
EXPECT_FP_EQ(negInf, __llvm_libc::copysignf(inf, -1.0));
2424
EXPECT_FP_EQ(inf, __llvm_libc::copysignf(negInf, 1.0));

‎libc/test/src/math/copysignl_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ using FPBits = __llvm_libc::fputil::FPBits<long double>;
1717
DECLARE_SPECIAL_CONSTANTS(long double)
1818

1919
TEST(CopySinlTest, SpecialNumbers) {
20-
EXPECT_FP_EQ(nan, __llvm_libc::copysignl(nan, -1.0));
21-
EXPECT_FP_EQ(nan, __llvm_libc::copysignl(nan, 1.0));
20+
EXPECT_FP_EQ(aNaN, __llvm_libc::copysignl(aNaN, -1.0));
21+
EXPECT_FP_EQ(aNaN, __llvm_libc::copysignl(aNaN, 1.0));
2222

2323
EXPECT_FP_EQ(negInf, __llvm_libc::copysignl(inf, -1.0));
2424
EXPECT_FP_EQ(inf, __llvm_libc::copysignl(negInf, 1.0));

‎libc/test/src/math/fabs_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DECLARE_SPECIAL_CONSTANTS(double)
2020
namespace mpfr = __llvm_libc::testing::mpfr;
2121

2222
TEST(FabsTest, SpecialNumbers) {
23-
EXPECT_FP_EQ(nan, __llvm_libc::fabs(nan));
23+
EXPECT_FP_EQ(aNaN, __llvm_libc::fabs(aNaN));
2424

2525
EXPECT_FP_EQ(inf, __llvm_libc::fabs(inf));
2626
EXPECT_FP_EQ(inf, __llvm_libc::fabs(negInf));

‎libc/test/src/math/fabsf_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DECLARE_SPECIAL_CONSTANTS(float)
2020
namespace mpfr = __llvm_libc::testing::mpfr;
2121

2222
TEST(FabsfTest, SpecialNumbers) {
23-
EXPECT_FP_EQ(nan, __llvm_libc::fabsf(nan));
23+
EXPECT_FP_EQ(aNaN, __llvm_libc::fabsf(aNaN));
2424

2525
EXPECT_FP_EQ(inf, __llvm_libc::fabsf(inf));
2626
EXPECT_FP_EQ(inf, __llvm_libc::fabsf(negInf));

‎libc/test/src/math/fabsl_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DECLARE_SPECIAL_CONSTANTS(long double)
2020
namespace mpfr = __llvm_libc::testing::mpfr;
2121

2222
TEST(FabslTest, SpecialNumbers) {
23-
EXPECT_FP_EQ(nan, __llvm_libc::fabsl(nan));
23+
EXPECT_FP_EQ(aNaN, __llvm_libc::fabsl(aNaN));
2424

2525
EXPECT_FP_EQ(inf, __llvm_libc::fabsl(inf));
2626
EXPECT_FP_EQ(inf, __llvm_libc::fabsl(negInf));

‎libc/test/src/math/floor_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ TEST(FloorTest, SpecialNumbers) {
2626
EXPECT_FP_EQ(inf, __llvm_libc::floor(inf));
2727
EXPECT_FP_EQ(negInf, __llvm_libc::floor(negInf));
2828

29-
ASSERT_NE(isnan(nan), 0);
30-
ASSERT_NE(isnan(__llvm_libc::floor(nan)), 0);
29+
EXPECT_FP_EQ(aNaN, __llvm_libc::floor(aNaN));
3130
}
3231

3332
TEST(FloorTest, RoundedNumbers) {

‎libc/test/src/math/floorf_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ TEST(FloorfTest, SpecialNumbers) {
2626
EXPECT_FP_EQ(inf, __llvm_libc::floorf(inf));
2727
EXPECT_FP_EQ(negInf, __llvm_libc::floorf(negInf));
2828

29-
ASSERT_NE(isnan(nan), 0);
30-
ASSERT_NE(isnan(__llvm_libc::floorf(nan)), 0);
29+
EXPECT_FP_EQ(aNaN, __llvm_libc::floorf(aNaN));
3130
}
3231

3332
TEST(FloorfTest, RoundedNumbers) {

‎libc/test/src/math/floorl_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ TEST(FloorlTest, SpecialNumbers) {
2626
EXPECT_FP_EQ(inf, __llvm_libc::floorl(inf));
2727
EXPECT_FP_EQ(negInf, __llvm_libc::floorl(negInf));
2828

29-
ASSERT_NE(isnan(nan), 0);
30-
ASSERT_NE(isnan(__llvm_libc::floorl(nan)), 0);
29+
EXPECT_FP_EQ(aNaN, __llvm_libc::floorl(aNaN));
3130
}
3231

3332
TEST(FloorlTest, RoundedNumbers) {

‎libc/test/src/math/fmax_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ using FPBits = __llvm_libc::fputil::FPBits<double>;
1717
DECLARE_SPECIAL_CONSTANTS(double)
1818

1919
TEST(FmaxTest, NaNArg) {
20-
EXPECT_FP_EQ(inf, __llvm_libc::fmax(nan, inf));
21-
EXPECT_FP_EQ(negInf, __llvm_libc::fmax(negInf, nan));
22-
EXPECT_FP_EQ(0.0, __llvm_libc::fmax(nan, 0.0));
23-
EXPECT_FP_EQ(-0.0, __llvm_libc::fmax(-0.0, nan));
24-
EXPECT_FP_EQ(-1.2345, __llvm_libc::fmax(nan, -1.2345));
25-
EXPECT_FP_EQ(1.2345, __llvm_libc::fmax(1.2345, nan));
26-
EXPECT_NE(isnan(__llvm_libc::fmax(nan, nan)), 0);
20+
EXPECT_FP_EQ(inf, __llvm_libc::fmax(aNaN, inf));
21+
EXPECT_FP_EQ(negInf, __llvm_libc::fmax(negInf, aNaN));
22+
EXPECT_FP_EQ(0.0, __llvm_libc::fmax(aNaN, 0.0));
23+
EXPECT_FP_EQ(-0.0, __llvm_libc::fmax(-0.0, aNaN));
24+
EXPECT_FP_EQ(-1.2345, __llvm_libc::fmax(aNaN, -1.2345));
25+
EXPECT_FP_EQ(1.2345, __llvm_libc::fmax(1.2345, aNaN));
26+
EXPECT_NE(isnan(__llvm_libc::fmax(aNaN, aNaN)), 0);
2727
}
2828

2929
TEST(FmaxTest, InfArg) {

‎libc/test/src/math/fmaxf_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ using FPBits = __llvm_libc::fputil::FPBits<float>;
1717
DECLARE_SPECIAL_CONSTANTS(float)
1818

1919
TEST(FmaxfTest, NaNArg) {
20-
EXPECT_FP_EQ(inf, __llvm_libc::fmaxf(nan, inf));
21-
EXPECT_FP_EQ(negInf, __llvm_libc::fmaxf(negInf, nan));
22-
EXPECT_FP_EQ(0.0f, __llvm_libc::fmaxf(nan, 0.0f));
23-
EXPECT_FP_EQ(-0.0f, __llvm_libc::fmaxf(-0.0f, nan));
24-
EXPECT_FP_EQ(-1.2345f, __llvm_libc::fmaxf(nan, -1.2345f));
25-
EXPECT_FP_EQ(1.2345f, __llvm_libc::fmaxf(1.2345f, nan));
26-
EXPECT_NE(isnan(__llvm_libc::fmaxf(nan, nan)), 0);
20+
EXPECT_FP_EQ(inf, __llvm_libc::fmaxf(aNaN, inf));
21+
EXPECT_FP_EQ(negInf, __llvm_libc::fmaxf(negInf, aNaN));
22+
EXPECT_FP_EQ(0.0f, __llvm_libc::fmaxf(aNaN, 0.0f));
23+
EXPECT_FP_EQ(-0.0f, __llvm_libc::fmaxf(-0.0f, aNaN));
24+
EXPECT_FP_EQ(-1.2345f, __llvm_libc::fmaxf(aNaN, -1.2345f));
25+
EXPECT_FP_EQ(1.2345f, __llvm_libc::fmaxf(1.2345f, aNaN));
26+
EXPECT_NE(isnan(__llvm_libc::fmaxf(aNaN, aNaN)), 0);
2727
}
2828

2929
TEST(FmaxfTest, InfArg) {

‎libc/test/src/math/fmaxl_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ using FPBits = __llvm_libc::fputil::FPBits<long double>;
1717
DECLARE_SPECIAL_CONSTANTS(long double)
1818

1919
TEST(FmaxlTest, NaNArg) {
20-
EXPECT_FP_EQ(inf, __llvm_libc::fmaxl(nan, inf));
21-
EXPECT_FP_EQ(negInf, __llvm_libc::fmaxl(negInf, nan));
22-
EXPECT_FP_EQ(0.0L, __llvm_libc::fmaxl(nan, 0.0L));
23-
EXPECT_FP_EQ(-0.0L, __llvm_libc::fmaxl(-0.0L, nan));
24-
EXPECT_FP_EQ(-1.2345L, __llvm_libc::fmaxl(nan, -1.2345L));
25-
EXPECT_FP_EQ(1.2345L, __llvm_libc::fmaxl(1.2345L, nan));
26-
EXPECT_NE(isnan(__llvm_libc::fmaxl(nan, nan)), 0);
20+
EXPECT_FP_EQ(inf, __llvm_libc::fmaxl(aNaN, inf));
21+
EXPECT_FP_EQ(negInf, __llvm_libc::fmaxl(negInf, aNaN));
22+
EXPECT_FP_EQ(0.0L, __llvm_libc::fmaxl(aNaN, 0.0L));
23+
EXPECT_FP_EQ(-0.0L, __llvm_libc::fmaxl(-0.0L, aNaN));
24+
EXPECT_FP_EQ(-1.2345L, __llvm_libc::fmaxl(aNaN, -1.2345L));
25+
EXPECT_FP_EQ(1.2345L, __llvm_libc::fmaxl(1.2345L, aNaN));
26+
EXPECT_NE(isnan(__llvm_libc::fmaxl(aNaN, aNaN)), 0);
2727
}
2828

2929
TEST(FmaxlTest, InfArg) {

‎libc/test/src/math/fmin_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ using FPBits = __llvm_libc::fputil::FPBits<double>;
1717
DECLARE_SPECIAL_CONSTANTS(double)
1818

1919
TEST(FminTest, NaNArg) {
20-
EXPECT_FP_EQ(inf, __llvm_libc::fmin(nan, inf));
21-
EXPECT_FP_EQ(negInf, __llvm_libc::fmin(negInf, nan));
22-
EXPECT_FP_EQ(0.0, __llvm_libc::fmin(nan, 0.0));
23-
EXPECT_FP_EQ(-0.0, __llvm_libc::fmin(-0.0, nan));
24-
EXPECT_FP_EQ(-1.2345, __llvm_libc::fmin(nan, -1.2345));
25-
EXPECT_FP_EQ(1.2345, __llvm_libc::fmin(1.2345, nan));
26-
EXPECT_NE(isnan(__llvm_libc::fmin(nan, nan)), 0);
20+
EXPECT_FP_EQ(inf, __llvm_libc::fmin(aNaN, inf));
21+
EXPECT_FP_EQ(negInf, __llvm_libc::fmin(negInf, aNaN));
22+
EXPECT_FP_EQ(0.0, __llvm_libc::fmin(aNaN, 0.0));
23+
EXPECT_FP_EQ(-0.0, __llvm_libc::fmin(-0.0, aNaN));
24+
EXPECT_FP_EQ(-1.2345, __llvm_libc::fmin(aNaN, -1.2345));
25+
EXPECT_FP_EQ(1.2345, __llvm_libc::fmin(1.2345, aNaN));
26+
EXPECT_NE(isnan(__llvm_libc::fmin(aNaN, aNaN)), 0);
2727
}
2828

2929
TEST(FminTest, InfArg) {

‎libc/test/src/math/fminf_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ using FPBits = __llvm_libc::fputil::FPBits<float>;
1717
DECLARE_SPECIAL_CONSTANTS(float)
1818

1919
TEST(FminfTest, NaNArg) {
20-
EXPECT_FP_EQ(inf, __llvm_libc::fminf(nan, inf));
21-
EXPECT_FP_EQ(negInf, __llvm_libc::fminf(negInf, nan));
22-
EXPECT_FP_EQ(0.0f, __llvm_libc::fminf(nan, 0.0f));
23-
EXPECT_FP_EQ(-0.0f, __llvm_libc::fminf(-0.0f, nan));
24-
EXPECT_FP_EQ(-1.2345f, __llvm_libc::fminf(nan, -1.2345f));
25-
EXPECT_FP_EQ(1.2345f, __llvm_libc::fminf(1.2345f, nan));
26-
EXPECT_NE(isnan(__llvm_libc::fminf(nan, nan)), 0);
20+
EXPECT_FP_EQ(inf, __llvm_libc::fminf(aNaN, inf));
21+
EXPECT_FP_EQ(negInf, __llvm_libc::fminf(negInf, aNaN));
22+
EXPECT_FP_EQ(0.0f, __llvm_libc::fminf(aNaN, 0.0f));
23+
EXPECT_FP_EQ(-0.0f, __llvm_libc::fminf(-0.0f, aNaN));
24+
EXPECT_FP_EQ(-1.2345f, __llvm_libc::fminf(aNaN, -1.2345f));
25+
EXPECT_FP_EQ(1.2345f, __llvm_libc::fminf(1.2345f, aNaN));
26+
EXPECT_NE(isnan(__llvm_libc::fminf(aNaN, aNaN)), 0);
2727
}
2828

2929
TEST(FminfTest, InfArg) {

‎libc/test/src/math/fminl_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ using FPBits = __llvm_libc::fputil::FPBits<long double>;
1717
DECLARE_SPECIAL_CONSTANTS(long double)
1818

1919
TEST(FminlTest, NaNArg) {
20-
EXPECT_FP_EQ(inf, __llvm_libc::fminl(nan, inf));
21-
EXPECT_FP_EQ(negInf, __llvm_libc::fminl(negInf, nan));
22-
EXPECT_FP_EQ(0.0L, __llvm_libc::fminl(nan, 0.0L));
23-
EXPECT_FP_EQ(-0.0L, __llvm_libc::fminl(-0.0L, nan));
24-
EXPECT_FP_EQ(-1.2345L, __llvm_libc::fminl(nan, -1.2345L));
25-
EXPECT_FP_EQ(1.2345L, __llvm_libc::fminl(1.2345L, nan));
26-
EXPECT_NE(isnan(__llvm_libc::fminl(nan, nan)), 0);
20+
EXPECT_FP_EQ(inf, __llvm_libc::fminl(aNaN, inf));
21+
EXPECT_FP_EQ(negInf, __llvm_libc::fminl(negInf, aNaN));
22+
EXPECT_FP_EQ(0.0L, __llvm_libc::fminl(aNaN, 0.0L));
23+
EXPECT_FP_EQ(-0.0L, __llvm_libc::fminl(-0.0L, aNaN));
24+
EXPECT_FP_EQ(-1.2345L, __llvm_libc::fminl(aNaN, -1.2345L));
25+
EXPECT_FP_EQ(1.2345L, __llvm_libc::fminl(1.2345L, aNaN));
26+
EXPECT_NE(isnan(__llvm_libc::fminl(aNaN, aNaN)), 0);
2727
}
2828

2929
TEST(FminlTest, InfArg) {

0 commit comments

Comments
 (0)