commit d930929be93798d790c91dd05adf2c038508f1b0
author Nicolas Geoffray <ngeoffray@google.com> Sat Oct 31 22:21:31 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Nov 02 13:45:30 2015 +0000
tree ef7a9b70e2e8f14ae2b49a07ca04b2fa1cee8496
parent 289c4e3a10acb6d0250dc25dd42465ca4d08c762

Fix inlining and lse bugs with unresolved access.

bug:25414532

Change-Id: I48b6660754774ea3e8a62a74175b1aa3728e0151

compiler/optimizing/load_store_elimination.cc

diff --git a/compiler/optimizing/load_store_elimination.cc b/compiler/optimizing/load_store_elimination.cc
index 90f28e5..6fbb682 100644
--- a/compiler/optimizing/load_store_elimination.cc
+++ b/compiler/optimizing/load_store_elimination.cc
@@ -59,7 +59,7 @@
           (use->IsInstanceFieldSet() && (reference_ == use->InputAt(1))) ||
           (use->IsUnresolvedInstanceFieldSet() && (reference_ == use->InputAt(1))) ||
           (use->IsStaticFieldSet() && (reference_ == use->InputAt(1))) ||
-          (use->IsUnresolvedStaticFieldSet() && (reference_ == use->InputAt(1))) ||
+          (use->IsUnresolvedStaticFieldSet() && (reference_ == use->InputAt(0))) ||
           (use->IsArraySet() && (reference_ == use->InputAt(2)))) {
         // reference_ is merged to a phi, passed to a callee, or stored to heap.
         // reference_ isn't the only name that can refer to its value anymore.