diff options
| author | Vladimir Marko <vmarko@google.com> | 2019-07-08 15:45:19 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2019-07-16 08:22:46 +0000 |
| commit | 2d06e029b1c84916154b5960d2acd1c84706dc04 (patch) | |
| tree | 31dca979adebd2ed3a058b23a12a3c91ce2874d1 /compiler/optimizing/code_generator_mips.h | |
| parent | 7cde45800e21c270945b43a8989334ffc7422c32 (diff) | |
Clean up linker patches in codegens.
In preparation for introducing boot image extension, make
sure that we can use both kBootImageLinkTimePcRelative and
kBootImageRelRo load kinds at the same time.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: aosp_taimen-userdebug boots
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Change-Id: I340f2d7d19e1c20699b37b0304d2e487d497da98
Diffstat (limited to 'compiler/optimizing/code_generator_mips.h')
| -rw-r--r-- | compiler/optimizing/code_generator_mips.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/optimizing/code_generator_mips.h b/compiler/optimizing/code_generator_mips.h index 50807310b6..e287588386 100644 --- a/compiler/optimizing/code_generator_mips.h +++ b/compiler/optimizing/code_generator_mips.h @@ -698,8 +698,7 @@ class CodeGeneratorMIPS : public CodeGenerator { // Deduplication map for 32-bit literals, used for non-patchable boot image addresses. Uint32ToLiteralMap uint32_literals_; - // PC-relative method patch info for kBootImageLinkTimePcRelative/kBootImageRelRo. - // Also used for type/string patches for kBootImageRelRo (same linker patch as for methods). + // PC-relative method patch info for kBootImageLinkTimePcRelative. ArenaDeque<PcRelativePatchInfo> boot_image_method_patches_; // PC-relative method patch info for kBssEntry. ArenaDeque<PcRelativePatchInfo> method_bss_entry_patches_; @@ -711,8 +710,9 @@ class CodeGeneratorMIPS : public CodeGenerator { ArenaDeque<PcRelativePatchInfo> boot_image_string_patches_; // PC-relative String patch info for kBssEntry. ArenaDeque<PcRelativePatchInfo> string_bss_entry_patches_; - // PC-relative patch info for IntrinsicObjects. - ArenaDeque<PcRelativePatchInfo> boot_image_intrinsic_patches_; + // PC-relative patch info for IntrinsicObjects for the boot image, + // and for method/type/string patches for kBootImageRelRo otherwise. + ArenaDeque<PcRelativePatchInfo> boot_image_other_patches_; // Patches for string root accesses in JIT compiled code. ArenaDeque<JitPatchInfo> jit_string_patches_; |