OpenJDK / amber / amber
changeset 60391:8c0b7b88b646
8240691: ClhsdbCDSJstackPrintAll incorrectly thinks CDS is in use
Summary: Fix by checking "UseSharedSpaces = false" for CDS enabled.
Reviewed-by: iklam
| author | minqi |
|---|---|
| date | Tue, 10 Mar 2020 11:52:53 -0700 |
| parents | 3f26298f486f |
| children | 81e8e9394197 |
| files | src/hotspot/share/prims/whitebox.cpp test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java test/hotspot/jtreg/serviceability/sa/ClhsdbCDSJstackPrintAll.java |
| diffstat | 3 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/prims/whitebox.cpp Tue Mar 10 20:51:09 2020 +0300 +++ b/src/hotspot/share/prims/whitebox.cpp Tue Mar 10 11:52:53 2020 -0700 @@ -1990,12 +1990,6 @@ WB_ENTRY(jboolean, WB_IsCDSIncludedInVmBuild(JNIEnv* env)) #if INCLUDE_CDS -# ifdef _LP64 - if (!UseCompressedOops || !UseCompressedClassPointers) { - // On 64-bit VMs, CDS is supported only with compressed oops/pointers - return false; - } -# endif // _LP64 return true; #else return false;
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java Tue Mar 10 20:51:09 2020 +0300 +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java Tue Mar 10 11:52:53 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -163,7 +163,7 @@ throw new SkippedException("Could not determine the UseSharedSpaces value"); } - if (!useSharedSpacesOutput.contains("true")) { + if (useSharedSpacesOutput.contains("UseSharedSpaces = false")) { // CDS archive is not mapped. Skip the rest of the test. cleanup(); throw new SkippedException("The CDS archive is not mapped");
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSJstackPrintAll.java Tue Mar 10 20:51:09 2020 +0300 +++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSJstackPrintAll.java Tue Mar 10 11:52:53 2020 -0700 @@ -69,7 +69,7 @@ throw new SkippedException("Could not determine the UseSharedSpaces value"); } - if (!useSharedSpacesOutput.contains("true")) { + if (useSharedSpacesOutput.contains("UseSharedSpaces = false")) { // CDS archive is not mapped. Skip the rest of the test. LingeredApp.stopApp(theApp); throw new SkippedException("The CDS archive is not mapped");