From 7929d1d111e7cc0a2025b97f59e7e04ea09b3ff4 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 10 May 2024 07:50:01 +0000 Subject: Revert "Workaround for b/336842546" This reverts commit a4ac01044c50f4da02c40b8da5520d2eb65b41d9. Bug: 336842546 Bug: 73760543 Reason for revert: Fix for the bug has been submitted. CL also has an issue with thread suspension. Change-Id: I06785d58f3e473a13e18876e481fff9118851f53 --- compiler/dex/inline_method_analyser.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'compiler/dex/inline_method_analyser.cc') diff --git a/compiler/dex/inline_method_analyser.cc b/compiler/dex/inline_method_analyser.cc index 0567fe12c8..85cf83c099 100644 --- a/compiler/dex/inline_method_analyser.cc +++ b/compiler/dex/inline_method_analyser.cc @@ -147,11 +147,8 @@ ArtMethod* GetTargetConstructor(ArtMethod* method, const Instruction* invoke_dir accessor.RegistersSize() - accessor.InsSize()); } uint32_t method_index = invoke_direct->VRegB_35c(); - StackHandleScope<2> hs(Thread::Current()); - Handle h_dex_cache = hs.NewHandle(method->GetDexCache()); - Handle h_class_loader = hs.NewHandle(method->GetClassLoader()); ArtMethod* target_method = Runtime::Current()->GetClassLinker()->LookupResolvedMethod( - method_index, h_dex_cache, h_class_loader); + method_index, method->GetDexCache(), method->GetClassLoader()); if (kIsDebugBuild && target_method != nullptr) { CHECK(!target_method->IsStatic()); CHECK(target_method->IsConstructor()); -- cgit v1.2.3-59-g8ed1b