summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-28 17:57:27 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-28 17:57:27 +0000
commitf0483c494fe092a35ba2022702c554eac68efddf (patch)
treed387def29992cd701cd4890a5a81b28e94ead84b /vm_insnhelper.c
parenta79ff4c7d8989cca323f397fe437e6e4a6415c8a (diff)
* constant.h, variable.c: to ensure compatibility, rb_const_get_* must
not raise an exception even when the constant is private. Instead, rb_public_const_get_* and rb_public_const_defined_* are introduced, which raise an exception when the referring constant is private. see [ruby-core:32912]. * vm_insnhelper.c (vm_get_ev_const): use rb_public_const_get_* instead of rb_const_get_* to follow the constant visibility when user code refers a constant. * test/ruby/test_marshal.rb (test_marshal_private_class): add a test. This test had failed because of incompatibility of rb_const_get. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index d537661204..94d6a87920 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1199,19 +1199,19 @@ vm_get_ev_const(rb_thread_t *th, const rb_iseq_t *iseq,
}
if (is_defined) {
- return rb_const_defined(klass, id);
+ return rb_public_const_defined(klass, id);
}
else {
- return rb_const_get(klass, id);
+ return rb_public_const_get(klass, id);
}
}
else {
vm_check_if_namespace(orig_klass);
if (is_defined) {
- return rb_const_defined_from(orig_klass, id);
+ return rb_public_const_defined_from(orig_klass, id);
}
else {
- return rb_const_get_from(orig_klass, id);
+ return rb_public_const_get_from(orig_klass, id);
}
}
}