Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 7461:561148896559
8005076: Creating a CDS archive with one alignment and running another causes a crash.
Summary: Save the alignment when writing the CDS and compare it when reading the CDS.
Reviewed-by: kvn, coleenp
| author | hseigel |
|---|---|
| date | Tue, 08 Jan 2013 13:38:11 -0500 |
| parents | 4daebd4cc1dd |
| children | 1f6d10b4cc0c 203f64878aab |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Mon Jan 07 15:32:51 2013 -0500 +++ b/src/share/vm/runtime/arguments.cpp Tue Jan 08 13:38:11 2013 -0500 @@ -1331,14 +1331,14 @@ // then a saved space from compressed oops. if ((int)ObjectAlignmentInBytes > 256) { jio_fprintf(defaultStream::error_stream(), - "error: ObjectAlignmentInBytes=%d must not be greater then 256\n", + "error: ObjectAlignmentInBytes=%d must not be greater than 256\n", (int)ObjectAlignmentInBytes); return false; } // In case page size is very small. if ((int)ObjectAlignmentInBytes >= os::vm_page_size()) { jio_fprintf(defaultStream::error_stream(), - "error: ObjectAlignmentInBytes=%d must be less then page size %d\n", + "error: ObjectAlignmentInBytes=%d must be less than page size %d\n", (int)ObjectAlignmentInBytes, os::vm_page_size()); return false; } @@ -2997,11 +2997,6 @@ FLAG_SET_DEFAULT(UseLargePages, false); } - // Add 2M to any size for SharedReadOnlySize to get around the JPRT setting - if (DumpSharedSpaces && !FLAG_IS_DEFAULT(SharedReadOnlySize)) { - SharedReadOnlySize = 14*M; - } - if (DumpSharedSpaces) { if (RequireSharedSpaces) { warning("cannot dump shared archive while using shared archive");