# HG changeset patch # User Roland Schatz # Date 1416400992 -3600 # Node ID 0ea607f6a68066cb0c637601c52d1dfc9c44087e # Parent 3b7746ceb0e84df697bf9457c749d94d720afd6c Use HotSpotWordTypeRewriterPhase in Truffle. diff -r 3b7746ceb0e8 -r 0ea607f6a680 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java Wed Nov 19 12:02:35 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotReplacementsImpl.java Wed Nov 19 13:43:12 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); } diff -r 3b7746ceb0e8 -r 0ea607f6a680 graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleReplacements.java --- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleReplacements.java Wed Nov 19 12:02:35 2014 +0100 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleReplacements.java Wed Nov 19 13:43:12 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); + } }