Revision: 11268
Author: [email protected]
Date: Wed Apr 11 02:55:20 2012
Log: Fix compile errors on 64 bit platforms.
Review URL: https://chromiumcodereview.appspot.com/10053009
http://code.google.com/p/v8/source/detail?r=11268
Modified:
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/heap.h
/branches/bleeding_edge/test/cctest/test-api.cc
=======================================
--- /branches/bleeding_edge/src/heap.cc Thu Apr 5 07:10:39 2012
+++ /branches/bleeding_edge/src/heap.cc Wed Apr 11 02:55:20 2012
@@ -5676,7 +5676,7 @@
}
-int Heap::PromotedExternalMemorySize() {
+intptr_t Heap::PromotedExternalMemorySize() {
if (amount_of_external_allocated_memory_
<= amount_of_external_allocated_memory_at_last_global_gc_) return 0;
return amount_of_external_allocated_memory_
=======================================
--- /branches/bleeding_edge/src/heap.h Wed Apr 11 02:23:57 2012
+++ /branches/bleeding_edge/src/heap.h Wed Apr 11 02:55:20 2012
@@ -1326,7 +1326,8 @@
// Adjusts the amount of registered external memory.
// Returns the adjusted value.
- inline int AdjustAmountOfExternalAllocatedMemory(int change_in_bytes);
+ inline intptr_t AdjustAmountOfExternalAllocatedMemory(
+ intptr_t change_in_bytes);
// Allocate uninitialized fixed array.
MUST_USE_RESULT MaybeObject* AllocateRawFixedArray(int length);
@@ -1646,7 +1647,7 @@
int gc_post_processing_depth_;
// Returns the amount of external memory registered since last global gc.
- int PromotedExternalMemorySize();
+ intptr_t PromotedExternalMemorySize();
int ms_count_; // how many mark-sweep collections happened
unsigned int gc_count_; // how many gc happened
@@ -1714,7 +1715,7 @@
intptr_t amount_of_external_allocated_memory_;
// Caches the amount of external memory registered at the last global gc.
- int amount_of_external_allocated_memory_at_last_global_gc_;
+ intptr_t amount_of_external_allocated_memory_at_last_global_gc_;
// Indicates that an allocation has failed in the old generation since
the
// last GC.
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Wed Mar 21 06:48:29 2012
+++ /branches/bleeding_edge/test/cctest/test-api.cc Wed Apr 11 02:55:20 2012
@@ -10869,9 +10869,9 @@
v8::HandleScope outer;
v8::Persistent<Context> env(Context::New());
CHECK(!env.IsEmpty());
- const int kSize = 1024*1024;
+ const intptr_t kSize = 1024*1024;
CHECK_EQ(v8::V8::AdjustAmountOfExternalAllocatedMemory(kSize), kSize);
- CHECK_EQ(v8::V8::AdjustAmountOfExternalAllocatedMemory(-kSize), 0);
+ CHECK_EQ(v8::V8::AdjustAmountOfExternalAllocatedMemory(-kSize), 0l);
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
