| Index: src/objects-inl.h
|
| diff --git a/src/objects-inl.h b/src/objects-inl.h
|
| index 8de9d360d9e2fc71a4a6971f91d1da1b6f0a9be8..56a5619b53492bb8392e70d2196275e2ecac2e60 100644
|
| --- a/src/objects-inl.h
|
| +++ b/src/objects-inl.h
|
| @@ -855,7 +855,7 @@ Failure* Failure::RetryAfterGC(int requested_bytes) {
|
| requested = static_cast<intptr_t>(
|
| (~static_cast<uintptr_t>(0)) >> (tag_bits + 1));
|
| }
|
| - int value = (requested << kSpaceTagSize) | NEW_SPACE;
|
| + int value = static_cast<int>(requested << kSpaceTagSize) | NEW_SPACE;
|
| return Construct(RETRY_AFTER_GC, value);
|
| }
|
|
|
| @@ -1009,9 +1009,9 @@ Address MapWord::DecodeMapAddress(MapSpace* map_space) {
|
| int MapWord::DecodeOffset() {
|
| // The offset field is represented in the kForwardingOffsetBits
|
| // most-significant bits.
|
| - int offset = (value_ >> kForwardingOffsetShift) << kObjectAlignmentBits;
|
| - ASSERT(0 <= offset && offset < Page::kObjectAreaSize);
|
| - return offset;
|
| + uintptr_t offset = (value_ >> kForwardingOffsetShift) << kObjectAlignmentBits;
|
| + ASSERT(offset < static_cast<uintptr_t>(Page::kObjectAreaSize));
|
| + return static_cast<int>(offset);
|
| }
|
|
|
|
|
|
|