*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java	Fri Jul  7 09:31:45 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java	Fri Jul  7 09:31:45 2017

*** 20,50 ****
--- 20,48 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.replacements.test;
  
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.nodes.StructuredGraph;
! import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
! import org.graalvm.compiler.options.OptionValues;
! import org.graalvm.compiler.nodes.StructuredGraph.Builder;
! import org.graalvm.compiler.phases.PhaseSuite;
+ import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.replacements.ReplacementsImpl;
  import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider;
  
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  public abstract class SnippetsTest extends ReplacementsTest {
  
      protected final ReplacementsImpl installer;
      protected final ClassfileBytecodeProvider bytecodeProvider;
  
      protected SnippetsTest() {
          ReplacementsImpl d = (ReplacementsImpl) getReplacements();
          bytecodeProvider = getSystemClassLoaderBytecodeProvider();
!         installer = new ReplacementsImpl(getInitialOptions(), null, d.providers, d.snippetReflection, bytecodeProvider, d.target);
          installer.setGraphBuilderPlugins(d.getGraphBuilderPlugins());
      }
  
      @Override
!     protected StructuredGraph parseEager(ResolvedJavaMethod m, AllowAssumptions allowAssumptions, CompilationIdentifier compilationId, OptionValues options) {
!         return installer.makeGraph(bytecodeProvider, m, null, null);
!     protected StructuredGraph parse(Builder builder, PhaseSuite<HighTierContext> graphBuilderSuite) {
!         return installer.makeGraph(getDebugContext(), bytecodeProvider, builder.getMethod(), null, null);
      }
  }