diff options
| author | Aart Bik <ajcbik@google.com> | 2015-10-19 18:42:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-19 18:42:59 +0000 |
| commit | f69f56e7d4a1e31dfce2a77558c9b7047f82092b (patch) | |
| tree | 30c394773a7544bf5296138f8e923b5d73dc5cb8 /compiler/optimizing/code_generator_arm.cc | |
| parent | a31e53f83cf7c773bd506bb4b7d28f73e92a391a (diff) | |
| parent | bb245d199a5240b4c520263fd2c8c10dba79eadc (diff) | |
Merge "Generalize codegen and simplification of deopt."
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 3e6cad83fa..92a5878476 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -1376,8 +1376,7 @@ void LocationsBuilderARM::VisitDeoptimize(HDeoptimize* deoptimize) { LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(deoptimize, LocationSummary::kCallOnSlowPath); HInstruction* cond = deoptimize->InputAt(0); - DCHECK(cond->IsCondition()); - if (cond->AsCondition()->NeedsMaterialization()) { + if (!cond->IsCondition() || cond->AsCondition()->NeedsMaterialization()) { locations->SetInAt(0, Location::RequiresRegister()); } } |