AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

build fix for 16520

Browse Source 
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
This commit is contained in:
dcarney@chromium.org 2013-09-04 11:09:55 +00:00
parent 1973774491
commit 7dcc12abf6
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/objects.cc
View File

@ -8178,8 +8178,8 @@ void Relocatable::PostGarbageCollectionProcessing(Isolate* isolate) {
// Reserve space for statics needing saving and restoring. // Reserve space for statics needing saving and restoring.
int Relocatable::ArchiveSpacePerThread(Isolate* isolate) { int Relocatable::ArchiveSpacePerThread() {
return sizeof(isolate->relocatable_top()); return sizeof(Relocatable*); // NOLINT
} }
@ -8187,22 +8187,21 @@ int Relocatable::ArchiveSpacePerThread(Isolate* isolate) {
char* Relocatable::ArchiveState(Isolate* isolate, char* to) { char* Relocatable::ArchiveState(Isolate* isolate, char* to) {
*reinterpret_cast<Relocatable**>(to) = isolate->relocatable_top(); *reinterpret_cast<Relocatable**>(to) = isolate->relocatable_top();
isolate->set_relocatable_top(NULL); isolate->set_relocatable_top(NULL);
return to + ArchiveSpacePerThread(isolate); return to + ArchiveSpacePerThread();
} }
// Restore statics that are thread local. // Restore statics that are thread local.
char* Relocatable::RestoreState(Isolate* isolate, char* from) { char* Relocatable::RestoreState(Isolate* isolate, char* from) {
isolate->set_relocatable_top(*reinterpret_cast<Relocatable**>(from)); isolate->set_relocatable_top(*reinterpret_cast<Relocatable**>(from));
return from + ArchiveSpacePerThread(isolate); return from + ArchiveSpacePerThread();
} }
char* Relocatable::Iterate( char* Relocatable::Iterate(ObjectVisitor* v, char* thread_storage) {
Isolate* isolate, ObjectVisitor* v, char* thread_storage) {
Relocatable* top = *reinterpret_cast<Relocatable**>(thread_storage); Relocatable* top = *reinterpret_cast<Relocatable**>(thread_storage);
Iterate(v, top); Iterate(v, top);
return thread_storage + ArchiveSpacePerThread(isolate); return thread_storage + ArchiveSpacePerThread();
} }

4
src/objects.h
View File

@ -8726,12 +8726,12 @@ class Relocatable BASE_EMBEDDED {
virtual void PostGarbageCollection() { } virtual void PostGarbageCollection() { }
static void PostGarbageCollectionProcessing(Isolate* isolate); static void PostGarbageCollectionProcessing(Isolate* isolate);
static int ArchiveSpacePerThread(Isolate* isolate); static int ArchiveSpacePerThread();
static char* ArchiveState(Isolate* isolate, char* to); static char* ArchiveState(Isolate* isolate, char* to);
static char* RestoreState(Isolate* isolate, char* from); static char* RestoreState(Isolate* isolate, char* from);
static void Iterate(Isolate* isolate, ObjectVisitor* v); static void Iterate(Isolate* isolate, ObjectVisitor* v);
static void Iterate(ObjectVisitor* v, Relocatable* top); static void Iterate(ObjectVisitor* v, Relocatable* top);
static char* Iterate(Isolate* isolate, ObjectVisitor* v, char* t); static char* Iterate(ObjectVisitor* v, char* t);
private: private:
Isolate* isolate_; Isolate* isolate_;

8
src/v8threads.cc
View File

@ -227,7 +227,7 @@ void ThreadManager::Unlock() {
} }
static int ArchiveSpacePerThread(Isolate* isolate) { static int ArchiveSpacePerThread() {
return HandleScopeImplementer::ArchiveSpacePerThread() + return HandleScopeImplementer::ArchiveSpacePerThread() +
Isolate::ArchiveSpacePerThread() + Isolate::ArchiveSpacePerThread() +
#ifdef ENABLE_DEBUGGER_SUPPORT #ifdef ENABLE_DEBUGGER_SUPPORT
@ -236,7 +236,7 @@ static int ArchiveSpacePerThread(Isolate* isolate) {
StackGuard::ArchiveSpacePerThread() + StackGuard::ArchiveSpacePerThread() +
RegExpStack::ArchiveSpacePerThread() + RegExpStack::ArchiveSpacePerThread() +
Bootstrapper::ArchiveSpacePerThread() + Bootstrapper::ArchiveSpacePerThread() +
Relocatable::ArchiveSpacePerThread(isolate); Relocatable::ArchiveSpacePerThread();
} }
@ -256,7 +256,7 @@ ThreadState::~ThreadState() {
void ThreadState::AllocateSpace() { 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(); char* data = state->data();
data = HandleScopeImplementer::Iterate(v, data); data = HandleScopeImplementer::Iterate(v, data);
data = isolate_->Iterate(v, data); data = isolate_->Iterate(v, data);
data = Relocatable::Iterate(Isolate::Current(), v, data); data = Relocatable::Iterate(v, data);
} }
} }