Mercurial > hg > graal-compiler
changeset 11082:bed0eddd82cd
Merge
author | twisti |
---|---|
date | Tue, 02 Jul 2013 22:51:23 -0700 |
parents | b800986664f4 (current diff) c1bd7b5bdc70 (diff) |
children | 8b789ce47503 |
files | |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/methodHandles.cpp Tue Jul 02 20:42:12 2013 -0400 +++ b/src/share/vm/prims/methodHandles.cpp Tue Jul 02 22:51:23 2013 -0700 @@ -1137,7 +1137,12 @@ if (VerifyMethodHandles && caller_jh != NULL && java_lang_invoke_MemberName::clazz(mname()) != NULL) { Klass* reference_klass = java_lang_Class::as_Klass(java_lang_invoke_MemberName::clazz(mname())); - if (reference_klass != NULL) { + if (reference_klass != NULL && reference_klass->oop_is_objArray()) { + reference_klass = ObjArrayKlass::cast(reference_klass)->bottom_klass(); + } + + // Reflection::verify_class_access can only handle instance classes. + if (reference_klass != NULL && reference_klass->oop_is_instance()) { // Emulate LinkResolver::check_klass_accessability. Klass* caller = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(caller_jh)); if (!Reflection::verify_class_access(caller,
--- a/src/share/vm/runtime/reflection.cpp Tue Jul 02 20:42:12 2013 -0400 +++ b/src/share/vm/runtime/reflection.cpp Tue Jul 02 22:51:23 2013 -0700 @@ -458,7 +458,7 @@ // doesn't have a classloader. if ((current_class == NULL) || (current_class == new_class) || - (InstanceKlass::cast(new_class)->is_public()) || + (new_class->is_public()) || is_same_class_package(current_class, new_class)) { return true; }