diff options
| author | 2015-12-10 23:55:53 +0000 | |
|---|---|---|
| committer | 2015-12-10 23:55:53 +0000 | |
| commit | 5cb6cf5b887b0c5ace6cf2cff3e2cbb5ec3a4a4f (patch) | |
| tree | 11190e0e396eb90facd92100cbed5b85b238d9ea /compiler/optimizing/builder.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/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index e1404ce59c..b156d136ca 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -744,7 +744,7 @@ ArtMethod* HGraphBuilder::ResolveMethod(uint16_t method_idx, InvokeType invoke_t soa.Decode<mirror::ClassLoader*>(dex_compilation_unit_->GetClassLoader()))); Handle<mirror::Class> compiling_class(hs.NewHandle(GetCompilingClass())); - ArtMethod* resolved_method = class_linker->ResolveMethod<ClassLinker::kForceICCECheck>( + ArtMethod* resolved_method = class_linker->ResolveMethod( *dex_compilation_unit_->GetDexFile(), method_idx, dex_compilation_unit_->GetDexCache(), |