[前][次][番号順一覧][スレッド一覧]

ruby-changes:43949

From: nagachika <ko1@a...>
Date: Sun, 28 Aug 2016 00:41:18 +0900 (JST)
Subject: [ruby-changes:43949] nagachika:r56022 (ruby_2_3): * vm_method.c: revert r55869. it breaks Integer#days with

nagachika	2016-08-28 00:41:12 +0900 (Sun, 28 Aug 2016)

  New Revision: 56022

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

  Log:
    * vm_method.c: revert r55869. it breaks Integer#days with
      ActiveSupport-4.1.x. [ruby-core:76949] [Bug #12353]
    
    * test/ruby/test_marshal.rb: ditto.

  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/test/ruby/test_marshal.rb
    branches/ruby_2_3/version.h
    branches/ruby_2_3/vm_method.c
Index: ruby_2_3/test/ruby/test_marshal.rb
===================================================================
--- ruby_2_3/test/ruby/test_marshal.rb	(revision 56021)
+++ ruby_2_3/test/ruby/test_marshal.rb	(revision 56022)
@@ -736,24 +736,4 @@ class TestMarshal < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_marshal.rb#L736
       end
     RUBY
   end
-
-  MethodMissingWithoutRespondTo = Struct.new(:wrapped_object) do
-    undef respond_to?
-    def method_missing(*args, &block)
-      wrapped_object.public_send(*args, &block)
-    end
-    def respond_to_missing?(name, private = false)
-      wrapped_object.respond_to?(name, false)
-    end
-  end
-
-  def test_method_missing_without_respond_to
-    bug12353 = "[ruby-core:75377] [Bug #12353]: try method_missing if" \
-               " respond_to? is undefined"
-    obj = MethodMissingWithoutRespondTo.new("foo")
-    dump = assert_nothing_raised(NoMethodError, bug12353) do
-      Marshal.dump(obj)
-    end
-    assert_equal(obj, Marshal.load(dump))
-  end
 end
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 56021)
+++ ruby_2_3/ChangeLog	(revision 56022)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun Aug 28 00:26:58 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* vm_method.c: revert r55869. it breaks Integer#days with
+	  ActiveSupport-4.1.x. [ruby-core:76949] [Bug #12353]
+
+	* test/ruby/test_marshal.rb: ditto.
+
 Sat Aug 27 03:51:23 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* id_table.c (hash_table_extend): should not shrink the table than
@@ -320,12 +327,6 @@ Fri Aug 12 04:04:23 2016  Nobuyoshi Naka https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L327
 	  from argument vector in rb_execarg.
 	  [ruby-core:75611] [Bug #12398]
 
-Fri Aug 12 03:50:38 2016  Nobuyoshi Nakada  <nobu@r...>
-
-	* vm_method.c (vm_respond_to): try method_missing if respond_to?
-	  is undefined, as if it is the default definition.
-	  [ruby-core:75377] [Bug #12353]
-
 Fri Aug 12 03:30:59 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* variable.c (rb_local_constants_i): exclude private constants
Index: ruby_2_3/vm_method.c
===================================================================
--- ruby_2_3/vm_method.c	(revision 56021)
+++ ruby_2_3/vm_method.c	(revision 56022)
@@ -1916,7 +1916,7 @@ vm_respond_to(rb_thread_t *th, VALUE kla https://github.com/ruby/ruby/blob/trunk/ruby_2_3/vm_method.c#L1916
     const rb_method_entry_t *const me =
 	method_entry_get(klass, resid, &defined_class);
 
-    if (!me) return -1;
+    if (!me) return TRUE;
     if (METHOD_ENTRY_BASIC(me)) {
 	return -1;
     }
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 56021)
+++ ruby_2_3/version.h	(revision 56022)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-08-27"
-#define RUBY_PATCHLEVEL 180
+#define RUBY_RELEASE_DATE "2016-08-28"
+#define RUBY_PATCHLEVEL 181
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 

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

[前][次][番号順一覧][スレッド一覧]