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 --- runtime/java_vm_ext.h | 1 - 1 file changed, 1 deletion(-) (limited to 'runtime/java_vm_ext.h') diff --git a/runtime/java_vm_ext.h b/runtime/java_vm_ext.h index 9e37f1178c..7374920f2b 100644 --- a/runtime/java_vm_ext.h +++ b/runtime/java_vm_ext.h @@ -136,7 +136,6 @@ class JavaVMExt : public JavaVM { REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::jni_weak_globals_lock_); void BroadcastForNewWeakGlobals() - REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::jni_weak_globals_lock_); jobject AddGlobalRef(Thread* self, ObjPtr obj) -- cgit v1.2.3-59-g8ed1b