diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-07 05:11:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-07 05:11:10 +0000 |
commit | 1d10aa8bfc98a42522716f71aae60cb70498a6e6 (patch) | |
tree | 248f0b7c17d48a551f7a69399f241bfca923362f /marshal.c | |
parent | 1c2ef610358af33f9ded3086aa2d70aac03dcac5 (diff) |
* marshal.c (w_object): reverted r26007. [ruby-dev:39845]
* test/test_delegate.rb (test_marshal): moved from test_marshal.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -643,23 +643,14 @@ w_object(VALUE obj, struct dump_arg *arg, int limit) if (rb_respond_to(obj, s_mdump)) { volatile VALUE v; - int hasiv2 = 0; st_add_direct(arg->data, obj, arg->data->num_entries); v = rb_funcall(obj, s_mdump, 0, 0); check_dump_arg(arg, s_mdump); - if (!hasiv && (hasiv2 = rb_ivar_count(obj) > 0)) { - w_byte(TYPE_IVAR, arg); - } w_class(TYPE_USRMARSHAL, obj, arg, FALSE); w_object(v, arg, limit); - if (hasiv) { - w_ivar(obj, ivtbl, &c_arg); - } - else if (hasiv2) { - w_objivar(obj, &c_arg); - } + if (hasiv) w_ivar(obj, ivtbl, &c_arg); return; } if (rb_respond_to(obj, s_dump)) { |