diff options
| author | 2024-05-10 07:50:01 +0000 | |
|---|---|---|
| committer | 2024-05-10 08:54:41 +0000 | |
| commit | 7929d1d111e7cc0a2025b97f59e7e04ea09b3ff4 (patch) | |
| tree | 693339a00e30a978c364543ad2d0e30e11f5ff3f /compiler/optimizing/optimizing_compiler.cc | |
| parent | dbef48883e284def3e12d1ef69480d642d3b280f (diff) | |
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
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index a75ac9239b..45d534a9ec 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -1183,14 +1183,14 @@ CompiledMethod* OptimizingCompiler::JniCompile(uint32_t access_flags, const CompilerOptions& compiler_options = GetCompilerOptions(); if (compiler_options.IsBootImage()) { ScopedObjectAccess soa(Thread::Current()); - VariableSizedHandleScope handles(soa.Self()); - ScopedNullHandle<mirror::ClassLoader> class_loader; // null means boot class path loader. - ArtMethod* method = - runtime->GetClassLinker()->LookupResolvedMethod(method_idx, dex_cache, class_loader); + ArtMethod* method = runtime->GetClassLinker()->LookupResolvedMethod( + method_idx, dex_cache.Get(), /*class_loader=*/ nullptr); // Try to compile a fully intrinsified implementation. Do not try to do this for // signature polymorphic methods as the InstructionBuilder cannot handle them; // and it would be useless as they always have a slow path for type conversions. if (method != nullptr && UNLIKELY(method->IsIntrinsic()) && !method->IsSignaturePolymorphic()) { + VariableSizedHandleScope handles(soa.Self()); + ScopedNullHandle<mirror::ClassLoader> class_loader; // null means boot class path loader. Handle<mirror::Class> compiling_class = handles.NewHandle(method->GetDeclaringClass()); DexCompilationUnit dex_compilation_unit( class_loader, |