diff options
Diffstat (limited to 'runtime/image.cc')
| -rw-r--r-- | runtime/image.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/image.cc b/runtime/image.cc index 42b348ac58..1bc19ff656 100644 --- a/runtime/image.cc +++ b/runtime/image.cc @@ -24,7 +24,7 @@ namespace art { const uint8_t ImageHeader::kImageMagic[] = { 'a', 'r', 't', '\n' }; -const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '1', '\0' }; +const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '2', '\0' }; ImageHeader::ImageHeader(uint32_t image_begin, uint32_t image_size, @@ -150,10 +150,10 @@ std::ostream& operator<<(std::ostream& os, const ImageSection& section) { void ImageSection::VisitPackedArtFields(ArtFieldVisitor* visitor, uint8_t* base) const { for (size_t pos = 0; pos < Size(); ) { auto* array = reinterpret_cast<LengthPrefixedArray<ArtField>*>(base + Offset() + pos); - for (size_t i = 0; i < array->Length(); ++i) { + for (size_t i = 0; i < array->size(); ++i) { visitor->Visit(&array->At(i, sizeof(ArtField))); } - pos += array->ComputeSize(array->Length()); + pos += array->ComputeSize(array->size()); } } @@ -164,10 +164,10 @@ void ImageSection::VisitPackedArtMethods(ArtMethodVisitor* visitor, const size_t method_size = ArtMethod::Size(pointer_size); for (size_t pos = 0; pos < Size(); ) { auto* array = reinterpret_cast<LengthPrefixedArray<ArtMethod>*>(base + Offset() + pos); - for (size_t i = 0; i < array->Length(); ++i) { + for (size_t i = 0; i < array->size(); ++i) { visitor->Visit(&array->At(i, method_size, method_alignment)); } - pos += array->ComputeSize(array->Length(), method_size, method_alignment); + pos += array->ComputeSize(array->size(), method_size, method_alignment); } } |