diff options
| author | 2016-11-11 18:44:44 +0000 | |
|---|---|---|
| committer | 2016-11-11 18:44:44 +0000 | |
| commit | 39ce7d2907edb978f1ab6cd75884be48ab11cd77 (patch) | |
| tree | 7d2f0c56bd8a7dd483b5c1ede7047b623d0e35d7 /runtime/java_vm_ext.h | |
| parent | 5302bd999afee6db5b0cfd63e6a49b0fcbf92dd4 (diff) | |
| parent | 3049324f4ef71b5d7a3de49bd77c75f07dbf8f3a (diff) | |
Merge "Make empty checkpoint work while weak ref access is disabled."
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) |