comparison src/share/vm/oops/instanceKlassKlass.cpp @ 3464:be4ca325525a

Merge.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 27 Jul 2011 17:32:44 -0700
parents 8ce625481709
children e6b1331a51d2
comparison
equal deleted inserted replaced
3239:7c4b4daac19b 3464:be4ca325525a
688 // Verify method ordering 688 // Verify method ordering
689 typeArrayOop method_ordering = ik->method_ordering(); 689 typeArrayOop method_ordering = ik->method_ordering();
690 guarantee(method_ordering->is_perm(), "should be in permspace"); 690 guarantee(method_ordering->is_perm(), "should be in permspace");
691 guarantee(method_ordering->is_typeArray(), "should be type array"); 691 guarantee(method_ordering->is_typeArray(), "should be type array");
692 int length = method_ordering->length(); 692 int length = method_ordering->length();
693 if (JvmtiExport::can_maintain_original_method_order()) { 693 if (JvmtiExport::can_maintain_original_method_order() ||
694 (UseSharedSpaces && length != 0)) {
694 guarantee(length == methods->length(), "invalid method ordering length"); 695 guarantee(length == methods->length(), "invalid method ordering length");
695 jlong sum = 0; 696 jlong sum = 0;
696 for (j = 0; j < length; j++) { 697 for (j = 0; j < length; j++) {
697 int original_index = method_ordering->int_at(j); 698 int original_index = method_ordering->int_at(j);
698 guarantee(original_index >= 0 && original_index < length, "invalid method ordering index"); 699 guarantee(original_index >= 0 && original_index < length, "invalid method ordering index");