From: Hiroshi Yamauchi <yamauchi@google.com>
Date: Thu, 28 Jan 2016 21:39:41 +0000 (-0800)
Subject: Remove ALWAYS_INLINE from ReadBarrier::Mark().
X-Git-Tag: android-x86-7.1-r1~424^2~102^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49c9333ef9e4aa58224504d3495f93b8ce163096;p=android-x86%2Fart.git

Remove ALWAYS_INLINE from ReadBarrier::Mark().

This fixes a Ritzperf EAAC performance regression in the read barrier
config.

Bug: 26744236
Bug: 12687968
Change-Id: Ieaeb57def0e3a9eeb5fd8b1234658b45fd31ce77
---

diff --git a/runtime/read_barrier.h b/runtime/read_barrier.h
index 3169a8bd5..77be6cf71 100644
--- a/runtime/read_barrier.h
+++ b/runtime/read_barrier.h
@@ -80,8 +80,7 @@ class ReadBarrier {
   static void AssertToSpaceInvariant(GcRootSource* gc_root_source, mirror::Object* ref)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
-  ALWAYS_INLINE static mirror::Object* Mark(mirror::Object* obj)
-      SHARED_REQUIRES(Locks::mutator_lock_);
+  static mirror::Object* Mark(mirror::Object* obj) SHARED_REQUIRES(Locks::mutator_lock_);
 
   static mirror::Object* WhitePtr() {
     return reinterpret_cast<mirror::Object*>(white_ptr_);