Mercurial > hg > truffle

changeset 15495:9c66a589ef63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed assertion in debug VM
author Doug Simon <doug.simon@oracle.com>
date Mon, 05 May 2014 00:16:46 +0200
parents e20a45d17181
children f5eba273a4f2
files src/share/vm/graal/graalCompiler.cpp
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp	Wed Apr 30 11:48:13 2014 +0200
+++ b/src/share/vm/graal/graalCompiler.cpp	Mon May 05 00:16:46 2014 +0200
@@ -48,10 +48,6 @@
     return;
   }
 
-  ThreadToNativeFromVM trans(JavaThread::current());
-  JavaThread* THREAD = JavaThread::current();
-  TRACE_graal_1("GraalCompiler::initialize");
-
   uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end();
   uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024;
   AMD64_ONLY(guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)"));
@@ -71,6 +67,10 @@
   }
 #endif
 
+  ThreadToNativeFromVM trans(JavaThread::current());
+  JavaThread* THREAD = JavaThread::current();
+  TRACE_graal_1("GraalCompiler::initialize");
+
   JNIEnv *env = ((JavaThread *) Thread::current())->jni_environment();
   jclass klass = env->FindClass("com/oracle/graal/hotspot/bridge/CompilerToVMImpl");
   if (klass == NULL) {