Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1132)

Unified Diff: src/spaces.cc

Issue 380263002: Fix windows compile, again. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/mark-compact.cc ('K') | « src/mark-compact.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/spaces.cc
diff --git a/src/spaces.cc b/src/spaces.cc
index 6ededac33eebdac7a5f4db2ea898f98bbb2e89da..e7cb8ccf85254003af635e44c2fe81d582e2b926 100644
--- a/src/spaces.cc
+++ b/src/spaces.cc
@@ -2578,15 +2578,15 @@ void PagedSpace::EvictEvacuationCandidatesFromFreeLists() {
}
-HeapObject* PagedSpace::EnsureSweepingProgress(int size_in_bytes) {
- ASSERT(size_in_bytes >= 0);
+HeapObject* PagedSpace::EnsureSweepingProgress(
+ int 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.
- intptr_t free_chunk =
+ int free_chunk =
collector->SweepInParallel(this, size_in_bytes);
- if (free_chunk >= static_cast<intptr_t>(size_in_bytes)) {
+ if (free_chunk >= size_in_bytes) {
HeapObject* object = free_list_.Allocate(size_in_bytes);
// We should be able to allocate an object here since we just freed that
// much memory.
« src/mark-compact.cc ('K') | « src/mark-compact.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698