< prev index next >

src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp

Print this page
rev 49948 : 8201593: Print array length in ArrayIndexOutOfBoundsException.
Reviewed-by: dholmes, mdoerr, smonteith

*** 46,60 **** ce->add_call_info_here(_info); ce->verify_oop_map(_info); __ b(_continuation); } ! RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, ! bool throw_index_out_of_bounds_exception) ! : _throw_index_out_of_bounds_exception(throw_index_out_of_bounds_exception) ! , _index(index) ! { assert(info != NULL, "must have info"); _info = new CodeEmitInfo(info); } void RangeCheckStub::emit_code(LIR_Assembler* ce) { --- 46,63 ---- ce->add_call_info_here(_info); ce->verify_oop_map(_info); __ b(_continuation); } ! RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array) ! : _throw_index_out_of_bounds_exception(false), _index(index), _array(array) { ! assert(info != NULL, "must have info"); ! _info = new CodeEmitInfo(info); ! } ! ! RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index) ! : _throw_index_out_of_bounds_exception(true), _index(index), _array(NULL) { assert(info != NULL, "must have info"); _info = new CodeEmitInfo(info); } void RangeCheckStub::emit_code(LIR_Assembler* ce) {
*** 67,84 **** debug_only(__ should_not_reach_here()); return; } if (_index->is_cpu_register()) { ! __ mov(rscratch1, _index->as_register()); } else { ! __ mov(rscratch1, _index->as_jint()); } Runtime1::StubID stub_id; if (_throw_index_out_of_bounds_exception) { stub_id = Runtime1::throw_index_exception_id; } else { stub_id = Runtime1::throw_range_check_failed_id; } __ far_call(RuntimeAddress(Runtime1::entry_for(stub_id)), NULL, rscratch2); ce->add_call_info_here(_info); ce->verify_oop_map(_info); --- 70,89 ---- debug_only(__ should_not_reach_here()); return; } if (_index->is_cpu_register()) { ! __ mov(r22, _index->as_register()); } else { ! __ mov(r22, _index->as_jint()); } Runtime1::StubID stub_id; if (_throw_index_out_of_bounds_exception) { stub_id = Runtime1::throw_index_exception_id; } else { + assert(_array != NULL, "sanity"); + __ mov(r23, _array->as_pointer_register()); stub_id = Runtime1::throw_range_check_failed_id; } __ far_call(RuntimeAddress(Runtime1::entry_for(stub_id)), NULL, rscratch2); ce->add_call_info_here(_info); ce->verify_oop_map(_info);
< prev index next >