commit 0418b5b20587c645b6bf9d8cb65d3d6a9f074d96
author Andreas Gampe <agampe@google.com> Thu Dec 04 17:24:50 2014 -0800
committer Andreas Gampe <agampe@google.com> Thu Dec 04 17:24:50 2014 -0800
tree f0f7d8a245851acd0409535640a804be5db7a6bb
parent 044ac4f4f6760eeef4ed96b5349a8a5c325c52f1

ART: Fix linting errors

Fix bounds_check_elimination linting errors.

Change-Id: I040433ecbc84d740bff331c37df0bfcc64dc244e

compiler/optimizing/bounds_check_elimination.cc

diff --git a/compiler/optimizing/bounds_check_elimination.cc b/compiler/optimizing/bounds_check_elimination.cc
index 91455bc..c353d66 100644
--- a/compiler/optimizing/bounds_check_elimination.cc
+++ b/compiler/optimizing/bounds_check_elimination.cc
@@ -384,7 +384,7 @@
 
 class BCEVisitor : public HGraphVisitor {
  public:
-  BCEVisitor(HGraph* graph)
+  explicit BCEVisitor(HGraph* graph)
       : HGraphVisitor(graph),
         maps_(graph->GetBlocks().Size()) {}
 
@@ -575,7 +575,7 @@
 
   void VisitPhi(HPhi* phi) {
     if (phi->IsLoopHeaderPhi() && phi->GetType() == Primitive::kPrimInt) {
-      DCHECK(phi->InputCount() == 2);
+      DCHECK_EQ(phi->InputCount(), 2U);
       HInstruction* instruction = phi->InputAt(1);
       if (instruction->IsAdd()) {
         HAdd* add = instruction->AsAdd();

compiler/optimizing/bounds_check_elimination.h

diff --git a/compiler/optimizing/bounds_check_elimination.h b/compiler/optimizing/bounds_check_elimination.h
index 25551d5..05cb185 100644
--- a/compiler/optimizing/bounds_check_elimination.h
+++ b/compiler/optimizing/bounds_check_elimination.h
@@ -23,7 +23,7 @@
 
 class BoundsCheckElimination : public HOptimization {
  public:
-  BoundsCheckElimination(HGraph* graph) : HOptimization(graph, true, "BCE") {}
+  explicit BoundsCheckElimination(HGraph* graph) : HOptimization(graph, true, "BCE") {}
 
   void Run() OVERRIDE;
 

compiler/optimizing/bounds_check_elimination_test.cc

diff --git a/compiler/optimizing/bounds_check_elimination_test.cc b/compiler/optimizing/bounds_check_elimination_test.cc
index 5e2e62c..f650ff2 100644
--- a/compiler/optimizing/bounds_check_elimination_test.cc
+++ b/compiler/optimizing/bounds_check_elimination_test.cc
@@ -188,10 +188,10 @@
   HBasicBlock* exit = new (&allocator) HBasicBlock(graph);
   graph->AddBlock(exit);
   exit->AddInstruction(new (&allocator) HExit());
-  block1->AddSuccessor(exit);   // true successor
-  block1->AddSuccessor(block2); // false successor
-  block2->AddSuccessor(exit);   // true successor
-  block2->AddSuccessor(block3); // false successor
+  block1->AddSuccessor(exit);    // true successor
+  block1->AddSuccessor(block2);  // false successor
+  block2->AddSuccessor(exit);    // true successor
+  block2->AddSuccessor(block3);  // false successor
   block3->AddSuccessor(exit);
 
   graph->BuildDominatorTree();
@@ -263,10 +263,10 @@
   HBasicBlock* exit = new (&allocator) HBasicBlock(graph);
   graph->AddBlock(exit);
   exit->AddInstruction(new (&allocator) HExit());
-  block1->AddSuccessor(exit);   // true successor
-  block1->AddSuccessor(block2); // false successor
-  block2->AddSuccessor(exit);   // true successor
-  block2->AddSuccessor(block3); // false successor
+  block1->AddSuccessor(exit);    // true successor
+  block1->AddSuccessor(block2);  // false successor
+  block2->AddSuccessor(exit);    // true successor
+  block2->AddSuccessor(block3);  // false successor
   block3->AddSuccessor(exit);
 
   graph->BuildDominatorTree();