commit 309f7ba795720b2d359d3cbab9e9120b069c0a6e
author Nicolas Geoffray <ngeoffray@google.com> Thu May 12 12:47:29 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 12 12:47:29 2022 +0000
tree 812c7c054f5851451b07fc39a2eead82b6586d61
parent d0309f822787ecf7240043f2bfe0121798044216
parent 5a7fdb362e8085c16bac8e44b02a912e48ae2e2b

Disable shared method memory optimization. am: 930070ed1c am: 5a7fdb362e

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/18343222

Change-Id: I5b2ee8a1901d8b1c5bafb54e2769cd725931a9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

runtime/art_method.h

diff --git a/runtime/art_method.h b/runtime/art_method.h
index d8bd380..c2de718 100644
--- a/runtime/art_method.h
+++ b/runtime/art_method.h
@@ -259,7 +259,9 @@
   }
 
   void SetMemorySharedMethod() REQUIRES_SHARED(Locks::mutator_lock_) {
-    if (!IsIntrinsic() && !IsAbstract()) {
+    // Disable until we make sure critical code is AOTed.
+    static constexpr bool kEnabledMemorySharedMethod = false;
+    if (kEnabledMemorySharedMethod && !IsIntrinsic() && !IsAbstract()) {
       AddAccessFlags(kAccMemorySharedMethod);
       SetHotCounter();
     }