From f79aa7fc107c661e5a6d6ffd2a33221864fa1fa3 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 4 Jul 2017 16:58:55 +0100 Subject: Small refactoring of field/method access checks. And some cleanup to reduce the size of the upcoming method resolution rewrite CL. Test: m test-art-host Test: testrunner.py --host Test: testrunner.py --host --interp-ac Bug: 62855082 Change-Id: I5bbf0a92d75fe9de6982b80280cd5877fcc37700 --- compiler/driver/compiler_driver-inl.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'compiler/driver/compiler_driver-inl.h') diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index a04349e392..db95bd6e03 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -103,16 +103,16 @@ inline std::pair CompilerDriver::IsFastInstanceField( } inline ArtMethod* CompilerDriver::ResolveMethod( - ScopedObjectAccess& soa, Handle dex_cache, - Handle class_loader, const DexCompilationUnit* mUnit, - uint32_t method_idx, InvokeType invoke_type, bool check_incompatible_class_change) { + ScopedObjectAccess& soa, + Handle dex_cache, + Handle class_loader, + const DexCompilationUnit* mUnit, + uint32_t method_idx, + InvokeType invoke_type) { DCHECK_EQ(class_loader.Get(), mUnit->GetClassLoader().Get()); ArtMethod* resolved_method = - check_incompatible_class_change - ? mUnit->GetClassLinker()->ResolveMethod( - *dex_cache->GetDexFile(), method_idx, dex_cache, class_loader, nullptr, invoke_type) - : mUnit->GetClassLinker()->ResolveMethod( - *dex_cache->GetDexFile(), method_idx, dex_cache, class_loader, nullptr, invoke_type); + mUnit->GetClassLinker()->ResolveMethod( + *dex_cache->GetDexFile(), method_idx, dex_cache, class_loader, nullptr, invoke_type); if (UNLIKELY(resolved_method == nullptr)) { DCHECK(soa.Self()->IsExceptionPending()); // Clean up any exception left by type resolution. -- cgit v1.2.3-59-g8ed1b