diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | test/ruby/test_marshal.rb | 20 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | vm_method.c | 2 |
4 files changed, 11 insertions, 30 deletions
@@ -1,3 +1,10 @@ +Sun Aug 28 00:26:58 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * 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@ruby-lang.org> * id_table.c (hash_table_extend): should not shrink the table than @@ -320,12 +327,6 @@ Fri Aug 12 04:04:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> from argument vector in rb_execarg. [ruby-core:75611] [Bug #12398] -Fri Aug 12 03:50:38 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * 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@ruby-lang.org> * variable.c (rb_local_constants_i): exclude private constants diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 38e03ac57b..e2e321bb41 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -736,24 +736,4 @@ class TestMarshal < Test::Unit::TestCase 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 @@ -1,10 +1,10 @@ #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" diff --git a/vm_method.c b/vm_method.c index 7f4af53518..24f37dc85f 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1916,7 +1916,7 @@ vm_respond_to(rb_thread_t *th, VALUE klass, VALUE obj, ID id, int priv) 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; } |