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
diff --git a/compiler/optimizing/code_generator_mips64.h b/compiler/optimizing/code_generator_mips64.h
index 52f3a62..15667e0 100644
--- a/compiler/optimizing/code_generator_mips64.h
+++ b/compiler/optimizing/code_generator_mips64.h
@@ -663,8 +663,7 @@
// Deduplication map for 64-bit literals, used for non-patchable method address or method code
// address.
Uint64ToLiteralMap uint64_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_;
@@ -676,8 +675,9 @@
ArenaDeque<PcRelativePatchInfo> boot_image_string_patches_;
// PC-relative type 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.
StringToLiteralMap jit_string_patches_;