*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java	Mon Mar 20 17:37:41 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java	Mon Mar 20 17:37:41 2017

*** 21,31 ****
--- 21,31 ----
   * questions.
   */
  package org.graalvm.compiler.core.test.tutorial;
  
  import static org.graalvm.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest;
  
+ import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions;
  import java.lang.reflect.Method;
  
  import org.graalvm.compiler.api.test.Graal;
  import org.graalvm.compiler.code.CompilationResult;
  import org.graalvm.compiler.core.GraalCompiler;

*** 36,45 ****
--- 36,46 ----
  import org.graalvm.compiler.debug.DebugDumpScope;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
  import org.graalvm.compiler.lir.phases.LIRSuites;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.PhaseSuite;
  import org.graalvm.compiler.phases.tiers.HighTierContext;
  import org.graalvm.compiler.phases.tiers.Suites;
  import org.graalvm.compiler.phases.util.Providers;

*** 81,99 ****
--- 82,101 ----
       */
      @SuppressWarnings("try")
      protected InstalledCode compileAndInstallMethod(ResolvedJavaMethod method) {
          /* Create a unique compilation identifier, visible in IGV. */
          CompilationIdentifier compilationId = backend.getCompilationIdentifier(method);
+         OptionValues options = getInitialOptions();
          try (Scope s = Debug.scope("compileAndInstallMethod", new DebugDumpScope(String.valueOf(compilationId), true))) {
  
              /*
               * The graph that is compiled. We leave it empty (no nodes added yet). This means that
               * it will be filled according to the graphBuilderSuite defined below. We also specify
               * that we want the compilation to make optimistic assumptions about runtime state such
               * as the loaded class hierarchy.
               */
!             StructuredGraph graph = new StructuredGraph(method, AllowAssumptions.YES, compilationId);
!             StructuredGraph graph = new StructuredGraph.Builder(getInitialOptions(), AllowAssumptions.YES).method(method).compilationId(compilationId).build();
  
              /*
               * The phases used to build the graph. Usually this is just the GraphBuilderPhase. If
               * the graph already contains nodes, it is ignored.
               */

*** 101,116 ****
--- 103,118 ----
  
              /*
               * The optimization phases that are applied to the graph. This is the main configuration
               * point for Graal. Add or remove phases to customize your compilation.
               */
!             Suites suites = backend.getSuites().getDefaultSuites(options);
  
              /*
               * The low-level phases that are applied to the low-level representation.
               */
!             LIRSuites lirSuites = backend.getSuites().getDefaultLIRSuites(options);
  
              /*
               * We want Graal to perform all speculative optimistic optimizations, using the
               * profiling information that comes with the method (collected by the interpreter) for
               * speculation.