vm.c: check cbase

* vm.c (rb_vm_cref_in_context): check also cbase, not only self.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44385 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 3 deletions

diff --git a/vm.c b/vm.c
index 947b1811e5..bd0d656f7d 100644
--- a/vm.c
+++ b/vm.c
@@ -930,13 +930,16 @@ rb_vm_cref(void)
     return rb_vm_get_cref(cfp->iseq, cfp->ep);
 }
 
-NODE *
-rb_vm_cref_in_context(VALUE self)
+const NODE *
+rb_vm_cref_in_context(VALUE self, VALUE cbase)
 {
     rb_thread_t *th = GET_THREAD();
     const rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
+    const NODE *cref;
     if (cfp->self != self) return NULL;
-    return rb_vm_get_cref(cfp->iseq, cfp->ep);
+    cref = rb_vm_get_cref(cfp->iseq, cfp->ep);
+    if (cref->nd_clss != cbase) return NULL;
+    return cref;
 }
 
 #if 0