naruse	2009-07-13 19:43:45 +0900 (Mon, 13 Jul 2009)

  New Revision: 24086

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24086

  Log:
    * marshal.c (r_object0): copy instance variables to new regexp.

  Modified files:
    trunk/ChangeLog
    trunk/marshal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24085)
+++ ChangeLog	(revision 24086)
@@ -1,3 +1,7 @@
+Mon Jul 13 19:41:05 2009  NARUSE, Yui  <naruse@r...>
+
+	* marshal.c (r_object0): copy instance variables to new regexp.
+
 Mon Jul 13 17:49:11 2009  Koichi Sasada  <ko1@a...>
 
 	* vm_core.h, compile.c: declare struct iseq_inline_cache_entry.
Index: marshal.c
===================================================================
--- marshal.c	(revision 24085)
+++ marshal.c	(revision 24086)
@@ -1393,7 +1393,7 @@
 	{
 	    volatile VALUE str = r_bytes(arg);
 	    int options = r_byte(arg);
-	    v = r_entry(rb_reg_new("", 0, options), arg);
+	    VALUE v = rb_reg_new("", 0, options);
 	    if (ivp) {
 		r_ivar(v, arg);
 		*ivp = Qfalse;
@@ -1404,7 +1404,8 @@
 #define f_gsub_bang(x,y,z) rb_funcall(x, rb_intern("gsub!"), 2, y, z)
 		f_gsub_bang(str, rb_reg_new("\\\\u", 3, 0), rb_usascii_str_new_cstr("u"));
 	    }
-	    v = r_entry(rb_reg_new_str(str, options), arg);
+	    str = r_entry(rb_reg_new_str(str, options), arg);
+	    rb_copy_generic_ivar(str, v);
 	    v = r_leave(v, arg);
 	}
 	break;

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