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

Unified Diff: src/mark-compact.h

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/isolate.h ('k') | src/mark-compact.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/mark-compact.h
diff --git a/src/mark-compact.h b/src/mark-compact.h
index 4b94b3111b93d667ec7f48cdbee780b494813a3c..f656dd513f34b71b4f3fa917d96cc08c4ff2eda9 100644
--- a/src/mark-compact.h
+++ b/src/mark-compact.h
@@ -188,7 +188,7 @@ class MarkingDeque {
HeapObject** obj_low = reinterpret_cast<HeapObject**>(low);
HeapObject** obj_high = reinterpret_cast<HeapObject**>(high);
array_ = obj_low;
- mask_ = RoundDownToPowerOf2(obj_high - obj_low) - 1;
+ mask_ = RoundDownToPowerOf2(static_cast<int>(obj_high - obj_low)) - 1;
top_ = bottom_ = 0;
overflowed_ = false;
}
@@ -248,10 +248,10 @@ class MarkingDeque {
}
HeapObject** array() { return array_; }
- intptr_t bottom() { return bottom_; }
- intptr_t top() { return top_; }
- intptr_t mask() { return mask_; }
- void set_top(intptr_t top) { top_ = top; }
+ int bottom() { return bottom_; }
+ int top() { return top_; }
+ int mask() { return mask_; }
+ void set_top(int top) { top_ = top; }
private:
HeapObject** array_;
@@ -301,7 +301,8 @@ class SlotsBuffer {
static int SizeOfChain(SlotsBuffer* buffer) {
if (buffer == NULL) return 0;
- return buffer->idx_ + (buffer->chain_length_ - 1) * kNumberOfElements;
+ return static_cast<int>(buffer->idx_ +
+ (buffer->chain_length_ - 1) * kNumberOfElements);
}
inline bool IsFull() {
@@ -441,7 +442,7 @@ class MarkCompactCollector {
// Sweep a single page from the given space conservatively.
// Return a number of reclaimed bytes.
- static int SweepConservatively(PagedSpace* space, Page* p);
+ static intptr_t SweepConservatively(PagedSpace* space, Page* p);
INLINE(static bool ShouldSkipEvacuationSlotRecording(Object** anchor)) {
return Page::FromAddress(reinterpret_cast<Address>(anchor))->
« no previous file with comments | « src/isolate.h ('k') | src/mark-compact.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698