diff options
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/sharpening.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc index 03d277f648..77b41abf7d 100644 --- a/compiler/optimizing/sharpening.cc +++ b/compiler/optimizing/sharpening.cc @@ -38,15 +38,15 @@ namespace art { static bool IsInBootImage(ArtMethod* method) { - const std::vector<gc::space::ImageSpace*>& image_spaces = - Runtime::Current()->GetHeap()->GetBootImageSpaces(); - for (gc::space::ImageSpace* image_space : image_spaces) { - const ImageSection& method_section = image_space->GetImageHeader().GetMethodsSection(); - if (method_section.Contains(reinterpret_cast<uint8_t*>(method) - image_space->Begin())) { - return true; - } - } - return false; + gc::Heap* heap = Runtime::Current()->GetHeap(); + DCHECK_EQ(heap->IsBootImageAddress(method), + std::any_of(heap->GetBootImageSpaces().begin(), + heap->GetBootImageSpaces().end(), + [=](gc::space::ImageSpace* space) REQUIRES_SHARED(Locks::mutator_lock_) { + return space->GetImageHeader().GetMethodsSection().Contains( + reinterpret_cast<uint8_t*>(method) - space->Begin()); + })); + return heap->IsBootImageAddress(method); } static bool BootImageAOTCanEmbedMethod(ArtMethod* method, const CompilerOptions& compiler_options) { |