Mercurial > hg > truffle
comparison src/share/vm/prims/jni.cpp @ 16006:66a9286203a2
decoupled Graal runtime initialization and Graal compilation queue initialization
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 03 Jun 2014 11:51:27 +0200 |
parents | b7fb36e57da8 |
children | d32be0297274 |
comparison
equal
deleted
inserted
replaced
16003:83433cf49019 | 16006:66a9286203a2 |
---|---|
33 #include "classfile/vmSymbols.hpp" | 33 #include "classfile/vmSymbols.hpp" |
34 #include "interpreter/linkResolver.hpp" | 34 #include "interpreter/linkResolver.hpp" |
35 #include "utilities/macros.hpp" | 35 #include "utilities/macros.hpp" |
36 #ifdef GRAAL | 36 #ifdef GRAAL |
37 #include "graal/graalCompiler.hpp" | 37 #include "graal/graalCompiler.hpp" |
38 #include "graal/graalVMToCompiler.hpp" | 38 #include "graal/graalRuntime.hpp" |
39 #endif | 39 #endif |
40 #if INCLUDE_ALL_GCS | 40 #if INCLUDE_ALL_GCS |
41 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" | 41 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" |
42 #endif // INCLUDE_ALL_GCS | 42 #endif // INCLUDE_ALL_GCS |
43 #include "memory/allocation.hpp" | 43 #include "memory/allocation.hpp" |
5216 if (CompileTheWorld) { | 5216 if (CompileTheWorld) { |
5217 // Graal is considered as application code so we need to | 5217 // Graal is considered as application code so we need to |
5218 // stop the VM deferring compilation now. | 5218 // stop the VM deferring compilation now. |
5219 CompilationPolicy::completed_vm_startup(); | 5219 CompilationPolicy::completed_vm_startup(); |
5220 | 5220 |
5221 VMToCompiler::compileTheWorld(); | 5221 GraalCompiler::instance()->compile_the_world(); |
5222 } | 5222 } |
5223 #endif | 5223 #endif |
5224 #else | 5224 #else |
5225 if (CompileTheWorld) ClassLoader::compile_the_world(); | 5225 if (CompileTheWorld) ClassLoader::compile_the_world(); |
5226 #endif | 5226 #endif |