summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 08:48:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 08:48:04 +0000
commit6827f86c519421fbbcc772c83845ada36f6bc5d5 (patch)
treeaa7b0c5bbfe3cd36f3ef27c071113126e1bf4c10
parentce094d1d73c46e90319ad4dcbd504c33740b710b (diff)
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_1@54271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--insns.def2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f88126c153..6a6d05bf53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 25 17:47:06 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * insns.def (opt_mod): show its method name on ZeroDivisionError.
+ [Bug #12158]
+
Fri Mar 25 17:45:36 2016 Rei Odaira <Rei.Odaira@gmail.com>
* test/ruby/test_process.rb (TestProcess#test_setsid): AIX
diff --git a/insns.def b/insns.def
index 1521cb05e9..3de695df15 100644
--- a/insns.def
+++ b/insns.def
@@ -1553,7 +1553,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 591204e92b..07f80aa880 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.9"
#define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 468
+#define RUBY_PATCHLEVEL 469
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3