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

*** 38,49 ****
--- 38,49 ----
  import org.graalvm.compiler.core.common.cfg.CFGVerifier;
  import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
  import org.graalvm.compiler.core.common.type.Stamp;
  import org.graalvm.compiler.core.common.type.StampFactory;
  import org.graalvm.compiler.core.common.type.StampPair;
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.DebugCloseable;
+ import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.graph.NodeSourcePosition;
  import org.graalvm.compiler.graph.spi.Canonicalizable;

*** 411,438 ****
--- 411,437 ----
              }
              return false;
          }
      }
  
      protected final OptionValues options;
      private final LoopExplosionPlugin loopExplosionPlugin;
      private final InvocationPlugins invocationPlugins;
      private final InlineInvokePlugin[] inlineInvokePlugins;
      private final ParameterPlugin parameterPlugin;
      private final NodePlugin[] nodePlugins;
      private final EconomicMap<SpecialCallTargetCacheKey, Object> specialCallTargetCache;
      private final EconomicMap<ResolvedJavaMethod, Object> invocationPluginCache;
  
      public PEGraphDecoder(Architecture architecture, StructuredGraph graph, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
-                     StampProvider stampProvider, OptionValues options, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
-                     ParameterPlugin parameterPlugin, NodePlugin[] nodePlugins) {
+                     NodePlugin[] nodePlugins) {
          super(architecture, graph, metaAccess, constantReflection, constantFieldProvider, stampProvider, true);
          this.loopExplosionPlugin = loopExplosionPlugin;
          this.invocationPlugins = invocationPlugins;
          this.inlineInvokePlugins = inlineInvokePlugins;
          this.parameterPlugin = parameterPlugin;
          this.options = options;
          this.nodePlugins = nodePlugins;
          this.specialCallTargetCache = EconomicMap.create(Equivalence.DEFAULT);
          this.invocationPluginCache = EconomicMap.create(Equivalence.DEFAULT);
      }
  

*** 447,457 ****
--- 446,456 ----
      public void decode(ResolvedJavaMethod method) {
          PEMethodScope methodScope = new PEMethodScope(graph, null, null, lookupEncodedGraph(method, null), method, null, 0, loopExplosionPlugin, null);
          decode(createInitialLoopScope(methodScope, null));
          cleanupGraph(methodScope);
  
!         Debug.dump(Debug.VERBOSE_LEVEL, graph, "After graph cleanup");
!         debug.dump(DebugContext.VERBOSE_LEVEL, graph, "After graph cleanup");
          assert graph.verify();
  
          try {
              /* Check that the control flow graph can be computed, to catch problems early. */
              assert CFGVerifier.verify(ControlFlowGraph.compute(graph, true, true, true, true));