archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7009268: guarantee(middle - slop > start) failed: need enough space to divide up

Browse source 
Codebuffer can overflow on test with large number of calls

Reviewed-by: dholmes, collins
This commit is contained in:
Bob Vandette 2011-01-07 12:44:54 -05:00
parent dec384330b
commit c14e8eb4f2
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/src/share/vm/c1/c1_Compilation.cpp
View file

@ -245,7 +245,7 @@ void Compilation::emit_code_epilog(LIR_Assembler* assembler) {
} }
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: // Preinitialize the consts section to some large size:
int locs_buffer_size = 20 * (relocInfo::length_limit + sizeof(relocInfo)); int locs_buffer_size = 20 * (relocInfo::length_limit + sizeof(relocInfo));
char* locs_buffer = NEW_RESOURCE_ARRAY(char, locs_buffer_size); char* locs_buffer = NEW_RESOURCE_ARRAY(char, locs_buffer_size);
@ -253,15 +253,20 @@ void Compilation::setup_code_buffer(CodeBuffer* code, int call_stub_estimate) {
locs_buffer_size / sizeof(relocInfo)); locs_buffer_size / sizeof(relocInfo));
code->initialize_consts_size(Compilation::desired_max_constant_size()); code->initialize_consts_size(Compilation::desired_max_constant_size());
// Call stubs + two deopt handlers (regular and MH) + exception handler // Call stubs + two deopt handlers (regular and MH) + exception handler
code->initialize_stubs_size((call_stub_estimate * LIR_Assembler::call_stub_size) + int stub_size = (call_stub_estimate * LIR_Assembler::call_stub_size) +
LIR_Assembler::exception_handler_size + LIR_Assembler::exception_handler_size +
2 * LIR_Assembler::deopt_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() { int Compilation::emit_code_body() {
// emit code // 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()); code()->initialize_oop_recorder(env()->oop_recorder());
_masm = new C1_MacroAssembler(code()); _masm = new C1_MacroAssembler(code());

2
hotspot/src/share/vm/c1/c1_Compilation.hpp
View file

@ -192,7 +192,7 @@ class Compilation: public StackObj {
return desired_max_code_buffer_size() / 10; 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 // timers
static void print_timers(); static void print_timers();