1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
naruse 2016-03-29 07:40:09 +00:00
parent b2ac0f9c7d
commit 91b26ffa2b
3 changed files with 7 additions and 2 deletions

View file

@ -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

View file

@ -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;

View file

@ -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