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

*** 26,35 ****
--- 26,36 ----
  
  import java.util.List;
  
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
  import org.graalvm.compiler.core.common.calc.Condition;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.nodes.ConditionAnchorNode;
  import org.graalvm.compiler.nodes.ConstantNode;
  import org.graalvm.compiler.nodes.FixedGuardNode;
  import org.graalvm.compiler.nodes.IfNode;

*** 68,79 ****
--- 69,80 ----
   * {@link IfNode}. This avoids materializing the instanceof test as a boolean which is then retested
   * by the {@link IfNode}.
   */
  public abstract class InstanceOfSnippetsTemplates extends AbstractTemplates {
  
!     public InstanceOfSnippetsTemplates(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection, TargetDescription target) {
!         super(options, factories, providers, snippetReflection, target);
      }
  
      /**
       * Gets the arguments used to retrieve and instantiate an instanceof snippet template.
       */

*** 92,102 ****
--- 93,103 ----
              if (instantiation.isInitialized()) {
                  // No need to re-instantiate the snippet - just re-use its result
                  replacer.replaceUsingInstantiation();
              } else {
                  Arguments args = makeArguments(replacer, tool);
!                 template(instanceOf.getDebug(), args).instantiate(providers.getMetaAccess(), instanceOf, replacer, tool, args);
              }
          }
  
          assert instanceOf.hasNoUsages();
          if (!instanceOf.isDeleted()) {