From 55f1fed0c404146429d38c41b9dd1647db238ba5 Mon Sep 17 00:00:00 2001 From: Almaz Mingaleev Date: Fri, 12 Apr 2024 07:15:38 +0000 Subject: Revert^4 "x86_64: Add JIT support for LoadMethodType." This reverts commit b63adc919ba9a53f4fbad476356c702845821149. Bringing back map from ArtMethod to code pointers. Bug: 297147201 Test: CtsPerfettoTestCases Test: ./art/test/testrunner/testrunner.py --host --64 --jit -b Test: ./art/test/testrunner/testrunner.py --host --64 --jit --cms -b Test: ./art/test/testrunner/testrunner.py --host --64 -b Test: ./art/test.py --host -b Change-Id: I6a1c50598ec878393edf8ef895274da79d4ab42d --- compiler/optimizing/instruction_builder.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'compiler/optimizing/instruction_builder.cc') diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 3a64769a8b..c97c78ca17 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -2720,9 +2720,10 @@ void HInstructionBuilder::BuildLoadMethodType(dex::ProtoIndex proto_index, uint3 const DexFile& dex_file = *dex_compilation_unit_->GetDexFile(); HLoadMethodType* load_method_type = new (allocator_) HLoadMethodType(graph_->GetCurrentMethod(), proto_index, dex_file, dex_pc); - if (!code_generator_->GetCompilerOptions().IsJitCompiler()) { - load_method_type->SetLoadKind(HLoadMethodType::LoadKind::kBssEntry); - } + HSharpening::ProcessLoadMethodType(load_method_type, + code_generator_, + *dex_compilation_unit_, + graph_->GetHandleCache()->GetHandles()); AppendInstruction(load_method_type); } -- cgit v1.2.3-59-g8ed1b