remove WB_isUbsanEnabled, fix test

MBaesken · Jul 31, 2024 · 2fd6123 · 2fd6123
1 parent 4a79243
commit 2fd6123
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
@@ -289,15 +289,6 @@ WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
 }
 WB_END
 
-WB_ENTRY(jboolean, WB_isUbsanEnabled(JNIEnv* env, jobject o)) {
-#if defined(UNDEFINED_BEHAVIOR_SANITIZER)
-  return true;
-#else
-  return false;
-#endif
-}
-WB_END
-
 WB_ENTRY(void, WB_ReadFromNoaccessArea(JNIEnv* env, jobject o))
   size_t granularity = os::vm_allocation_granularity();
   ReservedHeapSpace rhs(100 * granularity, granularity, os::vm_page_size());
@@ -2709,8 +2700,8 @@ static JNINativeMethod methods[] = {
                                                       (void*)&WB_AddToBootstrapClassLoaderSearch},
   {CC"addToSystemClassLoaderSearch0",    CC"(Ljava/lang/String;)V",
                                                       (void*)&WB_AddToSystemClassLoaderSearch},
-  {CC"getCompressedOopsMaxHeapSize", CC"()J",         (void*)&WB_GetCompressedOopsMaxHeapSize},
-  {CC"isUbsanEnabled",     CC"()Z",                   (void*)&WB_isUbsanEnabled},
+  {CC"getCompressedOopsMaxHeapSize", CC"()J",
+      (void*)&WB_GetCompressedOopsMaxHeapSize},
   {CC"printHeapSizes",     CC"()V",                   (void*)&WB_PrintHeapSizes    },
   {CC"readFromNoaccessArea",CC"()V",                  (void*)&WB_ReadFromNoaccessArea},
   {CC"stressVirtualSpaceResize",CC"(JJJ)I",           (void*)&WB_StressVirtualSpaceResize},

diff --git a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
@@ -30,6 +30,8 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar
+ * @build HelloDocker
+ * @run driver DockerBasicTest
  */
 import jdk.test.lib.containers.docker.Common;
 import jdk.test.lib.containers.docker.DockerRunOptions;