Clean up: Unify size fields in oat_writer

Test: ./art/test.py -b -r --host --optimizing --64
Change-Id: I095ac4511a249f6cf19e34fbfc256c9fcb6abada

2 files changed, 62 insertions, 124 deletions

diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc
index 8c1edb8e05..cb97a1a515 100644
--- a/dex2oat/linker/oat_writer.cc
+++ b/dex2oat/linker/oat_writer.cc
@@ -359,68 +359,6 @@ OatWriter::OatWriter(const CompilerOptions& compiler_options,
       bss_string_entries_(),
       oat_data_offset_(0u),
       oat_header_(nullptr),
-      size_vdex_header_(0),
-      size_vdex_checksums_(0),
-      size_dex_file_alignment_(0),
-      size_executable_offset_alignment_(0),
-      size_oat_header_(0),
-      size_oat_header_key_value_store_(0),
-      size_dex_file_(0),
-      size_verifier_deps_(0),
-      size_verifier_deps_alignment_(0),
-      size_vdex_lookup_table_alignment_(0),
-      size_vdex_lookup_table_(0),
-      size_interpreter_to_interpreter_bridge_(0),
-      size_interpreter_to_compiled_code_bridge_(0),
-      size_jni_dlsym_lookup_trampoline_(0),
-      size_jni_dlsym_lookup_critical_trampoline_(0),
-      size_quick_generic_jni_trampoline_(0),
-      size_quick_imt_conflict_trampoline_(0),
-      size_quick_resolution_trampoline_(0),
-      size_quick_to_interpreter_bridge_(0),
-      size_nterp_trampoline_(0),
-      size_trampoline_alignment_(0),
-      size_method_header_(0),
-      size_code_(0),
-      size_code_alignment_(0),
-      size_data_bimg_rel_ro_(0),
-      size_data_bimg_rel_ro_alignment_(0),
-      size_relative_call_thunks_(0),
-      size_misc_thunks_(0),
-      size_vmap_table_(0),
-      size_method_info_(0),
-      size_oat_dex_file_location_size_(0),
-      size_oat_dex_file_location_data_(0),
-      size_oat_dex_file_location_checksum_(0),
-      size_oat_dex_file_offset_(0),
-      size_oat_dex_file_class_offsets_offset_(0),
-      size_oat_dex_file_lookup_table_offset_(0),
-      size_oat_dex_file_dex_layout_sections_offset_(0),
-      size_oat_dex_file_dex_layout_sections_(0),
-      size_oat_dex_file_dex_layout_sections_alignment_(0),
-      size_oat_dex_file_method_bss_mapping_offset_(0),
-      size_oat_dex_file_type_bss_mapping_offset_(0),
-      size_oat_dex_file_public_type_bss_mapping_offset_(0),
-      size_oat_dex_file_package_type_bss_mapping_offset_(0),
-      size_oat_dex_file_string_bss_mapping_offset_(0),
-      size_bcp_bss_info_size_(0),
-      size_bcp_bss_info_method_bss_mapping_offset_(0),
-      size_bcp_bss_info_type_bss_mapping_offset_(0),
-      size_bcp_bss_info_public_type_bss_mapping_offset_(0),
-      size_bcp_bss_info_package_type_bss_mapping_offset_(0),
-      size_bcp_bss_info_string_bss_mapping_offset_(0),
-      size_oat_class_offsets_alignment_(0),
-      size_oat_class_offsets_(0),
-      size_oat_class_type_(0),
-      size_oat_class_status_(0),
-      size_oat_class_num_methods_(0),
-      size_oat_class_method_bitmaps_(0),
-      size_oat_class_method_offsets_(0),
-      size_method_bss_mappings_(0u),
-      size_type_bss_mappings_(0u),
-      size_public_type_bss_mappings_(0u),
-      size_package_type_bss_mappings_(0u),
-      size_string_bss_mappings_(0u),
       relative_patcher_(nullptr),
       profile_compilation_info_(info),
       compact_dex_level_(compact_dex_level) {}
diff --git a/dex2oat/linker/oat_writer.h b/dex2oat/linker/oat_writer.h
index 1b07d3796c..64e8ad94ab 100644
--- a/dex2oat/linker/oat_writer.h
+++ b/dex2oat/linker/oat_writer.h
@@ -493,70 +493,70 @@ class OatWriter {
   std::unique_ptr<const std::vector<uint8_t>> nterp_trampoline_;
 
   // output stats
-  uint32_t size_vdex_header_;
-  uint32_t size_vdex_checksums_;
-  uint32_t size_dex_file_alignment_;
-  uint32_t size_executable_offset_alignment_;
-  uint32_t size_oat_header_;
-  uint32_t size_oat_header_key_value_store_;
-  uint32_t size_dex_file_;
-  uint32_t size_verifier_deps_;
-  uint32_t size_verifier_deps_alignment_;
-  uint32_t size_vdex_lookup_table_alignment_;
-  uint32_t size_vdex_lookup_table_;
-  uint32_t size_interpreter_to_interpreter_bridge_;
-  uint32_t size_interpreter_to_compiled_code_bridge_;
-  uint32_t size_jni_dlsym_lookup_trampoline_;
-  uint32_t size_jni_dlsym_lookup_critical_trampoline_;
-  uint32_t size_quick_generic_jni_trampoline_;
-  uint32_t size_quick_imt_conflict_trampoline_;
-  uint32_t size_quick_resolution_trampoline_;
-  uint32_t size_quick_to_interpreter_bridge_;
-  uint32_t size_nterp_trampoline_;
-  uint32_t size_trampoline_alignment_;
-  uint32_t size_method_header_;
-  uint32_t size_code_;
-  uint32_t size_code_alignment_;
-  uint32_t size_data_bimg_rel_ro_;
-  uint32_t size_data_bimg_rel_ro_alignment_;
-  uint32_t size_relative_call_thunks_;
-  uint32_t size_misc_thunks_;
-  uint32_t size_vmap_table_;
-  uint32_t size_method_info_;
-  uint32_t size_oat_dex_file_location_size_;
-  uint32_t size_oat_dex_file_location_data_;
+  uint32_t size_vdex_header_ = 0;
+  uint32_t size_vdex_checksums_ = 0;
+  uint32_t size_dex_file_alignment_ = 0;
+  uint32_t size_executable_offset_alignment_ = 0;
+  uint32_t size_oat_header_ = 0;
+  uint32_t size_oat_header_key_value_store_ = 0;
+  uint32_t size_dex_file_ = 0;
+  uint32_t size_verifier_deps_ = 0;
+  uint32_t size_verifier_deps_alignment_ = 0;
+  uint32_t size_vdex_lookup_table_alignment_ = 0;
+  uint32_t size_vdex_lookup_table_ = 0;
+  uint32_t size_interpreter_to_interpreter_bridge_ = 0;
+  uint32_t size_interpreter_to_compiled_code_bridge_ = 0;
+  uint32_t size_jni_dlsym_lookup_trampoline_ = 0;
+  uint32_t size_jni_dlsym_lookup_critical_trampoline_ = 0;
+  uint32_t size_quick_generic_jni_trampoline_ = 0;
+  uint32_t size_quick_imt_conflict_trampoline_ = 0;
+  uint32_t size_quick_resolution_trampoline_ = 0;
+  uint32_t size_quick_to_interpreter_bridge_ = 0;
+  uint32_t size_nterp_trampoline_ = 0;
+  uint32_t size_trampoline_alignment_ = 0;
+  uint32_t size_method_header_ = 0;
+  uint32_t size_code_ = 0;
+  uint32_t size_code_alignment_ = 0;
+  uint32_t size_data_bimg_rel_ro_ = 0;
+  uint32_t size_data_bimg_rel_ro_alignment_ = 0;
+  uint32_t size_relative_call_thunks_ = 0;
+  uint32_t size_misc_thunks_ = 0;
+  uint32_t size_vmap_table_ = 0;
+  uint32_t size_method_info_ = 0;
+  uint32_t size_oat_dex_file_location_size_ = 0;
+  uint32_t size_oat_dex_file_location_data_ = 0;
   uint32_t size_oat_dex_file_magic_ = 0;
-  uint32_t size_oat_dex_file_location_checksum_;
+  uint32_t size_oat_dex_file_location_checksum_ = 0;
   uint32_t size_oat_dex_file_sha1_ = 0;
-  uint32_t size_oat_dex_file_offset_;
-  uint32_t size_oat_dex_file_class_offsets_offset_;
-  uint32_t size_oat_dex_file_lookup_table_offset_;
-  uint32_t size_oat_dex_file_dex_layout_sections_offset_;
-  uint32_t size_oat_dex_file_dex_layout_sections_;
-  uint32_t size_oat_dex_file_dex_layout_sections_alignment_;
-  uint32_t size_oat_dex_file_method_bss_mapping_offset_;
-  uint32_t size_oat_dex_file_type_bss_mapping_offset_;
-  uint32_t size_oat_dex_file_public_type_bss_mapping_offset_;
-  uint32_t size_oat_dex_file_package_type_bss_mapping_offset_;
-  uint32_t size_oat_dex_file_string_bss_mapping_offset_;
-  uint32_t size_bcp_bss_info_size_;
-  uint32_t size_bcp_bss_info_method_bss_mapping_offset_;
-  uint32_t size_bcp_bss_info_type_bss_mapping_offset_;
-  uint32_t size_bcp_bss_info_public_type_bss_mapping_offset_;
-  uint32_t size_bcp_bss_info_package_type_bss_mapping_offset_;
-  uint32_t size_bcp_bss_info_string_bss_mapping_offset_;
-  uint32_t size_oat_class_offsets_alignment_;
-  uint32_t size_oat_class_offsets_;
-  uint32_t size_oat_class_type_;
-  uint32_t size_oat_class_status_;
-  uint32_t size_oat_class_num_methods_;
-  uint32_t size_oat_class_method_bitmaps_;
-  uint32_t size_oat_class_method_offsets_;
-  uint32_t size_method_bss_mappings_;
-  uint32_t size_type_bss_mappings_;
-  uint32_t size_public_type_bss_mappings_;
-  uint32_t size_package_type_bss_mappings_;
-  uint32_t size_string_bss_mappings_;
+  uint32_t size_oat_dex_file_offset_ = 0;
+  uint32_t size_oat_dex_file_class_offsets_offset_ = 0;
+  uint32_t size_oat_dex_file_lookup_table_offset_ = 0;
+  uint32_t size_oat_dex_file_dex_layout_sections_offset_ = 0;
+  uint32_t size_oat_dex_file_dex_layout_sections_ = 0;
+  uint32_t size_oat_dex_file_dex_layout_sections_alignment_ = 0;
+  uint32_t size_oat_dex_file_method_bss_mapping_offset_ = 0;
+  uint32_t size_oat_dex_file_type_bss_mapping_offset_ = 0;
+  uint32_t size_oat_dex_file_public_type_bss_mapping_offset_ = 0;
+  uint32_t size_oat_dex_file_package_type_bss_mapping_offset_ = 0;
+  uint32_t size_oat_dex_file_string_bss_mapping_offset_ = 0;
+  uint32_t size_bcp_bss_info_size_ = 0;
+  uint32_t size_bcp_bss_info_method_bss_mapping_offset_ = 0;
+  uint32_t size_bcp_bss_info_type_bss_mapping_offset_ = 0;
+  uint32_t size_bcp_bss_info_public_type_bss_mapping_offset_ = 0;
+  uint32_t size_bcp_bss_info_package_type_bss_mapping_offset_ = 0;
+  uint32_t size_bcp_bss_info_string_bss_mapping_offset_ = 0;
+  uint32_t size_oat_class_offsets_alignment_ = 0;
+  uint32_t size_oat_class_offsets_ = 0;
+  uint32_t size_oat_class_type_ = 0;
+  uint32_t size_oat_class_status_ = 0;
+  uint32_t size_oat_class_num_methods_ = 0;
+  uint32_t size_oat_class_method_bitmaps_ = 0;
+  uint32_t size_oat_class_method_offsets_ = 0;
+  uint32_t size_method_bss_mappings_ = 0;
+  uint32_t size_type_bss_mappings_ = 0;
+  uint32_t size_public_type_bss_mappings_ = 0;
+  uint32_t size_package_type_bss_mappings_ = 0;
+  uint32_t size_string_bss_mappings_ = 0;
 
   // The helper for processing relative patches is external so that we can patch across oat files.
   MultiOatRelativePatcher* relative_patcher_;