Mercurial > hg > truffle
comparison src/share/vm/prims/jni.cpp @ 15603:b7fb36e57da8
made Graal initialization be driven from Java to simplify sequencing and synchronization
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 May 2014 23:27:07 +0200 |
parents | 063ec2920d21 |
children | 66a9286203a2 |
comparison
equal
deleted
inserted
replaced
15602:c73df62cbaee | 15603:b7fb36e57da8 |
---|---|
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 #endif | 39 #endif |
39 #if INCLUDE_ALL_GCS | 40 #if INCLUDE_ALL_GCS |
40 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" | 41 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" |
41 #endif // INCLUDE_ALL_GCS | 42 #endif // INCLUDE_ALL_GCS |
42 #include "memory/allocation.hpp" | 43 #include "memory/allocation.hpp" |
5208 #ifndef TARGET_OS_FAMILY_windows | 5209 #ifndef TARGET_OS_FAMILY_windows |
5209 #define CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(f) f() | 5210 #define CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(f) f() |
5210 #endif | 5211 #endif |
5211 | 5212 |
5212 // Check if we should compile all classes on bootclasspath | 5213 // Check if we should compile all classes on bootclasspath |
5214 #ifdef GRAAL | |
5215 #ifndef COMPILERGRAAL | |
5216 if (CompileTheWorld) { | |
5217 // Graal is considered as application code so we need to | |
5218 // stop the VM deferring compilation now. | |
5219 CompilationPolicy::completed_vm_startup(); | |
5220 | |
5221 VMToCompiler::compileTheWorld(); | |
5222 } | |
5223 #endif | |
5224 #else | |
5213 if (CompileTheWorld) ClassLoader::compile_the_world(); | 5225 if (CompileTheWorld) ClassLoader::compile_the_world(); |
5226 #endif | |
5214 if (ReplayCompiles) ciReplay::replay(thread); | 5227 if (ReplayCompiles) ciReplay::replay(thread); |
5215 | 5228 |
5216 // Some platforms (like Win*) need a wrapper around these test | 5229 // Some platforms (like Win*) need a wrapper around these test |
5217 // functions in order to properly handle error conditions. | 5230 // functions in order to properly handle error conditions. |
5218 CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(test_error_handler); | 5231 CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(test_error_handler); |