From d23d7d145c86975acbcc75505b8a323337066ac0 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 27 Apr 2016 21:03:42 +0000 Subject: Revert "Write conflict tables in image" Some strange issues on angler. This reverts commit cda9386add68d94697449c6cb08b356747e55c21. (cherry picked from commit 8e2478d23e89a7022c93ddc608dcbba7b29b91e6) Change-Id: Iffd25c5fb732ff72b58c787c107dc33c56f8c8d4 --- runtime/class_linker.h | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) (limited to 'runtime/class_linker.h') diff --git a/runtime/class_linker.h b/runtime/class_linker.h index ece171c9a6..2743921623 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -53,7 +53,6 @@ namespace mirror { class StackTraceElement; } // namespace mirror -class ImtConflictTable; template class Handle; template class MutableHandle; class InternTable; @@ -618,19 +617,6 @@ class ClassLinker { bool force_new_conflict_method) SHARED_REQUIRES(Locks::mutator_lock_); - // Create a conflict table with a specified capacity. - ImtConflictTable* CreateImtConflictTable(size_t count, LinearAlloc* linear_alloc); - - // Static version for when the class linker is not yet created. - static ImtConflictTable* CreateImtConflictTable(size_t count, - LinearAlloc* linear_alloc, - size_t pointer_size); - - - // Create the IMT and conflict tables for a class. - void FillIMTAndConflictTables(mirror::Class* klass) 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. @@ -1087,18 +1073,18 @@ class ClassLinker { ArtMethod* current_method, /*out*/ArtMethod** imt_ref) SHARED_REQUIRES(Locks::mutator_lock_); - void FillIMTFromIfTable(mirror::IfTable* if_table, - ArtMethod* unimplemented_method, - ArtMethod* imt_conflict_method, - mirror::Class* klass, - bool create_conflict_tables, - bool ignore_copied_methods, - ArtMethod** imt) SHARED_REQUIRES(Locks::mutator_lock_); + void ConstructIMTFromIfTable(mirror::IfTable* if_table, + ArtMethod* unimplemented_method, + ArtMethod* imt_conflict_method, + mirror::Class* klass, + bool create_conflict_tables, + bool ignore_copied_methods, + ArtMethod** out_imt) SHARED_REQUIRES(Locks::mutator_lock_); void FillImtFromSuperClass(Handle klass, ArtMethod* unimplemented_method, ArtMethod* imt_conflict_method, - ArtMethod** imt) SHARED_REQUIRES(Locks::mutator_lock_); + ArtMethod** out_imt) SHARED_REQUIRES(Locks::mutator_lock_); std::vector boot_class_path_; std::vector> boot_dex_files_; -- cgit v1.2.3-59-g8ed1b