Fix Windows x64 build broken by r5299.

Review URL: http://codereview.chromium.org/3158019

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

diff --git a/src/spaces-inl.h b/src/spaces-inl.h
index f6552de..3b4718b 100644 (file)
--- a/src/spaces-inl.h
+++ b/src/spaces-inl.h
@@ -243,15 +243,15 @@ void Page::InvalidateWatermark(bool value) {
 
 
 bool Page::GetPageFlag(PageFlag flag) {
-  return (flags_ & (1 << flag)) != 0;
+  return (flags_ & static_cast<intptr_t>(1 << flag)) != 0;
 }
 
 
 void Page::SetPageFlag(PageFlag flag, bool value) {
   if (value) {
-    flags_ |= (1 << flag);
+    flags_ |= static_cast<intptr_t>(1 << flag);
   } else {
-    flags_ &= ~(1 << flag);
+    flags_ &= ~static_cast<intptr_t>(1 << flag);
   }
 }
 

diff --git a/src/spaces.cc b/src/spaces.cc
index f0e5575..67adafd 100644 (file)
--- a/src/spaces.cc
+++ b/src/spaces.cc
@@ -390,7 +390,7 @@ void MemoryAllocator::FreeRawMemory(void* mem,
   }
   Counters::memory_allocated.Decrement(static_cast<int>(length));
   size_ -= static_cast<int>(length);
-  if (executable == EXECUTABLE) size_executable_ -= length;
+  if (executable == EXECUTABLE) size_executable_ -= static_cast<int>(length);
   ASSERT(size_ >= 0);
 }