comparison src/share/vm/classfile/classFileParser.cpp @ 474:7a018855d2f0

6779339: turn off LinkWellKnownClasses by default pending further testing Summary: temporarily turn off LinkWellKnownClasses optimization Reviewed-by: never, kvn
author jrose
date Mon, 08 Dec 2008 17:15:02 -0800
parents a45484ea312d
children 0af8b0718fc9
comparison
equal deleted inserted replaced
461:1f54ed41d6ae 474:7a018855d2f0
579 unresolved_klass, class_loader, protection_domain, 579 unresolved_klass, class_loader, protection_domain,
580 false, CHECK_(nullHandle)); 580 false, CHECK_(nullHandle));
581 interf = KlassHandle(THREAD, k); 581 interf = KlassHandle(THREAD, k);
582 vmtimer->resume(); 582 vmtimer->resume();
583 583
584 cp->klass_at_put(interface_index, interf()); // eagerly resolve 584 if (LinkWellKnownClasses) // my super type is well known to me
585 cp->klass_at_put(interface_index, interf()); // eagerly resolve
585 } 586 }
586 587
587 if (!Klass::cast(interf())->is_interface()) { 588 if (!Klass::cast(interf())->is_interface()) {
588 THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", nullHandle); 589 THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", nullHandle);
589 } 590 }
2697 protection_domain, 2698 protection_domain,
2698 true, 2699 true,
2699 CHECK_(nullHandle)); 2700 CHECK_(nullHandle));
2700 KlassHandle kh (THREAD, k); 2701 KlassHandle kh (THREAD, k);
2701 super_klass = instanceKlassHandle(THREAD, kh()); 2702 super_klass = instanceKlassHandle(THREAD, kh());
2702 cp->klass_at_put(super_class_index, super_klass()); // eagerly resolve 2703 if (LinkWellKnownClasses) // my super class is well known to me
2704 cp->klass_at_put(super_class_index, super_klass()); // eagerly resolve
2703 } 2705 }
2704 if (super_klass.not_null()) { 2706 if (super_klass.not_null()) {
2705 if (super_klass->is_interface()) { 2707 if (super_klass->is_interface()) {
2706 ResourceMark rm(THREAD); 2708 ResourceMark rm(THREAD);
2707 Exceptions::fthrow( 2709 Exceptions::fthrow(
3126 this_klass->set_has_final_method(); 3128 this_klass->set_has_final_method();
3127 } 3129 }
3128 this_klass->set_method_ordering(method_ordering()); 3130 this_klass->set_method_ordering(method_ordering());
3129 this_klass->set_initial_method_idnum(methods->length()); 3131 this_klass->set_initial_method_idnum(methods->length());
3130 this_klass->set_name(cp->klass_name_at(this_class_index)); 3132 this_klass->set_name(cp->klass_name_at(this_class_index));
3131 cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve 3133 if (LinkWellKnownClasses) // I am well known to myself
3134 cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve
3132 this_klass->set_protection_domain(protection_domain()); 3135 this_klass->set_protection_domain(protection_domain());
3133 this_klass->set_fields_annotations(fields_annotations()); 3136 this_klass->set_fields_annotations(fields_annotations());
3134 this_klass->set_methods_annotations(methods_annotations()); 3137 this_klass->set_methods_annotations(methods_annotations());
3135 this_klass->set_methods_parameter_annotations(methods_parameter_annotations()); 3138 this_klass->set_methods_parameter_annotations(methods_parameter_annotations());
3136 this_klass->set_methods_default_annotations(methods_default_annotations()); 3139 this_klass->set_methods_default_annotations(methods_default_annotations());