* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@4314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index d7b78d9d13..35fed14138 100644
--- a/eval.c
+++ b/eval.c
@@ -7604,6 +7604,7 @@ method_proc(method)
     Data_Get_Struct(proc, struct BLOCK, bdata);
     bdata->body->nd_file = mdata->body->nd_file;
     nd_set_line(bdata->body, nd_line(mdata->body));
+    bdata->body->nd_state = YIELD_FUNC_SVALUE;
 
     return proc;
 }
@@ -8479,8 +8480,6 @@ rb_thread_schedule()
     int need_select = 0;
     int select_timeout = 0;
 
-    if (ruby_in_compile) abort();
-
     rb_thread_pending = 0;
     if (curr_thread == curr_thread->next
 	&& curr_thread->status == THREAD_RUNNABLE)