Fix lookup iterator checks in GetRealNamedProperty* methods
BUG=v8:4143 R=verwaest@chromium.org LOG=n Review URL: https://codereview.chromium.org/1161553004 Cr-Commit-Position: refs/heads/master@{#28616}
This commit is contained in:
parent
32de677805
commit
7b24219346
11
src/api.cc
11
src/api.cc
@ -4033,10 +4033,10 @@ MaybeLocal<Value> v8::Object::GetRealNamedPropertyInPrototypeChain(
|
||||
auto proto = i::PrototypeIterator::GetCurrent(iter);
|
||||
i::LookupIterator it(self, key_obj, i::Handle<i::JSReceiver>::cast(proto),
|
||||
i::LookupIterator::PROTOTYPE_CHAIN_SKIP_INTERCEPTOR);
|
||||
if (!it.IsFound()) return MaybeLocal<Value>();
|
||||
Local<Value> result;
|
||||
has_pending_exception = !ToLocal<Value>(i::Object::GetProperty(&it), &result);
|
||||
RETURN_ON_FAILED_EXECUTION(Value);
|
||||
if (!it.IsFound()) return MaybeLocal<Value>();
|
||||
RETURN_ESCAPED(result);
|
||||
}
|
||||
|
||||
@ -4062,9 +4062,9 @@ v8::Object::GetRealNamedPropertyAttributesInPrototypeChain(
|
||||
auto proto = i::PrototypeIterator::GetCurrent(iter);
|
||||
i::LookupIterator it(self, key_obj, i::Handle<i::JSReceiver>::cast(proto),
|
||||
i::LookupIterator::PROTOTYPE_CHAIN_SKIP_INTERCEPTOR);
|
||||
if (!it.IsFound()) return Nothing<PropertyAttribute>();
|
||||
auto result = i::JSReceiver::GetPropertyAttributes(&it);
|
||||
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(PropertyAttribute);
|
||||
if (!it.IsFound()) return Nothing<PropertyAttribute>();
|
||||
if (result.FromJust() == ABSENT) {
|
||||
return Just(static_cast<PropertyAttribute>(NONE));
|
||||
}
|
||||
@ -4082,16 +4082,15 @@ v8::Object::GetRealNamedPropertyAttributesInPrototypeChain(Handle<String> key) {
|
||||
|
||||
MaybeLocal<Value> v8::Object::GetRealNamedProperty(Local<Context> context,
|
||||
Local<Name> key) {
|
||||
PREPARE_FOR_EXECUTION(
|
||||
context, "v8::Object::GetRealNamedPropertyInPrototypeChain()", Value);
|
||||
PREPARE_FOR_EXECUTION(context, "v8::Object::GetRealNamedProperty()", Value);
|
||||
auto self = Utils::OpenHandle(this);
|
||||
auto key_obj = Utils::OpenHandle(*key);
|
||||
i::LookupIterator it(self, key_obj,
|
||||
i::LookupIterator::PROTOTYPE_CHAIN_SKIP_INTERCEPTOR);
|
||||
if (!it.IsFound()) return MaybeLocal<Value>();
|
||||
Local<Value> result;
|
||||
has_pending_exception = !ToLocal<Value>(i::Object::GetProperty(&it), &result);
|
||||
RETURN_ON_FAILED_EXECUTION(Value);
|
||||
if (!it.IsFound()) return MaybeLocal<Value>();
|
||||
RETURN_ESCAPED(result);
|
||||
}
|
||||
|
||||
@ -4111,9 +4110,9 @@ Maybe<PropertyAttribute> v8::Object::GetRealNamedPropertyAttributes(
|
||||
auto key_obj = Utils::OpenHandle(*key);
|
||||
i::LookupIterator it(self, key_obj,
|
||||
i::LookupIterator::PROTOTYPE_CHAIN_SKIP_INTERCEPTOR);
|
||||
if (!it.IsFound()) return Nothing<PropertyAttribute>();
|
||||
auto result = i::JSReceiver::GetPropertyAttributes(&it);
|
||||
RETURN_ON_FAILED_EXECUTION_PRIMITIVE(PropertyAttribute);
|
||||
if (!it.IsFound()) return Nothing<PropertyAttribute>();
|
||||
if (result.FromJust() == ABSENT) {
|
||||
return Just(static_cast<PropertyAttribute>(NONE));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user