Mercurial > hg > truffle
diff src/share/vm/graal/graalCompilerToVM.cpp @ 9654:18632807db02
RuntimeStub installation support is now more distinct from normal nmethod installation
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 13 May 2013 11:21:24 +0200 |
parents | dd62ccda1849 |
children | fe9a18fbb15e |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp Mon May 13 11:00:56 2013 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Mon May 13 11:21:24 2013 +0200 @@ -872,12 +872,11 @@ HandleMark hm; Handle compResultHandle = JNIHandles::resolve(compResult); CodeBlob* cb = NULL; - methodHandle method = getMethodFromHotSpotMethod(HotSpotCompilationResult::method(compResult)); Handle installed_code_handle = JNIHandles::resolve(installed_code); Handle triggered_deoptimizations_handle = JNIHandles::resolve(triggered_deoptimizations); GraalEnv::CodeInstallResult result; - CodeInstaller installer(compResultHandle, method, result, cb, installed_code_handle, triggered_deoptimizations_handle); + CodeInstaller installer(compResultHandle, result, cb, installed_code_handle, triggered_deoptimizations_handle); if (PrintCodeCacheOnCompilation) { stringStream s; @@ -898,7 +897,6 @@ HotSpotInstalledCode::set_codeBlob(installed_code_handle, (jlong) cb); HotSpotInstalledCode::set_method(installed_code_handle, HotSpotCompilationResult::method(compResult)); HotSpotInstalledCode::set_start(installed_code_handle, (jlong) cb->code_begin()); - HotSpotInstalledCode::set_isNmethod(installed_code_handle, cb->is_nmethod()); nmethod* nm = cb->as_nmethod_or_null(); assert(nm == NULL || !installed_code_handle->is_scavengable() || nm->on_scavenge_root_list(), "nm should be scavengable if installed_code is scavengable"); }