Revert "Use trampolines for calls to helpers"
This reverts commit 754ddad084ccb610d0cf486f6131bdc69bae5bc6.
Change-Id: Icd979adee1d8d781b40a5e75daf3719444cb72e8
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) {