Merge branch 'pull/21565' into fibers

Author: AlanBateman

src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp

@@ -319,9 +319,9 @@ void C2_MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmp
   movptr(Address(boxReg, 0), checked_cast<int32_t>(markWord::unused_mark().value()));
 
   // It's inflated and we use scrReg for ObjectMonitor* in this section.
+  movptr(boxReg, Address(r15_thread, JavaThread::lock_id_offset()));
   movq(scrReg, tmpReg);
   xorq(tmpReg, tmpReg);
-  movptr(boxReg, Address(r15_thread, JavaThread::lock_id_offset()));
   lock();
   cmpxchgptr(boxReg, Address(scrReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(owner)));
 

src/hotspot/share/runtime/continuationFreezeThaw.cpp

@@ -1658,9 +1658,9 @@ bool FreezeBase::check_valid_fast_path() {
                   RegisterMap::ProcessFrames::skip,
                   RegisterMap::WalkContinuation::skip);
   map.set_include_argument_oops(false);
-  int i = 0;
-  for (frame f = freeze_start_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map), i++) {
-    if (!((f.is_compiled_frame() && !f.is_deoptimized_frame()) || (i == 0 && (f.is_runtime_frame() || f.is_native_frame())))) {
+  bool is_top_frame = true;
+  for (frame f = freeze_start_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map), is_top_frame = false) {
+    if (!((f.is_compiled_frame() && !f.is_deoptimized_frame()) || (is_top_frame && (f.is_runtime_frame() || f.is_native_frame())))) {
       return false;
     }
   }

src/hotspot/share/runtime/javaThread.hpp

@@ -472,8 +472,8 @@ class JavaThread: public Thread {
   int _frames_to_pop_failed_realloc;
 
   ContinuationEntry* _cont_entry;
-  intptr_t* _cont_fastpath; // the sp of the oldest known interpreted/call_stub frame inside the
-                            // continuation that we know about
+  intptr_t* _cont_fastpath; // the sp of the oldest known interpreted/call_stub/upcall_stub/native_wrapper
+                            // frame inside the continuation that we know about
   int _cont_fastpath_thread_state; // whether global thread state allows continuation fastpath (JVMTI)
 
   // It's signed for error detection.

test/jdk/ProblemList-Xcomp.txt

@@ -28,4 +28,5 @@
 #############################################################################
 
 java/lang/invoke/MethodHandles/CatchExceptionTest.java          8146623 generic-all
+java/lang/reflect/callerCache/ReflectionCallerCacheTest.java    8332028 generic-all
 com/sun/jdi/InterruptHangTest.java                              8043571 generic-all

test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java

@@ -27,7 +27,6 @@
  * @summary Test the caller class loader is not kept strongly reachable
  *         by reflection API
  * @library /test/lib/
- * @requires vm.compMode != "Xcomp"
  * @modules jdk.compiler
  * @build ReflectionCallerCacheTest Members jdk.test.lib.compiler.CompilerUtils
  * @run testng/othervm ReflectionCallerCacheTest