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

Unified Diff: src/incremental-marking.cc

Issue 7389008: Make Win64 compile. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Addressed review comments Created 9 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
« no previous file with comments | « src/ic.cc ('k') | src/isolate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/incremental-marking.cc
diff --git a/src/incremental-marking.cc b/src/incremental-marking.cc
index 436aae0c364f8b60badb6753ee621b0da2c11173..0d0eea74fedaeb916d4d1220420b1840c1b20f77 100644
--- a/src/incremental-marking.cc
+++ b/src/incremental-marking.cc
@@ -397,7 +397,7 @@ void IncrementalMarking::StartMarking() {
// Initialize marking stack.
Address addr = static_cast<Address>(marking_deque_memory_->address());
- int size = marking_deque_memory_->size();
+ size_t size = marking_deque_memory_->size();
if (FLAG_force_marking_deque_overflows) size = 64 * kPointerSize;
marking_deque_.Initialize(addr, addr + size);
@@ -432,11 +432,11 @@ void IncrementalMarking::PrepareForScavenge() {
void IncrementalMarking::UpdateMarkingDequeAfterScavenge() {
if (!IsMarking()) return;
- intptr_t current = marking_deque_.bottom();
- intptr_t mask = marking_deque_.mask();
- intptr_t limit = marking_deque_.top();
+ int current = marking_deque_.bottom();
+ int mask = marking_deque_.mask();
+ int limit = marking_deque_.top();
HeapObject** array = marking_deque_.array();
- intptr_t new_top = current;
+ int new_top = current;
Map* filler_map = heap_->one_pointer_filler_map();
« no previous file with comments | « src/ic.cc ('k') | src/isolate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698