Mercurial > hg > openjdk > hsx20
changeset 1982:2f9d59b0fa5c
7009268: guarantee(middle - slop > start) failed: need enough space to divide up
Summary: Codebuffer can overflow on test with large number of calls
Reviewed-by: dholmes, collins
| author | bobv |
|---|---|
| date | Fri, 07 Jan 2011 12:44:54 -0500 |
| parents | 36c186bcc085 |
| children | 4537d449ba57 |
| files | src/share/vm/c1/c1_Compilation.cpp src/share/vm/c1/c1_Compilation.hpp |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Compilation.cpp Mon Jan 03 14:09:11 2011 -0500 +++ b/src/share/vm/c1/c1_Compilation.cpp Fri Jan 07 12:44:54 2011 -0500 @@ -245,7 +245,7 @@ } -void Compilation::setup_code_buffer(CodeBuffer* code, int call_stub_estimate) { +bool Compilation::setup_code_buffer(CodeBuffer* code, int call_stub_estimate) { // Preinitialize the consts section to some large size: int locs_buffer_size = 20 * (relocInfo::length_limit + sizeof(relocInfo)); char* locs_buffer = NEW_RESOURCE_ARRAY(char, locs_buffer_size); @@ -253,15 +253,20 @@ locs_buffer_size / sizeof(relocInfo)); code->initialize_consts_size(Compilation::desired_max_constant_size()); // Call stubs + two deopt handlers (regular and MH) + exception handler - code->initialize_stubs_size((call_stub_estimate * LIR_Assembler::call_stub_size) + - LIR_Assembler::exception_handler_size + - 2 * LIR_Assembler::deopt_handler_size); + int stub_size = (call_stub_estimate * LIR_Assembler::call_stub_size) + + LIR_Assembler::exception_handler_size + + (2 * LIR_Assembler::deopt_handler_size); + if (stub_size >= code->insts_capacity()) return false; + code->initialize_stubs_size(stub_size); + return true; } int Compilation::emit_code_body() { // emit code - setup_code_buffer(code(), allocator()->num_calls()); + if (!setup_code_buffer(code(), allocator()->num_calls())) { + BAILOUT_("size requested greater than avail code buffer size", 0); + } code()->initialize_oop_recorder(env()->oop_recorder()); _masm = new C1_MacroAssembler(code());
--- a/src/share/vm/c1/c1_Compilation.hpp Mon Jan 03 14:09:11 2011 -0500 +++ b/src/share/vm/c1/c1_Compilation.hpp Fri Jan 07 12:44:54 2011 -0500 @@ -192,7 +192,7 @@ return desired_max_code_buffer_size() / 10; } - static void setup_code_buffer(CodeBuffer* cb, int call_stub_estimate); + static bool setup_code_buffer(CodeBuffer* cb, int call_stub_estimate); // timers static void print_timers();