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

Remove remaining HandleScope::Close usage

Browse Source 
For some reason, this is only caught when compiling with chromium on
Mac.

BUG=none
R=verwaest@chromium.org, dslomov@chromium.org
LOG=n

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18209 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jochen@chromium.org 2013-12-02 18:12:01 +00:00
parent 83bd5a603e
commit 5d4c7562a1
6 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/api.cc
View File

@ -2131,18 +2131,18 @@ Local<String> Message::Get() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ON_BAILOUT(isolate, "v8::Message::Get()", return Local<String>()); ON_BAILOUT(isolate, "v8::Message::Get()", return Local<String>());
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::Object> obj = Utils::OpenHandle(this); i::Handle<i::Object> obj = Utils::OpenHandle(this);
i::Handle<i::String> raw_result = i::MessageHandler::GetMessage(isolate, obj); i::Handle<i::String> raw_result = i::MessageHandler::GetMessage(isolate, obj);
Local<String> result = Utils::ToLocal(raw_result); Local<String> result = Utils::ToLocal(raw_result);
return scope.Close(result); return scope.Escape(result);
} }
v8::Handle<Value> Message::GetScriptResourceName() const { v8::Handle<Value> Message::GetScriptResourceName() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSMessageObject> message = i::Handle<i::JSMessageObject> message =
i::Handle<i::JSMessageObject>::cast(Utils::OpenHandle(this)); i::Handle<i::JSMessageObject>::cast(Utils::OpenHandle(this));
// Return this.script.name. // Return this.script.name.
@ -2151,14 +2151,14 @@ v8::Handle<Value> Message::GetScriptResourceName() const {
isolate)); isolate));
i::Handle<i::Object> resource_name(i::Script::cast(script->value())->name(), i::Handle<i::Object> resource_name(i::Script::cast(script->value())->name(),
isolate); isolate);
return scope.Close(Utils::ToLocal(resource_name)); return scope.Escape(Utils::ToLocal(resource_name));
} }
v8::Handle<Value> Message::GetScriptData() const { v8::Handle<Value> Message::GetScriptData() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSMessageObject> message = i::Handle<i::JSMessageObject> message =
i::Handle<i::JSMessageObject>::cast(Utils::OpenHandle(this)); i::Handle<i::JSMessageObject>::cast(Utils::OpenHandle(this));
// Return this.script.data. // Return this.script.data.
@ -2166,21 +2166,21 @@ v8::Handle<Value> Message::GetScriptData() const {
i::Handle<i::JSValue>::cast(i::Handle<i::Object>(message->script(), i::Handle<i::JSValue>::cast(i::Handle<i::Object>(message->script(),
isolate)); isolate));
i::Handle<i::Object> data(i::Script::cast(script->value())->data(), isolate); i::Handle<i::Object> data(i::Script::cast(script->value())->data(), isolate);
return scope.Close(Utils::ToLocal(data)); return scope.Escape(Utils::ToLocal(data));
} }
v8::Handle<v8::StackTrace> Message::GetStackTrace() const { v8::Handle<v8::StackTrace> Message::GetStackTrace() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSMessageObject> message = i::Handle<i::JSMessageObject> message =
i::Handle<i::JSMessageObject>::cast(Utils::OpenHandle(this)); i::Handle<i::JSMessageObject>::cast(Utils::OpenHandle(this));
i::Handle<i::Object> stackFramesObj(message->stack_frames(), isolate); i::Handle<i::Object> stackFramesObj(message->stack_frames(), isolate);
if (!stackFramesObj->IsJSArray()) return v8::Handle<v8::StackTrace>(); if (!stackFramesObj->IsJSArray()) return v8::Handle<v8::StackTrace>();
i::Handle<i::JSArray> stackTrace = i::Handle<i::JSArray> stackTrace =
i::Handle<i::JSArray>::cast(stackFramesObj); i::Handle<i::JSArray>::cast(stackFramesObj);
return scope.Close(Utils::StackTraceToLocal(stackTrace)); return scope.Escape(Utils::StackTraceToLocal(stackTrace));
} }
@ -2300,14 +2300,14 @@ Local<String> Message::GetSourceLine() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ON_BAILOUT(isolate, "v8::Message::GetSourceLine()", return Local<String>()); ON_BAILOUT(isolate, "v8::Message::GetSourceLine()", return Local<String>());
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
EXCEPTION_PREAMBLE(isolate); EXCEPTION_PREAMBLE(isolate);
i::Handle<i::Object> result = CallV8HeapFunction("GetSourceLine", i::Handle<i::Object> result = CallV8HeapFunction("GetSourceLine",
Utils::OpenHandle(this), Utils::OpenHandle(this),
&has_pending_exception); &has_pending_exception);
EXCEPTION_BAILOUT_CHECK(isolate, Local<v8::String>()); EXCEPTION_BAILOUT_CHECK(isolate, Local<v8::String>());
if (result->IsString()) { if (result->IsString()) {
return scope.Close(Utils::ToLocal(i::Handle<i::String>::cast(result))); return scope.Escape(Utils::ToLocal(i::Handle<i::String>::cast(result)));
} else { } else {
return Local<String>(); return Local<String>();
} }
@ -2331,11 +2331,11 @@ void Message::PrintCurrentStackTrace(FILE* out) {
Local<StackFrame> StackTrace::GetFrame(uint32_t index) const { Local<StackFrame> StackTrace::GetFrame(uint32_t index) const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSArray> self = Utils::OpenHandle(this); i::Handle<i::JSArray> self = Utils::OpenHandle(this);
i::Object* raw_object = self->GetElementNoExceptionThrown(isolate, index); i::Object* raw_object = self->GetElementNoExceptionThrown(isolate, index);
i::Handle<i::JSObject> obj(i::JSObject::cast(raw_object)); i::Handle<i::JSObject> obj(i::JSObject::cast(raw_object));
return scope.Close(Utils::StackFrameToLocal(obj)); return scope.Escape(Utils::StackFrameToLocal(obj));
} }
@ -2415,39 +2415,39 @@ int StackFrame::GetScriptId() const {
Local<String> StackFrame::GetScriptName() const { Local<String> StackFrame::GetScriptName() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSObject> self = Utils::OpenHandle(this); i::Handle<i::JSObject> self = Utils::OpenHandle(this);
i::Handle<i::Object> name = GetProperty(self, "scriptName"); i::Handle<i::Object> name = GetProperty(self, "scriptName");
if (!name->IsString()) { if (!name->IsString()) {
return Local<String>(); return Local<String>();
} }
return scope.Close(Local<String>::Cast(Utils::ToLocal(name))); return scope.Escape(Local<String>::Cast(Utils::ToLocal(name)));
} }
Local<String> StackFrame::GetScriptNameOrSourceURL() const { Local<String> StackFrame::GetScriptNameOrSourceURL() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSObject> self = Utils::OpenHandle(this); i::Handle<i::JSObject> self = Utils::OpenHandle(this);
i::Handle<i::Object> name = GetProperty(self, "scriptNameOrSourceURL"); i::Handle<i::Object> name = GetProperty(self, "scriptNameOrSourceURL");
if (!name->IsString()) { if (!name->IsString()) {
return Local<String>(); return Local<String>();
} }
return scope.Close(Local<String>::Cast(Utils::ToLocal(name))); return scope.Escape(Local<String>::Cast(Utils::ToLocal(name)));
} }
Local<String> StackFrame::GetFunctionName() const { Local<String> StackFrame::GetFunctionName() const {
i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate(); i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
ENTER_V8(isolate); ENTER_V8(isolate);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSObject> self = Utils::OpenHandle(this); i::Handle<i::JSObject> self = Utils::OpenHandle(this);
i::Handle<i::Object> name = GetProperty(self, "functionName"); i::Handle<i::Object> name = GetProperty(self, "functionName");
if (!name->IsString()) { if (!name->IsString()) {
return Local<String>(); return Local<String>();
} }
return scope.Close(Local<String>::Cast(Utils::ToLocal(name))); return scope.Escape(Local<String>::Cast(Utils::ToLocal(name)));
} }
@ -4158,7 +4158,7 @@ Local<v8::Object> Function::NewInstance(int argc,
ENTER_V8(isolate); ENTER_V8(isolate);
i::Logger::TimerEventScope timer_scope( i::Logger::TimerEventScope timer_scope(
isolate, i::Logger::TimerEventScope::v8_execute); isolate, i::Logger::TimerEventScope::v8_execute);
HandleScope scope(reinterpret_cast<Isolate*>(isolate)); EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Handle<i::JSFunction> function = Utils::OpenHandle(this); i::Handle<i::JSFunction> function = Utils::OpenHandle(this);
STATIC_ASSERT(sizeof(v8::Handle<v8::Value>) == sizeof(i::Object**)); STATIC_ASSERT(sizeof(v8::Handle<v8::Value>) == sizeof(i::Object**));
i::Handle<i::Object>* args = reinterpret_cast<i::Handle<i::Object>*>(argv); i::Handle<i::Object>* args = reinterpret_cast<i::Handle<i::Object>*>(argv);
@ -4166,7 +4166,7 @@ Local<v8::Object> Function::NewInstance(int argc,
i::Handle<i::Object> returned = i::Handle<i::Object> returned =
i::Execution::New(function, argc, args, &has_pending_exception); i::Execution::New(function, argc, args, &has_pending_exception);
EXCEPTION_BAILOUT_CHECK_DO_CALLBACK(isolate, Local<v8::Object>()); EXCEPTION_BAILOUT_CHECK_DO_CALLBACK(isolate, Local<v8::Object>());
return scope.Close(Utils::ToLocal(i::Handle<i::JSObject>::cast(returned))); return scope.Escape(Utils::ToLocal(i::Handle<i::JSObject>::cast(returned)));
} }
@ -7069,7 +7069,7 @@ Local<Value> Debug::GetMirror(v8::Handle<v8::Value> obj) {
if (!isolate->IsInitialized()) return Local<Value>(); if (!isolate->IsInitialized()) return Local<Value>();
ON_BAILOUT(isolate, "v8::Debug::GetMirror()", return Local<Value>()); ON_BAILOUT(isolate, "v8::Debug::GetMirror()", return Local<Value>());
ENTER_V8(isolate); ENTER_V8(isolate);
v8::HandleScope scope(reinterpret_cast<Isolate*>(isolate)); v8::EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate));
i::Debug* isolate_debug = isolate->debug(); i::Debug* isolate_debug = isolate->debug();
isolate_debug->Load(); isolate_debug->Load();
i::Handle<i::JSObject> debug(isolate_debug->debug_context()->global_object()); i::Handle<i::JSObject> debug(isolate_debug->debug_context()->global_object());
@ -7081,11 +7081,10 @@ Local<Value> Debug::GetMirror(v8::Handle<v8::Value> obj) {
const int kArgc = 1; const int kArgc = 1;
v8::Handle<v8::Value> argv[kArgc] = { obj }; v8::Handle<v8::Value> argv[kArgc] = { obj };
EXCEPTION_PREAMBLE(isolate); EXCEPTION_PREAMBLE(isolate);
v8::Handle<v8::Value> result = v8_fun->Call(Utils::ToLocal(debug), v8::Local<v8::Value> result =
kArgc, v8_fun->Call(Utils::ToLocal(debug), kArgc, argv);
argv);
EXCEPTION_BAILOUT_CHECK(isolate, Local<Value>()); EXCEPTION_BAILOUT_CHECK(isolate, Local<Value>());
return scope.Close(result); return scope.Escape(result);
} }

