Revert "Update class-table and intern-table concurrently with uffd GC"

This reverts commit 97a6f7cd191cde0abaaf6323ae2f67d8e42a1236.

Reason for revert: LUCI failure in libcore test

Change-Id: I381b261ae0f67103bf1d096d8f64c84ba3f3e19c

1 files changed, 13 insertions, 13 deletions

diff --git a/runtime/class_table.h b/runtime/class_table.h
index 54e066a18c..7e263737c3 100644
--- a/runtime/class_table.h
+++ b/runtime/class_table.h
@@ -21,7 +21,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/gc_visited_arena_pool.h"
+#include "base/allocator.h"
 #include "base/hash_set.h"
 #include "base/macros.h"
 #include "base/mutex.h"
@@ -151,7 +151,7 @@ class ClassTable {
                            TableSlotEmptyFn,
                            ClassDescriptorHash,
                            ClassDescriptorEquals,
-                           GcRootArenaAllocator<TableSlot, kAllocatorTagClassTable>>;
+                           TrackingAllocator<TableSlot, kAllocatorTagClassTable>>;
 
   ClassTable();
 
@@ -181,7 +181,7 @@ class ClassTable {
       REQUIRES(!lock_)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
-  // Returns the number of class-sets in the class table.
+  // Returns the number of classes in the class table.
   size_t Size() const
       REQUIRES(!lock_)
       REQUIRES_SHARED(Locks::mutator_lock_);
@@ -194,13 +194,17 @@ class ClassTable {
       REQUIRES_SHARED(Locks::mutator_lock_);
 
   // NO_THREAD_SAFETY_ANALYSIS for object marking requiring heap bitmap lock.
-  template <class Visitor>
-  void VisitRoots(Visitor& visitor, bool skip_classes = false) NO_THREAD_SAFETY_ANALYSIS
-      REQUIRES(!lock_) REQUIRES_SHARED(Locks::mutator_lock_);
+  template<class Visitor>
+  void VisitRoots(Visitor& visitor)
+      NO_THREAD_SAFETY_ANALYSIS
+      REQUIRES(!lock_)
+      REQUIRES_SHARED(Locks::mutator_lock_);
 
-  template <class Visitor>
-  void VisitRoots(const Visitor& visitor, bool skip_classes = false) NO_THREAD_SAFETY_ANALYSIS
-      REQUIRES(!lock_) REQUIRES_SHARED(Locks::mutator_lock_);
+  template<class Visitor>
+  void VisitRoots(const Visitor& visitor)
+      NO_THREAD_SAFETY_ANALYSIS
+      REQUIRES(!lock_)
+      REQUIRES_SHARED(Locks::mutator_lock_);
 
   template<class Visitor>
   void VisitClassesAndRoots(Visitor& visitor)
@@ -208,10 +212,6 @@ class ClassTable {
       REQUIRES(!lock_)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
-  // Visit classes in those class-sets which satisfy 'cond'.
-  template <class Condition, class Visitor>
-  void VisitClassesIfConditionMet(Condition& cond, Visitor& visitor) REQUIRES(!lock_)
-      REQUIRES_SHARED(Locks::mutator_lock_);
   // Stops visit if the visitor returns false.
   template <ReadBarrierOption kReadBarrierOption = kWithReadBarrier, typename Visitor>
   bool Visit(Visitor& visitor)