Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlassKlass.cpp Wed Jul 27 17:24:11 2011 -0700 +++ b/src/share/vm/oops/instanceKlassKlass.cpp Wed Jul 27 17:32:44 2011 -0700 @@ -690,7 +690,8 @@ guarantee(method_ordering->is_perm(), "should be in permspace"); guarantee(method_ordering->is_typeArray(), "should be type array"); int length = method_ordering->length(); - if (JvmtiExport::can_maintain_original_method_order()) { + if (JvmtiExport::can_maintain_original_method_order() || + (UseSharedSpaces && length != 0)) { guarantee(length == methods->length(), "invalid method ordering length"); jlong sum = 0; for (j = 0; j < length; j++) {