changeset 6738:ec8878dc470d

Merge
author asaha
date Tue, 03 Jun 2014 07:29:16 -0700
parents 54bc75c144b0 d6fcbd1e1075
children b207affc0618
files src/share/vm/classfile/verifier.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Thu May 29 13:14:25 2014 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Tue Jun 03 07:29:16 2014 -0700
@@ -2315,7 +2315,7 @@
         instanceKlassHandle mh(THREAD, m->method_holder());
         if (m->is_protected() && !mh->is_same_class_package(_klass())) {
           bool assignable = current_type().is_assignable_from(
-            objectref_type, this, true, CHECK_VERIFY(this));
+            objectref_type, this, CHECK_VERIFY(this));
           if (!assignable) {
             verify_error(ErrorContext::bad_type(bci,
                 TypeOrigin::cp(new_class_index, objectref_type),