Reviewers: Dmitry Lomov (chromium),
Description:
Fix Windows compile error.
BUG=
Please review this at https://codereview.chromium.org/384743002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+7, -8 lines):
M src/mark-compact.h
M src/mark-compact.cc
M src/spaces.h
M src/spaces.cc
Index: src/mark-compact.cc
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index
56b0da8b836c07e347af658cfb028594ea2cc705..9a89402c17c16daad2fd64a74fa83c76a9cf79be
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();
Index: src/mark-compact.h
diff --git a/src/mark-compact.h b/src/mark-compact.h
index
bcbc05606190cb7efb149e298dfd3893ef8ddf28..7f8d2e996182cf709e0b72eb73700404f570b796
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();
Index: src/spaces.cc
diff --git a/src/spaces.cc b/src/spaces.cc
index
e7cb8ccf85254003af635e44c2fe81d582e2b926..4f4c68db844fe2be2cf2569b84de4d215ece0a71
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);
Index: src/spaces.h
diff --git a/src/spaces.h b/src/spaces.h
index
855359835293d05bf7523a7a5b187d96a4ec7cbb..dcb7769a50e58d1d62544fc807096fa550f3f0f4
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);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
