*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java	Fri Jul  7 09:30:07 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java	Fri Jul  7 09:30:06 2017

*** 28,37 ****
--- 28,38 ----
  import org.graalvm.compiler.hotspot.HotSpotBackend;
  import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.nodes.StructuredGraph;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.runtime.RuntimeProvider;
  
  import jdk.vm.ci.code.InstalledCode;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.runtime.JVMCI;

*** 52,62 ****
--- 53,64 ----
          ResolvedJavaMethod method = getMetaAccess().lookupJavaMethod(getMethod(c, methodName));
          HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) JVMCI.getRuntime().getCompiler();
          HotSpotGraalRuntimeProvider rt = (HotSpotGraalRuntimeProvider) Graal.getRequiredCapability(RuntimeProvider.class);
          HotSpotProviders providers = rt.getHostBackend().getProviders();
          CompilationIdentifier compilationId = runtime().getHostBackend().getCompilationIdentifier(method);
!         StructuredGraph graph = compiler.getIntrinsicGraph(method, providers, compilationId, getInitialOptions());
!         OptionValues options = getInitialOptions();
+         StructuredGraph graph = compiler.getIntrinsicGraph(method, providers, compilationId, options, getDebugContext(options));
          if (graph != null) {
              return getCode(method, graph, true, true, graph.getOptions());
          }
          return null;
      }