From e824b05b3e0c01905d38af7d9c669ddc55cfcfb3 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 18 Apr 2016 17:46:05 +0000 Subject: merge revision(s) 54492,54494,54495,54496,54499,54503: [Backport #12249] * math.c (ruby_tgamma): fix tgamma(-0.0) on mingw. [ruby-core:74817] [Bug #12249] * math.c (ruby_lgamma_r): fix lgamma(-0.0) on mingw and OSX. * math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong. cf. [Bug #12249] * math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows, since msvcrt does not provide it. * missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0). [ruby-core:74823] [Bug #12249] * configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0) returns negative infinity. [Bug #12249] * math.c (ruby_lgamma_r): define by the configured result. * configure.in (rb_cv_lgamma_r_m0): fix the condition for lgamma_r(-0.0). [Bug #12249] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 30 ++++++++++++++++++++++++++++++ configure.in | 35 +++++++++++++++++++++++++++++++++++ math.c | 30 ++++++++++++++++++++++++++---- missing/lgamma_r.c | 2 +- test/ruby/test_math.rb | 9 +++++++++ version.h | 2 +- 6 files changed, 102 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62557cb002..3866a681f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +Tue Apr 19 02:32:50 2016 Nobuyoshi Nakada + + * configure.in (rb_cv_lgamma_r_m0): fix the condition for + lgamma_r(-0.0). [Bug #12249] + +Tue Apr 19 02:32:50 2016 Nobuyoshi Nakada + + * configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0) + returns negative infinity. [Bug #12249] + + * math.c (ruby_lgamma_r): define by the configured result. + +Tue Apr 19 02:32:50 2016 cremno phobia + + * math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows, + since msvcrt does not provide it. + + * missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0). + [ruby-core:74823] [Bug #12249] + +Tue Apr 19 02:32:50 2016 NAKAMURA Usaku + + * math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong. + cf. [Bug #12249] + +Tue Apr 19 02:32:50 2016 Nobuyoshi Nakada + + * math.c (ruby_tgamma): fix tgamma(-0.0) on mingw. + [ruby-core:74817] [Bug #12249] + Tue Apr 19 01:53:32 2016 Nobuyoshi Nakada * defs/keywords (alias, undef): symbol literals are allowed. diff --git a/configure.in b/configure.in index 1f714db1c9..1d083ea0a3 100644 --- a/configure.in +++ b/configure.in @@ -2438,6 +2438,41 @@ main(int argc, char **argv) ]) AS_IF([test "x$rb_cv_atan2_inf_c99" = xyes], [AC_DEFINE(ATAN2_INF_C99)]) +AS_IF([test "x$ac_cv_func_lgamma_r" = xyes], [ + AC_CACHE_CHECK(whether lgamma_r handles -0.0, rb_cv_lgamma_r_m0, [ + AC_TRY_RUN([ +@%:@include +@%:@ifdef HAVE_UNISTD_H +@%:@include +@%:@endif +@%:@ifndef EXIT_SUCCESS +@%:@define EXIT_SUCCESS 0 +@%:@endif +@%:@ifndef EXIT_FAILURE +@%:@define EXIT_FAILURE 1 +@%:@endif + +int +main(int argc, char **argv) +{ + int sign; + double x = lgamma_r(-0.0, &sign); + + /* should be [+inf, -1] */ + if (x <= 0) return EXIT_FAILURE; + if (!isinf(x)) return EXIT_FAILURE; + if (sign != -1) return EXIT_FAILURE; + return EXIT_SUCCESS; +} +], + [rb_cv_lgamma_r_m0=yes], + [rb_cv_lgamma_r_m0=no], + [rb_cv_lgamma_r_m0=yes] + ) + ]) + AS_IF([test "x$rb_cv_lgamma_r_m0" = xno], [AC_DEFINE(LGAMMA_R_M0_FIX)]) +]) + # Some platform need -lrt for clock_gettime, but the other don't. if test x"$ac_cv_func_clock_gettime" != xyes; then # glibc 2.17 moves clock_* functions from librt to the main C library. diff --git a/math.c b/math.c index 591d6ae2f2..9ac898f0ba 100644 --- a/math.c +++ b/math.c @@ -734,14 +734,36 @@ math_erfc(VALUE obj, VALUE x) return DBL2NUM(erfc(Get_Double(x))); } -#ifdef __MINGW32__ +#if defined __MINGW32__ static inline double -mingw_tgamma(const double d) +ruby_tgamma(const double d) { const double g = tgamma(d); - return (isnan(g) && !signbit(d)) ? INFINITY : g; + if (isinf(g)) { + if (d == 0.0 && signbit(d)) return -INFINITY; + } + if (isnan(g)) { + if (!signbit(d)) return INFINITY; + } + return g; +} +#define tgamma(d) ruby_tgamma(d) +#endif + +#if defined LGAMMA_R_M0_FIX +static inline double +ruby_lgamma_r(const double d, int *sign) +{ + const double g = lgamma_r(d, sign); + if (isinf(g)) { + if (d == 0.0 && signbit(d)) { + *sign = -1; + return INFINITY; + } + } + return g; } -#define tgamma(d) mingw_tgamma(d) +#define lgamma_r(d, sign) ruby_lgamma_r(d, sign) #endif /* diff --git a/missing/lgamma_r.c b/missing/lgamma_r.c index 6d2f38f40c..01066d2930 100644 --- a/missing/lgamma_r.c +++ b/missing/lgamma_r.c @@ -66,7 +66,7 @@ lgamma_r(double x, int *signp) double i, f, s; f = modf(-x, &i); if (f == 0.0) { /* pole error */ - *signp = 1; + *signp = signbit(x) ? -1 : 1; errno = ERANGE; return HUGE_VAL; } diff --git a/test/ruby/test_math.rb b/test/ruby/test_math.rb index ab55df8e30..7091783176 100644 --- a/test/ruby/test_math.rb +++ b/test/ruby/test_math.rb @@ -255,6 +255,10 @@ class TestMath < Test::Unit::TestCase end assert_raise(Math::DomainError) { Math.gamma(-Float::INFINITY) } + x = Math.gamma(-0.0) + mesg = "Math.gamma(-0.0) should be -INF" + assert_infinity(x, mesg) + assert_predicate(x, :negative?, mesg) end def test_lgamma @@ -271,6 +275,11 @@ class TestMath < Test::Unit::TestCase assert_float_and_int([Math.log(6), 1], Math.lgamma(4)) assert_raise(Math::DomainError) { Math.lgamma(-Float::INFINITY) } + x, sign = Math.lgamma(-0.0) + mesg = "Math.lgamma(-0.0) should be [INF, -1]" + assert_infinity(x, mesg) + assert_predicate(x, :positive?, mesg) + assert_equal(-1, sign, mesg) end def test_fixnum_to_f diff --git a/version.h b/version.h index 6fec9955ad..0c60c78bf2 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-04-19" -#define RUBY_PATCHLEVEL 94 +#define RUBY_PATCHLEVEL 95 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 -- cgit v1.2.3