Mercurial > hg > truffle

changeset 18464:e6b6463c9c06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge (FrameMapBuilder).
author Josef Eisl <josef.eisl@jku.at>
date Wed, 19 Nov 2014 16:06:49 +0100
parents eeed42f7e38c (current diff) 0ea607f6a680 (diff)
children f0a8b72315c1
files
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java	Wed Nov 19 16:04:01 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java	Wed Nov 19 16:06:49 2014 +0100
@@ -110,9 +110,9 @@
         return new HotSpotGraphMaker(this, substitute, original, frameStateProcessing);
     }
 
-    private static class HotSpotGraphMaker extends ReplacementsImpl.GraphMaker {
+    public static class HotSpotGraphMaker extends ReplacementsImpl.GraphMaker {
 
-        protected HotSpotGraphMaker(ReplacementsImpl replacements, ResolvedJavaMethod substitute, ResolvedJavaMethod substitutedMethod, FrameStateProcessing frameStateProcessing) {
+        public HotSpotGraphMaker(ReplacementsImpl replacements, ResolvedJavaMethod substitute, ResolvedJavaMethod substitutedMethod, FrameStateProcessing frameStateProcessing) {
             super(replacements, substitute, substitutedMethod, frameStateProcessing);
         }
 
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleReplacements.java	Wed Nov 19 16:04:01 2014 +0100
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleReplacements.java	Wed Nov 19 16:06:49 2014 +0100
@@ -22,8 +22,10 @@
  */
 package com.oracle.graal.truffle.hotspot;
 
+import com.oracle.graal.api.meta.*;
 import com.oracle.graal.api.replacements.*;
 import com.oracle.graal.api.runtime.*;
+import com.oracle.graal.hotspot.*;
 import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.phases.util.*;
 import com.oracle.graal.runtime.*;
@@ -40,4 +42,9 @@
         SnippetReflectionProvider snippetReflection = Graal.getRequiredCapability(SnippetReflectionProvider.class);
         return new HotSpotTruffleReplacements(providers, snippetReflection);
     }
+
+    @Override
+    protected GraphMaker createGraphMaker(ResolvedJavaMethod substitute, ResolvedJavaMethod original, FrameStateProcessing frameStateProcessing) {
+        return new HotSpotReplacementsImpl.HotSpotGraphMaker(this, substitute, original, frameStateProcessing);
+    }
 }