Chromium Code Reviews| Index: test/unittests/interpreter/constant-array-builder-unittest.cc |
| diff --git a/test/unittests/interpreter/constant-array-builder-unittest.cc b/test/unittests/interpreter/constant-array-builder-unittest.cc |
| index 17a7bb060aa1422de602e2406b1c4f28d1494af2..6ef94f5214ad426866243188a62e9844c1c8999c 100644 |
| --- a/test/unittests/interpreter/constant-array-builder-unittest.cc |
| +++ b/test/unittests/interpreter/constant-array-builder-unittest.cc |
| @@ -43,47 +43,46 @@ TEST_F(ConstantArrayBuilderTest, AllocateAllEntries) { |
| TEST_F(ConstantArrayBuilderTest, ToFixedArray) { |
| CanonicalHandleScope canonical(isolate()); |
| ConstantArrayBuilder builder(zone(), isolate()->factory()->the_hole_value()); |
| - static const size_t kNumberOfElements = 37; |
| - for (size_t i = 0; i < kNumberOfElements; i++) { |
| + static const int kNumberOfElements = 37; |
| + for (int i = 0; i < kNumberOfElements; i++) { |
| Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| builder.Insert(object); |
| CHECK(builder.At(i)->SameValue(*object)); |
| } |
| Handle<FixedArray> constant_array = builder.ToFixedArray(isolate()); |
| CHECK_EQ(constant_array->length(), kNumberOfElements); |
| - for (size_t i = 0; i < kNumberOfElements; i++) { |
| - CHECK(constant_array->get(static_cast<int>(i))->SameValue(*builder.At(i))); |
| + for (int i = 0; i < kNumberOfElements; i++) { |
| + CHECK(constant_array->get(i)->SameValue(*builder.At(i))); |
| } |
| } |
| TEST_F(ConstantArrayBuilderTest, ToLargeFixedArray) { |
| CanonicalHandleScope canonical(isolate()); |
| ConstantArrayBuilder builder(zone(), isolate()->factory()->the_hole_value()); |
| - static const size_t kNumberOfElements = 37373; |
| - for (size_t i = 0; i < kNumberOfElements; i++) { |
| + static const int kNumberOfElements = 37373; |
| + for (int i = 0; i < kNumberOfElements; i++) { |
| Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| builder.Insert(object); |
| CHECK(builder.At(i)->SameValue(*object)); |
| } |
| Handle<FixedArray> constant_array = builder.ToFixedArray(isolate()); |
| CHECK_EQ(constant_array->length(), kNumberOfElements); |
|
Michael Starzinger
2016/11/11 11:45:43
nit: As discussed offline: If the bogus conversion
ulan
2016/11/11 11:47:25
Done.
rmcilroy
2016/11/11 11:48:52
Any reason to do this? It seems like Ulan's approa
Michael Starzinger
2016/11/11 11:54:32
My reasoning was that safe indexed vector accessor
|
| - for (size_t i = 0; i < kNumberOfElements; i++) { |
| - CHECK(constant_array->get(static_cast<int>(i))->SameValue(*builder.At(i))); |
| + for (int i = 0; i < kNumberOfElements; i++) { |
| + CHECK(constant_array->get(i)->SameValue(*builder.At(i))); |
| } |
| } |
| TEST_F(ConstantArrayBuilderTest, ToLargeFixedArrayWithReservations) { |
| CanonicalHandleScope canonical(isolate()); |
| ConstantArrayBuilder builder(zone(), isolate()->factory()->the_hole_value()); |
| - static const size_t kNumberOfElements = 37373; |
| - for (size_t i = 0; i < kNumberOfElements; i++) { |
| - builder.CommitReservedEntry(builder.CreateReservedEntry(), |
| - Smi::FromInt(static_cast<int>(i))); |
| + static const int kNumberOfElements = 37373; |
| + for (int i = 0; i < kNumberOfElements; i++) { |
| + builder.CommitReservedEntry(builder.CreateReservedEntry(), Smi::FromInt(i)); |
| } |
| Handle<FixedArray> constant_array = builder.ToFixedArray(isolate()); |
| CHECK_EQ(constant_array->length(), kNumberOfElements); |
| - for (size_t i = 0; i < kNumberOfElements; i++) { |
| - CHECK(constant_array->get(static_cast<int>(i))->SameValue(*builder.At(i))); |
| + for (int i = 0; i < kNumberOfElements; i++) { |
| + CHECK(constant_array->get(i)->SameValue(*builder.At(i))); |
| } |
| } |
| @@ -204,7 +203,7 @@ TEST_F(ConstantArrayBuilderTest, GapFilledWhenLowReservationCommitted) { |
| for (size_t i = 0; i < k8BitCapacity; i++) { |
| OperandSize operand_size = builder.CreateReservedEntry(); |
| CHECK(OperandSize::kByte == operand_size); |
| - CHECK_EQ(builder.size(), 0); |
| + CHECK_EQ(builder.size(), 0u); |
| } |
| for (size_t i = 0; i < k8BitCapacity; i++) { |
| builder.CommitReservedEntry(builder.CreateReservedEntry(), |
| @@ -217,7 +216,7 @@ TEST_F(ConstantArrayBuilderTest, GapFilledWhenLowReservationCommitted) { |
| CHECK_EQ(builder.size(), 2 * k8BitCapacity); |
| } |
| Handle<FixedArray> constant_array = builder.ToFixedArray(isolate()); |
| - CHECK_EQ(constant_array->length(), 2 * k8BitCapacity); |
| + CHECK_EQ(constant_array->length(), static_cast<int>(2 * k8BitCapacity)); |
| for (size_t i = 0; i < k8BitCapacity; i++) { |
| Object* original = constant_array->get(static_cast<int>(k8BitCapacity + i)); |
| Object* duplicate = constant_array->get(static_cast<int>(i)); |
| @@ -233,7 +232,7 @@ TEST_F(ConstantArrayBuilderTest, GapNotFilledWhenLowReservationDiscarded) { |
| for (size_t i = 0; i < k8BitCapacity; i++) { |
| OperandSize operand_size = builder.CreateReservedEntry(); |
| CHECK(OperandSize::kByte == operand_size); |
| - CHECK_EQ(builder.size(), 0); |
| + CHECK_EQ(builder.size(), 0u); |
| } |
| for (size_t i = 0; i < k8BitCapacity; i++) { |
| Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| @@ -265,7 +264,7 @@ TEST_F(ConstantArrayBuilderTest, HolesWithUnusedReservations) { |
| CHECK_EQ(builder.Insert(isolate()->factory()->NewNumber(i)), |
| static_cast<size_t>(i)); |
| } |
| - CHECK_EQ(builder.Insert(isolate()->factory()->NewNumber(256)), 256); |
| + CHECK_EQ(builder.Insert(isolate()->factory()->NewNumber(256)), 256u); |
| Handle<FixedArray> constant_array = builder.ToFixedArray(isolate()); |
| CHECK_EQ(constant_array->length(), 257); |
| @@ -291,11 +290,12 @@ TEST_F(ConstantArrayBuilderTest, ReservationsAtAllScales) { |
| for (int i = 65536; i < 131072; ++i) { |
| CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kQuad); |
| } |
| - CHECK_EQ(builder.CommitReservedEntry(OperandSize::kByte, Smi::FromInt(1)), 0); |
| + CHECK_EQ(builder.CommitReservedEntry(OperandSize::kByte, Smi::FromInt(1)), |
| + 0u); |
| CHECK_EQ(builder.CommitReservedEntry(OperandSize::kShort, Smi::FromInt(2)), |
| - 256); |
| + 256u); |
| CHECK_EQ(builder.CommitReservedEntry(OperandSize::kQuad, Smi::FromInt(3)), |
| - 65536); |
| + 65536u); |
| Handle<FixedArray> constant_array = builder.ToFixedArray(isolate()); |
| CHECK_EQ(constant_array->length(), 65537); |
| int count = 1; |