--- old/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp	2018-03-20 18:39:45.578945614 -0400
+++ new/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp	2018-03-20 18:39:44.852878233 -0400
@@ -37,20 +37,7 @@
     _in_top_frame_unsafe_section = NULL;
   }
 
-  frame pd_last_frame() {
-    assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
-#ifdef AARCH64
-    assert (_anchor.last_Java_pc() != NULL, "pc should be stored");
-    return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
-#else
-    if (_anchor.last_Java_pc() != NULL) {
-      return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
-    } else {
-      // This will pick up pc from sp
-      return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
-    }
-#endif // AARCH64
-  }
+  frame pd_last_frame();
 
  public:
   intptr_t* last_Java_fp()                       { return _anchor.last_Java_fp(); }