# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1299703959 -3600
# Node ID 76607939e1399b54078fac6b8fa2e6ed105daa6a
# Parent  fb0db7a8ed5ea4193e8d7d239cd297bacbf4b494
Up-to-date with CRI changes.

diff -r fb0db7a8ed5e -r 76607939e139 c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java	Tue Mar 08 13:28:05 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java	Wed Mar 09 21:52:39 2011 +0100
@@ -159,7 +159,7 @@
         return vmExits;
     }
 
-    private final CiCompiler compiler;
+    private final C1XCompiler compiler;
     private final HotSpotVMConfig config;
     private final HotSpotRuntime runtime;
     private final HotSpotRegisterConfig registerConfig;
@@ -190,7 +190,7 @@
         C1XOptions.StackShadowPages = config.stackShadowPages;
     }
 
-    public CiCompiler getCompiler() {
+    public C1XCompiler getCompiler() {
         return compiler;
     }
 
diff -r fb0db7a8ed5e -r 76607939e139 c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExitsNative.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExitsNative.java	Tue Mar 08 13:28:05 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExitsNative.java	Wed Mar 09 21:52:39 2011 +0100
@@ -129,7 +129,7 @@
         try {
             Compiler compiler = Compiler.getInstance();
             HotSpotMethodResolved riMethod = new HotSpotMethodResolved(methodVmId, name);
-            CiResult result = compiler.getCompiler().compileMethod(riMethod, -1, null);
+            CiResult result = compiler.getCompiler().compileMethod(riMethod, -1, null, null);
             if (LogCompiledMethods) {
                 String qualifiedName = CiUtil.toJavaName(riMethod.holder()) + "::" + riMethod.name();
                 compiledMethods.add(qualifiedName);