Reviewers: Benedikt Meurer,
Message:
Committed patchset #1 manually as r16523.
Description:
build fix for 16520
[email protected]
BUG=
Committed: https://code.google.com/p/v8/source/detail?r=16523
Please review this at https://codereview.chromium.org/23874010/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/objects.h
M src/objects.cc
M src/v8threads.cc
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
56f267a676cbb8e6bb0c021138ed11c11c9c4713..e12d0ba3c40d0d064399c916175a1dbbf84a48bc
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();
}
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index
0a486dcff417e07cda99ccc71ff4f64f6863b081..8a17f21690bcb248cce7f01686edf4eeaa94da0f
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_;
Index: src/v8threads.cc
diff --git a/src/v8threads.cc b/src/v8threads.cc
index
17277a9c50c883f54be9e03608ed3b09fdb0ee5e..33b620d8eabe29252e17d4e6491a2251d1e2febb
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);
}
}
--
--
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.
