From e3c42f53fb48137517e71e1b308cae1ad35d130a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 18 Aug 2017 12:44:30 +0000
Subject: vm_insnhelper.c: vm_cfp_consistent_p

* vm_insnhelper.c (vm_cfp_consistent_p): extracted the conditions
  for cfp consistency.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_insnhelper.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 03b9d49e0e..69925c07ea 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1833,10 +1833,20 @@ vm_profile_show_result(void)
 #define VM_PROFILE_ATEXIT()
 #endif
 
+static inline int
+vm_cfp_consistent_p(rb_thread_t *th, const rb_control_frame_t *reg_cfp)
+{
+    const int ov_flags = RAISED_STACKOVERFLOW;
+    if (LIKELY(reg_cfp == th->ec.cfp + 1)) return TRUE;
+    if (rb_thread_raised_p(th, ov_flags)) {
+	rb_thread_raised_reset(th, ov_flags);
+	return TRUE;
+    }
+    return FALSE;
+}
+
 #define CHECK_CFP_CONSISTENCY(func) \
-    (LIKELY(reg_cfp == th->ec.cfp + 1) ? (void) 0 : \
-     rb_thread_raised_p(th, RAISED_STACKOVERFLOW) ? \
-     rb_thread_raised_reset(th, RAISED_STACKOVERFLOW) : \
+    (LIKELY(vm_cfp_consistent_p(th, reg_cfp)) ? (void)0 : \
      rb_bug(func ": cfp consistency error (%p, %p)", reg_cfp, th->ec.cfp+1))
 
 static inline
-- 
cgit v1.2.3