commit f69863b3039fc621ff4250e262d2a024d5e79ec8
author Brian Carlstrom <bdc@google.com> Wed Jul 17 21:53:13 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Jul 17 23:23:12 2013 -0700
tree b6d40c4019de2155f8753f83b4750bd3a3514d7a
parent 93ba893c20532990a430741e0a97212900094e8c

Fix cpplint whitespace/newline issues

Change-Id: Ie2049d9f667339e41f36c4f5d09f0d10d8d2c762

compiler/dex/frontend.cc

diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index 2d7c973..0803914 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -223,11 +223,14 @@
   { // NOLINT(whitespace/braces)
     switch (compiler.GetInstructionSet()) {
       case kThumb2:
-        cu->cg.reset(ArmCodeGenerator(cu.get(), cu->mir_graph.get(), &cu->arena)); break;
+        cu->cg.reset(ArmCodeGenerator(cu.get(), cu->mir_graph.get(), &cu->arena));
+        break;
       case kMips:
-        cu->cg.reset(MipsCodeGenerator(cu.get(), cu->mir_graph.get(), &cu->arena)); break;
+        cu->cg.reset(MipsCodeGenerator(cu.get(), cu->mir_graph.get(), &cu->arena));
+        break;
       case kX86:
-        cu->cg.reset(X86CodeGenerator(cu.get(), cu->mir_graph.get(), &cu->arena)); break;
+        cu->cg.reset(X86CodeGenerator(cu.get(), cu->mir_graph.get(), &cu->arena));
+        break;
       default:
         LOG(FATAL) << "Unexpected instruction set: " << compiler.GetInstructionSet();
     }

compiler/dex/quick/codegen_util.cc

diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc
index e728d27..e169dc8 100644
--- a/compiler/dex/quick/codegen_util.cc
+++ b/compiler/dex/quick/codegen_util.cc
@@ -61,7 +61,7 @@
 
 void Mir2Lir::SetMemRefType(LIR* lir, bool is_load, int mem_type) {
   uint64_t *mask_ptr;
-  uint64_t mask = ENCODE_MEM;;
+  uint64_t mask = ENCODE_MEM;
   DCHECK(GetTargetInstFlags(lir->opcode) & (IS_LOAD | IS_STORE));
   if (is_load) {
     mask_ptr = &lir->use_mask;

compiler/dex/quick/mips/utility_mips.cc

diff --git a/compiler/dex/quick/mips/utility_mips.cc b/compiler/dex/quick/mips/utility_mips.cc
index 1975d1a..8510006 100644
--- a/compiler/dex/quick/mips/utility_mips.cc
+++ b/compiler/dex/quick/mips/utility_mips.cc
@@ -208,8 +208,7 @@
     case kOpAdd:
       if (IS_SIMM16(value)) {
         opcode = kMipsAddiu;
-      }
-      else {
+      } else {
         short_form = false;
         opcode = kMipsAddu;
       }
@@ -218,8 +217,7 @@
       if (IS_SIMM16((-value))) {
         value = -value;
         opcode = kMipsAddiu;
-      }
-      else {
+      } else {
         short_form = false;
         opcode = kMipsSubu;
       }
@@ -239,8 +237,7 @@
     case kOpAnd:
       if (IS_UIMM16((value))) {
         opcode = kMipsAndi;
-      }
-      else {
+      } else {
         short_form = false;
         opcode = kMipsAnd;
       }
@@ -248,8 +245,7 @@
     case kOpOr:
       if (IS_UIMM16((value))) {
         opcode = kMipsOri;
-      }
-      else {
+      } else {
         short_form = false;
         opcode = kMipsOr;
       }
@@ -257,8 +253,7 @@
     case kOpXor:
       if (IS_UIMM16((value))) {
         opcode = kMipsXori;
-      }
-      else {
+      } else {
         short_form = false;
         opcode = kMipsXor;
       }

compiler/llvm/md_builder.cc

diff --git a/compiler/llvm/md_builder.cc b/compiler/llvm/md_builder.cc
index 3884f51..1bd76dd 100644
--- a/compiler/llvm/md_builder.cc
+++ b/compiler/llvm/md_builder.cc
@@ -33,17 +33,33 @@
   ::llvm::MDNode*& spec_ty = tbaa_special_type_[sty_id];
   if (spec_ty == NULL) {
     switch (sty_id) {
-    case kTBAARegister:     spec_ty = createTBAANode("Register", tbaa_root_); break;
-    case kTBAAStackTemp:    spec_ty = createTBAANode("StackTemp", tbaa_root_); break;
-    case kTBAAHeapArray:    spec_ty = createTBAANode("HeapArray", tbaa_root_); break;
-    case kTBAAHeapInstance: spec_ty = createTBAANode("HeapInstance", tbaa_root_); break;
-    case kTBAAHeapStatic:   spec_ty = createTBAANode("HeapStatic", tbaa_root_); break;
-    case kTBAAJRuntime:     spec_ty = createTBAANode("JRuntime", tbaa_root_); break;
-    case kTBAARuntimeInfo:  spec_ty = createTBAANode("RuntimeInfo",
-                                                     GetTBAASpecialType(kTBAAJRuntime)); break;
-    case kTBAAShadowFrame:  spec_ty = createTBAANode("ShadowFrame",
-                                                     GetTBAASpecialType(kTBAAJRuntime)); break;
-    case kTBAAConstJObject: spec_ty = createTBAANode("ConstJObject", tbaa_root_, true); break;
+    case kTBAARegister:
+      spec_ty = createTBAANode("Register", tbaa_root_);
+      break;
+    case kTBAAStackTemp:
+      spec_ty = createTBAANode("StackTemp", tbaa_root_);
+      break;
+    case kTBAAHeapArray:
+      spec_ty = createTBAANode("HeapArray", tbaa_root_);
+      break;
+    case kTBAAHeapInstance:
+      spec_ty = createTBAANode("HeapInstance", tbaa_root_);
+      break;
+    case kTBAAHeapStatic:
+      spec_ty = createTBAANode("HeapStatic", tbaa_root_);
+      break;
+    case kTBAAJRuntime:
+      spec_ty = createTBAANode("JRuntime", tbaa_root_);
+      break;
+    case kTBAARuntimeInfo:
+      spec_ty = createTBAANode("RuntimeInfo", GetTBAASpecialType(kTBAAJRuntime));
+      break;
+    case kTBAAShadowFrame:
+      spec_ty = createTBAANode("ShadowFrame", GetTBAASpecialType(kTBAAJRuntime));
+      break;
+    case kTBAAConstJObject:
+      spec_ty = createTBAANode("ConstJObject", tbaa_root_, true);
+      break;
     default:
       LOG(FATAL) << "Unknown TBAA special type: " << sty_id;
       break;