diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 07:40:09 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 07:40:09 +0000 |
commit | 91b26ffa2b1d23be74b57d0928d4b01e128f7b9c (patch) | |
tree | 01cb4dbe9e0d1afd1d4f9310d091a7e5da95e5c0 | |
parent | b2ac0f9c7d8ce2aee4730a5ccc4f35a17a1d36d9 (diff) | |
download | ruby-91b26ffa2b1d23be74b57d0928d4b01e128f7b9c.tar.gz |
merge revision(s) 54028: [Backport #12158]
* insns.def (opt_mod): show its method name on ZeroDivisionError.
[Bug #12158]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | insns.def | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Mar 29 16:29:44 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * insns.def (opt_mod): show its method name on ZeroDivisionError. + [Bug #12158] + Tue Mar 29 16:25:27 2016 Anthony Dmitriyev <antstorm@gmail.com> * net/ftp.rb: add NullSocket#closed? to fix closing not opened @@ -1547,7 +1547,7 @@ opt_mod long div, mod; if (y == 0) - rb_num_zerodiv(); + goto INSN_LABEL(normal_dispatch); if (y < 0) { if (x < 0) div = -x / -y; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 35 +#define RUBY_PATCHLEVEL 36 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |