commit 9afaac4ccdd90774cf95ce6fc42d9c6df4c8b817
author Bill Buzbee <buzbee@google.com> Mon Apr 04 16:59:35 2016 +0000
committer buzbee <buzbee@google.com> Fri Apr 15 08:46:07 2016 -0700
tree 05141a5bac59ffeee3c3d3be327cc42318f5f6f0
parent 240986c1fcd867b9a01e2e94ee2aa90235ce7d75

Revert "Revert "ART: Improve JitProfile perf in x86_64 mterp""

Bug: 215853

Bug triggering original revert fixed by:
https://android-review.googlesource.com/#/c/214728

This CL additionally corrects a secondary bug in argument setup
appearing in both x86 and x86_64 versions.

This reverts commit 0402c5690b1a961e923a39dab92ec1ee0b54b05a.

Change-Id: If86a5d43469d8a958e007acc0afe924330de5c16

runtime/interpreter/mterp/mterp.cc

diff --git a/runtime/interpreter/mterp/mterp.cc b/runtime/interpreter/mterp/mterp.cc
index f800683..e005589 100644
--- a/runtime/interpreter/mterp/mterp.cc
+++ b/runtime/interpreter/mterp/mterp.cc
@@ -694,7 +694,7 @@
   return MterpSetUpHotnessCountdown(method, shadow_frame);
 }
 
-// TUNING: Unused by arm/arm64/x86.  Remove when x86_64/mips/mips64 mterps support batch updates.
+// TUNING: Unused by arm/arm64/x86/x86_64.  Remove when mips/mips64 mterps support batch updates.
 extern "C" bool  MterpProfileBranch(Thread* self, ShadowFrame* shadow_frame, int32_t offset)
     SHARED_REQUIRES(Locks::mutator_lock_) {
   ArtMethod* method = shadow_frame->GetMethod();