comparison src/share/vm/graal/graalCodeInstaller.cpp @ 6950:41938af2b3d8

modifications to support non-perm-gen changes in HotSpot fixed issue when intrinsifying Class.getModifiers() for primitive classes
author Doug Simon <doug.simon@oracle.com>
date Wed, 14 Nov 2012 11:28:02 +0100
parents e522a00b91aa
children eec373d34caf
comparison
equal deleted inserted replaced
6949:d09b0fed89db 6950:41938af2b3d8
273 CodeInstaller::CodeInstaller(Handle& comp_result, methodHandle method, nmethod*& nm, bool bind_to_method) { 273 CodeInstaller::CodeInstaller(Handle& comp_result, methodHandle method, nmethod*& nm, bool bind_to_method) {
274 _env = CURRENT_ENV; 274 _env = CURRENT_ENV;
275 GraalCompiler::initialize_buffer_blob(); 275 GraalCompiler::initialize_buffer_blob();
276 CodeBuffer buffer(JavaThread::current()->get_buffer_blob()); 276 CodeBuffer buffer(JavaThread::current()->get_buffer_blob());
277 jobject comp_result_obj = JNIHandles::make_local(comp_result()); 277 jobject comp_result_obj = JNIHandles::make_local(comp_result());
278 jint entry_bci = HotSpotCompilationResult::entryBCI(comp_result);
278 initialize_assumptions(JNIHandles::resolve(comp_result_obj)); 279 initialize_assumptions(JNIHandles::resolve(comp_result_obj));
279 280
280 { 281 {
281 No_Safepoint_Verifier no_safepoint; 282 No_Safepoint_Verifier no_safepoint;
282 initialize_fields(JNIHandles::resolve(comp_result_obj), method); 283 initialize_fields(JNIHandles::resolve(comp_result_obj), method);
284 process_exception_handlers(); 285 process_exception_handlers();
285 } 286 }
286 287
287 int stack_slots = _total_frame_size / HeapWordSize; // conversion to words 288 int stack_slots = _total_frame_size / HeapWordSize; // conversion to words
288 289
289 nm = GraalEnv::register_method(method, -1, &_offsets, _custom_stack_area_offset, &buffer, stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table, 290 nm = GraalEnv::register_method(method, entry_bci, &_offsets, _custom_stack_area_offset, &buffer, stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
290 &_implicit_exception_table, GraalCompiler::instance(), _debug_recorder, _dependencies, NULL, -1, true, false, bind_to_method); 291 &_implicit_exception_table, GraalCompiler::instance(), _debug_recorder, _dependencies, NULL, -1, true, false, bind_to_method);
291 292
292 method->clear_queued_for_compilation(); 293 method->clear_queued_for_compilation();
293 } 294 }
294 295