Mercurial > hg > graal-jvmci-8

diff graal/Runtime/src/com/sun/hotspot/c1x/VMExitsNative.java @ 2492:4e5515d09314

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed merge issues. - Accessing static fields from the java.lang.Class object instead of the klassOop (1-line-change) - Fixed issue with RiField object caching (the caching was only taking the offset as a field ID, but need to take offset+is_static)
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 22 Apr 2011 19:00:07 +0200
parents 099e697d8934
children
line wrap: on
line diff
--- a/graal/Runtime/src/com/sun/hotspot/c1x/VMExitsNative.java	Fri Apr 22 15:30:53 2011 +0200
+++ b/graal/Runtime/src/com/sun/hotspot/c1x/VMExitsNative.java	Fri Apr 22 19:00:07 2011 +0200
@@ -70,7 +70,6 @@
 
     @Override
     public void compileMethod(long methodVmId, String name, int entryBCI) throws Throwable {
-
         if (!compileMethods) {
             return;
         }
@@ -99,7 +98,6 @@
                         Logger.info(String.format("%-10s %3d %s", type, e.getLineNumber(), current));
                     }
                 }
-                System.out.println("BAILOUT:" + result.bailout().getMessage());
                 String s = result.bailout().getMessage();
                 if (cause != null) {
                     s = cause.getMessage();
@@ -132,12 +130,12 @@
     }
 
     @Override
-    public RiField createRiField(RiType holder, String name, RiType type, int offset) {
+    public RiField createRiField(RiType holder, String name, RiType type, int offset, int flags) {
         if (offset != -1) {
             HotSpotTypeResolved resolved = (HotSpotTypeResolved) holder;
-            return resolved.createRiField(name, type, offset);
+            return resolved.createRiField(name, type, offset, flags);
         }
-        return new HotSpotField(compiler, holder, name, type, offset);
+        return new HotSpotField(compiler, holder, name, type, offset, flags);
     }
 
     @Override