Mercurial > hg > truffle

changeset 2278:76607939e139

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Up-to-date with CRI changes.
author Doug Simon <doug.simon@oracle.com>
date Wed, 09 Mar 2011 21:52:39 +0100
parents fb0db7a8ed5e
children 9aad24bf09ed
files c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExitsNative.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }
 
--- 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);