Fix compilation with GCC 5.2

skomski · Commit bot · commit e28183b5977a · 2015-10-05T11:07:28.000Z
Fixes: ../../test/cctest/compiler/test-js-typed-lowering.cc:224:14: error: ‘kJSTypes’ defined but not used [-Werror=unused-variable] static Type* kJSTypes[] = {Type::Undefined(), Type::Null(), Type::Boolean(), ../../src/bignum.cc: In member function ‘void v8::internal::Bignum::AssignDecimalString(Vector<const char>)’: ../../src/bignum.cc:80:6: error: assuming signed overflow does not occur when assuming that (X + c) < X is always false [-Werror=strict-overflow] ../../src/compiler/ia32/code-generator-ia32.cc:1366:3: required from here ../../src/base/logging.h:123:26: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] DEFINE_CHECK_OP_IMPL(EQ, ==) BUG= Review URL: https://codereview.chromium.org/1371823002 Cr-Commit-Position: refs/heads/master@{#31095}
diff --git a/src/bignum.cc b/src/bignum.cc
@@ -68,7 +68,9 @@ static uint64_t ReadUInt64(Vector<const char> buffer,
                            int from,
                            int digits_to_read) {
   uint64_t result = 0;
-  for (int i = from; i < from + digits_to_read; ++i) {
+  int to = from + digits_to_read;
+
+  for (int i = from; i < to; ++i) {
     int digit = buffer[i] - '0';
     DCHECK(0 <= digit && digit <= 9);
     result = result * 10 + digit;
diff --git a/src/compiler/ia32/code-generator-ia32.cc b/src/compiler/ia32/code-generator-ia32.cc
@@ -1363,7 +1363,7 @@ void CodeGenerator::AssembleReturn() {
   }
   size_t pop_size = descriptor->StackParameterCount() * kPointerSize;
   // Might need ecx for scratch if pop_size is too big.
-  DCHECK_EQ(0, descriptor->CalleeSavedRegisters() & ecx.bit());
+  DCHECK_EQ(0u, descriptor->CalleeSavedRegisters() & ecx.bit());
   __ Ret(static_cast<int>(pop_size), ecx);
 }
 
diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
@@ -1618,7 +1618,7 @@ void CodeGenerator::AssembleReturn() {
   }
   size_t pop_size = descriptor->StackParameterCount() * kPointerSize;
   // Might need rcx for scratch if pop_size is too big.
-  DCHECK_EQ(0, descriptor->CalleeSavedRegisters() & rcx.bit());
+  DCHECK_EQ(0u, descriptor->CalleeSavedRegisters() & rcx.bit());
   __ Ret(static_cast<int>(pop_size), rcx);
 }
 
diff --git a/test/cctest/compiler/test-js-typed-lowering.cc b/test/cctest/compiler/test-js-typed-lowering.cc
@@ -219,10 +219,6 @@ static Type* kNumberTypes[] = {
     Type::OrderedNumber(), Type::PlainNumber(), Type::Number()};
 
 
-static Type* kJSTypes[] = {Type::Undefined(), Type::Null(),   Type::Boolean(),
-                           Type::Number(),    Type::String(), Type::Object()};
-
-
 static Type* I32Type(bool is_signed) {
   return is_signed ? Type::Signed32() : Type::Unsigned32();
 }

Original file line number	Diff line number	Diff line change
`@@ -1363,7 +1363,7 @@ void CodeGenerator::AssembleReturn() {`
`1363`	`1363`	`}`
`1364`	`1364`	`size_t pop_size = descriptor->StackParameterCount() * kPointerSize;`
`1365`	`1365`	`// Might need ecx for scratch if pop_size is too big.`
`1366`		`- DCHECK_EQ(0, descriptor->CalleeSavedRegisters() & ecx.bit());`
	`1366`	`+ DCHECK_EQ(0u, descriptor->CalleeSavedRegisters() & ecx.bit());`
`1367`	`1367`	`__ Ret(static_cast<int>(pop_size), ecx);`
`1368`	`1368`	`}`
`1369`	`1369`
Original file line number	Diff line number	Diff line change
`@@ -1618,7 +1618,7 @@ void CodeGenerator::AssembleReturn() {`
`1618`	`1618`	`}`
`1619`	`1619`	`size_t pop_size = descriptor->StackParameterCount() * kPointerSize;`
`1620`	`1620`	`// Might need rcx for scratch if pop_size is too big.`
`1621`		`- DCHECK_EQ(0, descriptor->CalleeSavedRegisters() & rcx.bit());`
	`1621`	`+ DCHECK_EQ(0u, descriptor->CalleeSavedRegisters() & rcx.bit());`
`1622`	`1622`	`__ Ret(static_cast<int>(pop_size), rcx);`
`1623`	`1623`	`}`
`1624`	`1624`
Original file line number	Diff line number	Diff line change
`@@ -219,10 +219,6 @@ static Type* kNumberTypes[] = {`
`219`	`219`	`Type::OrderedNumber(), Type::PlainNumber(), Type::Number()};`
`220`	`220`
`221`	`221`
`222`		`-static Type* kJSTypes[] = {Type::Undefined(), Type::Null(), Type::Boolean(),`
`223`		`- Type::Number(), Type::String(), Type::Object()};`
`224`		`-`
`225`		`-`
`226`	`222`	`static Type* I32Type(bool is_signed) {`
`227`	`223`	`return is_signed ? Type::Signed32() : Type::Unsigned32();`
`228`	`224`	`}`