1 files changed, 20 insertions, 20 deletions

diff --git a/compiler/dex/ssa_transformation.cc b/compiler/dex/ssa_transformation.cc
index 197f66d017..939bf40564 100644
--- a/compiler/dex/ssa_transformation.cc
+++ b/compiler/dex/ssa_transformation.cc
@@ -26,15 +26,15 @@ namespace art {
 
 void MIRGraph::ClearAllVisitedFlags() {
   AllNodesIterator iter(this);
-  for (BasicBlock* bb = iter.Next(); bb != NULL; bb = iter.Next()) {
+  for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) {
     bb->visited = false;
   }
 }
 
 BasicBlock* MIRGraph::NeedsVisit(BasicBlock* bb) {
-  if (bb != NULL) {
+  if (bb != nullptr) {
     if (bb->visited || bb->hidden) {
-      bb = NULL;
+      bb = nullptr;
     }
   }
   return bb;
@@ -42,13 +42,13 @@ BasicBlock* MIRGraph::NeedsVisit(BasicBlock* bb) {
 
 BasicBlock* MIRGraph::NextUnvisitedSuccessor(BasicBlock* bb) {
   BasicBlock* res = NeedsVisit(GetBasicBlock(bb->fall_through));
-  if (res == NULL) {
+  if (res == nullptr) {
     res = NeedsVisit(GetBasicBlock(bb->taken));
-    if (res == NULL) {
+    if (res == nullptr) {
       if (bb->successor_block_list_type != kNotUsed) {
         for (SuccessorBlockInfo* sbi : bb->successor_blocks) {
           res = NeedsVisit(GetBasicBlock(sbi->block));
-          if (res != NULL) {
+          if (res != nullptr) {
             break;
           }
         }
@@ -75,7 +75,7 @@ void MIRGraph::RecordDFSOrders(BasicBlock* block) {
   while (!succ.empty()) {
     BasicBlock* curr = succ.back();
     BasicBlock* next_successor = NextUnvisitedSuccessor(curr);
-    if (next_successor != NULL) {
+    if (next_successor != nullptr) {
       MarkPreOrder(next_successor);
       succ.push_back(next_successor);
       continue;
@@ -107,7 +107,7 @@ void MIRGraph::ComputeDFSOrders() {
   if (num_reachable_blocks_ != GetNumBlocks()) {
     // Kill all unreachable blocks.
     AllNodesIterator iter(this);
-    for (BasicBlock* bb = iter.Next(); bb != NULL; bb = iter.Next()) {
+    for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) {
       if (!bb->visited) {
         bb->Kill(this);
       }
@@ -121,7 +121,7 @@ void MIRGraph::ComputeDFSOrders() {
  * register idx is defined in BasicBlock bb.
  */
 bool MIRGraph::FillDefBlockMatrix(BasicBlock* bb) {
-  if (bb->data_flow_info == NULL) {
+  if (bb->data_flow_info == nullptr) {
     return false;
   }
 
@@ -149,11 +149,11 @@ void MIRGraph::ComputeDefBlockMatrix() {
   }
 
   AllNodesIterator iter(this);
-  for (BasicBlock* bb = iter.Next(); bb != NULL; bb = iter.Next()) {
+  for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) {
     FindLocalLiveIn(bb);
   }
   AllNodesIterator iter2(this);
-  for (BasicBlock* bb = iter2.Next(); bb != NULL; bb = iter2.Next()) {
+  for (BasicBlock* bb = iter2.Next(); bb != nullptr; bb = iter2.Next()) {
     FillDefBlockMatrix(bb);
   }
 
@@ -247,7 +247,7 @@ bool MIRGraph::ComputeDominanceFrontier(BasicBlock* bb) {
 void MIRGraph::InitializeDominationInfo(BasicBlock* bb) {
   int num_total_blocks = GetBasicBlockListCount();
 
-  if (bb->dominators == NULL) {
+  if (bb->dominators == nullptr) {
     bb->dominators = new (arena_) ArenaBitVector(arena_, num_total_blocks,
                                                  true /* expandable */, kBitMapDominators);
     bb->i_dominated = new (arena_) ArenaBitVector(arena_, num_total_blocks,
@@ -357,7 +357,7 @@ void MIRGraph::ComputeDominators() {
 
   /* Initialize domination-related data structures */
   PreOrderDfsIterator iter(this);
-  for (BasicBlock* bb = iter.Next(); bb != NULL; bb = iter.Next()) {
+  for (BasicBlock* bb = iter.Next(); bb != nullptr; bb = iter.Next()) {
     InitializeDominationInfo(bb);
   }
 
@@ -376,7 +376,7 @@ void MIRGraph::ComputeDominators() {
   /* Compute the immediate dominators */
   RepeatingReversePostOrderDfsIterator iter2(this);
   bool change = false;
-  for (BasicBlock* bb = iter2.Next(false); bb != NULL; bb = iter2.Next(change)) {
+  for (BasicBlock* bb = iter2.Next(false); bb != nullptr; bb = iter2.Next(change)) {
     change = ComputeblockIDom(bb);
   }
 
@@ -387,19 +387,19 @@ void MIRGraph::ComputeDominators() {
   GetEntryBlock()->i_dom = 0;
 
   PreOrderDfsIterator iter3(this);
-  for (BasicBlock* bb = iter3.Next(); bb != NULL; bb = iter3.Next()) {
+  for (BasicBlock* bb = iter3.Next(); bb != nullptr; bb = iter3.Next()) {
     SetDominators(bb);
   }
 
   ReversePostOrderDfsIterator iter4(this);
-  for (BasicBlock* bb = iter4.Next(); bb != NULL; bb = iter4.Next()) {
+  for (BasicBlock* bb = iter4.Next(); bb != nullptr; bb = iter4.Next()) {
     ComputeBlockDominators(bb);
   }
 
   // Compute the dominance frontier for each block.
   ComputeDomPostOrderTraversal(GetEntryBlock());
   PostOrderDOMIterator iter5(this);
-  for (BasicBlock* bb = iter5.Next(); bb != NULL; bb = iter5.Next()) {
+  for (BasicBlock* bb = iter5.Next(); bb != nullptr; bb = iter5.Next()) {
     ComputeDominanceFrontier(bb);
   }
 
@@ -434,7 +434,7 @@ bool MIRGraph::ComputeBlockLiveIns(BasicBlock* bb) {
   DCHECK_EQ(temp_.ssa.num_vregs, cu_->mir_graph.get()->GetNumOfCodeAndTempVRs());
   ArenaBitVector* temp_live_vregs = temp_.ssa.work_live_vregs;
 
-  if (bb->data_flow_info == NULL) {
+  if (bb->data_flow_info == nullptr) {
     return false;
   }
   temp_live_vregs->Copy(bb->data_flow_info->live_in_v);
@@ -466,7 +466,7 @@ bool MIRGraph::ComputeBlockLiveIns(BasicBlock* bb) {
 void MIRGraph::FindPhiNodeBlocks() {
   RepeatingPostOrderDfsIterator iter(this);
   bool change = false;
-  for (BasicBlock* bb = iter.Next(false); bb != NULL; bb = iter.Next(change)) {
+  for (BasicBlock* bb = iter.Next(false); bb != nullptr; bb = iter.Next(change)) {
     change = ComputeBlockLiveIns(bb);
   }
 
@@ -505,7 +505,7 @@ void MIRGraph::FindPhiNodeBlocks() {
  */
 bool MIRGraph::InsertPhiNodeOperands(BasicBlock* bb) {
   /* Phi nodes are at the beginning of each block */
-  for (MIR* mir = bb->first_mir_insn; mir != NULL; mir = mir->next) {
+  for (MIR* mir = bb->first_mir_insn; mir != nullptr; mir = mir->next) {
     if (mir->dalvikInsn.opcode != static_cast<Instruction::Code>(kMirOpPhi))
       return true;
     int ssa_reg = mir->ssa_rep->defs[0];