comparison src/share/vm/graal/graalCompilerToVM.cpp @ 7094:eec7173947a1

removed remaining use of the C++ "compiler interface" (i.e. ci) by Graal for installing dependencies
author Doug Simon <doug.simon@oracle.com>
date Thu, 29 Nov 2012 17:13:13 +0100
parents af30115c9d0e
children 1baf7f1e3f23
comparison
equal deleted inserted replaced
7093:dff79b1f82f1 7094:eec7173947a1
26 #include "memory/oopFactory.hpp" 26 #include "memory/oopFactory.hpp"
27 #include "oops/generateOopMap.hpp" 27 #include "oops/generateOopMap.hpp"
28 #include "oops/fieldStreams.hpp" 28 #include "oops/fieldStreams.hpp"
29 #include "runtime/javaCalls.hpp" 29 #include "runtime/javaCalls.hpp"
30 #include "c1/c1_Runtime1.hpp" 30 #include "c1/c1_Runtime1.hpp"
31 #include "ci/ciMethodData.hpp"
32 #include "compiler/compileBroker.hpp" 31 #include "compiler/compileBroker.hpp"
33 #include "compiler/compilerOracle.hpp" 32 #include "compiler/compilerOracle.hpp"
34 #include "graal/graalCompilerToVM.hpp" 33 #include "graal/graalCompilerToVM.hpp"
35 #include "graal/graalCompiler.hpp" 34 #include "graal/graalCompiler.hpp"
36 #include "graal/graalEnv.hpp" 35 #include "graal/graalEnv.hpp"
739 ResourceMark rm; 738 ResourceMark rm;
740 HandleMark hm; 739 HandleMark hm;
741 Handle compResultHandle = JNIHandles::resolve(compResult); 740 Handle compResultHandle = JNIHandles::resolve(compResult);
742 nmethod* nm = NULL; 741 nmethod* nm = NULL;
743 methodHandle method = getMethodFromHotSpotMethod(HotSpotCompilationResult::method(compResult)); 742 methodHandle method = getMethodFromHotSpotMethod(HotSpotCompilationResult::method(compResult));
744 Arena arena;
745 ciEnv env(&arena);
746 Handle installed_code_handle = JNIHandles::resolve(installed_code); 743 Handle installed_code_handle = JNIHandles::resolve(installed_code);
747 GraalEnv::CodeInstallResult result; 744 GraalEnv::CodeInstallResult result;
748 CodeInstaller installer(compResultHandle, method, result, nm, installed_code_handle); 745 CodeInstaller installer(compResultHandle, method, result, nm, installed_code_handle);
749 746
750 if (result != GraalEnv::ok) { 747 if (result != GraalEnv::ok) {