* eval_intern.h (rb_thread_raised_set): use generic flags.

* eval.c (rb_longjmp): clear all raised flags.

* eval.c (stack_check): leave clearing flag to rb_longjmp.

* gc.c (rb_memerror): use thread raised flag instead of static flag.


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

1 files changed, 4 insertions, 11 deletions

diff --git a/eval.c b/eval.c
index 872eb2ccca..69d5488738 100644
--- a/eval.c
+++ b/eval.c
@@ -715,7 +715,7 @@ rb_longjmp(int tag, VALUE mesg)
 			0 /* TODO: id */, 0 /* TODO: klass */);
     }
 
-    rb_thread_reset_raised(th);
+    rb_thread_raised_clear(th);
     JUMP_TAG(tag);
 }
 
@@ -1243,16 +1243,9 @@ stack_check(void)
 {
     rb_thread_t *th = GET_THREAD();
 
-    if (!rb_thread_stack_overflowing_p(th) && ruby_stack_check()) {
-	int state;
-	rb_thread_set_stack_overflow(th);
-	PUSH_TAG();
-	if ((state = EXEC_TAG()) == 0) {
-	    rb_exc_raise(sysstack_error);
-	}
-	POP_TAG();
-	rb_thread_reset_stack_overflow(th);
-	JUMP_TAG(state);
+    if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) && ruby_stack_check()) {
+	rb_thread_raised_set(th, RAISED_STACKOVERFLOW);
+	rb_exc_raise(sysstack_error);
     }
 }