diff options
| author | Fred Shih <ffred@google.com> | 2014-08-06 10:42:17 -0700 |
|---|---|---|
| committer | Fred Shih <ffred@google.com> | 2014-08-06 13:46:53 -0700 |
| commit | b9dbab627bdc3570d5f41cfd6de80ff3b70e1783 (patch) | |
| tree | 6eb8c670138bb7dceb215aca1cac7cdfdcca9ed3 /compiler/dex/quick/gen_invoke.cc | |
| parent | 4853f940efe0aaccf83a4af55a8dd640d8ef7274 (diff) | |
| download | android_art-b9dbab627bdc3570d5f41cfd6de80ff3b70e1783.tar.gz android_art-b9dbab627bdc3570d5f41cfd6de80ff3b70e1783.tar.bz2 android_art-b9dbab627bdc3570d5f41cfd6de80ff3b70e1783.zip | |
Revert "Temporary fix for bad LIR generation in GenInlinedGet."
This reverts commit eb76e11d836ea953b4e40a28e3e69d3b0f4c86fa.
Bug: 16656190
Change-Id: Ie2dd58436b28e79214ef3a7c7651f16fe46a60e8
Diffstat (limited to 'compiler/dex/quick/gen_invoke.cc')
| -rwxr-xr-x | compiler/dex/quick/gen_invoke.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc index e70b0c5a48..8e7f6a6c58 100755 --- a/compiler/dex/quick/gen_invoke.cc +++ b/compiler/dex/quick/gen_invoke.cc @@ -1166,14 +1166,8 @@ bool Mir2Lir::GenInlinedGet(CallInfo* info) { } if (use_direct_type_ptr) { LoadConstant(reg_class, direct_type_ptr); - } else if (cu_->dex_file == old_dex) { - // TODO: Bug 16656190 If cu_->dex_file != old_dex the patching could retrieve the wrong class - // since the load class is indexed only by the type_idx. We should include which dex file a - // class is from in the LoadClassType LIR. - LoadClassType(type_idx, kArg1); } else { - cu_->dex_file = old_dex; - return false; + LoadClassType(type_idx, kArg1); } cu_->dex_file = old_dex; |