diff options
| author | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-06 19:30:12 -0600 |
|---|---|---|
| committer | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-06 19:32:30 -0600 |
| commit | 58d4793f8bd82b9daab5bf4fa40d5b68204e71eb (patch) | |
| tree | 449265cbacbf925f37ed0bd201e68f080e2537cc /runtime/class_linker.h | |
| parent | 20af13267def46b2e5f9a6fa6e94ac69056ef16f (diff) | |
| parent | 12eb0c532e33ca5d5e98addd580b5ad0a4b71be4 (diff) | |
| download | android_art-cm-14.1_prerebase.tar.gz android_art-cm-14.1_prerebase.tar.bz2 android_art-cm-14.1_prerebase.zip | |
Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebase
Android 7.1.1 release 4
Change-Id: I14b36666b5a478024f3a9ffab90fd675a6157461
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 4305dc6560..8aceffbdcc 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -647,6 +647,10 @@ class ClassLinker { SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!dex_lock_); + // Get the actual holding class for a copied method. Pretty slow, don't call often. + mirror::Class* GetHoldingClassOfCopiedMethod(ArtMethod* method) + SHARED_REQUIRES(Locks::mutator_lock_); + struct DexCacheData { // Weak root to the DexCache. Note: Do not decode this unnecessarily or else class unloading may // not work properly. @@ -675,7 +679,6 @@ class ClassLinker { SHARED_REQUIRES(Locks::mutator_lock_); static void DeleteClassLoader(Thread* self, const ClassLoaderData& data) - REQUIRES(Locks::classlinker_classes_lock_) SHARED_REQUIRES(Locks::mutator_lock_); void VisitClassLoaders(ClassLoaderVisitor* visitor) const @@ -1167,6 +1170,8 @@ class ClassLinker { // Image pointer size. size_t image_pointer_size_; + class FindVirtualMethodHolderVisitor; + friend struct CompilationHelper; // For Compile in ImageTest. friend class ImageDumper; // for DexLock friend class ImageWriter; // for GetClassRoots friend class JniCompilerTest; // for GetRuntimeQuickGenericJniStub |