Fix bugs introduced by r4475:...

test/cctest/test-heap.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 
 #include <stdlib.h>
 
 #include "v8.h"
 
 #include "execution.h"
 #include "factory.h"
 #include "macro-assembler.h"
 #include "global-handles.h"
@@ skipping 812 matching lines @@
   Address next_page = current_page + Page::kPageSize;
   int bytes_to_page = static_cast<int>(next_page - current_top);
   if (bytes_to_page <= FixedArray::kHeaderSize) {
     // Alas, need to cross another page to be able to
     // put desired value.
     next_page += Page::kPageSize;
     bytes_to_page = static_cast<int>(next_page - current_top);
   }
   CHECK(bytes_to_page > FixedArray::kHeaderSize);
 
-  intptr_t* flags_ptr = &Page::FromAddress(next_page)->flags;
+  int* flags_ptr = &Page::FromAddress(next_page)->flags;
   Address flags_addr = reinterpret_cast<Address>(flags_ptr);
 
   int bytes_to_allocate =
       static_cast<int>(flags_addr - current_top) + kPointerSize;
 
   int n_elements = (bytes_to_allocate - FixedArray::kHeaderSize) /
       kPointerSize;
   CHECK_EQ(bytes_to_allocate, FixedArray::SizeFor(n_elements));
   FixedArray* array = FixedArray::cast(
       Heap::AllocateFixedArray(n_elements));
@@ skipping 114 matching lines @@
   CHECK(page->IsRSetSet(clone_addr, object_size - kPointerSize));
   // Probe several addresses after the object.
   for (int i = 0; i < 7; i++) {
     int offset = object_size + i * kPointerSize;
     if (clone_addr + offset >= page->ObjectAreaEnd()) {
       break;
     }
     CHECK(!page->IsRSetSet(clone_addr, offset));
   }
 }