Skip to content

Commit

Permalink
8252530: Fix inconsistencies in hotspot whitebox
Browse files Browse the repository at this point in the history
Reviewed-by: lucy
Backport-of: ab17be2
  • Loading branch information
GoeLin committed Jul 3, 2023
1 parent 9c97b37 commit da6c1c7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions src/hotspot/share/prims/whitebox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,7 @@ WB_ENTRY(jboolean, WB_AreOpenArchiveHeapObjectsMapped(JNIEnv* env))
return MetaspaceShared::open_archive_heap_region_mapped();
WB_END

WB_ENTRY(jboolean, WB_IsCDSIncludedInVmBuild(JNIEnv* env))
WB_ENTRY(jboolean, WB_IsCDSIncluded(JNIEnv* env))
#if INCLUDE_CDS
# ifdef _LP64
if (!UseCompressedOops || !UseCompressedClassPointers) {
Expand All @@ -1851,7 +1851,7 @@ WB_ENTRY(jboolean, WB_IsJavaHeapArchiveSupported(JNIEnv* env))
WB_END


WB_ENTRY(jboolean, WB_IsJFRIncludedInVmBuild(JNIEnv* env))
WB_ENTRY(jboolean, WB_IsJFRIncluded(JNIEnv* env))
#if INCLUDE_JFR
return true;
#else
Expand Down Expand Up @@ -2282,8 +2282,8 @@ static JNINativeMethod methods[] = {
{CC"areSharedStringsIgnored", CC"()Z", (void*)&WB_AreSharedStringsIgnored },
{CC"getResolvedReferences", CC"(Ljava/lang/Class;)Ljava/lang/Object;", (void*)&WB_GetResolvedReferences},
{CC"areOpenArchiveHeapObjectsMapped", CC"()Z", (void*)&WB_AreOpenArchiveHeapObjectsMapped},
{CC"isCDSIncludedInVmBuild", CC"()Z", (void*)&WB_IsCDSIncludedInVmBuild },
{CC"isJFRIncludedInVmBuild", CC"()Z", (void*)&WB_IsJFRIncludedInVmBuild },
{CC"isCDSIncluded", CC"()Z", (void*)&WB_IsCDSIncluded },
{CC"isJFRIncluded", CC"()Z", (void*)&WB_IsJFRIncluded },
{CC"isJavaHeapArchiveSupported", CC"()Z", (void*)&WB_IsJavaHeapArchiveSupported },

{CC"clearInlineCaches0", CC"(Z)V", (void*)&WB_ClearInlineCaches },
Expand Down
4 changes: 2 additions & 2 deletions test/jtreg-ext/requires/VMProps.java
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ protected String vmHasSA() {
* support.
*/
protected String vmHasJFR() {
return "" + WB.isJFRIncludedInVmBuild();
return "" + WB.isJFRIncluded();
}

/**
Expand Down Expand Up @@ -398,7 +398,7 @@ protected String vmAotEnabled() {
* @return true if CDS is supported by the VM to be tested.
*/
protected String vmCDS() {
return "" + WB.isCDSIncludedInVmBuild();
return "" + WB.isCDSIncluded();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions test/lib/sun/hotspot/WhiteBox.java
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,8 @@ public Object getMethodOption(Executable method, String name) {
public native boolean isShared(Object o);
public native boolean isSharedClass(Class<?> c);
public native boolean areSharedStringsIgnored();
public native boolean isCDSIncludedInVmBuild();
public native boolean isJFRIncludedInVmBuild();
public native boolean isCDSIncluded();
public native boolean isJFRIncluded();
public native boolean isJavaHeapArchiveSupported();
public native Object getResolvedReferences(Class<?> c);
public native boolean areOpenArchiveHeapObjectsMapped();
Expand Down
2 changes: 1 addition & 1 deletion test/lib/sun/hotspot/code/Compiler.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2021, 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
Expand Down

1 comment on commit da6c1c7

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.