From 8b20f88b0a8d1b374dd5eaae289d19734c77b8f8 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 19 Jun 2015 16:17:05 +0100 Subject: Be careful with predecessor/successor index. When we simplify the CFG, we must preserve things that were already simplified. For example, the index in the predecessor list or successor list of a block must be preserved for ensuring the first block is a loop pre header. bug:21867463 Change-Id: Ic3fcb3eb2c3fb109d8a57ee2a6b6d4d65fdb9410 --- compiler/optimizing/constant_folding_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/optimizing/constant_folding_test.cc') diff --git a/compiler/optimizing/constant_folding_test.cc b/compiler/optimizing/constant_folding_test.cc index 422223f5e0..11f6362294 100644 --- a/compiler/optimizing/constant_folding_test.cc +++ b/compiler/optimizing/constant_folding_test.cc @@ -627,8 +627,8 @@ TEST(ConstantFolding, ConstantCondition) { " 9: If(8)\n" "BasicBlock 2, pred: 1, succ: 3\n" " 12: Goto 3\n" - "BasicBlock 3, pred: 2, 5, succ: 4\n" - " 22: Phi(3, 5) [15]\n" + "BasicBlock 3, pred: 5, 2, succ: 4\n" + " 22: Phi(5, 3) [15]\n" " 15: Add(22, 3)\n" " 17: ReturnVoid\n" "BasicBlock 4, pred: 3\n" -- cgit v1.2.3-59-g8ed1b