From 7dcc12abf62aaf08ecba0378eb1f34eafe1c1251 Mon Sep 17 00:00:00 2001
From: "dcarney@chromium.org"
 <dcarney@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 4 Sep 2013 11:09:55 +0000
Subject: [PATCH] build fix for 16520

TBR=bmeurer@chromium.org
BUG=

Review URL: https://codereview.chromium.org/23874010

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16523 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/objects.cc   | 13 ++++++-------
 src/objects.h    |  4 ++--
 src/v8threads.cc |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/objects.cc b/src/objects.cc
index 56f267a676..e12d0ba3c4 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -8178,8 +8178,8 @@ void Relocatable::PostGarbageCollectionProcessing(Isolate* isolate) {
 
 
 // Reserve space for statics needing saving and restoring.
-int Relocatable::ArchiveSpacePerThread(Isolate* isolate) {
-  return sizeof(isolate->relocatable_top());
+int Relocatable::ArchiveSpacePerThread() {
+  return sizeof(Relocatable*);  // NOLINT
 }
 
 
@@ -8187,22 +8187,21 @@ int Relocatable::ArchiveSpacePerThread(Isolate* isolate) {
 char* Relocatable::ArchiveState(Isolate* isolate, char* to) {
   *reinterpret_cast<Relocatable**>(to) = isolate->relocatable_top();
   isolate->set_relocatable_top(NULL);
-  return to + ArchiveSpacePerThread(isolate);
+  return to + ArchiveSpacePerThread();
 }
 
 
 // Restore statics that are thread local.
 char* Relocatable::RestoreState(Isolate* isolate, char* from) {
   isolate->set_relocatable_top(*reinterpret_cast<Relocatable**>(from));
-  return from + ArchiveSpacePerThread(isolate);
+  return from + ArchiveSpacePerThread();
 }
 
 
-char* Relocatable::Iterate(
-    Isolate* isolate, ObjectVisitor* v, char* thread_storage) {
+char* Relocatable::Iterate(ObjectVisitor* v, char* thread_storage) {
   Relocatable* top = *reinterpret_cast<Relocatable**>(thread_storage);
   Iterate(v, top);
-  return thread_storage + ArchiveSpacePerThread(isolate);
+  return thread_storage + ArchiveSpacePerThread();
 }
 
 
diff --git a/src/objects.h b/src/objects.h
index 0a486dcff4..8a17f21690 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -8726,12 +8726,12 @@ class Relocatable BASE_EMBEDDED {
   virtual void PostGarbageCollection() { }
 
   static void PostGarbageCollectionProcessing(Isolate* isolate);
-  static int ArchiveSpacePerThread(Isolate* isolate);
+  static int ArchiveSpacePerThread();
   static char* ArchiveState(Isolate* isolate, char* to);
   static char* RestoreState(Isolate* isolate, char* from);
   static void Iterate(Isolate* isolate, ObjectVisitor* v);
   static void Iterate(ObjectVisitor* v, Relocatable* top);
-  static char* Iterate(Isolate* isolate, ObjectVisitor* v, char* t);
+  static char* Iterate(ObjectVisitor* v, char* t);
 
  private:
   Isolate* isolate_;
diff --git a/src/v8threads.cc b/src/v8threads.cc
index 17277a9c50..33b620d8ea 100644
--- a/src/v8threads.cc
+++ b/src/v8threads.cc
@@ -227,7 +227,7 @@ void ThreadManager::Unlock() {
 }
 
 
-static int ArchiveSpacePerThread(Isolate* isolate) {
+static int ArchiveSpacePerThread() {
   return HandleScopeImplementer::ArchiveSpacePerThread() +
                         Isolate::ArchiveSpacePerThread() +
 #ifdef ENABLE_DEBUGGER_SUPPORT
@@ -236,7 +236,7 @@ static int ArchiveSpacePerThread(Isolate* isolate) {
                      StackGuard::ArchiveSpacePerThread() +
                     RegExpStack::ArchiveSpacePerThread() +
                    Bootstrapper::ArchiveSpacePerThread() +
-                    Relocatable::ArchiveSpacePerThread(isolate);
+                    Relocatable::ArchiveSpacePerThread();
 }
 
 
@@ -256,7 +256,7 @@ ThreadState::~ThreadState() {
 
 
 void ThreadState::AllocateSpace() {
-  data_ = NewArray<char>(ArchiveSpacePerThread(Isolate::Current()));
+  data_ = NewArray<char>(ArchiveSpacePerThread());
 }
 
 
@@ -396,7 +396,7 @@ void ThreadManager::Iterate(ObjectVisitor* v) {
     char* data = state->data();
     data = HandleScopeImplementer::Iterate(v, data);
     data = isolate_->Iterate(v, data);
-    data = Relocatable::Iterate(Isolate::Current(), v, data);
+    data = Relocatable::Iterate(v, data);
   }
 }