git: ca9df934a552 - stable/11 - test_inf_inputs: Use atf_tc_expect_fail() instead of atf_tc_skip()

[Dimitry Andric]

The branch stable/11 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=ca9df934a5520f9692eb6808b1d02c0d3f1b927a

commit ca9df934a5520f9692eb6808b1d02c0d3f1b927a
Author:     Alex Richardson <arichardson at FreeBSD.org>
AuthorDate: 2021-01-29 09:28:40 +0000
Commit:     Dimitry Andric <dim at FreeBSD.org>
CommitDate: 2021-02-12 20:53:02 +0000

    test_inf_inputs: Use atf_tc_expect_fail() instead of atf_tc_skip()
    
    Reviewed By:    lwhsu
    Differential Revision: https://reviews.freebsd.org/D28396
    
    (cherry picked from commit 4d2edf3af1dbd8a3e7cf1b22343a1ecfc2dd41ba)
    
    Fix lib/msun's ctrig_test/test_inf_inputs test case with clang >= 10
    
    This sprinkles a few strategic volatiles in an attempt to defeat clang's
    optimization interfering with the expected floating-point exception
    flags.
    
    Reported by:    lwhsu
    PR:             244732
    
    (cherry picked from commit ac76bc1145dd7f4476e5d982ce8f355f71015713)
---
 lib/msun/src/s_ccoshf.c     | 2 +-
 lib/msun/src/s_ctanh.c      | 2 +-
 lib/msun/src/s_ctanhf.c     | 2 +-
 lib/msun/tests/ctrig_test.c | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/msun/src/s_ccoshf.c b/lib/msun/src/s_ccoshf.c
index eeed92f8cf46..7fd61798c2f8 100644
--- a/lib/msun/src/s_ccoshf.c
+++ b/lib/msun/src/s_ccoshf.c
@@ -41,7 +41,7 @@ static const float huge = 0x1p127;
 float complex
 ccoshf(float complex z)
 {
-	float x, y, h;
+	volatile float x, y, h;
 	int32_t hx, hy, ix, iy;
 
 	x = crealf(z);
diff --git a/lib/msun/src/s_ctanh.c b/lib/msun/src/s_ctanh.c
index f5b9bdd9d5f8..7d2391eaea79 100644
--- a/lib/msun/src/s_ctanh.c
+++ b/lib/msun/src/s_ctanh.c
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 double complex
 ctanh(double complex z)
 {
-	double x, y;
+	volatile double x, y;
 	double t, beta, s, rho, denom;
 	uint32_t hx, ix, lx;
 
diff --git a/lib/msun/src/s_ctanhf.c b/lib/msun/src/s_ctanhf.c
index 520bf77d6d5c..c222c15f81ee 100644
--- a/lib/msun/src/s_ctanhf.c
+++ b/lib/msun/src/s_ctanhf.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 float complex
 ctanhf(float complex z)
 {
-	float x, y;
+	volatile float x, y;
 	float t, beta, s, rho, denom;
 	uint32_t hx, ix;
 
diff --git a/lib/msun/tests/ctrig_test.c b/lib/msun/tests/ctrig_test.c
index b47ad43fa199..45b2b78b0416 100644
--- a/lib/msun/tests/ctrig_test.c
+++ b/lib/msun/tests/ctrig_test.c
@@ -248,9 +248,6 @@ ATF_TC_BODY(test_inf_inputs, tc)
 	long double complex z, c, s;
 	unsigned i;
 
-	if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
-		atf_tc_skip("https://bugs.freebsd.org/244732");
-
 	/*
 	 * IN		CSINH		CCOSH		CTANH
 	 * Inf,Inf	+-Inf,NaN inval	+-Inf,NaN inval	1,+-0