8026365: NoClassDefinitionFound for anonymous class invokespecial.

Reviewed-by: dcubed, kamg

src/share/vm/classfile/verifier.cpp

@@ -2439,10 +2439,11 @@ void ClassVerifier::verify_invoke_instructions(
              && !ref_class_type.equals(current_type())
              && !ref_class_type.equals(VerificationType::reference_type(
                   current_class()->super()->name()))) {
-    bool subtype = ref_class_type.is_assignable_from(
+    bool subtype = false;
+    if (!current_class()->is_anonymous()) {
+      subtype = ref_class_type.is_assignable_from(
                  current_type(), this, CHECK_VERIFY(this));
-    if (!subtype) {
-      if (current_class()->is_anonymous()) {
+    } else {
       subtype = ref_class_type.is_assignable_from(VerificationType::reference_type(
                  current_class()->host_klass()->name()), this, CHECK_VERIFY(this));
     }
@@ -2453,7 +2454,6 @@ void ClassVerifier::verify_invoke_instructions(
        return;
     }
   }
-  }
   // Match method descriptor with operand stack
   for (int i = nargs - 1; i >= 0; i--) {  // Run backwards
     current_frame->pop_stack(sig_types[i], CHECK_VERIFY(this));
@@ -2470,17 +2470,13 @@ void ClassVerifier::verify_invoke_instructions(
         if (!current_class()->is_anonymous()) {
           current_frame->pop_stack(current_type(), CHECK_VERIFY(this));
         } else {
-          // anonymous class invokespecial calls: either the
-          // operand stack/objectref  is a subtype of the current class OR
-          // the objectref is a subtype of the host_klass of the current class
+          // anonymous class invokespecial calls: check if the
+          // objectref is a subtype of the host_klass of the current class
           // to allow an anonymous class to reference methods in the host_klass
           VerificationType top = current_frame->pop_stack(CHECK_VERIFY(this));
-          bool subtype = current_type().is_assignable_from(top, this, CHECK_VERIFY(this));
-          if (!subtype) {
           VerificationType hosttype =
             VerificationType::reference_type(current_class()->host_klass()->name());
-            subtype = hosttype.is_assignable_from(top, this, CHECK_VERIFY(this));
-          }
+          bool subtype = hosttype.is_assignable_from(top, this, CHECK_VERIFY(this));
           if (!subtype) {
             verify_error( ErrorContext::bad_type(current_frame->offset(),
               current_frame->stack_top_ctx(),

test/TEST.groups

@@ -69,6 +69,7 @@ needs_jdk = \
   runtime/7107135/Test7107135.sh \
   runtime/7158988/FieldMonitor.java \
   runtime/7194254/Test7194254.java \
+  runtime/8026365/InvokeSpecialAnonTest.java \
   runtime/jsig/Test8017498.sh \
   runtime/Metaspace/FragmentMetaspace.java \
   runtime/NMT/BaselineWithParameter.java \