From 39d4df62d4e2606073d05cc363370db825ad7b9f Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 7 May 2021 12:22:47 +0000
Subject: Revert "Devirtualize to HInvokeStaticOrDirect."

This reverts commit 5024ddfd125b5c3b59d7f359ae33cf7f0255b048.

Bug: 187408838

Reason for revert: b/187408838

Change-Id: If74f5ddbacc73296f66c55762e2a8d1ec2cd1f19
---
 runtime/entrypoints/entrypoint_utils.cc | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'runtime/entrypoints/entrypoint_utils.cc')

diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc
index 1c0127a519..ef0c474026 100644
--- a/runtime/entrypoints/entrypoint_utils.cc
+++ b/runtime/entrypoints/entrypoint_utils.cc
@@ -302,10 +302,6 @@ void MaybeUpdateBssMethodEntry(ArtMethod* callee, MethodReference callee_referen
                 oat_file->GetBssMethods().data() + oat_file->GetBssMethods().size());
       std::atomic<ArtMethod*>* atomic_entry =
           reinterpret_cast<std::atomic<ArtMethod*>*>(method_entry);
-      if (kIsDebugBuild) {
-        ArtMethod* existing = atomic_entry->load(std::memory_order_acquire);
-        CHECK(existing->IsRuntimeMethod() || existing == callee);
-      }
       static_assert(sizeof(*method_entry) == sizeof(*atomic_entry), "Size check.");
       atomic_entry->store(callee, std::memory_order_release);
     }
-- 
cgit v1.2.3-59-g8ed1b