From fe031978cbd4fbe589cf6d5e6aca291b611f1adb Mon Sep 17 00:00:00 2001 From: wingo Date: Fri, 10 Apr 2015 06:59:39 -0700 Subject: [PATCH] Fix some -Werror=sign-compare errors R=svenpanne@chromium.org LOG=N BUG= Review URL: https://codereview.chromium.org/1072333002 Cr-Commit-Position: refs/heads/master@{#27752} --- src/utils.h | 6 +++--- test/cctest/test-cpu-profiler.cc | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/utils.h b/src/utils.h index 881d8bffab..dd47129031 100644 --- a/src/utils.h +++ b/src/utils.h @@ -41,7 +41,7 @@ inline int WhichPowerOf2(uint32_t x) { DCHECK(base::bits::IsPowerOfTwo32(x)); int bits = 0; #ifdef DEBUG - int original_x = x; + uint32_t original_x = x; #endif if (x >= 0x10000) { bits += 16; @@ -62,7 +62,7 @@ inline int WhichPowerOf2(uint32_t x) { case 2: bits++; // Fall through. case 1: break; } - DCHECK_EQ(1 << bits, original_x); + DCHECK_EQ(static_cast(1) << bits, original_x); return bits; } @@ -97,7 +97,7 @@ inline int WhichPowerOf2_64(uint64_t x) { case 2: bits++; // Fall through. case 1: break; } - DCHECK_EQ(1L << bits, original_x); + DCHECK_EQ(static_cast(1) << bits, original_x); return bits; } diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc index b46db63b61..d935b055e7 100644 --- a/test/cctest/test-cpu-profiler.cc +++ b/test/cctest/test-cpu-profiler.cc @@ -1721,7 +1721,7 @@ const char* GetBranchDeoptReason(i::CpuProfile* iprofile, const char* branch[], v8::CpuProfile* profile = reinterpret_cast(iprofile); const ProfileNode* iopt_function = NULL; iopt_function = GetSimpleBranch(profile, branch, length); - CHECK_EQ(1, iopt_function->deopt_infos().size()); + CHECK_EQ(1U, iopt_function->deopt_infos().size()); return iopt_function->deopt_infos()[0].deopt_reason; } @@ -1902,11 +1902,11 @@ TEST(DeoptAtFirstLevelInlinedSource) { GetSimpleBranch(profile, branch, arraysize(branch)); const std::vector& deopt_infos = itest_node->deopt_infos(); - CHECK_EQ(1, deopt_infos.size()); + CHECK_EQ(1U, deopt_infos.size()); const v8::CpuProfileDeoptInfo& info = deopt_infos[0]; CHECK_EQ(reason(i::Deoptimizer::kNotAHeapNumber), info.deopt_reason); - CHECK_EQ(2, info.stack.size()); + CHECK_EQ(2U, info.stack.size()); CHECK_EQ(inlined_script_id, info.stack[0].script_id); CHECK_EQ(offset(inlined_source, "left /"), info.stack[0].position); CHECK_EQ(script_id, info.stack[1].script_id); @@ -1975,11 +1975,11 @@ TEST(DeoptAtSecondLevelInlinedSource) { GetSimpleBranch(profile, branch, arraysize(branch)); const std::vector& deopt_infos = itest_node->deopt_infos(); - CHECK_EQ(1, deopt_infos.size()); + CHECK_EQ(1U, deopt_infos.size()); const v8::CpuProfileDeoptInfo info = deopt_infos[0]; CHECK_EQ(reason(i::Deoptimizer::kNotAHeapNumber), info.deopt_reason); - CHECK_EQ(3, info.stack.size()); + CHECK_EQ(3U, info.stack.size()); CHECK_EQ(inlined_script_id, info.stack[0].script_id); CHECK_EQ(offset(inlined_source, "left /"), info.stack[0].position); CHECK_EQ(script_id, info.stack[1].script_id); @@ -2031,7 +2031,7 @@ TEST(DeoptUntrackedFunction) { const char* branch[] = {"", "test"}; const ProfileNode* itest_node = GetSimpleBranch(profile, branch, arraysize(branch)); - CHECK_EQ(0, itest_node->deopt_infos().size()); + CHECK_EQ(0U, itest_node->deopt_infos().size()); iprofiler->DeleteProfile(iprofile); }