commit d29c27ff21b8cce7c06a4aff1bd382305df4d381
author David Brazdil <dbrazdil@google.com> Wed Apr 01 16:07:58 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 01 16:07:59 2015 +0000
tree 28b2cb99d7095a217c4321c9753fb68b434f3718
parent 04914da1385564fca1990863d9a2690af10e1946
parent 0534beb324a74a8c3668c46eaf3d1a4633881b3a

Merge "ART: Materialize constants on environment use"

compiler/optimizing/prepare_for_register_allocation.cc

diff --git a/compiler/optimizing/prepare_for_register_allocation.cc b/compiler/optimizing/prepare_for_register_allocation.cc
index 2d9a2bf..0161984 100644
--- a/compiler/optimizing/prepare_for_register_allocation.cc
+++ b/compiler/optimizing/prepare_for_register_allocation.cc
@@ -60,7 +60,7 @@
 
 void PrepareForRegisterAllocation::VisitCondition(HCondition* condition) {
   bool needs_materialization = false;
-  if (!condition->GetUses().HasOnlyOneUse()) {
+  if (!condition->GetUses().HasOnlyOneUse() || !condition->GetEnvUses().IsEmpty()) {
     needs_materialization = true;
   } else {
     HInstruction* user = condition->GetUses().GetFirst()->GetUser();