diff 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
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Fri Oct 02 10:12:01 2015 +0200
+++ b/src/share/vm/jvmci/jvmciCodeInstaller.cpp	Fri Oct 02 10:13:56 2015 +0200
@@ -384,7 +384,7 @@
 }
 
 // constructor used to create a method
-JVMCIEnv::CodeInstallResult CodeInstaller::install(Handle target, Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log) {
+JVMCIEnv::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler, Handle target, Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log) {
   CodeBuffer buffer("JVMCI Compiler CodeBuffer");
   jobject compiled_code_obj = JNIHandles::make_local(compiled_code());
   initialize_dependencies(JNIHandles::resolve(compiled_code_obj));
@@ -425,7 +425,7 @@
     }
     result = JVMCIEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer,
                                        stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
-                                       JVMCICompiler::instance(), _debug_recorder, _dependencies, env, id,
+                                       compiler, _debug_recorder, _dependencies, env, id,
                                        has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log);
     cb = nm;
   }