usa	2016-03-25 17:48:04 +0900 (Fri, 25 Mar 2016)

  New Revision: 54271

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54271

  Log:
    merge revision(s) 54028: [Backport #12158]
    
    * insns.def (opt_mod): show its method name on ZeroDivisionError.
      [Bug #12158]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/insns.def
    branches/ruby_2_1/version.h
Index: ruby_2_1/insns.def
===================================================================
--- ruby_2_1/insns.def	(revision 54270)
+++ ruby_2_1/insns.def	(revision 54271)
@@ -1553,7 +1553,7 @@ opt_mod https://github.com/ruby/ruby/blob/trunk/ruby_2_1/insns.def#L1553
 	    long div, mod;
 
 	    if (y == 0)
-		rb_num_zerodiv();
+		goto INSN_LABEL(normal_dispatch);
 	    if (y < 0) {
 		if (x < 0)
 		    div = -x / -y;
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 54270)
+++ ruby_2_1/ChangeLog	(revision 54271)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Mar 25 17:47:06 2016  NARUSE, Yui  <naruse@r...>
+
+	* insns.def (opt_mod): show its method name on ZeroDivisionError.
+	  [Bug #12158]
+
 Fri Mar 25 17:45:36 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* test/ruby/test_process.rb (TestProcess#test_setsid): AIX
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 54270)
+++ ruby_2_1/version.h	(revision 54271)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54028


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/