src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp

@@ -685,11 +685,12 @@
 
   return entry;
 }
 
 address TemplateInterpreterGenerator::generate_deopt_entry_for (TosState state,
-                                                               int step) {
+                                                               int step,
+                                                               address continuation) {
   address entry = __ pc();
 
   BLOCK_COMMENT("deopt_entry {");
 
   // TODO(ZASM): necessary? NULL last_sp until next java call

@@ -708,11 +709,15 @@
                CAST_FROM_FN_PTR(address,
                                 InterpreterRuntime::throw_pending_exception));
     __ should_not_reach_here();
     __ bind(L);
   }
+  if (continuation == NULL) {
   __ dispatch_next(state, step);
+  } else {
+    __ jump_to_entry(continuation, Z_R1_scratch);
+  }
 
   BLOCK_COMMENT("} deopt_entry");
 
   return entry;
 }