From 3049324f4ef71b5d7a3de49bd77c75f07dbf8f3a Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Thu, 3 Nov 2016 13:06:52 -0700 Subject: Make empty checkpoint work while weak ref access is disabled. Fix a potential race on PushOntoMarkStack for CC by running an empty checkpoint (while weak ref access is disabled). Bug: 32508093 Bug: 12687968 Test: test-art-host with CC/CMS, libartd boot with N9, Ritz EAAC. Change-Id: I3749bb525e7734804307ee16262355f3fc730312 --- tools/cpp-define-generator/constant_thread.def | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/cpp-define-generator/constant_thread.def') diff --git a/tools/cpp-define-generator/constant_thread.def b/tools/cpp-define-generator/constant_thread.def index af5ca21f17..1364b558ec 100644 --- a/tools/cpp-define-generator/constant_thread.def +++ b/tools/cpp-define-generator/constant_thread.def @@ -25,5 +25,7 @@ DEFINE_THREAD_CONSTANT(SUSPEND_REQUEST, int32_t, art::kSuspendRequest) DEFINE_THREAD_CONSTANT(CHECKPOINT_REQUEST, int32_t, art::kCheckpointRequest) +DEFINE_THREAD_CONSTANT(EMPTY_CHECKPOINT_REQUEST, int32_t, art::kEmptyCheckpointRequest) +DEFINE_THREAD_CONSTANT(SUSPEND_OR_CHECKPOINT_REQUEST, int32_t, art::kSuspendRequest | art::kCheckpointRequest | art::kEmptyCheckpointRequest) #undef DEFINE_THREAD_CONSTANT -- cgit v1.2.3-59-g8ed1b