diff -r e89989198037 -r 76aed99c0ddd hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp
--- a/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp	Mon Jan 04 13:57:34 2016 -0800
+++ b/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp	Thu Jan 07 21:10:28 2016 +0000
@@ -433,11 +433,11 @@
   // This is the sp before any possible extension (adapter/locals).
   intptr_t* unextended_sp = interpreter_frame_sender_sp();
 
-#ifdef COMPILER2
+#if defined(COMPILER2) || INCLUDE_JVMCI
   if (map->update_map()) {
     update_map_with_saved_link(map, (intptr_t**) addr_at(link_offset));
   }
-#endif // COMPILER2
+#endif // COMPILER2 || INCLUDE_JVMCI
 
   return frame(sender_sp, unextended_sp, link(), sender_pc());
 }