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

*** 20,42 ****
--- 20,41 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.aarch64;
  
  import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER;
  import static jdk.vm.ci.aarch64.AArch64.lr;
  import static jdk.vm.ci.code.ValueUtil.isStackSlot;
  import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.fp;
  import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCacheRegister;
  import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.metaspaceMethodRegister;
+ import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER;
  
  import org.graalvm.compiler.core.aarch64.AArch64NodeLIRBuilder;
  import org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules;
  import org.graalvm.compiler.core.common.LIRKind;
  import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
  import org.graalvm.compiler.core.gen.DebugInfoBuilder;
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.hotspot.HotSpotDebugInfoBuilder;
  import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
  import org.graalvm.compiler.hotspot.HotSpotLockStack;
  import org.graalvm.compiler.hotspot.HotSpotNodeLIRBuilder;
  import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode;

*** 169,179 ****
--- 168,178 ----
      }
  
      @Override
      public void visitFullInfopointNode(FullInfopointNode i) {
          if (i.getState() != null && i.getState().bci == BytecodeFrame.AFTER_BCI) {
!             i.getDebug().log("Ignoring InfopointNode for AFTER_BCI");
          } else {
              super.visitFullInfopointNode(i);
          }
      }