Mercurial > hg > truffle
comparison src/share/vm/prims/jni.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | cefad50507d8 |
children | 096c224171c4 |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
5156 /* thread is thread_in_vm here */ | 5156 /* thread is thread_in_vm here */ |
5157 *vm = (JavaVM *)(&main_vm); | 5157 *vm = (JavaVM *)(&main_vm); |
5158 *(JNIEnv**)penv = thread->jni_environment(); | 5158 *(JNIEnv**)penv = thread->jni_environment(); |
5159 | 5159 |
5160 #ifdef GRAAL | 5160 #ifdef GRAAL |
5161 // GraalCompiler needs to have been created in compileBroker.cpp | |
5161 GraalCompiler* graal_compiler = GraalCompiler::instance(); | 5162 GraalCompiler* graal_compiler = GraalCompiler::instance(); |
5162 graal_compiler->initialize(); | 5163 graal_compiler->initialize(); |
5163 #endif | 5164 #endif |
5164 | 5165 |
5165 // Tracks the time application was running before GC | 5166 // Tracks the time application was running before GC |