1 files changed, 9 insertions, 3 deletions
diff --git a/vm_core.h b/vm_core.h
index 1a1016217a..ee49704317 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -728,17 +728,23 @@ void rb_thread_lock_destroy(rb_thread_lock_t *);
 
 /* tracer */
 void
-rb_threadptr_exec_event_hooks(rb_thread_t *th, rb_event_flag_t flag, VALUE self, ID id, VALUE klass);
+rb_threadptr_exec_event_hooks(rb_thread_t *th, rb_event_flag_t flag, VALUE self, ID id, VALUE klass, int pop_p);
 
-#define EXEC_EVENT_HOOK(th, flag, self, id, klass) do { \
+#define EXEC_EVENT_HOOK_ORIG(th, flag, self, id, klass, pop_p) do { \
     rb_event_flag_t wait_event__ = (th)->event_flags; \
     if (UNLIKELY(wait_event__)) { \
 	if (wait_event__ & ((flag) | RUBY_EVENT_VM)) { \
-	    rb_threadptr_exec_event_hooks((th), (flag), (self), (id), (klass)); \
+	    rb_threadptr_exec_event_hooks((th), (flag), (self), (id), (klass), (pop_p)); \
 	} \
     } \
 } while (0)
 
+#define EXEC_EVENT_HOOK(th, flag, self, id, klass) \
+  EXEC_EVENT_HOOK_ORIG(th, flag, self, id, klass, 0)
+
+#define EXEC_EVENT_HOOK_AND_POP_FRAME(th, flag, self, id, klass) \
+  EXEC_EVENT_HOOK_ORIG(th, flag, self, id, klass, 1)
+
 #if defined __GNUC__ && __GNUC__ >= 4
 #pragma GCC visibility push(default)
 #endif