Index: src/mark-compact.cc |
=================================================================== |
--- src/mark-compact.cc (revision 5551) |
+++ src/mark-compact.cc (working copy) |
@@ -167,8 +167,8 @@ |
// reclaiming the waste and free list blocks). |
static const int kFragmentationLimit = 15; // Percent. |
static const int kFragmentationAllowed = 1 * MB; // Absolute. |
- int old_gen_recoverable = 0; |
- int old_gen_used = 0; |
+ intptr_t old_gen_recoverable = 0; |
+ intptr_t old_gen_used = 0; |
OldSpaces spaces; |
for (OldSpace* space = spaces.next(); space != NULL; space = spaces.next()) { |
@@ -2008,8 +2008,10 @@ |
#ifdef DEBUG |
if (FLAG_gc_verbose) { |
- PrintF("update %p : %p -> %p\n", obj->address(), |
- map, new_map); |
+ PrintF("update %p : %p -> %p\n", |
+ obj->address(), |
+ reinterpret_cast<void*>(map), |
+ reinterpret_cast<void*>(new_map)); |
} |
#endif |
} |
@@ -2068,8 +2070,8 @@ |
&UpdatePointerToNewGen, |
Heap::WATERMARK_SHOULD_BE_VALID); |
- int live_maps_size = Heap::map_space()->Size(); |
- int live_maps = live_maps_size / Map::kSize; |
+ intptr_t live_maps_size = Heap::map_space()->Size(); |
+ int live_maps = static_cast<int>(live_maps_size / Map::kSize); |
ASSERT(live_map_objects_size_ == live_maps_size); |
if (Heap::map_space()->NeedsCompaction(live_maps)) { |