Use LIRSlowPath for intrinsics, improve String.indexOf().
Rewrite intrinsic launchpads to use the LIRSlowPath.
Improve String.indexOf for constant chars by avoiding
the check for code points over 0xFFFF.
Change-Id: I7fd5583214c5b4ab9c38ee36c5d6f003dd6345a8
diff --git a/compiler/dex/quick/mir_to_lir.cc b/compiler/dex/quick/mir_to_lir.cc
index 31f5c28..f93a5e3 100644
--- a/compiler/dex/quick/mir_to_lir.cc
+++ b/compiler/dex/quick/mir_to_lir.cc
@@ -1088,8 +1088,6 @@
HandleSuspendLaunchPads();
HandleThrowLaunchPads();
-
- HandleIntrinsicLaunchPads();
}
//
@@ -1097,10 +1095,10 @@
//
LIR* Mir2Lir::LIRSlowPath::GenerateTargetLabel() {
- LIR* target = m2l_->RawLIR(current_dex_pc_, kPseudoTargetLabel);
- m2l_->AppendLIR(target);
- fromfast_->target = target;
m2l_->SetCurrentDexPc(current_dex_pc_);
+ LIR* target = m2l_->NewLIR0(kPseudoTargetLabel);
+ fromfast_->target = target;
return target;
}
+
} // namespace art