src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java

*** 1,7 ****
  /*
!  * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1104,1114 ****
--- 1104,1118 ----
          assert !graphBuilderConfig.unresolvedIsError();
          DeoptimizeNode deopt = append(new DeoptimizeNode(InvalidateRecompile, Unresolved));
          deopt.updateNodeSourcePosition(() -> createBytecodePosition());
      }
  
+     /**
+      * @return the entry point to exception dispatch
+      */
      private AbstractBeginNode handleException(ValueNode exceptionObject, int bci, boolean deoptimizeOnly) {
+         FixedWithNextNode currentLastInstr = lastInstr;
          assert bci == BytecodeFrame.BEFORE_BCI || bci == bci() : "invalid bci";
          debug.log("Creating exception dispatch edges at %d, exception object=%s, exception seen=%s", bci, exceptionObject, (profilingInfo == null ? "" : profilingInfo.getExceptionSeen(bci)));
  
          FrameStateBuilder dispatchState = frameState.copy();
          dispatchState.clearStack();
*** 1124,1145 ****
              dispatchBegin = graph.add(new BeginNode());
              dispatchState.push(JavaKind.Object, exceptionObject);
              dispatchState.setRethrowException(true);
          }
          this.controlFlowSplit = true;
!         FixedWithNextNode finishedDispatch = finishInstruction(dispatchBegin, dispatchState);
  
          if (deoptimizeOnly) {
              DeoptimizeNode deoptimizeNode = graph.add(new DeoptimizeNode(DeoptimizationAction.None, DeoptimizationReason.TransferToInterpreter));
!             dispatchBegin.setNext(BeginNode.begin(deoptimizeNode));
          } else {
!             createHandleExceptionTarget(finishedDispatch, bci, dispatchState);
          }
          return dispatchBegin;
      }
  
!     protected void createHandleExceptionTarget(FixedWithNextNode finishedDispatch, int bci, FrameStateBuilder dispatchState) {
          BciBlock dispatchBlock = currentBlock.exceptionDispatchBlock();
          /*
           * The exception dispatch block is always for the last bytecode of a block, so if we are not
           * at the endBci yet, there is no exception handler for this bci and we can unwind
           * immediately.
--- 1128,1156 ----
              dispatchBegin = graph.add(new BeginNode());
              dispatchState.push(JavaKind.Object, exceptionObject);
              dispatchState.setRethrowException(true);
          }
          this.controlFlowSplit = true;
!         FixedWithNextNode afterExceptionLoaded = finishInstruction(dispatchBegin, dispatchState);
  
          if (deoptimizeOnly) {
              DeoptimizeNode deoptimizeNode = graph.add(new DeoptimizeNode(DeoptimizationAction.None, DeoptimizationReason.TransferToInterpreter));
!             afterExceptionLoaded.setNext(BeginNode.begin(deoptimizeNode));
          } else {
!             createHandleExceptionTarget(afterExceptionLoaded, bci, dispatchState);
          }
+         assert currentLastInstr == lastInstr;
          return dispatchBegin;
      }
  
!     protected void createHandleExceptionTarget(FixedWithNextNode afterExceptionLoaded, int bci, FrameStateBuilder dispatchState) {
!         FixedWithNextNode afterInstrumentation = afterExceptionLoaded;
!         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
!             afterInstrumentation = plugin.instrumentExceptionDispatch(graph, afterInstrumentation);
!             assert afterInstrumentation.next() == null : "exception dispatch instrumentation will be linked to dispatch block";
!         }
! 
          BciBlock dispatchBlock = currentBlock.exceptionDispatchBlock();
          /*
           * The exception dispatch block is always for the last bytecode of a block, so if we are not
           * at the endBci yet, there is no exception handler for this bci and we can unwind
           * immediately.
*** 1147,1157 ****
          if (bci != currentBlock.endBci || dispatchBlock == null) {
              dispatchBlock = blockMap.getUnwindBlock();
          }
  
          FixedNode target = createTarget(dispatchBlock, dispatchState);
!         finishedDispatch.setNext(target);
      }
  
      protected ValueNode genLoadIndexed(ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind kind) {
          return LoadIndexedNode.create(graph.getAssumptions(), array, index, boundsCheck, kind, metaAccess, constantReflection);
      }
--- 1158,1168 ----
          if (bci != currentBlock.endBci || dispatchBlock == null) {
              dispatchBlock = blockMap.getUnwindBlock();
          }
  
          FixedNode target = createTarget(dispatchBlock, dispatchState);
!         afterInstrumentation.setNext(target);
      }
  
      protected ValueNode genLoadIndexed(ValueNode array, ValueNode index, GuardingNode boundsCheck, JavaKind kind) {
          return LoadIndexedNode.create(graph.getAssumptions(), array, index, boundsCheck, kind, metaAccess, constantReflection);
      }