Make oatdump work with .art files and code generated by Optimizing.
When inspecting an .art file with oatdump (using `--image'),
do not try to compute size stats about the vmap table if the
method has been compiled with Optimizing.
Change-Id: I1204b53c91ac8bf98665ed357d8509a4a01a52f9
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index b3801b3..cf4f822 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -1889,10 +1889,14 @@
state->stats_.pc_mapping_table_bytes += pc_mapping_table_bytes;
}
- size_t vmap_table_bytes = state->ComputeOatSize(
- method->GetVmapTable(image_pointer_size), &first_occurrence);
- if (first_occurrence) {
- state->stats_.vmap_table_bytes += vmap_table_bytes;
+ size_t vmap_table_bytes = 0u;
+ if (!method->IsOptimized(image_pointer_size)) {
+ // Method compiled with the optimizing compiler have no vmap table.
+ vmap_table_bytes = state->ComputeOatSize(
+ method->GetVmapTable(image_pointer_size), &first_occurrence);
+ if (first_occurrence) {
+ state->stats_.vmap_table_bytes += vmap_table_bytes;
+ }
}
const void* quick_oat_code_begin = state->GetQuickOatCodeBegin(method);