Fix more -Werror=sign-compare bugs with GCC 4.9.2

R=svenpanne@chromium.org
LOG=N
BUG=

Review URL: https://codereview.chromium.org/1128043002

Cr-Commit-Position: refs/heads/master@{#28337}

diff --git a/src/compiler/frame-elider.cc b/src/compiler/frame-elider.cc
index 1168467..f800b77 100644 (file)
--- a/src/compiler/frame-elider.cc
+++ b/src/compiler/frame-elider.cc
@@ -48,7 +48,7 @@ void FrameElider::MarkDeConstruction() {
       // deconstructions.
       for (auto succ : block->successors()) {
         if (!InstructionBlockAt(succ)->needs_frame()) {
-          DCHECK_EQ(1, block->SuccessorCount());
+          DCHECK_EQ(1U, block->SuccessorCount());
           block->mark_must_deconstruct_frame();
         }
       }
@@ -56,7 +56,7 @@ void FrameElider::MarkDeConstruction() {
       // Find "no frame -> frame" transitions, inserting frame constructions.
       for (auto succ : block->successors()) {
         if (InstructionBlockAt(succ)->needs_frame()) {
-          DCHECK_NE(1, block->SuccessorCount());
+          DCHECK_NE(1U, block->SuccessorCount());
           InstructionBlockAt(succ)->mark_must_construct_frame();
         }
       }

diff --git a/src/heap/identity-map.cc b/src/heap/identity-map.cc
index e968989..9840d74 100644 (file)
--- a/src/heap/identity-map.cc
+++ b/src/heap/identity-map.cc
@@ -38,7 +38,7 @@ IdentityMapBase::RawEntry IdentityMapBase::Insert(Handle<Object> key) {
 
 int IdentityMapBase::Hash(Object* address) {
   uintptr_t raw_address = reinterpret_cast<uintptr_t>(address);
-  CHECK_NE(0, raw_address);  // Cannot store Smi 0 as a key here, sorry.
+  CHECK_NE(0U, raw_address);  // Cannot store Smi 0 as a key here, sorry.
   // Xor some of the upper bits, since the lower 2 or 3 are usually aligned.
   return static_cast<int>((raw_address >> 11) ^ raw_address);
 }

diff --git a/test/unittests/counters-unittest.cc b/test/unittests/counters-unittest.cc
index dd60a0d..822a5c5 100644 (file)
--- a/test/unittests/counters-unittest.cc
+++ b/test/unittests/counters-unittest.cc
@@ -49,7 +49,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample1) {
   FLAG_histogram_interval = 10;
   AddSample(10, 1000);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
 }
 
@@ -58,7 +58,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample2) {
   FLAG_histogram_interval = 10;
   AddSample(10, 500);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
 }
 
@@ -69,7 +69,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample3) {
   AddSample(15, 500);
   AddSample(15, 1000);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
 }
 
@@ -79,7 +79,7 @@ TEST_F(AggregatedMemoryHistogramTest, OneSample4) {
   AddSample(10, 500);
   AddSample(15, 750);
   AddSample(20, 1000);
-  EXPECT_EQ(1, samples()->size());
+  EXPECT_EQ(1U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
 }
 
@@ -88,7 +88,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples1) {
   FLAG_histogram_interval = 10;
   AddSample(10, 1000);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
   EXPECT_EQ(1000, (*samples())[1]);
 }
@@ -99,7 +99,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples2) {
   AddSample(10, 1000);
   AddSample(20, 1000);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
   EXPECT_EQ(1000, (*samples())[1]);
 }
@@ -111,7 +111,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples3) {
   AddSample(20, 1000);
   AddSample(20, 500);
   AddSample(30, 500);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(1000, (*samples())[0]);
   EXPECT_EQ(500, (*samples())[1]);
 }
@@ -121,7 +121,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples4) {
   FLAG_histogram_interval = 10;
   AddSample(10, 1000);
   AddSample(30, 0);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(750, (*samples())[0]);
   EXPECT_EQ(250, (*samples())[1]);
 }
@@ -131,7 +131,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples5) {
   FLAG_histogram_interval = 10;
   AddSample(10, 0);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ(250, (*samples())[0]);
   EXPECT_EQ(750, (*samples())[1]);
 }
@@ -142,7 +142,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples6) {
   AddSample(10, 0);
   AddSample(15, 1000);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ((500 + 1000) / 2, (*samples())[0]);
   EXPECT_EQ(1000, (*samples())[1]);
 }
@@ -154,7 +154,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples7) {
   AddSample(15, 1000);
   AddSample(25, 0);
   AddSample(30, 1000);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ((500 + 750) / 2, (*samples())[0]);
   EXPECT_EQ((250 + 500) / 2, (*samples())[1]);
 }
@@ -166,7 +166,7 @@ TEST_F(AggregatedMemoryHistogramTest, TwoSamples8) {
   AddSample(15, 0);
   AddSample(25, 1000);
   AddSample(30, 0);
-  EXPECT_EQ(2, samples()->size());
+  EXPECT_EQ(2U, samples()->size());
   EXPECT_EQ((500 + 250) / 2, (*samples())[0]);
   EXPECT_EQ((750 + 500) / 2, (*samples())[1]);
 }
@@ -177,7 +177,7 @@ TEST_F(AggregatedMemoryHistogramTest, ManySamples1) {
   const int kMaxSamples = 1000;
   AddSample(0, 0);
   AddSample(10 * kMaxSamples, 10 * kMaxSamples);
-  EXPECT_EQ(kMaxSamples, samples()->size());
+  EXPECT_EQ(static_cast<unsigned>(kMaxSamples), samples()->size());
   for (int i = 0; i < kMaxSamples; i++) {
     EXPECT_EQ(i * 10 + 5, (*samples())[i]);
   }
@@ -189,7 +189,7 @@ TEST_F(AggregatedMemoryHistogramTest, ManySamples2) {
   const int kMaxSamples = 1000;
   AddSample(0, 0);
   AddSample(10 * (2 * kMaxSamples), 10 * (2 * kMaxSamples));
-  EXPECT_EQ(kMaxSamples, samples()->size());
+  EXPECT_EQ(static_cast<unsigned>(kMaxSamples), samples()->size());
   for (int i = 0; i < kMaxSamples; i++) {
     EXPECT_EQ(i * 10 + 5, (*samples())[i]);
   }