From b63adc919ba9a53f4fbad476356c702845821149 Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Mon, 24 Jun 2024 08:02:27 +0000 Subject: Revert^3 "x86_64: Add JIT support for LoadMethodType." This reverts commit d92a43f4310e2d634d6e8f24103fc1e27557d784. Reason for revert: Failing 979-const-method-handle https://ci.chromium.org/ui/p/art/builders/ci/host-x86_64-cms/10095/overview Change-Id: I9b44d8cc66e98db074edfa90ce2ebab087e4b115 --- compiler/optimizing/instruction_builder.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing/instruction_builder.cc') diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index c97c78ca17..3a64769a8b 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -2720,10 +2720,9 @@ 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); - HSharpening::ProcessLoadMethodType(load_method_type, - code_generator_, - *dex_compilation_unit_, - graph_->GetHandleCache()->GetHandles()); + if (!code_generator_->GetCompilerOptions().IsJitCompiler()) { + load_method_type->SetLoadKind(HLoadMethodType::LoadKind::kBssEntry); + } AppendInstruction(load_method_type); } -- cgit v1.2.3-59-g8ed1b