# HG changeset patch
# User asaha
# Date 1401805756 25200
# Node ID ec8878dc470d723b8a7de6970ae6ca5e97613f0a
# Parent  54bc75c144b046ce4ffe384012161fd9ea1135b0# Parent  d6fcbd1e1075768b496482a436bc91d55136bf17
Merge

diff -r 54bc75c144b0 -r ec8878dc470d make/hotspot_version
diff -r 54bc75c144b0 -r ec8878dc470d src/share/vm/classfile/verifier.cpp
--- 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),