src/hotspot/share/c1/c1_LIRGenerator.cpp

rev 49887 : 8201593: Print array length in ArrayIndexOutOfBoundsException.
Reviewed-by: dholmes, mdoerr

*** 488,498 ****
  }
  
  
  void LIRGenerator::array_range_check(LIR_Opr array, LIR_Opr index,
                                      CodeEmitInfo* null_check_info, CodeEmitInfo* range_check_info) {
!   CodeStub* stub = new RangeCheckStub(range_check_info, index);
    if (index->is_constant()) {
      cmp_mem_int(lir_cond_belowEqual, array, arrayOopDesc::length_offset_in_bytes(),
                  index->as_jint(), null_check_info);
      __ branch(lir_cond_belowEqual, T_INT, stub); // forward branch
    } else {
--- 488,498 ----
  }
  
  
  void LIRGenerator::array_range_check(LIR_Opr array, LIR_Opr index,
                                      CodeEmitInfo* null_check_info, CodeEmitInfo* range_check_info) {
!   CodeStub* stub = new RangeCheckStub(range_check_info, index, array);
    if (index->is_constant()) {
      cmp_mem_int(lir_cond_belowEqual, array, arrayOopDesc::length_offset_in_bytes(),
                  index->as_jint(), null_check_info);
      __ branch(lir_cond_belowEqual, T_INT, stub); // forward branch
    } else {
*** 502,512 ****
    }
  }
  
  
  void LIRGenerator::nio_range_check(LIR_Opr buffer, LIR_Opr index, LIR_Opr result, CodeEmitInfo* info) {
!   CodeStub* stub = new RangeCheckStub(info, index, true);
    if (index->is_constant()) {
      cmp_mem_int(lir_cond_belowEqual, buffer, java_nio_Buffer::limit_offset(), index->as_jint(), info);
      __ branch(lir_cond_belowEqual, T_INT, stub); // forward branch
    } else {
      cmp_reg_mem(lir_cond_aboveEqual, index, buffer,
--- 502,512 ----
    }
  }
  
  
  void LIRGenerator::nio_range_check(LIR_Opr buffer, LIR_Opr index, LIR_Opr result, CodeEmitInfo* info) {
!   CodeStub* stub = new RangeCheckStub(info, index);
    if (index->is_constant()) {
      cmp_mem_int(lir_cond_belowEqual, buffer, java_nio_Buffer::limit_offset(), index->as_jint(), info);
      __ branch(lir_cond_belowEqual, T_INT, stub); // forward branch
    } else {
      cmp_reg_mem(lir_cond_aboveEqual, index, buffer,
*** 1887,1897 ****
    index.load_item();
  
    LIR_Opr result = rlock_result(x);
    if (GenerateRangeChecks) {
      CodeEmitInfo* info = state_for(x);
!     CodeStub* stub = new RangeCheckStub(info, index.result(), true);
      if (index.result()->is_constant()) {
        cmp_mem_int(lir_cond_belowEqual, buf.result(), java_nio_Buffer::limit_offset(), index.result()->as_jint(), info);
        __ branch(lir_cond_belowEqual, T_INT, stub);
      } else {
        cmp_reg_mem(lir_cond_aboveEqual, index.result(), buf.result(),
--- 1887,1897 ----
    index.load_item();
  
    LIR_Opr result = rlock_result(x);
    if (GenerateRangeChecks) {
      CodeEmitInfo* info = state_for(x);
!     CodeStub* stub = new RangeCheckStub(info, index.result());
      if (index.result()->is_constant()) {
        cmp_mem_int(lir_cond_belowEqual, buf.result(), java_nio_Buffer::limit_offset(), index.result()->as_jint(), info);
        __ branch(lir_cond_belowEqual, T_INT, stub);
      } else {
        cmp_reg_mem(lir_cond_aboveEqual, index.result(), buf.result(),
*** 1971,1986 ****
    // emit array address setup early so it schedules better
    LIR_Address* array_addr = emit_array_address(array.result(), index.result(), x->elt_type(), false);
  
    if (GenerateRangeChecks && needs_range_check) {
      if (StressLoopInvariantCodeMotion && range_check_info->deoptimize_on_exception()) {
!       __ branch(lir_cond_always, T_ILLEGAL, new RangeCheckStub(range_check_info, index.result()));
      } else if (use_length) {
        // TODO: use a (modified) version of array_range_check that does not require a
        //       constant length to be loaded to a register
        __ cmp(lir_cond_belowEqual, length.result(), index.result());
!       __ branch(lir_cond_belowEqual, T_INT, new RangeCheckStub(range_check_info, index.result()));
      } else {
        array_range_check(array.result(), index.result(), null_check_info, range_check_info);
        // The range check performs the null check, so clear it out for the load
        null_check_info = NULL;
      }
--- 1971,1986 ----
    // emit array address setup early so it schedules better
    LIR_Address* array_addr = emit_array_address(array.result(), index.result(), x->elt_type(), false);
  
    if (GenerateRangeChecks && needs_range_check) {
      if (StressLoopInvariantCodeMotion && range_check_info->deoptimize_on_exception()) {
!       __ branch(lir_cond_always, T_ILLEGAL, new RangeCheckStub(range_check_info, index.result(), array.result()));
      } else if (use_length) {
        // TODO: use a (modified) version of array_range_check that does not require a
        //       constant length to be loaded to a register
        __ cmp(lir_cond_belowEqual, length.result(), index.result());
!       __ branch(lir_cond_belowEqual, T_INT, new RangeCheckStub(range_check_info, index.result(), array.result()));
      } else {
        array_range_check(array.result(), index.result(), null_check_info, range_check_info);
        // The range check performs the null check, so clear it out for the load
        null_check_info = NULL;
      }