* eval.c (method_proc): should specify YIELD_FUNC_SVALUE.

  [ruby-dev:21107]

* marshal.c (w_object): should not call w_extended for USRMARSHAL
  dump. [ruby-dev:21106]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 1 deletions

diff --git a/marshal.c b/marshal.c
index c5f68bd1e..835783958 100644
--- a/marshal.c
+++ b/marshal.c
@@ -484,7 +484,8 @@ w_object(obj, arg, limit)
 	    VALUE v;
 
 	    v = rb_funcall(obj, s_mdump, 0, 0);
-	    w_class(TYPE_USRMARSHAL, obj, arg);
+	    w_byte(TYPE_USRMARSHAL, arg);
+	    w_unique(rb_class2name(CLASS_OF(obj)), arg);
 	    w_object(v, arg, limit);
 	    if (ivtbl) w_ivar(ivtbl, &c_arg);
 	    return;