diff options
| author | 2015-12-10 23:55:53 +0000 | |
|---|---|---|
| committer | 2015-12-10 23:55:53 +0000 | |
| commit | 5cb6cf5b887b0c5ace6cf2cff3e2cbb5ec3a4a4f (patch) | |
| tree | 11190e0e396eb90facd92100cbed5b85b238d9ea /compiler/driver/compiler_driver.cc | |
| parent | e8f3f4ee29de6951a02d5a3c1c4204584eb1e2a3 (diff) | |
| parent | 2b895fd83371fb1a0cd75c7de3411cfb59f442c6 (diff) | |
Merge "Revert "ART: Check invoke-interface earlier in verifier"" am: 170e01a6b5
am: 2b895fd833
* commit '2b895fd83371fb1a0cd75c7de3411cfb59f442c6':
Revert "ART: Check invoke-interface earlier in verifier"
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 82af541765..0cad643641 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -1902,7 +1902,7 @@ class ResolveClassFieldsAndMethodsVisitor : public CompilationVisitor { } if (resolve_fields_and_methods) { while (it.HasNextDirectMethod()) { - ArtMethod* method = class_linker->ResolveMethod<ClassLinker::kNoICCECheckForCache>( + ArtMethod* method = class_linker->ResolveMethod( dex_file, it.GetMemberIndex(), dex_cache, class_loader, nullptr, it.GetMethodInvokeType(class_def)); if (method == nullptr) { @@ -1911,7 +1911,7 @@ class ResolveClassFieldsAndMethodsVisitor : public CompilationVisitor { it.Next(); } while (it.HasNextVirtualMethod()) { - ArtMethod* method = class_linker->ResolveMethod<ClassLinker::kNoICCECheckForCache>( + ArtMethod* method = class_linker->ResolveMethod( dex_file, it.GetMemberIndex(), dex_cache, class_loader, nullptr, it.GetMethodInvokeType(class_def)); if (method == nullptr) { |