diff options
| author | Jeff Hao <jeffhao@google.com> | 2016-06-28 23:47:09 +0000 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2016-06-29 01:23:37 +0000 |
| commit | fd43db68d204caaa0e411ca79a37af15d1c001af (patch) | |
| tree | 1c26b5329dd7fee6884ec608e7fb1038c848ed1f /patchoat | |
| parent | 6777a3ceaf9ad3c7906805f0c05680d60db2b6b3 (diff) | |
| download | android_art-fd43db68d204caaa0e411ca79a37af15d1c001af.tar.gz android_art-fd43db68d204caaa0e411ca79a37af15d1c001af.tar.bz2 android_art-fd43db68d204caaa0e411ca79a37af15d1c001af.zip | |
Revert "Optimize IMT"
This reverts commit 0790af1391b316c5c12b4e135be357008c060696.
Bug: 29188168 (for initial CL)
Bug: 29778499 (reason for revert)
Change-Id: I2c3e4ec2cebdd40faec67ddb721b7acdc8e90061
Diffstat (limited to 'patchoat')
| -rw-r--r-- | patchoat/patchoat.cc | 12 | ||||
| -rw-r--r-- | patchoat/patchoat.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index 5bb61bb829..0a7ffda3b4 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -494,17 +494,6 @@ void PatchOat::PatchArtMethods(const ImageHeader* image_header) { image_header->VisitPackedArtMethods(&visitor, heap_->Begin(), pointer_size); } -void PatchOat::PatchImTables(const ImageHeader* image_header) { - const size_t pointer_size = InstructionSetPointerSize(isa_); - // We can safely walk target image since the conflict tables are independent. - image_header->VisitPackedImTables( - [this](ArtMethod* method) { - return RelocatedAddressOfPointer(method); - }, - image_->Begin(), - pointer_size); -} - void PatchOat::PatchImtConflictTables(const ImageHeader* image_header) { const size_t pointer_size = InstructionSetPointerSize(isa_); // We can safely walk target image since the conflict tables are independent. @@ -647,7 +636,6 @@ bool PatchOat::PatchImage(bool primary_image) { PatchArtFields(image_header); PatchArtMethods(image_header); - PatchImTables(image_header); PatchImtConflictTables(image_header); PatchInternedStrings(image_header); PatchClassTable(image_header); diff --git a/patchoat/patchoat.h b/patchoat/patchoat.h index 61ec695d83..3ef837fde9 100644 --- a/patchoat/patchoat.h +++ b/patchoat/patchoat.h @@ -117,7 +117,6 @@ class PatchOat { bool PatchImage(bool primary_image) SHARED_REQUIRES(Locks::mutator_lock_); void PatchArtFields(const ImageHeader* image_header) SHARED_REQUIRES(Locks::mutator_lock_); void PatchArtMethods(const ImageHeader* image_header) SHARED_REQUIRES(Locks::mutator_lock_); - void PatchImTables(const ImageHeader* image_header) SHARED_REQUIRES(Locks::mutator_lock_); void PatchImtConflictTables(const ImageHeader* image_header) SHARED_REQUIRES(Locks::mutator_lock_); void PatchInternedStrings(const ImageHeader* image_header) |