diff options
-rw-r--r-- | compiler/image_writer.cc | 3 | ||||
-rw-r--r-- | dex2oat/dex2oat.cc | 1 | ||||
-rw-r--r-- | runtime/class_linker.cc | 6 | ||||
-rw-r--r-- | runtime/oat_file_assistant.cc | 1 | ||||
-rw-r--r-- | test/Android.run-test.mk | 3 |
5 files changed, 4 insertions, 10 deletions
diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index da15bc91ff..d0bb201d69 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -209,9 +209,6 @@ bool ImageWriter::Write(int image_fd, oat_header.GetQuickResolutionTrampolineOffset(); image_info.oat_address_offsets_[kOatAddressQuickToInterpreterBridge] = oat_header.GetQuickToInterpreterBridgeOffset(); - } else { - // Other oat files use the primary trampolines. - // TODO: Dummy values to protect usage? b/26317072 } diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index c4f68ea966..32a237a126 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -1589,7 +1589,6 @@ class Dex2Oat FINAL { std::vector<gc::space::ImageSpace*> image_spaces = Runtime::Current()->GetHeap()->GetBootImageSpaces(); for (gc::space::ImageSpace* image_space : image_spaces) { - // TODO: IS THIS IN ORDER? JUST TAKE THE LAST ONE? image_base_ = std::max(image_base_, RoundUp( reinterpret_cast<uintptr_t>(image_space->GetImageHeader().GetOatFileEnd()), kPageSize)); diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 67458cc964..41842e88f3 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -736,7 +736,7 @@ void ClassLinker::RunRootClinits() { static void SanityCheckArtMethod(ArtMethod* m, mirror::Class* expected_class, - std::vector<gc::space::ImageSpace*>& spaces) + const std::vector<gc::space::ImageSpace*>& spaces) SHARED_REQUIRES(Locks::mutator_lock_) { if (m->IsRuntimeMethod()) { CHECK(m->GetDeclaringClass() == nullptr) << PrettyMethod(m); @@ -760,7 +760,7 @@ static void SanityCheckArtMethod(ArtMethod* m, static void SanityCheckArtMethodPointerArray(mirror::PointerArray* arr, mirror::Class* expected_class, size_t pointer_size, - std::vector<gc::space::ImageSpace*>& spaces) + const std::vector<gc::space::ImageSpace*>& spaces) SHARED_REQUIRES(Locks::mutator_lock_) { CHECK(arr != nullptr); for (int32_t j = 0; j < arr->GetLength(); ++j) { @@ -778,7 +778,7 @@ static void SanityCheckArtMethodPointerArray(mirror::PointerArray* arr, static void SanityCheckArtMethodPointerArray(ArtMethod** arr, size_t size, size_t pointer_size, - std::vector<gc::space::ImageSpace*>& spaces) + const std::vector<gc::space::ImageSpace*>& spaces) SHARED_REQUIRES(Locks::mutator_lock_) { CHECK_EQ(arr != nullptr, size != 0u); if (arr != nullptr) { diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index 8543ff4ef9..d6b08684b9 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -952,7 +952,6 @@ const OatFileAssistant::ImageInfo* OatFileAssistant::GetImageInfo() { Runtime* runtime = Runtime::Current(); std::vector<gc::space::ImageSpace*> image_spaces = runtime->GetHeap()->GetBootImageSpaces(); if (!image_spaces.empty()) { - // TODO: Better support multi-images? b/26317072 cached_image_info_.location = image_spaces[0]->GetImageLocation(); if (isa_ == kRuntimeISA) { diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 8c5ff0a938..31ab2f2f76 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -588,8 +588,7 @@ endif TEST_ART_BROKEN_DEFAULT_HEAP_POISONING_RUN_TESTS := TEST_ART_BROKEN_OPTIMIZING_HEAP_POISONING_RUN_TESTS := - -# Tests broken by multi-image. b/26317072 +# Tests broken by multi-image. TEST_ART_BROKEN_MULTI_IMAGE_RUN_TESTS := \ 476-checker-ctor-memory-barrier \ 530-checker-lse |