Revert "Revert "Revert "Use trampolines for calls to helpers"""
This reverts commit f9487c039efb4112616d438593a2ab02792e0304.
Change-Id: Id48a4aae4ecce73db468587967968a3f7618b700
diff --git a/compiler/dex/quick/arm/utility_arm.cc b/compiler/dex/quick/arm/utility_arm.cc
index 8e6d9a8..70cbdd2 100644
--- a/compiler/dex/quick/arm/utility_arm.cc
+++ b/compiler/dex/quick/arm/utility_arm.cc
@@ -1111,14 +1111,8 @@
}
LIR* ArmMir2Lir::OpThreadMem(OpKind op, ThreadOffset<4> thread_offset) {
- if (op == kOpBlx) {
- const uint32_t trampoline = cu_->compiler_driver->AddEntrypointTrampoline(
- thread_offset.Int32Value());
- return NewLIR1(kThumb2BlTramp, trampoline);
- } else {
- LOG(FATAL) << "Invalid opcode for ARM OpThreadMem on Arm";
- return NULL;
- }
+ LOG(FATAL) << "Unexpected use of OpThreadMem for Arm";
+ return NULL;
}
LIR* ArmMir2Lir::OpMem(OpKind op, RegStorage r_base, int disp) {