src/hotspot/cpu/sparc/c1_CodeStubs_sparc.cpp

rev 49827 : 8201593: Print array length in ArrayIndexOutOfBoundsException.

@@ -36,15 +36,12 @@
 #include "gc/g1/g1BarrierSet.hpp"
 #endif // INCLUDE_ALL_GCS
 
 #define __ ce->masm()->
 
-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)
-{
+RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array)
+  : _throw_index_out_of_bounds_exception(array == NULL), _index(index), _array(array) {
   assert(info != NULL, "must have info");
   _info = new CodeEmitInfo(info);
 }
 
 

@@ -67,10 +64,11 @@
     __ set(_index->as_jint(), G4);
   }
   if (_throw_index_out_of_bounds_exception) {
     __ call(Runtime1::entry_for(Runtime1::throw_index_exception_id), relocInfo::runtime_call_type);
   } else {
+    __ mov(_array->as_pointer_register(), G5);
     __ call(Runtime1::entry_for(Runtime1::throw_range_check_failed_id), relocInfo::runtime_call_type);
   }
   __ delayed()->nop();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);