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_2@54331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a638728e4..5b4991d31a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 29 01:07:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_mod): show its method name on ZeroDivisionError.
+	  [Bug #12158]
+
 Tue Mar 29 01:05:28 2016  Anthony Dmitriyev  <antstorm@gmail.com>
 
 	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
diff --git a/insns.def b/insns.def
index c38a25e4ae..eb1ffeb62e 100644
--- a/insns.def
+++ b/insns.def
@@ -1594,7 +1594,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;
diff --git a/version.h b/version.h
index ce090a66af..0e7557d4a0 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 273
+#define RUBY_PATCHLEVEL 274
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3