Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jun 24, 2020
2 parents f7ce0c6 + a1f02d1 commit 6777083a659979b4da8372c396f2becbb35e48f0
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/hotspot/cpu/aarch64/frame_aarch64.cpp
@@ -749,7 +749,7 @@ extern "C" void npf() {
extern "C" void pf(unsigned long sp, unsigned long fp, unsigned long pc,
unsigned long bcx, unsigned long thread) {
if (!reg_map) {
reg_map = NEW_C_HEAP_OBJ(RegisterMap, mtNone);
reg_map = NEW_C_HEAP_OBJ(RegisterMap, mtInternal);
::new (reg_map) RegisterMap((JavaThread*)thread, false);
} else {
*reg_map = RegisterMap((JavaThread*)thread, false);

0 comments on commit 6777083

Please sign in to comment.