From 26818be14daf0964e935269a9d7cec182d7d5249 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <tobias.hartmann@oracle.com>
Date: Thu, 7 Nov 2024 16:36:27 +0100
Subject: [PATCH] More fixes

---
 .../x86/continuationFreezeThaw_x86.inline.hpp |  1 -
 .../inlinetypes/TestVirtualThreads.java       | 20 ++++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp b/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
index d5f6d4b5bb1..11580c751f9 100644
--- a/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/continuationFreezeThaw_x86.inline.hpp
@@ -157,7 +157,6 @@ inline void FreezeBase::relativize_interpreted_frame_metadata(const frame& f, co
 inline void FreezeBase::set_top_frame_metadata_pd(const frame& hf) {
   stackChunkOop chunk = _cont.tail();
   assert(chunk->is_in_chunk(hf.sp() - 1), "");
-  // TODO this does not work if the callee needs stack repair. But for interpreted callers, we just update the sp so that it fits :)
   assert(chunk->is_in_chunk(hf.sp() - frame::sender_sp_offset), "");
 
   address frame_pc = hf.pc();
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestVirtualThreads.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestVirtualThreads.java
index 28bc02362a3..544c37b0c88 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestVirtualThreads.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestVirtualThreads.java
@@ -116,15 +116,14 @@ public String toString() {
 
         public void verify(String loc, int i) {
             if (x1 != i || x2 != i) {
-                new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this).printStackTrace(System.out);
-                System.exit(1);
+                throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this);
             }
         }
 
         public static void verify(SmallValue val, String loc, int i, boolean useNull) {
             if (useNull) {
                 if (val != null) {
-                    new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val).printStackTrace(System.out);
+                    throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val);
                 }
             } else {
                 val.verify(loc, i);
@@ -160,15 +159,14 @@ public String toString() {
         public void verify(String loc, int i) {
             if (x1 != i || x2 != i || x3 != i || x4 != i || x5 != i ||
                 x6 != i || x7 != i) {
-                new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this).printStackTrace(System.out);
-                System.exit(1);
+                throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this);
             }
         }
 
         public static void verify(LargeValue val, String loc, int i, boolean useNull) {
             if (useNull) {
                 if (val != null) {
-                    new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val).printStackTrace(System.out);
+                    throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val);
                 }
             } else {
                 val.verify(loc, i);
@@ -202,15 +200,14 @@ public String toString() {
         public void verify(String loc, int i) {
             if (x1 != (byte)i || x2 != (short)i || x3 != i || x4 != i || x5 != i ||
                 x6 != ((i % 2) == 0)) {
-                new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this).printStackTrace(System.out);
-                System.exit(1);
+                throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + this);
             }
         }
 
         public static void verify(LargeValue2 val, String loc, int i, boolean useNull) {
             if (useNull) {
                 if (val != null) {
-                    new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val).printStackTrace(System.out);
+                    throw new RuntimeException("Incorrect result at " + loc + " for i = " + i + ": " + val);
                 }
             } else {
                 val.verify(loc, i);
@@ -240,15 +237,14 @@ public String toString() {
 
         public void verify(String loc, Object obj) {
             if (x1 != obj || x2 != obj || x3 != obj || x4 != obj || x5 != obj) {
-                new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + this).printStackTrace(System.out);
-                System.exit(1);
+                throw new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + this);
             }
         }
 
         public static void verify(LargeValueWithOops val, String loc, Object obj, boolean useNull) {
             if (useNull) {
                 if (val != null) {
-                    new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + val).printStackTrace(System.out);
+                    throw new RuntimeException("Incorrect result at " + loc + " for obj = " + obj + ": " + val);
                 }
             } else {
                 val.verify(loc, obj);