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

*** 20,43 ****
--- 20,43 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.stubs;
  
+ 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.Transition.SAFEPOINT;
  import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.REEXECUTABLE;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.clearPendingException;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord;
  import static org.graalvm.word.LocationIdentity.any;
  import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
  
  import org.graalvm.compiler.api.replacements.Fold;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
  import org.graalvm.compiler.graph.Node.NodeIntrinsic;
  import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
+ import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
  import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode;
  import org.graalvm.compiler.hotspot.word.KlassPointer;
  import org.graalvm.compiler.options.OptionValues;