diff options
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 4426056078..1d29e319d5 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -128,6 +128,7 @@ class ClassLinker { kLongArrayClass, kShortArrayClass, kJavaLangStackTraceElementArrayClass, + kDalvikSystemClassExt, kClassRootsMax, }; @@ -417,10 +418,10 @@ class ClassLinker { REQUIRES(!dex_lock_); void VisitClassRoots(RootVisitor* visitor, VisitRootFlags flags) - REQUIRES(!Locks::classlinker_classes_lock_) + REQUIRES(!Locks::classlinker_classes_lock_, !Locks::trace_lock_) REQUIRES_SHARED(Locks::mutator_lock_); void VisitRoots(RootVisitor* visitor, VisitRootFlags flags) - REQUIRES(!dex_lock_) + REQUIRES(!dex_lock_, !Locks::classlinker_classes_lock_, !Locks::trace_lock_) REQUIRES_SHARED(Locks::mutator_lock_); mirror::DexCache* FindDexCache(Thread* self, |