diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-09-18 16:46:20 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-09-18 16:46:20 +0100 |
| commit | c83d441a722f0afb510c9cd0e69e09d65652143c (patch) | |
| tree | 68ec67c519cfc3b4eb6e4bbefe2f2fa88a185c22 | |
| parent | aaadf03fd8d9f6a50a3b8b4b916e7cc161e4edba (diff) | |
| download | art-c83d441a722f0afb510c9cd0e69e09d65652143c.zip art-c83d441a722f0afb510c9cd0e69e09d65652143c.tar.gz art-c83d441a722f0afb510c9cd0e69e09d65652143c.tar.bz2 | |
Fix a lint error and update a test after the phi fix.
Change-Id: I6e9ab2a8300c2493a8d3e93ab4ced3d7c9552fc5
| -rw-r--r-- | compiler/optimizing/nodes.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/ssa_test.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index a4c8ce5..aae65ec 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -339,7 +339,7 @@ class HBasicBlock : public ArenaObject { } void SwapPredecessors() { - DCHECK(predecessors_.Size() == 2); + DCHECK_EQ(predecessors_.Size(), 2u); HBasicBlock* temp = predecessors_.Get(0); predecessors_.Put(0, predecessors_.Get(1)); predecessors_.Put(1, temp); diff --git a/compiler/optimizing/ssa_test.cc b/compiler/optimizing/ssa_test.cc index 99fd9eb..ad3b205 100644 --- a/compiler/optimizing/ssa_test.cc +++ b/compiler/optimizing/ssa_test.cc @@ -207,8 +207,8 @@ TEST(SsaTest, Loop1) { "BasicBlock 2, pred: 3, 6, succ: 3\n" " 4: Phi(6, 0) [6]\n" " 5: Goto\n" - "BasicBlock 3, pred: 2, 5, succ: 2\n" - " 6: Phi(4, 0) [4]\n" + "BasicBlock 3, pred: 5, 2, succ: 2\n" + " 6: Phi(0, 4) [4]\n" " 7: Goto\n" "BasicBlock 4\n" // Synthesized blocks to avoid critical edge. @@ -298,8 +298,8 @@ TEST(SsaTest, Loop4) { " 2: Goto\n" "BasicBlock 1, pred: 0, succ: 4\n" " 3: Goto\n" - "BasicBlock 2, pred: 3, 4, succ: 5, 3\n" - " 4: Phi(1, 0) [9, 5, 5]\n" + "BasicBlock 2, pred: 4, 3, succ: 5, 3\n" + " 4: Phi(0, 1) [9, 5, 5]\n" " 5: Equal(4, 4) [6]\n" " 6: If(5)\n" "BasicBlock 3, pred: 2, succ: 2\n" @@ -339,8 +339,8 @@ TEST(SsaTest, Loop5) { " 6: Goto\n" "BasicBlock 3, pred: 1, succ: 8\n" " 7: Goto\n" - "BasicBlock 4, pred: 5, 8, succ: 6, 5\n" - " 8: Phi(8, 14) [8, 12, 9, 9]\n" + "BasicBlock 4, pred: 8, 5, succ: 6, 5\n" + " 8: Phi(14, 8) [8, 12, 9, 9]\n" " 9: Equal(8, 8) [10]\n" " 10: If(9)\n" "BasicBlock 5, pred: 4, succ: 4\n" |