diff options
| author | Mingyao Yang <mingyao@google.com> | 2015-04-01 14:03:04 -0700 |
|---|---|---|
| committer | Mingyao Yang <mingyao@google.com> | 2015-04-01 14:05:13 -0700 |
| commit | d43b3ac88cd46b8815890188c9c2b9a3f1564648 (patch) | |
| tree | 6c599c3f40d57e92786bd7f41c0541d9eaa2643b /compiler/optimizing/prepare_for_register_allocation.cc | |
| parent | a109632b240f3c9355ca95500f6f48e4478e3c51 (diff) | |
| download | art-d43b3ac88cd46b8815890188c9c2b9a3f1564648.tar.gz art-d43b3ac88cd46b8815890188c9c2b9a3f1564648.tar.bz2 art-d43b3ac88cd46b8815890188c9c2b9a3f1564648.zip | |
Revert "Revert "Deoptimization-based bce.""
This reverts commit 0ba627337274ccfb8c9cb9bf23fffb1e1b9d1430.
Change-Id: I1ca10d15bbb49897a0cf541ab160431ec180a006
Diffstat (limited to 'compiler/optimizing/prepare_for_register_allocation.cc')
| -rw-r--r-- | compiler/optimizing/prepare_for_register_allocation.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/prepare_for_register_allocation.cc b/compiler/optimizing/prepare_for_register_allocation.cc index 0161984a13..f5d8d82571 100644 --- a/compiler/optimizing/prepare_for_register_allocation.cc +++ b/compiler/optimizing/prepare_for_register_allocation.cc @@ -64,7 +64,7 @@ void PrepareForRegisterAllocation::VisitCondition(HCondition* condition) { needs_materialization = true; } else { HInstruction* user = condition->GetUses().GetFirst()->GetUser(); - if (!user->IsIf()) { + if (!user->IsIf() && !user->IsDeoptimize()) { needs_materialization = true; } else { // TODO: if there is no intervening instructions with side-effect between this condition |