--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotConstantPool.java	Mon Apr 23 21:27:48 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotConstantPool.java	Tue Apr 24 13:04:43 2012 +0200
@@ -30,10 +30,9 @@
  * Implementation of RiConstantPool for HotSpot.
  */
 public class HotSpotConstantPool extends CompilerObject implements RiConstantPool {
-    /**
-     * 
-     */
+
     private static final long serialVersionUID = -5443206401485234850L;
+
     private final HotSpotTypeResolvedImpl type;
 
     public HotSpotConstantPool(Compiler compiler, HotSpotTypeResolvedImpl type) {
@@ -43,7 +42,7 @@
 
     @Override
     public Object lookupConstant(int cpi) {
-        Object constant = compiler.getVMEntries().RiConstantPool_lookupConstant(type, cpi);
+        Object constant = compiler.getCompilerToVM().RiConstantPool_lookupConstant(type, cpi);
         return constant;
     }
 
@@ -54,21 +53,21 @@
 
     @Override
     public RiMethod lookupMethod(int cpi, int byteCode) {
-        return compiler.getVMEntries().RiConstantPool_lookupMethod(type, cpi, (byte) byteCode);
+        return compiler.getCompilerToVM().RiConstantPool_lookupMethod(type, cpi, (byte) byteCode);
     }
 
     @Override
     public RiType lookupType(int cpi, int opcode) {
-        return compiler.getVMEntries().RiConstantPool_lookupType(type, cpi);
+        return compiler.getCompilerToVM().RiConstantPool_lookupType(type, cpi);
     }
 
     @Override
     public RiField lookupField(int cpi, int opcode) {
-        return compiler.getVMEntries().RiConstantPool_lookupField(type, cpi, (byte) opcode);
+        return compiler.getCompilerToVM().RiConstantPool_lookupField(type, cpi, (byte) opcode);
     }
 
     @Override
     public void loadReferencedType(int cpi, int bytecode) {
-        compiler.getVMEntries().RiConstantPool_loadReferencedType(type, cpi, (byte) bytecode);
+        compiler.getCompilerToVM().RiConstantPool_loadReferencedType(type, cpi, (byte) bytecode);
     }
 }