From 9939fc67eb8d86220d98262d8360973cdbe4b75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <mhaessig@openjdk.org>
Date: Mon, 22 Jun 2026 13:53:15 +0000
Subject: [PATCH] 8387017:
 java/lang/instrument/GetObjectSizeIntrinsicsTest.java fails with Error
 evaluating expression: invalid boolean value: `null' for expression
 `vm.opt.VerifyOops'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Joel Sikström <jsikstro@openjdk.org>
Reviewed-by: jpai, jsikstro, epeter
---
 .../GetObjectSizeIntrinsicsTest.java           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java b/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
index e1b026c56ef..6cb71022c0c 100644
--- a/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
+++ b/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
@@ -26,7 +26,7 @@
  * @bug 8253525
  * @summary Test for fInst.getObjectSize with 32-bit compressed oops
  * @library /test/lib
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -55,7 +55,7 @@
  * @summary Test for fInst.getObjectSize with zero-based compressed oops
  * @library /test/lib
  * @requires vm.bits == 64
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -84,7 +84,7 @@
  * @summary Test for fInst.getObjectSize without compressed oops
  * @library /test/lib
  * @requires vm.bits == 64
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -113,7 +113,7 @@
  * @summary Test for fInst.getObjectSize with 32-bit compressed oops
  * @library /test/lib
  * @requires vm.debug
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -146,7 +146,7 @@
  * @library /test/lib
  * @requires vm.bits == 64
  * @requires vm.debug
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -179,7 +179,7 @@
  * @library /test/lib
  * @requires vm.bits == 64
  * @requires vm.debug
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -212,7 +212,7 @@
  * @library /test/lib
  * @requires vm.bits == 64
  * @requires vm.debug
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -245,7 +245,7 @@
  * @library /test/lib
  * @requires vm.bits == 64
  * @requires vm.debug
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest
@@ -279,7 +279,7 @@
  * @requires vm.bits == 64
  * @requires vm.debug
  * @requires os.maxMemory >= 10G
- * @requires !vm.opt.VerifyOops
+ * @requires (vm.opt.VerifyOops == "null" | !vm.opt.VerifyOops)
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run build GetObjectSizeIntrinsicsTest