Revert "Remove finalizable restriction on structural redefinition"

This reverts commit 55d6fa4c352a1fadbd21b8d8e0929833e547b9e5.

Bug: 134162467
Test: None, pure revert.
Reason for revert: Flaky segvs across multiple configurations.

Change-Id: Iaa8ec6cbd2eee141e271cd3a56a1b6be8bbb3a7c

1 files changed, 1 insertions, 14 deletions

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 3e24346bf3..b600c43fe3 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -498,21 +498,8 @@ class MANAGED Class final : public Object {
   template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
   bool IsPrimitiveArray() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  // Enum used to control whether we try to add a finalizer-reference for object alloc or not.
-  enum class AddFinalizer {
-    // Don't create a finalizer reference regardless of what the class-flags say.
-    kNoAddFinalizer,
-    // Use the class-flags to figure out if we should make a finalizer reference.
-    kUseClassTag,
-  };
-
   // Creates a raw object instance but does not invoke the default constructor.
-  // kCheckAddFinalizer controls whether we use a DCHECK to sanity check that we create a
-  // finalizer-reference if needed. This should only be disabled when doing structural class
-  // redefinition.
-  template <bool kIsInstrumented = true,
-            AddFinalizer kAddFinalizer = AddFinalizer::kUseClassTag,
-            bool kCheckAddFinalizer = true>
+  template<bool kIsInstrumented = true, bool kCheckAddFinalizer = true>
   ALWAYS_INLINE ObjPtr<Object> Alloc(Thread* self, gc::AllocatorType allocator_type)
       REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_);