From 081f73e888b3c246cf7635db37b7f1105cf1a2ff Mon Sep 17 00:00:00 2001 From: Dave Allison Date: Mon, 7 Apr 2014 18:58:07 +0000 Subject: Revert "Use trampolines for calls to helpers" This reverts commit 754ddad084ccb610d0cf486f6131bdc69bae5bc6. Change-Id: Icd979adee1d8d781b40a5e75daf3719444cb72e8 --- compiler/dex/quick/codegen_util.cc | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'compiler/dex/quick/codegen_util.cc') diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index b163ef7e06..6e6b8f0a30 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -1012,26 +1012,11 @@ CompiledMethod* Mir2Lir::GetCompiledMethod() { vmap_encoder.PushBackUnsigned(0u); // Size is 0. } - // All relocations - UniquePtr all_relocs(new FinalRelocations()); - - // Build the final relocations for this method. - if (trampoline_calls_.size() != 0) { - FinalEntrypointRelocationSet* ep_relocs = - cu_->compiler_driver->AllocateFinalEntrypointRelocationSet(cu_); - for (size_t i = 0 ; i < trampoline_calls_.size(); ++i) { - const TrampolineCall& call = trampoline_calls_[i]; - ep_relocs->Add(call.code_offset_, call.trampoline_offset_); - } - all_relocs->push_back(ep_relocs); - } - UniquePtr > cfi_info(ReturnCallFrameInformation()); CompiledMethod* result = new CompiledMethod(*cu_->compiler_driver, cu_->instruction_set, code_buffer_, frame_size_, core_spill_mask_, fp_spill_mask_, encoded_mapping_table_, - vmap_encoder.GetData(), native_gc_map_, cfi_info.get(), - all_relocs.release()); + vmap_encoder.GetData(), native_gc_map_, cfi_info.get()); return result; } -- cgit v1.2.3-59-g8ed1b