--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp Fri Nov 17 20:56:14 2017 +0300
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp Tue Nov 21 09:04:42 2017 -0800
@@ -687,7 +687,8 @@
}
address TemplateInterpreterGenerator::generate_deopt_entry_for (TosState state,
- int step) {
+ int step,
+ address continuation) {
address entry = __ pc();
BLOCK_COMMENT("deopt_entry {");
@@ -710,7 +711,11 @@
__ should_not_reach_here();
__ bind(L);
}
- __ dispatch_next(state, step);
+ if (continuation == NULL) {
+ __ dispatch_next(state, step);
+ } else {
+ __ jump_to_entry(continuation, Z_R1_scratch);
+ }
BLOCK_COMMENT("} deopt_entry");