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

*** 20,42 ****
--- 20,42 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.stubs;
  
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_REGISTERS;
  import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee;
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
+ import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_REGISTERS;
+ import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
  
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  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.DebugContext;
  import org.graalvm.compiler.debug.JavaMethodContext;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;

*** 102,112 ****
--- 102,113 ----
       *            be re-executed.
       * @param killedLocations the memory locations killed by the stub call
       */
      public ForeignCallStub(OptionValues options, HotSpotJVMCIRuntimeProvider runtime, HotSpotProviders providers, long address, ForeignCallDescriptor descriptor, boolean prependThread,
                      Transition transition,
-                     boolean reexecutable, LocationIdentity... killedLocations) {
+                     LocationIdentity... killedLocations) {
          super(options, providers, HotSpotForeignCallLinkageImpl.create(providers.getMetaAccess(), providers.getCodeCache(), providers.getWordTypes(), providers.getForeignCalls(), descriptor, 0L,
                          PRESERVES_REGISTERS, JavaCall, JavaCallee, transition, reexecutable, killedLocations));
          this.jvmciRuntime = runtime;
          this.prependThread = prependThread;
          Class<?>[] targetParameterTypes = createTargetParameters(descriptor);

*** 221,236 ****
--- 222,236 ----
       *
       * In each example above, the {@code currentThread} argument is the C++ JavaThread value (i.e.,
       * %r15 on AMD64) and is only prepended if {@link #prependThread} is true.
       */
      @Override
!     protected StructuredGraph getGraph(DebugContext debug, CompilationIdentifier compilationId) {
          WordTypes wordTypes = providers.getWordTypes();
          Class<?>[] args = linkage.getDescriptor().getArgumentTypes();
          boolean isObjectResult = !LIRKind.isValue(linkage.getOutgoingCallingConvention().getReturn());
  
          StructuredGraph graph = new StructuredGraph.Builder(options).name(toString()).compilationId(compilationId).build();
+         StructuredGraph graph = new StructuredGraph.Builder(options, debug).name(toString()).compilationId(compilationId).build();
          graph.disableUnsafeAccessTracking();
  
          GraphKit kit = new GraphKit(graph, providers, wordTypes, providers.getGraphBuilderPlugins());
          ParameterNode[] params = createParameters(kit, args);
  

*** 241,257 ****
--- 241,257 ----
              InvokeNode object = kit.createInvoke(HotSpotReplacementsUtil.class, "getAndClearObjectResult", thread);
              result = kit.createInvoke(StubUtil.class, "verifyObject", object);
          }
          kit.append(new ReturnNode(linkage.getDescriptor().getResultType() == void.class ? null : result));
  
!         Debug.dump(Debug.VERBOSE_LEVEL, graph, "Initial stub graph");
!         debug.dump(DebugContext.VERBOSE_LEVEL, graph, "Initial stub graph");
  
          kit.inlineInvokes();
  
          new RemoveValueProxyPhase().apply(graph);
  
!         Debug.dump(Debug.VERBOSE_LEVEL, graph, "Stub graph before compilation");
!         debug.dump(DebugContext.VERBOSE_LEVEL, graph, "Stub graph before compilation");
  
          return graph;
      }
  
      private ParameterNode[] createParameters(GraphKit kit, Class<?>[] args) {