Mercurial > hg > graal-compiler
comparison src/share/vm/prims/jni.cpp @ 7106:4983da9d3fc7
Merge
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Thu, 29 Nov 2012 17:43:48 -0800 |
parents | 35568cbc6a43 |
children | ce248dc0a656 |
comparison
equal
deleted
inserted
replaced
7105:f1f32b695d1e | 7106:4983da9d3fc7 |
---|---|
5150 /* thread is thread_in_vm here */ | 5150 /* thread is thread_in_vm here */ |
5151 *vm = (JavaVM *)(&main_vm); | 5151 *vm = (JavaVM *)(&main_vm); |
5152 *(JNIEnv**)penv = thread->jni_environment(); | 5152 *(JNIEnv**)penv = thread->jni_environment(); |
5153 | 5153 |
5154 #ifdef GRAAL | 5154 #ifdef GRAAL |
5155 GraalCompiler* compiler = GraalCompiler::instance(); | 5155 GraalCompiler* compiler = GraalCompiler::instance(); |
5156 ciObjectFactory::initialize(); | 5156 compiler->initialize(); |
5157 compiler->initialize(); | |
5158 #endif | 5157 #endif |
5159 | 5158 |
5160 // Tracks the time application was running before GC | 5159 // Tracks the time application was running before GC |
5161 RuntimeService::record_application_start(); | 5160 RuntimeService::record_application_start(); |
5162 | 5161 |