*** old/src/hotspot/cpu/arm/runtime_arm.cpp	Mon Sep 17 10:30:34 2018
--- new/src/hotspot/cpu/arm/runtime_arm.cpp	Mon Sep 17 10:30:33 2018

*** 124,142 ****
--- 124,135 ----
  
    __ raw_pop(FP, LR);
  
    // Restore SP from its saved reg (FP) if the exception PC is a MethodHandle call site.
    __ ldr(Rtemp, Address(Rthread, JavaThread::is_method_handle_return_offset()));
  #ifdef AARCH64
    Label skip;
    __ cbz(Rtemp, skip);
    __ mov(SP, Rmh_SP_save);
    __ bind(skip);
  #else
    __ cmp(Rtemp, 0);
    __ mov(SP, Rmh_SP_save, ne);
  #endif
  
    // R0 contains handler address
    // Since this may be the deopt blob we must set R5 to look like we returned
    // from the original pc that threw the exception