diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-12-11 14:24:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-11 14:24:43 +0000 |
| commit | 0f13269734be07b5869005952a3cb91b0b34b73d (patch) | |
| tree | 026115080385984050674455e54721f00cb5df10 /compiler/optimizing/instruction_builder.cc | |
| parent | 768bd97cede0a6de738936aad738f8bb0099322e (diff) | |
| parent | a64b52deb0c792b8a0d47546edb8a2f8a7816c33 (diff) | |
Merge changes I8c4cec43,I00634b89,I0579db64
* changes:
Do not pass DexFile to ClassLinker::Lookup/ResolveString().
Do not pass DexFile to ClassLinker::ResolveMethodType().
Do not pass DexFile to ClassLinker::ResolveField*().
Diffstat (limited to 'compiler/optimizing/instruction_builder.cc')
| -rw-r--r-- | compiler/optimizing/instruction_builder.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 4485f064c6..bce4de32d5 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -1484,8 +1484,7 @@ ArtField* HInstructionBuilder::ResolveField(uint16_t field_idx, bool is_static, Handle<mirror::ClassLoader> class_loader = dex_compilation_unit_->GetClassLoader(); Handle<mirror::Class> compiling_class(hs.NewHandle(GetCompilingClass())); - ArtField* resolved_field = class_linker->ResolveField(*dex_compilation_unit_->GetDexFile(), - field_idx, + ArtField* resolved_field = class_linker->ResolveField(field_idx, dex_compilation_unit_->GetDexCache(), class_loader, is_static); |