src/share/vm/classfile/classFileParser.cpp

*** 814,826 ****
        // Call resolve_super so classcircularity is checked
        Klass* k = SystemDictionary::resolve_super_or_fail(class_name,
                      unresolved_klass, class_loader, protection_domain,
                      false, CHECK_NULL);
        interf = KlassHandle(THREAD, k);
- 
-       if (LinkWellKnownClasses)  // my super type is well known to me
-         cp->klass_at_put(interface_index, interf()); // eagerly resolve
      }
  
      if (!Klass::cast(interf())->is_interface()) {
        THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", NULL);
      }
--- 814,823 ----
*** 3195,3206 ****
                                                             true,
                                                             CHECK_(nullHandle));
  
        KlassHandle kh (THREAD, k);
        super_klass = instanceKlassHandle(THREAD, kh());
-       if (LinkWellKnownClasses)  // my super class is well known to me
-         cp->klass_at_put(super_class_index, super_klass()); // eagerly resolve
      }
      if (super_klass.not_null()) {
        if (super_klass->is_interface()) {
          ResourceMark rm(THREAD);
          Exceptions::fthrow(
--- 3192,3201 ----
*** 3642,3652 ****
      // size is equal to the number of methods in the class. If
      // that changes, then InstanceKlass::idnum_can_increment()
      // has to be changed accordingly.
      this_klass->set_initial_method_idnum(methods->length());
      this_klass->set_name(cp->klass_name_at(this_class_index));
!     if (LinkWellKnownClasses || is_anonymous())  // I am well known to myself
        cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve
  
      if (fields_annotations != NULL ||
          methods_annotations != NULL ||
          methods_parameter_annotations != NULL ||
--- 3637,3647 ----
      // size is equal to the number of methods in the class. If
      // that changes, then InstanceKlass::idnum_can_increment()
      // has to be changed accordingly.
      this_klass->set_initial_method_idnum(methods->length());
      this_klass->set_name(cp->klass_name_at(this_class_index));
!     if (is_anonymous())  // I am well known to myself
        cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve
  
      if (fields_annotations != NULL ||
          methods_annotations != NULL ||
          methods_parameter_annotations != NULL ||