commit 3a74d15ccc9a902874473ac9632e568b19b91b1c
author Mingyao Yang <mingyao@google.com> Mon Apr 21 15:39:44 2014 -0700
committer Mingyao Yang <mingyao@google.com> Mon Apr 21 15:58:26 2014 -0700
tree 3024a2f6ec8ab6a2b403a889e4c58cee8e43ae27
parent 4e0d5ee57ab5f76a761cf0d7ebb50b782e3eacdc

Delete throw launchpads.

Bug: 13170824

Change-Id: I9d5834f5a66f5eb00f2ac80774e8c27dea99949e

compiler/dex/quick/gen_invoke.cc

diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc
index 758096b..465e196 100644
--- a/compiler/dex/quick/gen_invoke.cc
+++ b/compiler/dex/quick/gen_invoke.cc
@@ -34,10 +34,10 @@
  * and "op" calls may be used here.
  */
 
-void Mir2Lir::AddIntrinsicLaunchpad(CallInfo* info, LIR* branch, LIR* resume) {
-  class IntrinsicLaunchpadPath : public Mir2Lir::LIRSlowPath {
+void Mir2Lir::AddIntrinsicSlowPath(CallInfo* info, LIR* branch, LIR* resume) {
+  class IntrinsicSlowPathPath : public Mir2Lir::LIRSlowPath {
    public:
-    IntrinsicLaunchpadPath(Mir2Lir* m2l, CallInfo* info, LIR* branch, LIR* resume = nullptr)
+    IntrinsicSlowPathPath(Mir2Lir* m2l, CallInfo* info, LIR* branch, LIR* resume = nullptr)
         : LIRSlowPath(m2l, info->offset, branch, resume), info_(info) {
     }
 
@@ -57,7 +57,7 @@
     CallInfo* const info_;
   };
 
-  AddSlowPath(new (arena_) IntrinsicLaunchpadPath(this, info, branch, resume));
+  AddSlowPath(new (arena_) IntrinsicSlowPathPath(this, info, branch, resume));
 }
 
 /*
@@ -1094,7 +1094,7 @@
     MarkPossibleNullPointerException(info->opt_flags);
     LoadWordDisp(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);
@@ -1141,7 +1141,7 @@
   if (range_check) {
     DCHECK(range_check_branch != nullptr);
     info->opt_flags |= MIR_IGNORE_NULL_CHECK;  // Record that we've already null checked.
-    AddIntrinsicLaunchpad(info, range_check_branch);
+    AddIntrinsicSlowPath(info, range_check_branch);
   }
   return true;
 }
@@ -1352,7 +1352,7 @@
     DCHECK(high_code_point_branch != nullptr);
     LIR* resume_tgt = NewLIR0(kPseudoTargetLabel);
     info->opt_flags |= MIR_IGNORE_NULL_CHECK;  // Record that we've null checked.
-    AddIntrinsicLaunchpad(info, high_code_point_branch, resume_tgt);
+    AddIntrinsicSlowPath(info, high_code_point_branch, resume_tgt);
   } else {
     DCHECK_EQ(mir_graph_->ConstantValue(rl_char) & ~0xFFFF, 0);
     DCHECK(high_code_point_branch == nullptr);
@@ -1384,7 +1384,7 @@
   info->opt_flags |= MIR_IGNORE_NULL_CHECK;  // Record that we've null checked.
   // TUNING: check if rl_cmp.s_reg_low is already null checked
   LIR* cmp_null_check_branch = OpCmpImmBranch(kCondEq, reg_cmp, 0, nullptr);
-  AddIntrinsicLaunchpad(info, cmp_null_check_branch);
+  AddIntrinsicSlowPath(info, cmp_null_check_branch);
   // NOTE: not a safepoint
   if (cu_->instruction_set != kX86 && cu_->instruction_set != kX86_64) {
     OpReg(kOpBlx, r_tgt);