Merge "Delete throw launchpads."

diff --cc compiler/dex/quick/arm/int_arm.cc
Simple merge

diff --cc compiler/dex/quick/codegen_util.cc
Simple merge

diff --cc compiler/dex/quick/gen_common.cc
Simple merge

diff --cc compiler/dex/quick/gen_invoke.cc
index 4d8941e,465e196..53b6ed4
--- 1/compiler/dex/quick/gen_invoke.cc
--- 2/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@@ -1092,14 -1087,14 +1092,14 @@@ bool Mir2Lir::GenInlinedCharAt(CallInfo
      reg_ptr = AllocTemp();
      if (range_check) {
        reg_max = AllocTemp();
 -      LoadWordDisp(rl_obj.reg, count_offset, reg_max);
 +      Load32Disp(rl_obj.reg, count_offset, reg_max);
        MarkPossibleNullPointerException(info->opt_flags);
      }
 -    LoadWordDisp(rl_obj.reg, offset_offset, reg_off);
 +    Load32Disp(rl_obj.reg, offset_offset, reg_off);
      MarkPossibleNullPointerException(info->opt_flags);
 -    LoadWordDisp(rl_obj.reg, value_offset, reg_ptr);
 +    Load32Disp(rl_obj.reg, value_offset, reg_ptr);
      if (range_check) {
-       // Set up a launch pad to allow retry in case of bounds violation */
+       // Set up a slow path to allow retry in case of bounds violation */
        OpRegReg(kOpCmp, rl_idx.reg, reg_max);
        FreeTemp(reg_max);
        range_check_branch = OpCondBranch(kCondUge, nullptr);

diff --cc compiler/dex/quick/mips/int_mips.cc
Simple merge

diff --cc compiler/dex/quick/mir_to_lir.cc
Simple merge

diff --cc compiler/dex/quick/mir_to_lir.h
Simple merge

diff --cc compiler/dex/quick/x86/call_x86.cc
Simple merge

diff --cc compiler/dex/quick/x86/int_x86.cc
Simple merge

diff --cc compiler/dex/quick/x86/target_x86.cc
Simple merge