[PATCHv2,02/11] Unify drift between _Complex function type variants
Commit Message
While trying to convert the _Complex function wrappers
into a single generic implementation, a few minor
variations between identical versions emerged.
* s_ccoshf.c (__ccoshf): Remove FE_INVALID
check, and remove __glibc_likely hint
from FP_INFINITE check.
* s_csinhf.c (__csinhf): Likewise.
* s_ccoshl.c (__ccoshl): Remove __glibc_likely
hint from FP_INFINITE check.
* s_csinhl.c (__csinhl): Likewise.
---
math/s_ccoshf.c | 4 +---
math/s_ccoshl.c | 2 +-
math/s_csinhf.c | 4 +---
math/s_csinhl.c | 4 +---
4 files changed, 4 insertions(+), 10 deletions(-)
Comments
On Fri, 1 Jul 2016, Paul E. Murphy wrote:
> While trying to convert the _Complex function wrappers
> into a single generic implementation, a few minor
> variations between identical versions emerged.
>
> * s_ccoshf.c (__ccoshf): Remove FE_INVALID
> check, and remove __glibc_likely hint
> from FP_INFINITE check.
> * s_csinhf.c (__csinhf): Likewise.
>
> * s_ccoshl.c (__ccoshl): Remove __glibc_likely
> hint from FP_INFINITE check.
> * s_csinhl.c (__csinhl): Likewise.
This patch is OK.
On 07/01/2016 03:13 PM, Paul E. Murphy wrote:
> While trying to convert the _Complex function wrappers
> into a single generic implementation, a few minor
> variations between identical versions emerged.
>
> * s_ccoshf.c (__ccoshf): Remove FE_INVALID
> check, and remove __glibc_likely hint
> from FP_INFINITE check.
> * s_csinhf.c (__csinhf): Likewise.
>
> * s_ccoshl.c (__ccoshl): Remove __glibc_likely
> hint from FP_INFINITE check.
> * s_csinhl.c (__csinhl): Likewise.
> ---
Committed as f2de695.
@@ -94,7 +94,7 @@ __ccoshf (__complex__ float x)
feraiseexcept (FE_INVALID);
}
}
- else if (__glibc_likely (rcls == FP_INFINITE))
+ else if (rcls == FP_INFINITE)
{
/* Real part is infinite. */
if (__glibc_likely (icls > FP_ZERO))
@@ -128,10 +128,8 @@ __ccoshf (__complex__ float x)
__real__ retval = HUGE_VALF;
__imag__ retval = __nanf ("") + __nanf ("");
-#ifdef FE_INVALID
if (icls == FP_INFINITE)
feraiseexcept (FE_INVALID);
-#endif
}
}
else
@@ -94,7 +94,7 @@ __ccoshl (__complex__ long double x)
feraiseexcept (FE_INVALID);
}
}
- else if (__glibc_likely (rcls == FP_INFINITE))
+ else if (rcls == FP_INFINITE)
{
/* Real part is infinite. */
if (__glibc_likely (icls > FP_ZERO))
@@ -111,7 +111,7 @@ __csinhf (__complex__ float x)
}
}
}
- else if (__glibc_likely (rcls == FP_INFINITE))
+ else if (rcls == FP_INFINITE)
{
/* Real part is infinite. */
if (__glibc_likely (icls > FP_ZERO))
@@ -147,10 +147,8 @@ __csinhf (__complex__ float x)
__real__ retval = HUGE_VALF;
__imag__ retval = __nanf ("") + __nanf ("");
-#ifdef FE_INVALID
if (icls == FP_INFINITE)
feraiseexcept (FE_INVALID);
-#endif
}
}
else
@@ -111,7 +111,7 @@ __csinhl (__complex__ long double x)
}
}
}
- else if (__glibc_likely (rcls == FP_INFINITE))
+ else if (rcls == FP_INFINITE)
{
/* Real part is infinite. */
if (__glibc_likely (icls > FP_ZERO))
@@ -147,10 +147,8 @@ __csinhl (__complex__ long double x)
__real__ retval = HUGE_VALL;
__imag__ retval = __nanl ("") + __nanl ("");
-#ifdef FE_INVALID
if (icls == FP_INFINITE)
feraiseexcept (FE_INVALID);
-#endif
}
}
else