*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java	Mon Mar 20 17:38:07 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java	Mon Mar 20 17:38:07 2017

*** 23,33 ****
--- 23,33 ----
  package org.graalvm.compiler.hotspot.aarch64;
  
  import static jdk.vm.ci.aarch64.AArch64.zr;
  import static jdk.vm.ci.code.ValueUtil.asRegister;
  
! import org.graalvm.compiler.asm.NumUtil;
! import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.asm.aarch64.AArch64Address;
  import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.lir.LIRFrameState;
  import org.graalvm.compiler.lir.LIRInstructionClass;

*** 75,96 ****
--- 75,96 ----
          final long pollingPageAddress = config.safepointPollingAddress;
          return !NumUtil.isSignedNbit(21, pollingPageAddress - config.codeCacheLowBound) || !NumUtil.isSignedNbit(21, pollingPageAddress - config.codeCacheHighBound);
      }
  
      public static void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm, GraalHotSpotVMConfig config, boolean onReturn, Register scratch, LIRFrameState state) {
          int pos = masm.position();
          if (isPollingPageFar(config)) {
              crb.recordMark(onReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR);
              masm.movNativeAddress(scratch, config.safepointPollingAddress);
+             crb.recordMark(onReturn ? config.MARKID_POLL_RETURN_FAR : config.MARKID_POLL_FAR);
              if (state != null) {
!                 crb.recordInfopoint(masm.position(), state, InfopointReason.SAFEPOINT);
              }
              masm.ldr(32, zr, AArch64Address.createBaseRegisterOnlyAddress(scratch));
          } else {
              crb.recordMark(onReturn ? config.MARKID_POLL_RETURN_NEAR : config.MARKID_POLL_NEAR);
              if (state != null) {
!                 crb.recordInfopoint(masm.position(), state, InfopointReason.SAFEPOINT);
              }
              masm.ldr(32, zr, AArch64Address.createPcLiteralAddress(0));
          }
      }