*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.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/IntrinsicGraphBuilder.java	Fri Jul  7 09:31:48 2017

*** 27,36 ****
--- 27,37 ----
  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.core.common.type.TypeReference;
+ import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.nodes.CallTargetNode;
  import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
  import org.graalvm.compiler.nodes.FixedNode;
  import org.graalvm.compiler.nodes.FixedWithNextNode;

*** 74,99 ****
--- 75,98 ----
      protected final int invokeBci;
      protected FixedWithNextNode lastInstr;
      protected ValueNode[] arguments;
      protected ValueNode returnValue;
  
!     public IntrinsicGraphBuilder(OptionValues options, DebugContext debug, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
!                     StampProvider stampProvider, Bytecode code, int invokeBci) {
                      Bytecode code, int invokeBci) {
          this(options, metaAccess, constantReflection, constantFieldProvider, stampProvider, code, invokeBci, AllowAssumptions.YES);
+         this(options, debug, metaAccess, constantReflection, constantFieldProvider, stampProvider, code, invokeBci, AllowAssumptions.YES);
      }
  
!     protected IntrinsicGraphBuilder(OptionValues options, DebugContext debug, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
!                     StampProvider stampProvider,
                      Bytecode code, int invokeBci, AllowAssumptions allowAssumptions) {
!                     StampProvider stampProvider, Bytecode code, int invokeBci, AllowAssumptions allowAssumptions) {
          this.metaAccess = metaAccess;
          this.constantReflection = constantReflection;
          this.constantFieldProvider = constantFieldProvider;
          this.stampProvider = stampProvider;
          this.code = code;
          this.method = code.getMethod();
!         this.graph = new StructuredGraph.Builder(options, debug, allowAssumptions).method(method).build();
          this.invokeBci = invokeBci;
          this.lastInstr = graph.start();
  
          Signature sig = method.getSignature();
          int max = sig.getParameterCount(false);