From 61d9da258d0701c25f4876bb89fbbd3912b3ef98 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 17 Apr 2017 00:10:47 +0000
Subject: [PATCH] gc.c: rb_threadptr_stack_check

* gc.c (rb_threadptr_stack_check): check probability of stack
  overflow for the given thread, not the current thread.

* vm_eval.c (stack_check): check the given thread, not the current
  thread.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval_intern.h | 1 +
 gc.c          | 6 ++++++
 vm_eval.c     | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/eval_intern.h b/eval_intern.h
index c5210b14de..eb1746bfb2 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -268,6 +268,7 @@ int rb_threadptr_reset_raised(rb_thread_t *th);
 #define rb_thread_raised_reset(th, f) ((th)->raised_flag &= ~(f))
 #define rb_thread_raised_p(th, f)     (((th)->raised_flag & (f)) != 0)
 #define rb_thread_raised_clear(th)    ((th)->raised_flag = 0)
+int rb_threadptr_stack_check(rb_thread_t *th);
 
 VALUE rb_f_eval(int argc, const VALUE *argv, VALUE self);
 VALUE rb_make_exception(int argc, const VALUE *argv);
diff --git a/gc.c b/gc.c
index ef4770a797..2c23abf0fa 100644
--- a/gc.c
+++ b/gc.c
@@ -3965,6 +3965,12 @@ stack_check(rb_thread_t *th, int water_mark)
 
 #define STACKFRAME_FOR_CALL_CFUNC 512
 
+int
+rb_threadptr_stack_check(rb_thread_t *th)
+{
+    return stack_check(th, STACKFRAME_FOR_CALL_CFUNC);
+}
+
 int
 ruby_stack_check(void)
 {
diff --git a/vm_eval.c b/vm_eval.c
index 3ea0b8d921..2713af0550 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -300,7 +300,8 @@ rb_current_receiver(void)
 static inline void
 stack_check(rb_thread_t *th)
 {
-    if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) && ruby_stack_check()) {
+    if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) &&
+	rb_threadptr_stack_check(th)) {
 	rb_thread_raised_set(th, RAISED_STACKOVERFLOW);
 	rb_exc_raise(sysstack_error);
     }