< prev index next >

src/hotspot/cpu/x86/methodHandles_x86.cpp

Print this page
rev 50390 : 8200623: Primitive heap access for interpreter BarrierSetAssembler/x86

*** 173,183 **** __ verify_oop(method_temp); __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_LambdaForm::vmentry_offset_in_bytes())), temp2); __ verify_oop(method_temp); __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_MemberName::method_offset_in_bytes())), temp2); __ verify_oop(method_temp); ! __ movptr(method_temp, Address(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes()))); if (VerifyMethodHandles && !for_compiler_entry) { // make sure recv is already on stack __ movptr(temp2, Address(method_temp, Method::const_offset())); __ load_sized_value(temp2, --- 173,185 ---- __ verify_oop(method_temp); __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_LambdaForm::vmentry_offset_in_bytes())), temp2); __ verify_oop(method_temp); __ load_heap_oop(method_temp, Address(method_temp, NONZERO(java_lang_invoke_MemberName::method_offset_in_bytes())), temp2); __ verify_oop(method_temp); ! __ access_load_at(T_ADDRESS, IN_HEAP, method_temp, ! Address(method_temp, NONZERO(java_lang_invoke_ResolvedMethodName::vmtarget_offset_in_bytes())), ! noreg, noreg); if (VerifyMethodHandles && !for_compiler_entry) { // make sure recv is already on stack __ movptr(temp2, Address(method_temp, Method::const_offset())); __ load_sized_value(temp2,
*** 388,406 **** case vmIntrinsics::_linkToSpecial: if (VerifyMethodHandles) { verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp3); } __ load_heap_oop(rbx_method, member_vmtarget); ! __ movptr(rbx_method, vmtarget_method); break; case vmIntrinsics::_linkToStatic: if (VerifyMethodHandles) { verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp3); } __ load_heap_oop(rbx_method, member_vmtarget); ! __ movptr(rbx_method, vmtarget_method); break; case vmIntrinsics::_linkToVirtual: { // same as TemplateTable::invokevirtual, --- 390,408 ---- case vmIntrinsics::_linkToSpecial: if (VerifyMethodHandles) { verify_ref_kind(_masm, JVM_REF_invokeSpecial, member_reg, temp3); } __ load_heap_oop(rbx_method, member_vmtarget); ! __ access_load_at(T_ADDRESS, IN_HEAP, rbx_method, vmtarget_method, noreg, noreg); break; case vmIntrinsics::_linkToStatic: if (VerifyMethodHandles) { verify_ref_kind(_masm, JVM_REF_invokeStatic, member_reg, temp3); } __ load_heap_oop(rbx_method, member_vmtarget); ! __ access_load_at(T_ADDRESS, IN_HEAP, rbx_method, vmtarget_method, noreg, noreg); break; case vmIntrinsics::_linkToVirtual: { // same as TemplateTable::invokevirtual,
*** 410,420 **** verify_ref_kind(_masm, JVM_REF_invokeVirtual, member_reg, temp3); } // pick out the vtable index from the MemberName, and then we can discard it: Register temp2_index = temp2; ! __ movptr(temp2_index, member_vmindex); if (VerifyMethodHandles) { Label L_index_ok; __ cmpl(temp2_index, 0); __ jcc(Assembler::greaterEqual, L_index_ok); --- 412,422 ---- verify_ref_kind(_masm, JVM_REF_invokeVirtual, member_reg, temp3); } // pick out the vtable index from the MemberName, and then we can discard it: Register temp2_index = temp2; ! __ access_load_at(T_ADDRESS, IN_HEAP, temp2_index, member_vmindex, noreg, noreg); if (VerifyMethodHandles) { Label L_index_ok; __ cmpl(temp2_index, 0); __ jcc(Assembler::greaterEqual, L_index_ok);
*** 444,454 **** __ load_heap_oop(temp3_intf, member_clazz); load_klass_from_Class(_masm, temp3_intf); __ verify_klass_ptr(temp3_intf); Register rbx_index = rbx_method; ! __ movptr(rbx_index, member_vmindex); if (VerifyMethodHandles) { Label L; __ cmpl(rbx_index, 0); __ jcc(Assembler::greaterEqual, L); __ STOP("invalid vtable index for MH.invokeInterface"); --- 446,456 ---- __ load_heap_oop(temp3_intf, member_clazz); load_klass_from_Class(_masm, temp3_intf); __ verify_klass_ptr(temp3_intf); Register rbx_index = rbx_method; ! __ access_load_at(T_ADDRESS, IN_HEAP, rbx_index, member_vmindex, noreg, noreg); if (VerifyMethodHandles) { Label L; __ cmpl(rbx_index, 0); __ jcc(Assembler::greaterEqual, L); __ STOP("invalid vtable index for MH.invokeInterface");
< prev index next >