Revision: 16523
Author:   [email protected]
Date:     Wed Sep  4 11:09:55 2013 UTC
Log:      build fix for 16520

[email protected]
BUG=

Review URL: https://codereview.chromium.org/23874010
http://code.google.com/p/v8/source/detail?r=16523

Modified:
 /branches/bleeding_edge/src/objects.cc
 /branches/bleeding_edge/src/objects.h
 /branches/bleeding_edge/src/v8threads.cc

=======================================
--- /branches/bleeding_edge/src/objects.cc      Wed Sep  4 10:34:42 2013 UTC
+++ /branches/bleeding_edge/src/objects.cc      Wed Sep  4 11:09:55 2013 UTC
@@ -8178,8 +8178,8 @@


 // 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 @@
 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();
 }


=======================================
--- /branches/bleeding_edge/src/objects.h       Wed Sep  4 10:34:42 2013 UTC
+++ /branches/bleeding_edge/src/objects.h       Wed Sep  4 11:09:55 2013 UTC
@@ -8726,12 +8726,12 @@
   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_;
=======================================
--- /branches/bleeding_edge/src/v8threads.cc    Wed Sep  4 10:34:42 2013 UTC
+++ /branches/bleeding_edge/src/v8threads.cc    Wed Sep  4 11:09:55 2013 UTC
@@ -227,7 +227,7 @@
 }


-static int ArchiveSpacePerThread(Isolate* isolate) {
+static int ArchiveSpacePerThread() {
   return HandleScopeImplementer::ArchiveSpacePerThread() +
                         Isolate::ArchiveSpacePerThread() +
 #ifdef ENABLE_DEBUGGER_SUPPORT
@@ -236,7 +236,7 @@
                      StackGuard::ArchiveSpacePerThread() +
                     RegExpStack::ArchiveSpacePerThread() +
                    Bootstrapper::ArchiveSpacePerThread() +
-                    Relocatable::ArchiveSpacePerThread(isolate);
+                    Relocatable::ArchiveSpacePerThread();
 }


@@ -256,7 +256,7 @@


 void ThreadState::AllocateSpace() {
-  data_ = NewArray<char>(ArchiveSpacePerThread(Isolate::Current()));
+  data_ = NewArray<char>(ArchiveSpacePerThread());
 }


@@ -396,7 +396,7 @@
     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);
   }
 }

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to