diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-03-09 10:17:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-09 10:17:11 +0000 |
| commit | 9992e095643f6746361df03c4c98e742d9ad5899 (patch) | |
| tree | 8abf49af54ee57fc0acebf2a3d9cafd87d6ec48e /compiler/optimizing/code_generator_arm64.h | |
| parent | a5867bfeb34529dad71220046e7327cef23af207 (diff) | |
| parent | e47f60c482648172334aaca59e6c1ab7a3d42610 (diff) | |
| download | art-9992e095643f6746361df03c4c98e742d9ad5899.tar.gz art-9992e095643f6746361df03c4c98e742d9ad5899.tar.bz2 art-9992e095643f6746361df03c4c98e742d9ad5899.zip | |
Merge "Retrieve String/Class references from .data.bimg.rel.ro."
Diffstat (limited to 'compiler/optimizing/code_generator_arm64.h')
| -rw-r--r-- | compiler/optimizing/code_generator_arm64.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_arm64.h b/compiler/optimizing/code_generator_arm64.h index cb61b69609..b59ccd9034 100644 --- a/compiler/optimizing/code_generator_arm64.h +++ b/compiler/optimizing/code_generator_arm64.h @@ -832,6 +832,7 @@ class CodeGeneratorARM64 : public CodeGenerator { // Deduplication map for 64-bit literals, used for non-patchable method address or method code. Uint64ToLiteralMap uint64_literals_; // PC-relative method patch info for kBootImageLinkTimePcRelative/BootImageRelRo. + // Also used for type/string patches for kBootImageRelRo (same linker patch as for methods). ArenaDeque<PcRelativePatchInfo> boot_image_method_patches_; // PC-relative method patch info for kBssEntry. ArenaDeque<PcRelativePatchInfo> method_bss_entry_patches_; @@ -839,7 +840,7 @@ class CodeGeneratorARM64 : public CodeGenerator { ArenaDeque<PcRelativePatchInfo> boot_image_type_patches_; // PC-relative type patch info for kBssEntry. ArenaDeque<PcRelativePatchInfo> type_bss_entry_patches_; - // PC-relative String patch info; type depends on configuration (intern table or boot image PIC). + // PC-relative String patch info for kBootImageLinkTimePcRelative. ArenaDeque<PcRelativePatchInfo> boot_image_string_patches_; // PC-relative String patch info for kBssEntry. ArenaDeque<PcRelativePatchInfo> string_bss_entry_patches_; |