diff options
| author | 2016-11-03 13:06:52 -0700 | |
|---|---|---|
| committer | 2016-11-09 18:14:08 -0800 | |
| commit | 3049324f4ef71b5d7a3de49bd77c75f07dbf8f3a (patch) | |
| tree | 19e2d9d5e8476bf526dd5924ef05b1d727b75f8b /runtime/java_vm_ext.h | |
| parent | e7b46e22c7f4f6f503501b3b2ad99113289d142b (diff) | |
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
Diffstat (limited to 'runtime/java_vm_ext.h')
| -rw-r--r-- | runtime/java_vm_ext.h | 1 |
1 files changed, 0 insertions, 1 deletions
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<mirror::Object> obj) |