diff options
| author | 2015-12-08 22:33:23 +0000 | |
|---|---|---|
| committer | 2015-12-08 22:33:23 +0000 | |
| commit | eb5ddd7b02ce2d25d4f28f85a13aac628526e1c1 (patch) | |
| tree | 8f655b382e73222e70e30daaeedc3999014aa7ae /compiler/driver/compiler_driver.cc | |
| parent | 2433d4e17c3006b8262a0d9421e201fc84777208 (diff) | |
| parent | dae24142127c64551142a50423085aabdb0a6060 (diff) | |
Merge "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 9d3af1681a..a05105b84e 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( + ArtMethod* method = class_linker->ResolveMethod<ClassLinker::kNoICCECheckForCache>( 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( + ArtMethod* method = class_linker->ResolveMethod<ClassLinker::kNoICCECheckForCache>( dex_file, it.GetMemberIndex(), dex_cache, class_loader, nullptr, it.GetMethodInvokeType(class_def)); if (method == nullptr) { |