4
src/api.h
View File

@ -308,12 +308,12 @@ OPEN_HANDLE_LIST(DECLARE_OPEN_HANDLE)
template <class T> template <class T>
v8::internal::Handle<T> v8::internal::Handle<T>::EscapeFrom( v8::internal::Handle<T> v8::internal::Handle<T>::EscapeFrom(
v8::HandleScope* scope) { v8::EscapableHandleScope* scope) {
v8::internal::Handle<T> handle; v8::internal::Handle<T> handle;
if (!is_null()) { if (!is_null()) {
handle = *this; handle = *this;
} }
return Utils::OpenHandle(*scope->Close(Utils::ToLocal(handle)), true); return Utils::OpenHandle(*scope->Escape(Utils::ToLocal(handle)), true);
} }

4
src/debug.cc
View File

@ -3640,7 +3640,7 @@ v8::Handle<v8::Object> MessageImpl::GetEventData() const {
v8::Handle<v8::String> MessageImpl::GetJSON() const { v8::Handle<v8::String> MessageImpl::GetJSON() const {
v8::HandleScope scope( v8::EscapableHandleScope scope(
reinterpret_cast<v8::Isolate*>(event_data_->GetIsolate())); reinterpret_cast<v8::Isolate*>(event_data_->GetIsolate()));
if (IsEvent()) { if (IsEvent()) {
@ -3656,7 +3656,7 @@ v8::Handle<v8::String> MessageImpl::GetJSON() const {
if (caught_exception || !json->IsString()) { if (caught_exception || !json->IsString()) {
return v8::Handle<v8::String>(); return v8::Handle<v8::String>();
} }
return scope.Close(v8::Utils::ToLocal(Handle<String>::cast(json))); return scope.Escape(v8::Utils::ToLocal(Handle<String>::cast(json)));
} else { } else {
return v8::Utils::ToLocal(response_json_); return v8::Utils::ToLocal(response_json_);
} }

2
src/factory.cc
View File

@ -854,7 +854,7 @@ Handle<Object> Factory::NewError(const char* maker,
const char* message, const char* message,
Vector< Handle<Object> > args) { Vector< Handle<Object> > args) {
// Instantiate a closeable HandleScope for EscapeFrom. // Instantiate a closeable HandleScope for EscapeFrom.
v8::HandleScope scope(reinterpret_cast<v8::Isolate*>(isolate())); v8::EscapableHandleScope scope(reinterpret_cast<v8::Isolate*>(isolate()));
Handle<FixedArray> array = NewFixedArray(args.length()); Handle<FixedArray> array = NewFixedArray(args.length());
for (int i = 0; i < args.length(); i++) { for (int i = 0; i < args.length(); i++) {
array->set(i, *args[i]); array->set(i, *args[i]);

2
src/handles.h
View File

@ -83,7 +83,7 @@ class Handle {
// Closes the given scope, but lets this handle escape. See // Closes the given scope, but lets this handle escape. See
// implementation in api.h. // implementation in api.h.
inline Handle<T> EscapeFrom(v8::HandleScope* scope); inline Handle<T> EscapeFrom(v8::EscapableHandleScope* scope);
#ifdef DEBUG #ifdef DEBUG
enum DereferenceCheckMode { INCLUDE_DEFERRED_CHECK, NO_DEFERRED_CHECK }; enum DereferenceCheckMode { INCLUDE_DEFERRED_CHECK, NO_DEFERRED_CHECK };

2
test/cctest/test-heap.cc
View File

@ -935,7 +935,7 @@ TEST(EmptyHandleEscapeFrom) {
Handle<JSObject> runaway; Handle<JSObject> runaway;
{ {
v8::HandleScope nested(CcTest::isolate()); v8::EscapableHandleScope nested(CcTest::isolate());
Handle<JSObject> empty; Handle<JSObject> empty;
runaway = empty.EscapeFrom(&nested); runaway = empty.EscapeFrom(&nested);
} }