am 02c8cc6d: Fixing cpplint whitespace/blank_line, whitespace/end_of_line, whitespace/labels, whitespace/semicolon issues

* commit '02c8cc6d1312a2b55533f02f6369dc7c94672f90':
  Fixing cpplint whitespace/blank_line, whitespace/end_of_line, whitespace/labels, whitespace/semicolon issues

5 files changed, 9 insertions, 8 deletions

diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc
index a768a19..c2ee8e8 100644
--- a/compiler/dex/mir_graph.cc
+++ b/compiler/dex/mir_graph.cc
@@ -453,7 +453,7 @@ BasicBlock* MIRGraph::ProcessCanThrow(BasicBlock* cur_block, MIR* insn, int cur_
     cur_block->successor_block_list.blocks =
         new (arena_) GrowableArray<SuccessorBlockInfo*>(arena_, 2, kGrowableArraySuccessorBlocks);
 
-    for (;iterator.HasNext(); iterator.Next()) {
+    for (; iterator.HasNext(); iterator.Next()) {
       BasicBlock *catch_block = FindBlock(iterator.GetHandlerAddress(), false /* split*/,
                                          false /* creat */, NULL  /* immed_pred_block_p */);
       catch_block->catch_entry = true;
@@ -994,9 +994,10 @@ char* MIRGraph::GetDalvikDisassembly(const MIR* mir) {
       case Instruction::k22b:
         str.append(StringPrintf(", #%d", insn.vC));
         break;
-      default:
-        ; // Nothing left to print
+      default: {
+        // Nothing left to print
       }
+    }
   }
   if (nop) {
     str.append("]--optimized away");
diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc
index 22c738a..d79b26e 100644
--- a/compiler/dex/mir_optimization.cc
+++ b/compiler/dex/mir_optimization.cc
@@ -191,9 +191,9 @@ static SelectInstructionKind SelectKind(MIR* mir) {
     case Instruction::GOTO_16:
     case Instruction::GOTO_32:
       return kSelectGoto;
-    default:;
+    default:
+      return kSelectNone;
   }
-  return kSelectNone;
 }
 
 int MIRGraph::GetSSAUseCount(int s_reg) {
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc
index 7a59644..8daa397 100644
--- a/compiler/dex/quick/codegen_util.cc
+++ b/compiler/dex/quick/codegen_util.cc
@@ -461,7 +461,7 @@ void Mir2Lir::InstallFillArrayData() {
 }
 
 static int AssignLiteralOffsetCommon(LIR* lir, int offset) {
-  for (;lir != NULL; lir = lir->next) {
+  for (; lir != NULL; lir = lir->next) {
     lir->offset = offset;
     offset += 4;
   }
diff --git a/compiler/dex/quick/ralloc_util.cc b/compiler/dex/quick/ralloc_util.cc
index 92bd94e..4542f8f 100644
--- a/compiler/dex/quick/ralloc_util.cc
+++ b/compiler/dex/quick/ralloc_util.cc
@@ -507,7 +507,7 @@ void Mir2Lir::NullifyRange(LIR *start, LIR *finish, int s_reg1, int s_reg2) {
   if (start && finish) {
     LIR *p;
     DCHECK_EQ(s_reg1, s_reg2);
-    for (p = start; ;p = p->next) {
+    for (p = start; ; p = p->next) {
       NopLIR(p);
       if (p == finish)
         break;
diff --git a/compiler/dex/vreg_analysis.cc b/compiler/dex/vreg_analysis.cc
index a97d1ec..b50fe71 100644
--- a/compiler/dex/vreg_analysis.cc
+++ b/compiler/dex/vreg_analysis.cc
@@ -282,7 +282,7 @@ bool MIRGraph::InferTypeAndSize(BasicBlock* bb) {
         bool defined_ref = rl_temp.defined && rl_temp.ref;
         bool is_wide = rl_temp.wide || ((attrs & DF_A_WIDE) != 0);
         bool is_high = is_phi && rl_temp.wide && rl_temp.high_word;
-        for (int i = 0; i < ssa_rep->num_uses;i++) {
+        for (int i = 0; i < ssa_rep->num_uses; i++) {
           rl_temp = reg_location_[ssa_rep->uses[i]];
           defined_fp |= rl_temp.defined && rl_temp.fp;
           defined_core |= rl_temp.defined && rl_temp.core;