Merge "Revert "Temporary fix for bad LIR generation in GenInlinedGet.""

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;