From 07cbc5ba4f117ea74faecffe14ffc0ce8aa7ee0e Mon Sep 17 00:00:00 2001
From: Hans Boehm <hboehm@google.com>
Date: Wed, 26 Jan 2022 02:43:33 +0000
Subject: Revert "Reduce pauses for weak reference access"

This reverts commit 0ab5b6d2afbdd71a18f8fb9b1fcf39e54cfd55a5.

Reason for revert: Breaks CMS builds

Change-Id: Ib3dfcc90ac5b7259c7f718a0373b48acc2ba10b2
---
 runtime/jni/java_vm_ext.cc | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'runtime/jni/java_vm_ext.cc')

diff --git a/runtime/jni/java_vm_ext.cc b/runtime/jni/java_vm_ext.cc
index 94108c69de..12e6d22252 100644
--- a/runtime/jni/java_vm_ext.cc
+++ b/runtime/jni/java_vm_ext.cc
@@ -864,10 +864,6 @@ ObjPtr<mirror::Object> JavaVMExt::DecodeWeakGlobalLocked(Thread* self, IndirectR
   if (kDebugLocking) {
     Locks::jni_weak_globals_lock_->AssertHeld(self);
   }
-  // TODO: Handle the already null case without waiting.
-  // TODO: Otherwise we should just wait for kInitMarkingDone, and track which weak globals were
-  // marked at that point. We would only need one mark bit per entry in the weak_globals_ table,
-  // and a quick pass over that early on during reference processing.
   WaitForWeakGlobalsAccess(self);
   return weak_globals_.Get(ref);
 }
-- 
cgit v1.2.3-59-g8ed1b