commit 28d332c720cb7c9c0163c4844bb0c1a2a067470e
author Jeff Hao <jeffhao@google.com> Tue May 12 21:46:16 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 12 21:46:17 2015 +0000
tree d06a72736529db0a16988588022ea084b362472c
parent 85c63973b00b6c091f9b380e99733dbfad6b5874
parent da3749ef05977911cdc059b7daa53d5799c7acaf

Merge "Add test for String init called from unresolvable class."

compiler/dex/gvn_dead_code_elimination.cc

diff --git a/compiler/dex/gvn_dead_code_elimination.cc b/compiler/dex/gvn_dead_code_elimination.cc
index 6e1e414..915fbcd 100644
--- a/compiler/dex/gvn_dead_code_elimination.cc
+++ b/compiler/dex/gvn_dead_code_elimination.cc
@@ -340,7 +340,8 @@
       DCHECK_EQ(vreg_high_words_.IsBitSet(v_reg), v_reg == data->vreg_def + 1);
       if (data->vreg_def == v_reg && data->low_def_over_high_word) {
         vreg_high_words_.SetBit(v_reg);
-      } else if (data->vreg_def != v_reg && data->high_def_over_low_word) {
+      } else if (data->vreg_def != v_reg &&
+          (data->high_def_over_low_word || data->prev_value_high.value == kNoValue)) {
         vreg_high_words_.ClearBit(v_reg);
       }
     } else {