From 1f17463dec2ab1535096cb56005a840eae4fea5b Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Tue, 1 Feb 2022 21:41:56 +0900 Subject: merge revision(s) 6a6227e0168b059c3ed34c9f0ace2e5dc2364221: [Backport #18517] Shifting zero always results in zero [Bug #18517] --- numeric.c | 2 ++ 1 file changed, 2 insertions(+) --- numeric.c | 2 ++ version.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/numeric.c b/numeric.c index d6fe05d8e8..3e66ba7d7b 100644 --- a/numeric.c +++ b/numeric.c @@ -5073,6 +5073,7 @@ rb_fix_lshift(VALUE x, VALUE y) long val, width; val = NUM2LONG(x); + if (!val) return (rb_to_int(y), INT2FIX(0)); if (!FIXNUM_P(y)) return rb_big_lshift(rb_int2big(val), y); width = FIX2LONG(y); @@ -5127,6 +5128,7 @@ rb_fix_rshift(VALUE x, VALUE y) long i, val; val = FIX2LONG(x); + if (!val) return (rb_to_int(y), INT2FIX(0)); if (!FIXNUM_P(y)) return rb_big_rshift(rb_int2big(val), y); i = FIX2LONG(y); diff --git a/version.h b/version.h index ac08e82e8b..0adb79b72f 100644 --- a/version.h +++ b/version.h @@ -11,11 +11,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 10 +#define RUBY_PATCHLEVEL 11 #define RUBY_RELEASE_YEAR 2022 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" -- cgit v1.2.3