--- a/hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.cpp Sun Dec 11 12:05:57 2016 -0800
+++ b/hotspot/src/cpu/s390/vm/c1_LIRAssembler_s390.cpp Sun Dec 11 19:07:04 2016 -0800
@@ -153,7 +153,7 @@
__ nop();
// Generate code for exception handler.
- address handler_base = __ start_a_stub(exception_handler_size);
+ address handler_base = __ start_a_stub(exception_handler_size());
if (handler_base == NULL) {
// Not enough space left for the handler.
bailout("exception handler overflow");
@@ -166,7 +166,7 @@
address call_addr = emit_call_c(a);
CHECK_BAILOUT_(-1);
__ should_not_reach_here();
- guarantee(code_offset() - offset <= exception_handler_size, "overflow");
+ guarantee(code_offset() - offset <= exception_handler_size(), "overflow");
__ end_a_stub();
return offset;
@@ -251,7 +251,7 @@
__ nop();
// Generate code for exception handler.
- address handler_base = __ start_a_stub(deopt_handler_size);
+ address handler_base = __ start_a_stub(deopt_handler_size());
if (handler_base == NULL) {
// Not enough space left for the handler.
bailout("deopt handler overflow");
@@ -260,7 +260,7 @@
// Size must be constant (see HandlerImpl::emit_deopt_handler).
__ load_const(Z_R1_scratch, SharedRuntime::deopt_blob()->unpack());
__ call(Z_R1_scratch);
- guarantee(code_offset() - offset <= deopt_handler_size, "overflow");
+ guarantee(code_offset() - offset <= deopt_handler_size(), "overflow");
__ end_a_stub();
return offset;
@@ -1157,7 +1157,7 @@
// compiled code to calling interpreted code.
address call_pc = __ pc();
- address stub = __ start_a_stub(call_stub_size);
+ address stub = __ start_a_stub(call_stub_size());
if (stub == NULL) {
bailout("static call stub overflow");
return;
@@ -1180,7 +1180,7 @@
}
__ z_br(Z_R1);
- assert(__ offset() - start <= call_stub_size, "stub too big");
+ assert(__ offset() - start <= call_stub_size(), "stub too big");
__ end_a_stub(); // Update current stubs pointer and restore insts_end.
}