# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1303501953 -7200
# Node ID c737ee310b3903cfdd69c0ed742e302fe6559dcb
# Parent  e88293edf07c800e08a9339e71c1ff332b8d722c
Small adjustment to assertion and constants size calculation.

diff -r e88293edf07c -r c737ee310b39 graal/Runtime/src/com/sun/hotspot/c1x/HotSpotTypeResolvedImpl.java
--- 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;
         }
diff -r e88293edf07c -r c737ee310b39 src/share/vm/c1x/c1x_CodeInstaller.cpp
--- 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;