Merge branch 'upstream-master'

DataDog · Sep 15, 2024 · fb626ba · fb626ba
2 parents 3396942 + a8f143c
commit fb626ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -2062,7 +2062,7 @@ NOINLINE intptr_t* ThawBase::thaw_slow(stackChunkOop chunk, bool return_barrier)
 
   assert(_cont.chunk_invariant(), "");
 
-  JVMTI_ONLY(if (!return_barrier) invalidate_jvmti_stack(_thread));
+  JVMTI_ONLY(invalidate_jvmti_stack(_thread));
 
   _thread->set_cont_fastpath(_fastpath);
 

diff --git a/test/jdk/ProblemList-Xcomp.txt b/test/jdk/ProblemList-Xcomp.txt
@@ -29,4 +29,4 @@
 
 java/lang/invoke/MethodHandles/CatchExceptionTest.java          8146623 generic-all
 java/lang/management/MemoryMXBean/CollectionUsageThreshold.java 8318668 generic-all
-com/sun/jdi/InterruptHangTest.java                              8306679,8043571 generic-all
+com/sun/jdi/InterruptHangTest.java                              8043571 generic-all