comparison src/share/vm/jvmci/jvmciCodeInstaller.cpp @ 22650:939d5da65929

reduced delta against jvmci-9
author Doug Simon <doug.simon@oracle.com>
date Fri, 02 Oct 2015 10:13:56 +0200
parents 5fade64c1b5f
children 15013021dbfa
comparison
equal deleted inserted replaced
22649:5cd42bb63fad 22650:939d5da65929
382 } 382 }
383 } 383 }
384 } 384 }
385 385
386 // constructor used to create a method 386 // constructor used to create a method
387 JVMCIEnv::CodeInstallResult CodeInstaller::install(Handle target, Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log) { 387 JVMCIEnv::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler, Handle target, Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log) {
388 CodeBuffer buffer("JVMCI Compiler CodeBuffer"); 388 CodeBuffer buffer("JVMCI Compiler CodeBuffer");
389 jobject compiled_code_obj = JNIHandles::make_local(compiled_code()); 389 jobject compiled_code_obj = JNIHandles::make_local(compiled_code());
390 initialize_dependencies(JNIHandles::resolve(compiled_code_obj)); 390 initialize_dependencies(JNIHandles::resolve(compiled_code_obj));
391 391
392 // Get instructions and constants CodeSections early because we need it. 392 // Get instructions and constants CodeSections early because we need it.
423 // Make sure a valid compile_id is associated with every compile 423 // Make sure a valid compile_id is associated with every compile
424 id = CompileBroker::assign_compile_id_unlocked(Thread::current(), method, entry_bci); 424 id = CompileBroker::assign_compile_id_unlocked(Thread::current(), method, entry_bci);
425 } 425 }
426 result = JVMCIEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer, 426 result = JVMCIEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer,
427 stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table, 427 stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
428 JVMCICompiler::instance(), _debug_recorder, _dependencies, env, id, 428 compiler, _debug_recorder, _dependencies, env, id,
429 has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log); 429 has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log);
430 cb = nm; 430 cb = nm;
431 } 431 }
432 432
433 if (cb != NULL) { 433 if (cb != NULL) {