diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-01-09 15:03:12 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2017-01-16 12:09:53 +0000 |
| commit | 6bec91c7d4670905cd67440991ec76fd54d0f000 (patch) | |
| tree | 05f4ba288e629270773c65b34b71be7bae5e92ff /compiler/optimizing/code_generator_mips64.h | |
| parent | 4155998a2f5c7a252a6611e3926943e931ea280a (diff) | |
| download | art-6bec91c7d4670905cd67440991ec76fd54d0f000.tar.gz art-6bec91c7d4670905cd67440991ec76fd54d0f000.tar.bz2 art-6bec91c7d4670905cd67440991ec76fd54d0f000.zip | |
Store resolved types for AOT code in .bss.
Test: m test-art-host
Test: m test-art-target on Nexus 9.
Test: Nexus 9 boots.
Test: Build aosp_mips64-eng.
Bug: 30627598
Bug: 34193123
Change-Id: I8ec60a98eb488cb46ae3ea56341f5709dad4f623
Diffstat (limited to 'compiler/optimizing/code_generator_mips64.h')
| -rw-r--r-- | compiler/optimizing/code_generator_mips64.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_mips64.h b/compiler/optimizing/code_generator_mips64.h index 8ac919f47e..df78830713 100644 --- a/compiler/optimizing/code_generator_mips64.h +++ b/compiler/optimizing/code_generator_mips64.h @@ -411,7 +411,8 @@ class CodeGeneratorMIPS64 : public CodeGenerator { Mips64Label pc_rel_label; }; - PcRelativePatchInfo* NewPcRelativeStringPatch(const DexFile& dex_file, uint32_t string_index); + PcRelativePatchInfo* NewPcRelativeStringPatch(const DexFile& dex_file, + dex::StringIndex string_index); PcRelativePatchInfo* NewPcRelativeTypePatch(const DexFile& dex_file, dex::TypeIndex type_index); PcRelativePatchInfo* NewPcRelativeDexCacheArrayPatch(const DexFile& dex_file, uint32_t element_offset); @@ -469,7 +470,7 @@ class CodeGeneratorMIPS64 : public CodeGenerator { ArenaDeque<PcRelativePatchInfo> pc_relative_string_patches_; // Deduplication map for boot type literals for kBootImageLinkTimeAddress. BootTypeToLiteralMap boot_image_type_patches_; - // PC-relative type patch info. + // PC-relative type patch info; type depends on configuration (app .bss or boot image PIC). ArenaDeque<PcRelativePatchInfo> pc_relative_type_patches_; // Deduplication map for patchable boot image addresses. Uint32ToLiteralMap boot_image_address_patches_; |