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

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
comparison
equal deleted inserted replaced
2491:0654ee04b214 2492:4e5515d09314
68 68
69 private static Set<String> compiledMethods = new HashSet<String>(); 69 private static Set<String> compiledMethods = new HashSet<String>();
70 70
71 @Override 71 @Override
72 public void compileMethod(long methodVmId, String name, int entryBCI) throws Throwable { 72 public void compileMethod(long methodVmId, String name, int entryBCI) throws Throwable {
73
74 if (!compileMethods) { 73 if (!compileMethods) {
75 return; 74 return;
76 } 75 }
77 76
78 try { 77 try {
97 type = "compiled"; 96 type = "compiled";
98 } 97 }
99 Logger.info(String.format("%-10s %3d %s", type, e.getLineNumber(), current)); 98 Logger.info(String.format("%-10s %3d %s", type, e.getLineNumber(), current));
100 } 99 }
101 } 100 }
102 System.out.println("BAILOUT:" + result.bailout().getMessage());
103 String s = result.bailout().getMessage(); 101 String s = result.bailout().getMessage();
104 if (cause != null) { 102 if (cause != null) {
105 s = cause.getMessage(); 103 s = cause.getMessage();
106 } 104 }
107 compiler.getVMEntries().recordBailout(s); 105 compiler.getVMEntries().recordBailout(s);
130 public RiSignature createRiSignature(String signature) { 128 public RiSignature createRiSignature(String signature) {
131 return new HotSpotSignature(compiler, signature); 129 return new HotSpotSignature(compiler, signature);
132 } 130 }
133 131
134 @Override 132 @Override
135 public RiField createRiField(RiType holder, String name, RiType type, int offset) { 133 public RiField createRiField(RiType holder, String name, RiType type, int offset, int flags) {
136 if (offset != -1) { 134 if (offset != -1) {
137 HotSpotTypeResolved resolved = (HotSpotTypeResolved) holder; 135 HotSpotTypeResolved resolved = (HotSpotTypeResolved) holder;
138 return resolved.createRiField(name, type, offset); 136 return resolved.createRiField(name, type, offset, flags);
139 } 137 }
140 return new HotSpotField(compiler, holder, name, type, offset); 138 return new HotSpotField(compiler, holder, name, type, offset, flags);
141 } 139 }
142 140
143 @Override 141 @Override
144 public RiType createRiType(long vmId, String name) { 142 public RiType createRiType(long vmId, String name) {
145 throw new RuntimeException("not implemented"); 143 throw new RuntimeException("not implemented");