# HG changeset patch # User adinn # Date 1516891647 0 # Thu Jan 25 14:47:27 2018 +0000 # Node ID e321560ac819c05274c59f46f5cc28ccfd4b38ec # Parent 77baeab90732e7cfb6eb1b754a768a197bca1ab5 8195859: AArch64: vtableStubs gtest fails after 8174962 Summary: gtest vtableStubs introduced by 8174962 fails on AArch64 with an invalid insn encoding Reviewed-by: duke diff --git a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp --- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp +++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp @@ -1049,7 +1049,8 @@ ldr(method_result, Address(method_result, vtable_offset_in_bytes)); } else { vtable_offset_in_bytes += vtable_index.as_constant() * wordSize; - ldr(method_result, Address(recv_klass, vtable_offset_in_bytes)); + ldr(method_result, + form_address(rscratch1, recv_klass, vtable_offset_in_bytes)); } }