commit f9487c039efb4112616d438593a2ab02792e0304
author Dave Allison <dallison@google.com> Tue Apr 08 23:08:12 2014 +0000
committer Dave Allison <dallison@google.com> Wed Apr 09 13:18:07 2014 -0700
tree 95f88645bec774d3e8df170bd0f40e4cd0911a34
parent b24b0e2bb128532945b31ea62715776d7751f84d

Revert "Revert "Use trampolines for calls to helpers""

This reverts commit 081f73e888b3c246cf7635db37b7f1105cf1a2ff.

Change-Id: Ibd777f8ce73cf8ed6c4cb81d50bf6437ac28cb61

Conflicts:
	compiler/dex/quick/mir_to_lir.h

compiler/dex/quick/gen_common.cc

diff --git a/compiler/dex/quick/gen_common.cc b/compiler/dex/quick/gen_common.cc
index 4522379..2afc43c 100644
--- a/compiler/dex/quick/gen_common.cc
+++ b/compiler/dex/quick/gen_common.cc
@@ -17,6 +17,7 @@
 #include "dex/compiler_internals.h"
 #include "dex/quick/arm/arm_lir.h"
 #include "dex/quick/mir_to_lir-inl.h"
+#include "driver/compiler_options.h"
 #include "entrypoints/quick/quick_entrypoints.h"
 #include "mirror/array.h"
 #include "mirror/object-inl.h"
@@ -968,12 +969,20 @@
         void Compile() {
           GenerateTargetLabel();
 
-          RegStorage r_tgt = m2l_->CallHelperSetup(QUICK_ENTRYPOINT_OFFSET(4, pResolveString));
+          const CompilerOptions& compiler_options =
+            m2l_->cu_->compiler_driver->GetCompilerOptions();
+          if (compiler_options.GenerateHelperTrampolines()) {
+            m2l_->OpRegCopy(m2l_->TargetReg(kArg0), r_method_);
+            m2l_->CallHelper(RegStorage::InvalidReg(), QUICK_ENTRYPOINT_OFFSET(4, pResolveString),
+                             true);
+          } else {
+            RegStorage r_tgt = m2l_->CallHelperSetup(QUICK_ENTRYPOINT_OFFSET(4, pResolveString));
 
-          m2l_->OpRegCopy(m2l_->TargetReg(kArg0), r_method_);   // .eq
-          LIR* call_inst = m2l_->OpReg(kOpBlx, r_tgt);
-          m2l_->MarkSafepointPC(call_inst);
-          m2l_->FreeTemp(r_tgt);
+            m2l_->OpRegCopy(m2l_->TargetReg(kArg0), r_method_);
+            LIR* call_inst = m2l_->OpReg(kOpBlx, r_tgt);
+            m2l_->MarkSafepointPC(call_inst);
+            m2l_->FreeTemp(r_tgt);
+          }
 
           m2l_->OpUnconditionalBranch(cont_);
         }