< prev index next >
src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
Print this page
rev 50027 : 8201593: Print array length in ArrayIndexOutOfBoundsException.
Reviewed-by: dholmes, mdoerr, smonteith, shade
@@ -48,18 +48,22 @@
}
// TODO: ARM - is it possible to inline these stubs into the main code stream?
-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)
-{
- _info = info == NULL ? NULL : new CodeEmitInfo(info);
+
+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) {
__ bind(_entry);
if (_info->deoptimize_on_exception()) {
@@ -71,11 +75,11 @@
ce->verify_oop_map(_info);
debug_only(__ should_not_reach_here());
return;
}
// Pass the array index on stack because all registers must be preserved
- ce->verify_reserved_argument_area_size(1);
+ ce->verify_reserved_argument_area_size(_throw_index_out_of_bounds_exception ? 1 : 2);
if (_index->is_cpu_register()) {
__ str_32(_index->as_register(), Address(SP));
} else {
__ mov_slow(Rtemp, _index->as_jint()); // Rtemp should be OK in C1
__ str_32(Rtemp, Address(SP));
@@ -85,10 +89,11 @@
#ifdef AARCH64
__ NOT_TESTED();
#endif
__ call(Runtime1::entry_for(Runtime1::throw_index_exception_id), relocInfo::runtime_call_type);
} else {
+ __ str(_array->as_pointer_register(), Address(SP, BytesPerWord)); // ??? Correct offset? Correct instruction?
__ call(Runtime1::entry_for(Runtime1::throw_range_check_failed_id), relocInfo::runtime_call_type);
}
ce->add_call_info_here(_info);
ce->verify_oop_map(_info);
DEBUG_ONLY(STOP("RangeCheck");)
< prev index next >