From 8b4cf7b7081bbd2d6dd42f3163f5da2cec34689d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 5 Oct 2015 07:10:21 +0000
Subject: [PATCH] eval_intern.h: pass_passed_block

* eval_intern.h (pass_passed_block): make helper inline function.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 eval_intern.h | 17 ++++++++---------
 vm_eval.c     |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/eval_intern.h b/eval_intern.h
index 4d23d4e8a0..6b5ca7fe60 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -4,15 +4,14 @@
 #include "ruby/ruby.h"
 #include "vm_core.h"
 
-#define PASS_PASSED_BLOCK_TH(th) do { \
-    (th)->passed_block = rb_vm_control_frame_block_ptr(th->cfp); \
-    (th)->cfp->flag |= VM_FRAME_FLAG_PASSED; \
-} while (0)
-
-#define PASS_PASSED_BLOCK() do { \
-    rb_thread_t * const __th__ = GET_THREAD(); \
-    PASS_PASSED_BLOCK_TH(__th__); \
-} while (0)
+static inline void
+pass_passed_block(rb_thread_t *th)
+{
+    th->passed_block = rb_vm_control_frame_block_ptr(th->cfp);
+    th->cfp->flag |= VM_FRAME_FLAG_PASSED;
+}
+#define PASS_PASSED_BLOCK_TH(th) pass_passed_block(th)
+#define PASS_PASSED_BLOCK() pass_passed_block(GET_THREAD())
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
diff --git a/vm_eval.c b/vm_eval.c
index f550769799..3461966195 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -859,7 +859,7 @@ rb_funcallv_public(VALUE recv, ID mid, int argc, const VALUE *argv)
 VALUE
 rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE *argv)
 {
-    PASS_PASSED_BLOCK_TH(GET_THREAD());
+    PASS_PASSED_BLOCK();
 
     return rb_call(recv, mid, argc, argv, CALL_PUBLIC);
 }