diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Apr 23 16:11:39 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * 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 <naruse@ruby-lang.org> * 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; |