src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java

*** 35,45 ****
  import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
! import org.graalvm.compiler.serviceprovider.GraalServices;
  
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.meta.AllocatableValue;
  
  /**
--- 35,45 ----
  import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.lir.LIRInstructionClass;
  import org.graalvm.compiler.lir.Opcode;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
! import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
  
  import jdk.vm.ci.code.Register;
  import jdk.vm.ci.meta.AllocatableValue;
  
  /**
*** 69,79 ****
  
      @Override
      public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
          leaveFrame(crb, masm, /* emitSafepoint */false, false);
  
!         if (GraalServices.JAVA_SPECIFICATION_VERSION < 8) {
              // Restore sp from fp if the exception PC is a method handle call site.
              try (ScratchRegister sc = masm.getScratchRegister()) {
                  Register scratch = sc.getRegister();
                  final boolean allowOverwrite = false;
                  AArch64Address address = masm.makeAddress(thread, isMethodHandleReturnOffset, scratch, 4, allowOverwrite);
--- 69,79 ----
  
      @Override
      public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
          leaveFrame(crb, masm, /* emitSafepoint */false, false);
  
!         if (JavaVersionUtil.JAVA_SPECIFICATION_VERSION < 8) {
              // Restore sp from fp if the exception PC is a method handle call site.
              try (ScratchRegister sc = masm.getScratchRegister()) {
                  Register scratch = sc.getRegister();
                  final boolean allowOverwrite = false;
                  AArch64Address address = masm.makeAddress(thread, isMethodHandleReturnOffset, scratch, 4, allowOverwrite);