From 973ba3e8e24f4497aebcbd3819fc9c0f38a7909f Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 23 Apr 2016 07:15:26 +0000 Subject: * include/ruby/ruby.h (rb_mul_size_overflow): use UNLIKELY by user side to improve generallity. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/ruby.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b666883cf..dc2141ed94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Apr 23 16:11:39 2016 NARUSE, Yui + + * include/ruby/ruby.h (rb_mul_size_overflow): use UNLIKELY + by user side to improve generallity. + Sat Apr 23 16:10:02 2016 NARUSE, Yui * include/ruby/ruby.h (RB_LIKELY): use prefix in ruby.h. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index b12beff9b1..ef6caa1163 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1628,10 +1628,10 @@ rb_mul_size_overflow(size_t a, size_t b, size_t max, size_t *c) { #ifdef DSIZE_T DSIZE_T c2 = (DSIZE_T)a * (DSIZE_T)b; - if (RB_UNLIKELY(c2 > max)) return 1; + if (c2 > max) return 1; *c = (size_t)c2; #else - if (b != 0 && RB_UNLIKELY(a > max / b)) return 1; + if (b != 0 && a > max / b) return 1; *c = a * b; #endif return 0; -- cgit v1.2.3