Mercurial > hg > truffle

changeset 13434:a150ff9e8efc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author hseigel
date Fri, 06 Dec 2013 11:49:50 -0500
parents 769557390c43 (diff) c586f8a7322f (current diff)
children bf15208b72a5
files
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.cpp	Thu Dec 05 12:35:38 2013 +0100
+++ b/src/share/vm/interpreter/linkResolver.cpp	Fri Dec 06 11:49:50 2013 -0500
@@ -943,8 +943,17 @@
     Klass *klass_to_check = !InstanceKlass::cast(current_klass())->is_anonymous() ?
                                   current_klass() :
                                   InstanceKlass::cast(current_klass())->host_klass();
+    // As of the fix for 4486457 we disable verification for all of the
+    // dynamically-generated bytecodes associated with the 1.4
+    // reflection implementation, not just those associated with
+    // sun/reflect/SerializationConstructorAccessor.
+    bool is_reflect = JDK_Version::is_gte_jdk14x_version() &&
+                      UseNewReflection &&
+                      klass_to_check->is_subclass_of(
+                        SystemDictionary::reflect_MagicAccessorImpl_klass());
 
-    if (!InstanceKlass::cast(klass_to_check)->is_same_or_direct_interface(resolved_klass())) {
+    if (!is_reflect &&
+        !InstanceKlass::cast(klass_to_check)->is_same_or_direct_interface(resolved_klass())) {
       ResourceMark rm(THREAD);
       char buf[200];
       jio_snprintf(buf, sizeof(buf),