commit b0b051ad6c9fab511346882650d5d689f805a980
author Mingyao Yang <mingyao@google.com> Thu Nov 17 09:04:53 2016 -0800
committer Mingyao Yang <mingyao@google.com> Mon Dec 19 14:26:33 2016 -0800
tree fe02f128018f1aa55be5c0425295ae0ef670de2c
parent d54f43ca39dfa92f08c2d760123f185f0f65fb86

CHA guard optimization (elimination/hoisting).

Test: manual by checking the dump-cfg output.

Change-Id: I254e168b9a85d2d3d23e02eea7e129c1bc9ab920

compiler/optimizing/nodes.cc

diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index cabc078..b9e284f 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -1357,7 +1357,9 @@
 void HInstruction::MoveBefore(HInstruction* cursor) {
   DCHECK(!IsPhi());
   DCHECK(!IsControlFlow());
-  DCHECK(CanBeMoved());
+  DCHECK(CanBeMoved() ||
+         // HShouldDeoptimizeFlag can only be moved by CHAGuardOptimization.
+         IsShouldDeoptimizeFlag());
   DCHECK(!cursor->IsPhi());
 
   next_->previous_ = previous_;