*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java	Mon Mar 20 17:38:58 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java	Mon Mar 20 17:38:57 2017

*** 27,48 ****
--- 27,49 ----
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_PC_LOCATION;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionOop;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc;
! import static org.graalvm.compiler.nodes.PiNode.piCast;
! import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.LoadExceptionObjectInVM;
+ import static org.graalvm.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp;
  import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
  import org.graalvm.compiler.core.common.type.StampFactory;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.extended.ForeignCallNode;
  import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode;
  import org.graalvm.compiler.nodes.spi.LoweringTool;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
  import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
  import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
  import org.graalvm.compiler.replacements.Snippets;
  import org.graalvm.compiler.replacements.nodes.ReadRegisterNode;

*** 61,95 ****
--- 62,91 ----
   * must not cause a deoptimization as the runtime/interpreter would not have a valid location to
   * find the exception object to be rethrown.
   */
  public class LoadExceptionObjectSnippets implements Snippets {
  
      /**
       * Alternative way to implement exception object loading.
       */
      private static final boolean USE_C_RUNTIME = HotspotSnippetsOptions.LoadExceptionObjectInVM.getValue();
  
      @Snippet
      public static Object loadException(@ConstantParameter Register threadRegister) {
          Word thread = registerAsWord(threadRegister);
          Object exception = readExceptionOop(thread);
          writeExceptionOop(thread, null);
          writeExceptionPc(thread, Word.zero());
!         return piCast(exception, StampFactory.forNodeIntrinsic());
!         return piCastToSnippetReplaceeStamp(exception);
      }
  
      public static class Templates extends AbstractTemplates {
  
          private final SnippetInfo loadException = snippet(LoadExceptionObjectSnippets.class, "loadException", EXCEPTION_OOP_LOCATION, EXCEPTION_PC_LOCATION);
  
!         public Templates(OptionValues options, HotSpotProviders providers, TargetDescription target) {
!             super(options, providers, providers.getSnippetReflection(), target);
          }
  
          public void lower(LoadExceptionObjectNode loadExceptionObject, HotSpotRegistersProvider registers, LoweringTool tool) {
              if (USE_C_RUNTIME) {
              StructuredGraph graph = loadExceptionObject.graph();
+             if (LoadExceptionObjectInVM.getValue(graph.getOptions())) {
                  ReadRegisterNode thread = graph.add(new ReadRegisterNode(registers.getThreadRegister(), true, false));
                  graph.addBeforeFixed(loadExceptionObject, thread);
                  ForeignCallNode loadExceptionC = graph.add(new ForeignCallNode(providers.getForeignCalls(), LOAD_AND_CLEAR_EXCEPTION, thread));
                  loadExceptionC.setStateAfter(loadExceptionObject.stateAfter());
                  graph.replaceFixedWithFixed(loadExceptionObject, loadExceptionC);