diff options
| author | 2017-07-20 14:09:32 +0000 | |
|---|---|---|
| committer | 2017-07-20 14:09:32 +0000 | |
| commit | 331f4c4e287791611733120c1a1c2afd55ecdd65 (patch) | |
| tree | 1fcf7810c6c8e2df8b6191bb14a69084f3c7cf11 /compiler/driver/compiler_driver-inl.h | |
| parent | 13c8343a3394414c90f2fcd1e8efff70e7d2387e (diff) | |
| parent | ba118827465d12177f3996e50133960087b1c916 (diff) | |
Merge "ART: Change method lookup to be more consistent to JLS and the RI."
Diffstat (limited to 'compiler/driver/compiler_driver-inl.h')
| -rw-r--r-- | compiler/driver/compiler_driver-inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h index db95bd6e03..b04392918d 100644 --- a/compiler/driver/compiler_driver-inl.h +++ b/compiler/driver/compiler_driver-inl.h @@ -111,7 +111,7 @@ inline ArtMethod* CompilerDriver::ResolveMethod( InvokeType invoke_type) { DCHECK_EQ(class_loader.Get(), mUnit->GetClassLoader().Get()); ArtMethod* resolved_method = - mUnit->GetClassLinker()->ResolveMethod<ClassLinker::kForceICCECheck>( + mUnit->GetClassLinker()->ResolveMethod<ClassLinker::ResolveMode::kCheckICCEAndIAE>( *dex_cache->GetDexFile(), method_idx, dex_cache, class_loader, nullptr, invoke_type); if (UNLIKELY(resolved_method == nullptr)) { DCHECK(soa.Self()->IsExceptionPending()); |