From ba201d247dbcf4c30a9c05d29ea51fe8639732e4 Mon Sep 17 00:00:00 2001 From: Almaz Mingaleev Date: Tue, 26 Nov 2024 10:40:13 +0000 Subject: 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 --- compiler/linker/linker_patch.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/linker/linker_patch.h') 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_; } -- cgit v1.2.3-59-g8ed1b