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

*** 23,33 ****
--- 23,33 ----
  package org.graalvm.compiler.replacements;
  
  import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
  
  import org.graalvm.compiler.bytecode.BytecodeProvider;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.java.GraphBuilderPhase;
  import org.graalvm.compiler.nodes.EncodedGraph;
  import org.graalvm.compiler.nodes.GraphEncoder;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;

*** 36,46 ****
--- 36,45 ----
  import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
  import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
  import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.common.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
  import org.graalvm.compiler.phases.util.Providers;

*** 60,72 ****
--- 59,72 ----
      protected final OptimisticOptimizations optimisticOpts;
      private final AllowAssumptions allowAssumptions;
      private final EconomicMap<ResolvedJavaMethod, EncodedGraph> graphCache;
  
      public CachingPEGraphDecoder(Architecture architecture, StructuredGraph graph, Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
-                     AllowAssumptions allowAssumptions, OptionValues options, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
-                     ParameterPlugin parameterPlugin, NodePlugin[] nodePlugins) {
          super(architecture, graph, providers.getMetaAccess(), providers.getConstantReflection(), providers.getConstantFieldProvider(), providers.getStampProvider(), options, loopExplosionPlugin,
+                     NodePlugin[] nodePlugins) {
+         super(architecture, graph, providers.getMetaAccess(), providers.getConstantReflection(), providers.getConstantFieldProvider(), providers.getStampProvider(), loopExplosionPlugin,
                          invocationPlugins, inlineInvokePlugins, parameterPlugin, nodePlugins);
  
          this.providers = providers;
          this.graphBuilderConfig = graphBuilderConfig;
          this.optimisticOpts = optimisticOpts;

*** 79,90 ****
--- 79,90 ----
                          optimisticOpts, initialIntrinsicContext);
      }
  
      @SuppressWarnings("try")
      private EncodedGraph createGraph(ResolvedJavaMethod method, BytecodeProvider intrinsicBytecodeProvider) {
!         StructuredGraph graphToEncode = new StructuredGraph.Builder(options, debug, allowAssumptions).useProfilingInfo(false).method(method).build();
!         try (Debug.Scope scope = Debug.scope("createGraph", graphToEncode)) {
!         try (DebugContext.Scope scope = debug.scope("createGraph", graphToEncode)) {
              IntrinsicContext initialIntrinsicContext = intrinsicBytecodeProvider != null ? new IntrinsicContext(method, method, intrinsicBytecodeProvider, INLINE_AFTER_PARSING) : null;
              GraphBuilderPhase.Instance graphBuilderPhaseInstance = createGraphBuilderPhaseInstance(initialIntrinsicContext);
              graphBuilderPhaseInstance.apply(graphToEncode);
  
              PhaseContext context = new PhaseContext(providers);

*** 99,109 ****
--- 99,109 ----
              EncodedGraph encodedGraph = GraphEncoder.encodeSingleGraph(graphToEncode, architecture);
              graphCache.put(method, encodedGraph);
              return encodedGraph;
  
          } catch (Throwable ex) {
!             throw Debug.handle(ex);
!             throw debug.handle(ex);
          }
      }
  
      @Override
      protected EncodedGraph lookupEncodedGraph(ResolvedJavaMethod method, BytecodeProvider intrinsicBytecodeProvider) {