* eval.c (stack_check): made flag per threads.

* thread.c (rb_thread_set_raised, rb_thread_reset_raised): prefixed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 7 deletions

diff --git a/eval.c b/eval.c
index db760116df..cd65803273 100644
--- a/eval.c
+++ b/eval.c
@@ -656,7 +656,7 @@ rb_longjmp(int tag, VALUE mesg)
     const char *file;
     int line = 0;
 
-    if (thread_set_raised(th)) {
+    if (rb_thread_set_raised(th)) {
 	th->errinfo = exception_error;
 	JUMP_TAG(TAG_FATAL);
     }
@@ -703,7 +703,7 @@ rb_longjmp(int tag, VALUE mesg)
 	    th->errinfo = mesg;
 	}
 	else if (status) {
-	    thread_reset_raised(th);
+	    rb_thread_reset_raised(th);
 	    JUMP_TAG(status);
 	}
     }
@@ -715,7 +715,7 @@ rb_longjmp(int tag, VALUE mesg)
 			0 /* TODO: id */, 0 /* TODO: klass */);
     }
 
-    thread_reset_raised(th);
+    rb_thread_reset_raised(th);
     JUMP_TAG(tag);
 }
 
@@ -1241,17 +1241,17 @@ rb_with_disable_interrupt(VALUE (*proc)(ANYARGS), VALUE data)
 static inline void
 stack_check(void)
 {
-    static int overflowing = 0;
+    rb_thread_t *th = GET_THREAD();
 
-    if (!overflowing && ruby_stack_check()) {
+    if (!rb_thread_stack_overflowing_p(th) && ruby_stack_check()) {
 	int state;
-	overflowing = 1;
+	rb_thread_set_stack_overflow(th);
 	PUSH_TAG();
 	if ((state = EXEC_TAG()) == 0) {
 	    rb_exc_raise(sysstack_error);
 	}
 	POP_TAG();
-	overflowing = 0;
+	rb_thread_reset_stack_overflow(th);
 	JUMP_TAG(state);
     }
 }
@@ -1427,6 +1427,8 @@ rb_call0(VALUE klass, VALUE recv, ID mid, int argc, const VALUE *argv, int scope
 	}
     }
 
+    stack_check();
+
     {
 	VALUE val;
 	/*