--- old/src/share/vm/runtime/vframeArray.cpp	2021-01-25 19:31:05.782151131 +0000
+++ new/src/share/vm/runtime/vframeArray.cpp	2021-01-25 19:31:05.658149827 +0000
@@ -477,7 +477,7 @@
   // Copy registers for callee-saved registers
   if (reg_map != NULL) {
     for(int i = 0; i < RegisterMap::reg_count; i++) {
-#ifdef AMD64
+#if defined(AMD64) || defined(AARCH64)
       // The register map has one entry for every int (32-bit value), so
       // 64-bit physical registers have two entries in the map, one for
       // each half.  Ignore the high halves of 64-bit registers, just like