From 384c7861b27f6b5ded42a32ab7d14a48c987f515 Mon Sep 17 00:00:00 2001
From: Lokesh Gidra <lokeshgidra@google.com>
Date: Sun, 21 Nov 2021 11:45:19 -0800
Subject: Handle black allocations in concurrent mark-compact

Test: art/test/testrunner/testrunner.py
Bug: 160737021
Change-Id: I4ad6d090cbf87a9120bbc4aaf778a2e1b0d8ae6b
---
 runtime/mirror/class.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime/mirror/class.h')

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 0b0ef488de..ecf7856642 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -486,6 +486,7 @@ class MANAGED Class final : public Object {
 
   size_t GetComponentSize() REQUIRES_SHARED(Locks::mutator_lock_);
 
+  template<ReadBarrierOption kReadBarrierOption = kWithoutReadBarrier>
   size_t GetComponentSizeShift() REQUIRES_SHARED(Locks::mutator_lock_);
 
   bool IsObjectClass() REQUIRES_SHARED(Locks::mutator_lock_);
@@ -495,7 +496,8 @@ class MANAGED Class final : public Object {
   template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
   bool IsInstantiable() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
+  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
+           ReadBarrierOption kReadBarrierOption = kWithoutReadBarrier>
   ALWAYS_INLINE bool IsObjectArrayClass() REQUIRES_SHARED(Locks::mutator_lock_);
 
   template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
-- 
cgit v1.2.3-59-g8ed1b