diff options
| author | 2024-11-26 10:40:13 +0000 | |
|---|---|---|
| committer | 2024-12-09 08:05:53 +0000 | |
| commit | ba201d247dbcf4c30a9c05d29ea51fe8639732e4 (patch) | |
| tree | adeceded6df7783b5ec66b3e99be0827ccb29281 /dex2oat | |
| parent | 1be926562ae7f1d28f2d4504aee3a0eca9dcba17 (diff) | |
Revert^2 "arm64: Store resolved MethodType-s in .bss."
This reverts commit fad4678f3ae48d84b7ed1c842b03a023e4f2cb37.
Bug: 380651440
bug: 297147201
Test: atest CtsLibcoreOjTestCases on a redfin device flashed
Test: with ab/12108082: test crashes w/o WriteBarrier line
Test: and passes w/ it.
Change-Id: Ibdfc090e3c2b693c1bb3b160a64c9f94448e18ec
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/linker/arm64/relative_patcher_arm64.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dex2oat/linker/arm64/relative_patcher_arm64.cc b/dex2oat/linker/arm64/relative_patcher_arm64.cc index ed700d0fd7..79fcd18b00 100644 --- a/dex2oat/linker/arm64/relative_patcher_arm64.cc +++ b/dex2oat/linker/arm64/relative_patcher_arm64.cc @@ -281,7 +281,8 @@ void Arm64RelativePatcher::PatchPcRelativeReference(std::vector<uint8_t>* code, patch.GetType() == LinkerPatch::Type::kTypeBssEntry || patch.GetType() == LinkerPatch::Type::kPublicTypeBssEntry || patch.GetType() == LinkerPatch::Type::kPackageTypeBssEntry || - patch.GetType() == LinkerPatch::Type::kStringBssEntry) << patch.GetType(); + patch.GetType() == LinkerPatch::Type::kStringBssEntry || + patch.GetType() == LinkerPatch::Type::kMethodTypeBssEntry) << patch.GetType(); DCHECK_EQ(insn & 0xbfbffc00, 0xb9000000) << std::hex << insn; } if (kIsDebugBuild) { |