comparison src/share/vm/runtime/stubRoutines.cpp @ 10418:ff3c23a329ed

Merge
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Wed, 19 Jun 2013 20:24:27 +0200
parents 746b070f5022
children 40b8c383bc31 b800986664f4
comparison
equal deleted inserted replaced
10417:acc1c61ba408 10418:ff3c23a329ed
145 if (_code1 == NULL) { 145 if (_code1 == NULL) {
146 ResourceMark rm; 146 ResourceMark rm;
147 TraceTime timer("StubRoutines generation 1", TraceStartupTime); 147 TraceTime timer("StubRoutines generation 1", TraceStartupTime);
148 _code1 = BufferBlob::create("StubRoutines (1)", code_size1); 148 _code1 = BufferBlob::create("StubRoutines (1)", code_size1);
149 if (_code1 == NULL) { 149 if (_code1 == NULL) {
150 vm_exit_out_of_memory(code_size1, "CodeCache: no room for StubRoutines (1)"); 150 vm_exit_out_of_memory(code_size1, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (1)");
151 } 151 }
152 CodeBuffer buffer(_code1); 152 CodeBuffer buffer(_code1);
153 StubGenerator_generate(&buffer, false); 153 StubGenerator_generate(&buffer, false);
154 } 154 }
155 } 155 }
197 if (_code2 == NULL) { 197 if (_code2 == NULL) {
198 ResourceMark rm; 198 ResourceMark rm;
199 TraceTime timer("StubRoutines generation 2", TraceStartupTime); 199 TraceTime timer("StubRoutines generation 2", TraceStartupTime);
200 _code2 = BufferBlob::create("StubRoutines (2)", code_size2); 200 _code2 = BufferBlob::create("StubRoutines (2)", code_size2);
201 if (_code2 == NULL) { 201 if (_code2 == NULL) {
202 vm_exit_out_of_memory(code_size2, "CodeCache: no room for StubRoutines (2)"); 202 vm_exit_out_of_memory(code_size2, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (2)");
203 } 203 }
204 CodeBuffer buffer(_code2); 204 CodeBuffer buffer(_code2);
205 StubGenerator_generate(&buffer, true); 205 StubGenerator_generate(&buffer, true);
206 } 206 }
207 207