Mercurial > hg > truffle

diff src/share/vm/graal/graalCompiler.cpp @ 7216:5a95c784febf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed windows make files and VS2012-specific compilation issues
author Christian Haeubl <haeubl@ssw.jku.at>
date Tue, 04 Dec 2012 11:14:23 +0100
parents ce248dc0a656
children 8a3efb8c831d
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.cpp	Tue Dec 04 10:10:02 2012 +0100
+++ b/src/share/vm/graal/graalCompiler.cpp	Tue Dec 04 11:14:23 2012 +0100
@@ -49,8 +49,8 @@
   JavaThread* THREAD = JavaThread::current();
   TRACE_graal_1("GraalCompiler::initialize");
 
-  unsigned long heap_end = (long) Universe::heap()->reserved_region().end();
-  unsigned long allocation_end = heap_end + 16l * 1024 * 1024 * 1024;
+  uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end();
+  uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024;
   guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)");
   NOT_LP64(error("check TLAB allocation code for address space conflicts"));