Fix compile errors on Win64.

Review URL: https://chromiumcodereview.appspot.com/10913273

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12509 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/heap.cc b/src/heap.cc
index 6f6d6c9..bdb63bf 100644 (file)
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -680,7 +680,7 @@ static bool AbortIncrementalMarkingAndCollectGarbage(
 
 
 void Heap::ReserveSpace(
-    intptr_t *sizes,
+    int *sizes,
     Address *locations_out) {
   bool gc_performed = true;
   int counter = 0;

diff --git a/src/heap.h b/src/heap.h
index 2585cac..90d0797 100644 (file)
--- a/src/heap.h
+++ b/src/heap.h
@@ -1332,7 +1332,7 @@ class Heap {
 
   // Support for partial snapshots.  After calling this we have a linear
   // space to write objects in each space.
-  void ReserveSpace(intptr_t *sizes, Address* addresses);
+  void ReserveSpace(int *sizes, Address* addresses);
 
   //
   // Support for the API.

diff --git a/src/serialize.h b/src/serialize.h
index 008dd99..2041792 100644 (file)
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -328,7 +328,7 @@ class Deserializer: public SerializerDeserializer {
   // Deserialize a single object and the objects reachable from it.
   void DeserializePartial(Object** root);
 
-  void set_reservation(int space_number, uintptr_t reservation) {
+  void set_reservation(int space_number, int reservation) {
     ASSERT(space_number >= 0);
     ASSERT(space_number <= LAST_SPACE);
     reservations_[space_number] = reservation;
@@ -380,7 +380,7 @@ class Deserializer: public SerializerDeserializer {
   // space.  It is used to calculate the addresses of back-references.
   Address high_water_[LAST_SPACE + 1];
 
-  intptr_t reservations_[LAST_SPACE + 1];
+  int reservations_[LAST_SPACE + 1];
   static const intptr_t kUninitializedReservation = -1;
 
   ExternalReferenceDecoder* external_reference_decoder_;