summaryrefslogtreecommitdiff
path: root/compiler/linker/linker_patch.h
diff options
context:
space:
mode:
author Almaz Mingaleev <mingaleev@google.com> 2024-11-26 10:40:13 +0000
committer Almaz Mingaleev <mingaleev@google.com> 2024-12-09 08:05:53 +0000
commitba201d247dbcf4c30a9c05d29ea51fe8639732e4 (patch)
treeadeceded6df7783b5ec66b3e99be0827ccb29281 /compiler/linker/linker_patch.h
parent1be926562ae7f1d28f2d4504aee3a0eca9dcba17 (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 'compiler/linker/linker_patch.h')
-rw-r--r--compiler/linker/linker_patch.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/linker/linker_patch.h b/compiler/linker/linker_patch.h
index 4eb0782d52..d73d88dcb2 100644
--- a/compiler/linker/linker_patch.h
+++ b/compiler/linker/linker_patch.h
@@ -295,7 +295,8 @@ class LinkerPatch {
patch_type_ == Type::kPublicTypeBssEntry ||
patch_type_ == Type::kPackageTypeBssEntry ||
patch_type_ == Type::kStringRelative ||
- patch_type_ == Type::kStringBssEntry);
+ patch_type_ == Type::kStringBssEntry ||
+ patch_type_ == Type::kMethodTypeBssEntry);
return pc_insn_offset_;
}