diff options
| author | 2019-04-01 10:57:55 +0100 | |
|---|---|---|
| committer | 2019-04-02 07:57:27 +0000 | |
| commit | dfc0de7696a50a9aeee95dcf74dac036e3334314 (patch) | |
| tree | 20a6edd33cca852f8e65ce8d20a85949b566904c /runtime/class_loader_utils.h | |
| parent | 9ef308da0ea8d1df2edf65d4957599fafcc56aeb (diff) | |
Partially ObjPtr<>-ify Object, fix stale ref in test.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I0c0bc669c0ab8d99185e662a2fec16f32a42a0a2
Diffstat (limited to 'runtime/class_loader_utils.h')
| -rw-r--r-- | runtime/class_loader_utils.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_loader_utils.h b/runtime/class_loader_utils.h index 562dc47d21..b809bafc7f 100644 --- a/runtime/class_loader_utils.h +++ b/runtime/class_loader_utils.h @@ -22,6 +22,7 @@ #include "handle_scope.h" #include "jni/jni_internal.h" #include "mirror/class_loader.h" +#include "mirror/object-inl.h" #include "native/dalvik_system_DexFile.h" #include "scoped_thread_state_change-inl.h" #include "well_known_classes.h" @@ -33,7 +34,7 @@ namespace art { inline bool IsPathOrDexClassLoader(ScopedObjectAccessAlreadyRunnable& soa, Handle<mirror::ClassLoader> class_loader) REQUIRES_SHARED(Locks::mutator_lock_) { - mirror::Class* class_loader_class = class_loader->GetClass(); + ObjPtr<mirror::Class> class_loader_class = class_loader->GetClass(); return (class_loader_class == soa.Decode<mirror::Class>(WellKnownClasses::dalvik_system_PathClassLoader)) || @@ -45,7 +46,7 @@ inline bool IsPathOrDexClassLoader(ScopedObjectAccessAlreadyRunnable& soa, inline bool IsInMemoryDexClassLoader(ScopedObjectAccessAlreadyRunnable& soa, Handle<mirror::ClassLoader> class_loader) REQUIRES_SHARED(Locks::mutator_lock_) { - mirror::Class* class_loader_class = class_loader->GetClass(); + ObjPtr<mirror::Class> class_loader_class = class_loader->GetClass(); return (class_loader_class == soa.Decode<mirror::Class>(WellKnownClasses::dalvik_system_InMemoryDexClassLoader)); } @@ -53,7 +54,7 @@ inline bool IsInMemoryDexClassLoader(ScopedObjectAccessAlreadyRunnable& soa, inline bool IsDelegateLastClassLoader(ScopedObjectAccessAlreadyRunnable& soa, Handle<mirror::ClassLoader> class_loader) REQUIRES_SHARED(Locks::mutator_lock_) { - mirror::Class* class_loader_class = class_loader->GetClass(); + ObjPtr<mirror::Class> class_loader_class = class_loader->GetClass(); return class_loader_class == soa.Decode<mirror::Class>(WellKnownClasses::dalvik_system_DelegateLastClassLoader); } |