Index: src/api.cc |
diff --git a/src/api.cc b/src/api.cc |
index 8d101631df9eddeb4bcdbfd7864087e99f97dee5..647b807a76dc4b4b211bca5380e886e751181e1f 100644 |
--- a/src/api.cc |
+++ b/src/api.cc |
@@ -1953,8 +1953,10 @@ v8::Local<Value> v8::TryCatch::StackTrace() const { |
i::Handle<i::JSObject> obj(i::JSObject::cast(raw_obj), isolate_); |
i::Handle<i::String> name = isolate_->factory()->stack_string(); |
if (!i::JSReceiver::HasProperty(obj, name)) return v8::Local<Value>(); |
- i::Handle<i::Object> value = i::Object::GetProperty(obj, name); |
- if (value.is_null()) return v8::Local<Value>(); |
+ i::Handle<i::Object> value; |
+ if (!i::Object::GetProperty(obj, name).ToHandle(&value)) { |
+ return v8::Local<Value>(); |
+ } |
return v8::Utils::ToLocal(scope.CloseAndEscape(value)); |
} else { |
return v8::Local<Value>(); |
@@ -2049,8 +2051,8 @@ static i::Handle<i::Object> CallV8HeapFunction(const char* name, |
i::Handle<i::String> fmt_str = |
isolate->factory()->InternalizeUtf8String(name); |
i::Handle<i::Object> object_fun = |
- i::GlobalObject::GetPropertyNoExceptionThrown( |
- isolate->js_builtins_object(), fmt_str); |
+ i::Object::GetProperty( |
+ isolate->js_builtins_object(), fmt_str).ToHandleChecked(); |
i::Handle<i::JSFunction> fun = i::Handle<i::JSFunction>::cast(object_fun); |
i::Handle<i::Object> value = i::Execution::Call( |
isolate, fun, recv, argc, argv, has_pending_exception); |
@@ -2185,7 +2187,7 @@ Local<StackFrame> StackTrace::GetFrame(uint32_t index) const { |
EscapableHandleScope scope(reinterpret_cast<Isolate*>(isolate)); |
i::Handle<i::JSArray> self = Utils::OpenHandle(this); |
i::Handle<i::Object> obj = |
- i::Object::GetElementNoExceptionThrown(isolate, self, index); |
+ i::Object::GetElement(isolate, self, index).ToHandleChecked(); |
i::Handle<i::JSObject> jsobj = i::Handle<i::JSObject>::cast(obj); |
return scope.Escape(Utils::StackFrameToLocal(jsobj)); |
} |
@@ -2500,8 +2502,8 @@ static i::Object* LookupBuiltin(i::Isolate* isolate, |
const char* builtin_name) { |
i::Handle<i::String> string = |
isolate->factory()->InternalizeUtf8String(builtin_name); |
- return *i::GlobalObject::GetPropertyNoExceptionThrown( |
- isolate->js_builtins_object(), string); |
+ return *i::Object::GetProperty( |
+ isolate->js_builtins_object(), string).ToHandleChecked(); |
} |
@@ -7001,8 +7003,8 @@ Local<Value> Debug::GetMirror(v8::Handle<v8::Value> obj) { |
isolate_debug->debug_context()->global_object()); |
i::Handle<i::String> name = isolate->factory()->InternalizeOneByteString( |
STATIC_ASCII_VECTOR("MakeMirror")); |
- i::Handle<i::Object> fun_obj = i::Object::GetProperty(debug, name); |
- ASSERT(!fun_obj.is_null()); |
+ i::Handle<i::Object> fun_obj = |
+ i::Object::GetProperty(debug, name).ToHandleChecked(); |
i::Handle<i::JSFunction> fun = i::Handle<i::JSFunction>::cast(fun_obj); |
v8::Handle<v8::Function> v8_fun = Utils::ToLocal(fun); |
const int kArgc = 1; |