Mercurial > hg > icedtea8-forest > hotspot
changeset 10931:65907019826a jdk8u292-b09
Merge
author | andrew |
---|---|
date | Sat, 27 Mar 2021 18:53:08 +0000 |
parents | b8703bf4625d (current diff) 655498b9a44d (diff) |
children | 91b61f678a19 |
files | |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp Mon Mar 22 06:46:59 2021 +0000 +++ b/src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp Sat Mar 27 18:53:08 2021 +0000 @@ -54,6 +54,8 @@ opr = as_oop_opr(reg); } else if (type == T_METADATA) { opr = as_metadata_opr(reg); + } else if (type == T_ADDRESS) { + opr = as_address_opr(reg); } else { opr = as_opr(reg); }
--- a/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Mon Mar 22 06:46:59 2021 +0000 +++ b/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Sat Mar 27 18:53:08 2021 +0000 @@ -791,7 +791,7 @@ if (type == T_ARRAY || type == T_OBJECT) { __ str(src->as_register(), frame_map()->address_for_slot(dest->single_stack_ix())); __ verify_oop(src->as_register()); - } else if (type == T_METADATA || type == T_DOUBLE) { + } else if (type == T_METADATA || type == T_DOUBLE || type == T_ADDRESS) { __ str(src->as_register(), frame_map()->address_for_slot(dest->single_stack_ix())); } else { __ strw(src->as_register(), frame_map()->address_for_slot(dest->single_stack_ix())); @@ -904,7 +904,7 @@ if (type == T_ARRAY || type == T_OBJECT) { __ ldr(dest->as_register(), frame_map()->address_for_slot(src->single_stack_ix())); __ verify_oop(dest->as_register()); - } else if (type == T_METADATA) { + } else if (type == T_METADATA || type == T_ADDRESS) { __ ldr(dest->as_register(), frame_map()->address_for_slot(src->single_stack_ix())); } else { __ ldrw(dest->as_register(), frame_map()->address_for_slot(src->single_stack_ix()));