diff options
| author | 2015-12-15 22:17:21 +0000 | |
|---|---|---|
| committer | 2015-12-15 22:17:21 +0000 | |
| commit | bc90a0538e56f98b8e138cb622e6b9d834244ad9 (patch) | |
| tree | fd85833863a13ce4abc7baaea1d2059c2419ad1e /runtime/class_linker.h | |
| parent | 0bbc1727c446ee5f4cc3c28e68127164ef379594 (diff) | |
| parent | ae358c1d5cef227b44d6f4971b79e1ab91aa26eb (diff) | |
Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index f16fe92d80..0d3bc1e2c3 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -983,8 +983,8 @@ class ClassLinker { bool CanWeInitializeClass(mirror::Class* klass, bool can_init_statics, bool can_init_parents) SHARED_REQUIRES(Locks::mutator_lock_); - void UpdateClassMethods(mirror::Class* klass, - LengthPrefixedArray<ArtMethod>* new_methods) + void UpdateClassVirtualMethods(mirror::Class* klass, + LengthPrefixedArray<ArtMethod>* new_methods) SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!Locks::classlinker_classes_lock_); |