*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java	Fri Jul  7 09:30:31 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java	Fri Jul  7 09:30:31 2017

*** 31,42 ****
--- 31,41 ----
  import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter;
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
  import org.graalvm.compiler.bytecode.BytecodeProvider;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.type.StampFactory;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.java.GraphBuilderPhase;
  import org.graalvm.compiler.nodes.ParameterNode;

*** 94,116 ****
--- 93,115 ----
          this.method = providers.getMetaAccess().lookupJavaMethod(javaMethod);
      }
  
      @Override
      @SuppressWarnings("try")
!     protected StructuredGraph getGraph(DebugContext debug, CompilationIdentifier compilationId) {
          Plugins defaultPlugins = providers.getGraphBuilderPlugins();
          MetaAccessProvider metaAccess = providers.getMetaAccess();
          SnippetReflectionProvider snippetReflection = providers.getSnippetReflection();
  
          Plugins plugins = new Plugins(defaultPlugins);
          plugins.prependParameterPlugin(new ConstantBindingParameterPlugin(makeConstArgs(), metaAccess, snippetReflection));
          GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
  
          // Stubs cannot have optimistic assumptions since they have
          // to be valid for the entire run of the VM.
!         final StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).compilationId(compilationId).build();
!         try (Scope outer = Debug.scope("SnippetStub", graph)) {
!         try (DebugContext.Scope outer = debug.scope("SnippetStub", graph)) {
              graph.disableUnsafeAccessTracking();
  
              IntrinsicContext initialIntrinsicContext = new IntrinsicContext(method, method, getReplacementsBytecodeProvider(), INLINE_AFTER_PARSING);
              GraphBuilderPhase.Instance instance = new GraphBuilderPhase.Instance(metaAccess, providers.getStampProvider(),
                              providers.getConstantReflection(), providers.getConstantFieldProvider(),

*** 130,140 ****
--- 129,139 ----
              CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
              PhaseContext context = new PhaseContext(providers);
              canonicalizer.apply(graph, context);
              new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
          } catch (Throwable e) {
!             throw Debug.handle(e);
!             throw debug.handle(e);
          }
  
          return graph;
      }