stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8098815: Assertion failure in CDS shared string archive support on Windows

Browse Source 
Check for a zero length before calling the G1 fill_archive_regions routine

Reviewed-by: coleenp, iklam, dcubed
This commit is contained in:
Tom Benson 2015-06-17 13:22:38 -07:00 committed by Ioi Lam
parent 8a2a6073df
commit 8da14a64c8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hotspot/src/share/vm/memory/filemap.cpp
View File

@ -647,8 +647,8 @@ char* FileMapInfo::map_region(int i) {
return base; return base;
} }
MemRegion *string_ranges = NULL; static MemRegion *string_ranges = NULL;
int num_ranges = 0; static int num_ranges = 0;
bool FileMapInfo::map_string_regions() { bool FileMapInfo::map_string_regions() {
#if INCLUDE_ALL_GCS #if INCLUDE_ALL_GCS
if (UseG1GC && UseCompressedOops && UseCompressedClassPointers) { if (UseG1GC && UseCompressedOops && UseCompressedClassPointers) {
@ -737,7 +737,10 @@ bool FileMapInfo::verify_string_regions() {
} }
void FileMapInfo::fixup_string_regions() { void FileMapInfo::fixup_string_regions() {
if (string_ranges != NULL) { // If any string regions were found, call the fill routine to make them parseable.
// Note that string_ranges may be non-NULL even if no ranges were found.
if (num_ranges != 0) {
assert(string_ranges != NULL, "Null string_ranges array with non-zero count");
G1CollectedHeap::heap()->fill_archive_regions(string_ranges, num_ranges); G1CollectedHeap::heap()->fill_archive_regions(string_ranges, num_ranges);
} }
} }