Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8240691: ClhsdbCDSJstackPrintAll incorrectly thinks CDS is in use
Fix by checking "UseSharedSpaces = false" for CDS enabled.

Reviewed-by: iklam
  • Loading branch information
yminqi committed Mar 10, 2020
1 parent 02916db commit 0e3529ad10c382e2b61435e4b88bc02d22d683f4
@@ -1990,12 +1990,6 @@ WB_END

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;
@@ -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 @@ public static void main(String[] args) throws Exception {
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");
@@ -69,7 +69,7 @@ public static void main(String[] args) throws Exception {
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");

0 comments on commit 0e3529a

Please sign in to comment.