Mercurial > hg > truffle

changeset 2495:c737ee310b39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small adjustment to assertion and constants size calculation.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 22 Apr 2011 21:52:33 +0200
parents e88293edf07c
children 96ca0e1b8a1d
files graal/Runtime/src/com/sun/hotspot/c1x/HotSpotTypeResolvedImpl.java src/share/vm/c1x/c1x_CodeInstaller.cpp
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotTypeResolvedImpl.java	Fri Apr 22 21:13:09 2011 +0200
+++ b/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotTypeResolvedImpl.java	Fri Apr 22 21:52:33 2011 +0200
@@ -209,7 +209,6 @@
             result = new HotSpotField(compiler, this, name, type, offset, flags);
             fieldCache.put(id, result);
         } else {
-            assert result.type().equals(type);
             assert result.name().equals(name);
             assert result.accessFlags() == flags;
         }
--- a/src/share/vm/c1x/c1x_CodeInstaller.cpp	Fri Apr 22 21:13:09 2011 +0200
+++ b/src/share/vm/c1x/c1x_CodeInstaller.cpp	Fri Apr 22 21:52:33 2011 +0200
@@ -223,7 +223,7 @@
 
 
   // (very) conservative estimate: each site needs a constant section entry
-  _constants_size = _sites->length() * BytesPerLong;
+  _constants_size = _sites->length() * (BytesPerLong*2);
   _total_size = align_size_up(_code_size, HeapWordSize) + _constants_size;
 
   _next_call_type = MARK_INVOKE_INVALID;