From: hpayer@chromium.org <hpayer@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Thu, 10 Jul 2014 13:57:07 +0000 (+0000)
Subject: Fix Windows compile error.
X-Git-Tag: upstream/4.7.83~8292
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a087f3050003d20105258038d4468f8cb4c7c9d4;p=platform%2Fupstream%2Fv8.git

Fix Windows compile error.

BUG=
R=dslomov@chromium.org

Review URL: https://codereview.chromium.org/384743002

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

diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index 56b0da8b8..9a89402c1 100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -4068,14 +4068,14 @@ intptr_t MarkCompactCollector::SweepConservatively(PagedSpace* space,
 
 
 int MarkCompactCollector::SweepInParallel(PagedSpace* space,
-                                          int required_freed_bytes) {
+                                          intptr_t required_freed_bytes) {
   PageIterator it(space);
   FreeList* free_list = space == heap()->old_pointer_space()
                             ? free_list_old_pointer_space_.get()
                             : free_list_old_data_space_.get();
   FreeList private_free_list(space);
-  int max_freed = 0;
-  int max_freed_overall = 0;
+  intptr_t max_freed = 0;
+  intptr_t max_freed_overall = 0;
   while (it.has_next()) {
     Page* p = it.next();
 
diff --git a/src/mark-compact.h b/src/mark-compact.h
index bcbc05606..7f8d2e996 100644
--- a/src/mark-compact.h
+++ b/src/mark-compact.h
@@ -663,7 +663,7 @@ class MarkCompactCollector {
   // to a value larger than 0, then sweeping returns after a block of at least
   // required_freed_bytes was freed. If required_freed_bytes was set to zero
   // then the whole given space is swept.
-  int SweepInParallel(PagedSpace* space, int required_freed_bytes);
+  int SweepInParallel(PagedSpace* space, intptr_t required_freed_bytes);
 
   void WaitUntilSweepingCompleted();
 
diff --git a/src/spaces.cc b/src/spaces.cc
index e7cb8ccf8..4f4c68db8 100644
--- a/src/spaces.cc
+++ b/src/spaces.cc
@@ -2578,13 +2578,12 @@ void PagedSpace::EvictEvacuationCandidatesFromFreeLists() {
 }
 
 
-HeapObject* PagedSpace::EnsureSweepingProgress(
-    int size_in_bytes) {
+HeapObject* PagedSpace::EnsureSweepingProgress(intptr_t size_in_bytes) {
   MarkCompactCollector* collector = heap()->mark_compact_collector();
 
   if (collector->IsConcurrentSweepingInProgress(this)) {
     // If sweeping is still in progress try to sweep pages on the main thread.
-    int free_chunk =
+    intptr_t free_chunk =
         collector->SweepInParallel(this, size_in_bytes);
     if (free_chunk >= size_in_bytes) {
       HeapObject* object = free_list_.Allocate(size_in_bytes);
diff --git a/src/spaces.h b/src/spaces.h
index 855359835..dcb7769a5 100644
--- a/src/spaces.h
+++ b/src/spaces.h
@@ -2017,7 +2017,7 @@ class PagedSpace : public Space {
   // If sweeping is still in progress try to sweep unswept pages. If that is
   // not successful, wait for the sweeper threads and re-try free-list
   // allocation.
-  MUST_USE_RESULT HeapObject* EnsureSweepingProgress(int size_in_bytes);
+  MUST_USE_RESULT HeapObject* EnsureSweepingProgress(intptr_t size_in_bytes);
 
   // Slow path of AllocateRaw.  This function is space-dependent.
   MUST_USE_RESULT HeapObject* SlowAllocateRaw(int size_in_bytes);