Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"
Bug: 27995065
This reverts commit e3ff7b293be2a6791fe9d135d660c0cffe4bd73f.
Change-Id: I5363c7ce18f47fd422c15eed5423a345a57249d8
diff --git a/compiler/optimizing/pretty_printer_test.cc b/compiler/optimizing/pretty_printer_test.cc
index 951cdfb..a444688 100644
--- a/compiler/optimizing/pretty_printer_test.cc
+++ b/compiler/optimizing/pretty_printer_test.cc
@@ -104,9 +104,9 @@
"BasicBlock 1, pred: 0, succ: 3\n"
" 2: Goto 3\n"
"BasicBlock 2, pred: 3, succ: 4\n"
- " 4: ReturnVoid\n"
+ " 3: ReturnVoid\n"
"BasicBlock 3, pred: 1, succ: 2\n"
- " 3: Goto 2\n"
+ " 4: Goto 2\n"
"BasicBlock 4, pred: 2\n"
" 5: Exit\n";
@@ -135,10 +135,10 @@
TEST_F(PrettyPrinterTest, CFG4) {
const char* expected =
"BasicBlock 0, succ: 3\n"
- " 1: SuspendCheck\n"
- " 2: Goto 3\n"
+ " 2: SuspendCheck\n"
+ " 3: Goto 3\n"
"BasicBlock 1, pred: 3, 1, succ: 1\n"
- " 3: SuspendCheck\n"
+ " 1: SuspendCheck\n"
" 4: Goto 1\n"
"BasicBlock 3, pred: 0, succ: 1\n"
" 0: Goto 1\n";
@@ -176,18 +176,18 @@
TEST_F(PrettyPrinterTest, CFG6) {
const char* expected =
"BasicBlock 0, succ: 1\n"
- " 3: IntConstant [4, 4]\n"
- " 1: SuspendCheck\n"
- " 2: Goto 1\n"
+ " 4: IntConstant [8, 8]\n"
+ " 2: SuspendCheck\n"
+ " 3: Goto 1\n"
"BasicBlock 1, pred: 0, succ: 5, 2\n"
- " 4: Equal(3, 3) [5]\n"
- " 5: If(4)\n"
+ " 8: Equal(4, 4) [9]\n"
+ " 9: If(8)\n"
"BasicBlock 2, pred: 1, succ: 3\n"
- " 6: Goto 3\n"
+ " 10: Goto 3\n"
"BasicBlock 3, pred: 5, 2, succ: 4\n"
- " 7: ReturnVoid\n"
+ " 11: ReturnVoid\n"
"BasicBlock 4, pred: 3\n"
- " 8: Exit\n"
+ " 12: Exit\n"
"BasicBlock 5, pred: 1, succ: 3\n"
" 0: Goto 3\n";
@@ -203,17 +203,17 @@
TEST_F(PrettyPrinterTest, CFG7) {
const char* expected =
"BasicBlock 0, succ: 1\n"
- " 4: IntConstant [5, 5]\n"
- " 2: SuspendCheck\n"
- " 3: Goto 1\n"
+ " 6: IntConstant [10, 10]\n"
+ " 4: SuspendCheck\n"
+ " 5: Goto 1\n"
"BasicBlock 1, pred: 0, succ: 5, 6\n"
- " 5: Equal(4, 4) [6]\n"
- " 6: If(5)\n"
+ " 10: Equal(6, 6) [11]\n"
+ " 11: If(10)\n"
"BasicBlock 2, pred: 6, 3, succ: 3\n"
- " 11: Goto 3\n"
+ " 12: Goto 3\n"
"BasicBlock 3, pred: 5, 2, succ: 2\n"
- " 8: SuspendCheck\n"
- " 9: Goto 2\n"
+ " 2: SuspendCheck\n"
+ " 13: Goto 2\n"
"BasicBlock 5, pred: 1, succ: 3\n"
" 0: Goto 3\n"
"BasicBlock 6, pred: 1, succ: 2\n"
@@ -231,13 +231,13 @@
TEST_F(PrettyPrinterTest, IntConstant) {
const char* expected =
"BasicBlock 0, succ: 1\n"
- " 2: IntConstant\n"
- " 0: SuspendCheck\n"
- " 1: Goto 1\n"
+ " 3: IntConstant\n"
+ " 1: SuspendCheck\n"
+ " 2: Goto 1\n"
"BasicBlock 1, pred: 0, succ: 2\n"
- " 3: ReturnVoid\n"
+ " 5: ReturnVoid\n"
"BasicBlock 2, pred: 1\n"
- " 4: Exit\n";
+ " 6: Exit\n";
const uint16_t data[] = ONE_REGISTER_CODE_ITEM(
Instruction::CONST_4 | 0 | 0,