commit 5d7b7f81ed5455893f984752c00571ef27cc97c5
author Nicolas Geoffray <ngeoffray@google.com> Tue Apr 28 00:52:43 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Fri May 01 10:07:52 2015 +0100
tree a497582ae4ab5a69ba7035c1f95af0ee0f0b025b
parent 01ce498499eed47e87fceb8736d26fe49b2a4346

Update the remaining input index of phis after deleting an input.

bug:20715803
bug:20690906

Change-Id: Iaf08f0c30d629e766be2b04815dc3e38b6e7ff35

compiler/optimizing/nodes.cc

diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index f07f4c7..d3ee770 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -712,6 +712,9 @@
 void HPhi::RemoveInputAt(size_t index) {
   RemoveAsUserOfInput(index);
   inputs_.DeleteAt(index);
+  for (size_t i = index, e = InputCount(); i < e; ++i) {
+    InputRecordAt(i).GetUseNode()->SetIndex(i);
+  }
 }
 
 #define DEFINE_ACCEPT(name, super)                                             \