diff options
| author | 2015-12-10 15:58:19 -0800 | |
|---|---|---|
| committer | 2015-12-10 15:58:19 -0800 | |
| commit | 682857fece0425362c4fb55da611e7144c9ec092 (patch) | |
| tree | 68f85fecbbc6c13ae4ac8d80768fae4f054a7ba0 /compiler/driver/compiler_driver.cc | |
| parent | 99dd068563bbd460f5ba8c81249e6e55e794de5e (diff) | |
| parent | 748047de833061466e230baf374480a147568f73 (diff) | |
Merge "ART: Stash a resolved method late in the verifier"
am: 748047de83
* commit '748047de833061466e230baf374480a147568f73':
ART: Stash a resolved method late in the 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 0cad643641..82af541765 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) { |