8195859: AArch64: vtableStubs gtest fails after 8174962

adinn · adinn · commit cf8d43353ffa · 2018-01-25T14:47:27.000Z
Gtest vtableStubs introduced by 8174962 fails on AArch64 with an invalid insn encoding

Reviewed-by: duke
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1049,7 +1049,8 @@ void MacroAssembler::lookup_virtual_method(Register recv_klass,
     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));
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1049,7 +1049,8 @@ void MacroAssembler::lookup_virtual_method(Register recv_klass,`
`1049`	`1049`	`ldr(method_result, Address(method_result, vtable_offset_in_bytes));`
`1050`	`1050`	`} else {`
`1051`	`1051`	`vtable_offset_in_bytes += vtable_index.as_constant() * wordSize;`
`1052`		`- ldr(method_result, Address(recv_klass, vtable_offset_in_bytes));`
	`1052`	`+ ldr(method_result,`
	`1053`	`+ form_address(rscratch1, recv_klass, vtable_offset_in_bytes));`
`1053`	`1054`	`}`
`1054`	`1055`	`}`
`1055`	`1056`