diff options
| author | 2015-12-10 13:37:39 -0800 | |
|---|---|---|
| committer | 2015-12-10 13:37:39 -0800 | |
| commit | 2b895fd83371fb1a0cd75c7de3411cfb59f442c6 (patch) | |
| tree | 4ae775d15f51efb704ca5b00a2ee4b6fb6615812 /compiler/driver/compiler_driver.cc | |
| parent | 6e0e9c77b0b6109605eef6e5ea2c2b3de30a6ffc (diff) | |
| parent | 170e01a6b59b3242a5afc76c3a03c00ce288150f (diff) | |
Merge "Revert "ART: Check invoke-interface earlier in verifier""
am: 170e01a6b5
* commit '170e01a6b59b3242a5afc76c3a03c00ce288150f':
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) { |