Commit 89240527 authored by erik.corry@gmail.com's avatar erik.corry@gmail.com

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
parent 924c38c0
...@@ -680,7 +680,7 @@ static bool AbortIncrementalMarkingAndCollectGarbage( ...@@ -680,7 +680,7 @@ static bool AbortIncrementalMarkingAndCollectGarbage(
void Heap::ReserveSpace( void Heap::ReserveSpace(
intptr_t *sizes, int *sizes,
Address *locations_out) { Address *locations_out) {
bool gc_performed = true; bool gc_performed = true;
int counter = 0; int counter = 0;
......
...@@ -1332,7 +1332,7 @@ class Heap { ...@@ -1332,7 +1332,7 @@ class Heap {
// Support for partial snapshots. After calling this we have a linear // Support for partial snapshots. After calling this we have a linear
// space to write objects in each space. // space to write objects in each space.
void ReserveSpace(intptr_t *sizes, Address* addresses); void ReserveSpace(int *sizes, Address* addresses);
// //
// Support for the API. // Support for the API.
......
...@@ -328,7 +328,7 @@ class Deserializer: public SerializerDeserializer { ...@@ -328,7 +328,7 @@ class Deserializer: public SerializerDeserializer {
// Deserialize a single object and the objects reachable from it. // Deserialize a single object and the objects reachable from it.
void DeserializePartial(Object** root); 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 >= 0);
ASSERT(space_number <= LAST_SPACE); ASSERT(space_number <= LAST_SPACE);
reservations_[space_number] = reservation; reservations_[space_number] = reservation;
...@@ -380,7 +380,7 @@ class Deserializer: public SerializerDeserializer { ...@@ -380,7 +380,7 @@ class Deserializer: public SerializerDeserializer {
// space. It is used to calculate the addresses of back-references. // space. It is used to calculate the addresses of back-references.
Address high_water_[LAST_SPACE + 1]; Address high_water_[LAST_SPACE + 1];
intptr_t reservations_[LAST_SPACE + 1]; int reservations_[LAST_SPACE + 1];
static const intptr_t kUninitializedReservation = -1; static const intptr_t kUninitializedReservation = -1;
ExternalReferenceDecoder* external_reference_decoder_; ExternalReferenceDecoder* external_reference_decoder_;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment