Mercurial > hg > truffle
comparison src/share/vm/graal/graalCompiler.cpp @ 15495:9c66a589ef63
fixed assertion in debug VM
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 05 May 2014 00:16:46 +0200 |
parents | 07fac8558d7b |
children | 063ec2920d21 |
comparison
equal
deleted
inserted
replaced
15494:e20a45d17181 | 15495:9c66a589ef63 |
---|---|
46 void GraalCompiler::initialize() { | 46 void GraalCompiler::initialize() { |
47 if (!should_perform_init()) { | 47 if (!should_perform_init()) { |
48 return; | 48 return; |
49 } | 49 } |
50 | 50 |
51 ThreadToNativeFromVM trans(JavaThread::current()); | |
52 JavaThread* THREAD = JavaThread::current(); | |
53 TRACE_graal_1("GraalCompiler::initialize"); | |
54 | |
55 uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end(); | 51 uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end(); |
56 uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024; | 52 uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024; |
57 AMD64_ONLY(guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)")); | 53 AMD64_ONLY(guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)")); |
58 NOT_LP64(error("check TLAB allocation code for address space conflicts")); | 54 NOT_LP64(error("check TLAB allocation code for address space conflicts")); |
59 | 55 |
68 } else { | 64 } else { |
69 set_state(initialized); | 65 set_state(initialized); |
70 } | 66 } |
71 } | 67 } |
72 #endif | 68 #endif |
69 | |
70 ThreadToNativeFromVM trans(JavaThread::current()); | |
71 JavaThread* THREAD = JavaThread::current(); | |
72 TRACE_graal_1("GraalCompiler::initialize"); | |
73 | 73 |
74 JNIEnv *env = ((JavaThread *) Thread::current())->jni_environment(); | 74 JNIEnv *env = ((JavaThread *) Thread::current())->jni_environment(); |
75 jclass klass = env->FindClass("com/oracle/graal/hotspot/bridge/CompilerToVMImpl"); | 75 jclass klass = env->FindClass("com/oracle/graal/hotspot/bridge/CompilerToVMImpl"); |
76 if (klass == NULL) { | 76 if (klass == NULL) { |
77 tty->print_cr("graal CompilerToVMImpl class not found"); | 77 tty->print_cr("graal CompilerToVMImpl class not found"); |