kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm.c: check cbase

Browse source 
* 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
This commit is contained in:
nobu 2013-12-24 14:04:31 +00:00
parent fb725a20e2
commit 20c38381a8
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
proc.c
View file

@ -14,7 +14,7 @@
#include "gc.h"
#include "iseq.h"
NODE *rb_vm_cref_in_context(VALUE self);
const NODE *rb_vm_cref_in_context(VALUE self, VALUE cbase);
struct METHOD {
VALUE recv;
@ -1622,9 +1622,9 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
ID id;
VALUE body;
int noex = NOEX_PUBLIC;
const NODE *cref = rb_vm_cref_in_context(mod);
const NODE *cref = rb_vm_cref_in_context(mod, mod);
if (cref && cref->nd_clss == mod) {
if (cref) {
noex = (int)cref->nd_visi;
}

9
vm.c
View file

@ -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