Chromium Code Reviews| Index: src/runtime/runtime-object.cc |
| diff --git a/src/runtime/runtime-object.cc b/src/runtime/runtime-object.cc |
| index 064e4c216291dc7d56261dc195a0db1d6d2f54ab..59aac4800b609abc6fb73f862c6cc37cdcfe19d9 100644 |
| --- a/src/runtime/runtime-object.cc |
| +++ b/src/runtime/runtime-object.cc |
| @@ -779,25 +779,36 @@ RUNTIME_FUNCTION(Runtime_HasOwnProperty) { |
| } |
| +// ES6 section 12.9.3, operator in. |
| RUNTIME_FUNCTION(Runtime_HasProperty) { |
| HandleScope scope(isolate); |
| - DCHECK(args.length() == 2); |
| - CONVERT_ARG_HANDLE_CHECKED(JSReceiver, receiver, 0); |
| - CONVERT_ARG_HANDLE_CHECKED(Name, key, 1); |
| + DCHECK_EQ(2, args.length()); |
| + CONVERT_ARG_HANDLE_CHECKED(Object, key, 0); |
| + CONVERT_ARG_HANDLE_CHECKED(Object, object, 1); |
| - Maybe<bool> maybe = JSReceiver::HasProperty(receiver, key); |
| - if (!maybe.IsJust()) return isolate->heap()->exception(); |
| - return isolate->heap()->ToBoolean(maybe.FromJust()); |
| -} |
| + // Check that {object} is actually a receiver. |
| + if (!object->IsJSReceiver()) { |
| + THROW_NEW_ERROR_RETURN_FAILURE( |
| + isolate, |
| + NewTypeError(MessageTemplate::kInvalidInOperatorUse, key, object)); |
| + } |
| + Handle<JSReceiver> receiver = Handle<JSReceiver>::cast(object); |
| + // Check for fast element case. |
| + uint32_t index = 0; |
| + if (key->ToArrayIndex(&index)) { |
| + Maybe<bool> maybe = JSReceiver::HasElement(receiver, index); |
| + if (!maybe.IsJust()) return isolate->heap()->exception(); |
| + return isolate->heap()->ToBoolean(maybe.FromJust()); |
| + } |
| -RUNTIME_FUNCTION(Runtime_HasElement) { |
| - HandleScope scope(isolate); |
| - DCHECK(args.length() == 2); |
| - CONVERT_ARG_HANDLE_CHECKED(JSReceiver, receiver, 0); |
| - CONVERT_SMI_ARG_CHECKED(index, 1); |
| + // Convert {key} to a Name first. |
| + Handle<Name> name; |
| + ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, name, |
| + Runtime::ToName(isolate, key)); |
| - Maybe<bool> maybe = JSReceiver::HasElement(receiver, index); |
| + // Lookup property by {name} on {receiver}. |
| + Maybe<bool> maybe = JSReceiver::HasProperty(receiver, name); |
|
Yang
2015/08/13 12:07:37
This code is duplicate to v8::Object::Has. Maybe w
Benedikt Meurer
2015/08/13 12:11:13
Mhm, yeah, there's moar code duplication with api.
|
| if (!maybe.IsJust()) return isolate->heap()->exception(); |
| return isolate->heap()->ToBoolean(maybe.FromJust()); |
| } |