fix assert failure

Author: offamitkumar

src/hotspot/cpu/s390/sharedRuntime_s390.cpp

@@ -2184,7 +2184,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
 
   // The last java pc will also be used as resume pc if this is the wrapper for wait0.
   // For this purpose the precise location matters but not for oopmap lookup.
-  __ load_const(Z_R10, last_java_pc);
+  __ z_larl(Z_R10, last_java_pc);
 
   // Lock a synchronized method.
 
@@ -2364,14 +2364,12 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
 
   // Check preemption for Object.wait()
   if (method->is_object_wait0()) {
-    __ stop("crash here also");
-    Label not_preempted;
+    NearLabel not_preempted;
     __ z_ltg(Z_R1_scratch, Address(Z_thread, JavaThread::preempt_alternate_return_offset()));
     __ z_brz(not_preempted); // if 0, jump to not_preempted
     __ z_mvghi(Address(Z_thread, JavaThread::preempt_alternate_return_offset()), 0);
     __ z_br(Z_R1_scratch);
     __ bind(not_preempted);
-
   }
   __ bind(last_java_pc);
 
@@ -2483,8 +2481,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   // Clear "last Java frame" SP and PC.
   //--------------------------------------------------------------------
 
-  // TODO: FIX THIS, Last java frame won't be set if we're resuming after preemption
-  __ reset_last_Java_frame();
+  if (method->is_object_wait0()) {
+    // Last java frame won't be set if we're resuming after preemption
+    __ store_const(Address(Z_thread, JavaThread::last_Java_sp_offset()), 0);
+    __ store_const(Address(Z_thread, JavaThread::last_Java_pc_offset()), 0);
+  } else {
+    __ reset_last_Java_frame();
+  }
 
   // Unpack oop result, e.g. JNIHandles::resolve result.
   if (is_reference_type(ret_type)) {