From ce3be9265ee617ab730e21ba1ae04201dc479b3b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 23 Jun 2017 01:43:39 +0000
Subject: vm_insnhelper.c: vm_stack_consistency_error

* vm_insnhelper.c (vm_stack_consistency_error): extracted from
  insns.def for further info in the future.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 insns.def       |  3 +--
 vm_insnhelper.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/insns.def b/insns.def
index 84bfd822da..96bcc43db8 100644
--- a/insns.def
+++ b/insns.def
@@ -913,8 +913,7 @@ leave
     if (OPT_CHECKED_RUN) {
 	const VALUE *const bp = vm_base_ptr(reg_cfp);
 	if (reg_cfp->sp != bp) {
-	    rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
-		   VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, bp));
+	    vm_stack_consistency_error(th, reg_cfp, bp);
 	}
     }
 
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 83ebe37124..9aaf881a2e 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -3297,6 +3297,22 @@ vm_case_dispatch(CDHASH hash, OFFSET else_offset, VALUE key)
     return 0;
 }
 
+NORETURN(static void
+	 vm_stack_consistency_error(rb_thread_t *,
+				    const rb_control_frame_t *,
+				    const VALUE *));
+static void
+vm_stack_consistency_error(rb_thread_t *th,
+			   const rb_control_frame_t *cfp,
+			   const VALUE *bp)
+{
+    const ptrdiff_t nsp = VM_SP_CNT(th, cfp->sp);
+    const ptrdiff_t nbp = VM_SP_CNT(th, bp);
+    static const char stack_consistency_error[] =
+	"Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")";
+    rb_bug(stack_consistency_error, nsp, nbp);
+}
+
 enum binop_operands_type {
     bot_others = 0,
     bot_fixnum,
-- 
cgit v1.2.3