--- a/hotspot/src/cpu/ppc/vm/ppc.ad Tue Jul 28 19:20:42 2015 +0200
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad Wed Jul 29 08:05:21 2015 +0200
@@ -1082,7 +1082,7 @@
// Start the stub.
address stub = __ start_a_stub(Compile::MAX_stubs_size/2);
if (stub == NULL) {
- Compile::current()->env()->record_out_of_memory_failure();
+ ciEnv::current()->record_failure("CodeCache is full");
return;
}
@@ -1160,7 +1160,7 @@
// Emit the trampoline stub which will be related to the branch-and-link below.
CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, offsets.insts_call_instruction_offset);
- if (Compile::current()->env()->failing()) { return offsets; } // Code cache may be full.
+ if (ciEnv::current()->failing()) { return offsets; } // Code cache may be full.
__ relocate(rtype);
}
@@ -3397,7 +3397,7 @@
// Emit the trampoline stub which will be related to the branch-and-link below.
CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, start_offset);
- if (Compile::current()->env()->failing()) { return; } // Code cache may be full.
+ if (ciEnv::current()->failing()) { return; } // Code cache may be full.
__ relocate(_optimized_virtual ?
relocInfo::opt_virtual_call_type : relocInfo::static_call_type);
}
@@ -3410,7 +3410,11 @@
__ bl(__ pc()); // Emits a relocation.
// The stub for call to interpreter.
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ if (stub == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
}
%}
@@ -3455,7 +3459,11 @@
assert(_method, "execute next statement conditionally");
// The stub for call to interpreter.
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ if (stub == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
// Restore original sp.
__ ld(R11_scratch1, 0, R1_SP); // Load caller sp.