| Index: src/lookup-inl.h
|
| diff --git a/src/lookup-inl.h b/src/lookup-inl.h
|
| index cc7378892562afda7bda425973d2ee699917cccc..d7ad7b7f8988e902fdc1a3f8c863a5664d180b63 100644
|
| --- a/src/lookup-inl.h
|
| +++ b/src/lookup-inl.h
|
| @@ -30,11 +30,42 @@ JSReceiver* LookupIterator::NextHolder(Map* map) {
|
| return next;
|
| }
|
|
|
| +LookupIterator::State LookupIterator::LookupRealNameInHolder(Map* map,
|
| + JSReceiver* holder) {
|
| + if (map->is_dictionary_map()) {
|
| + if (holder == NULL) return UNKNOWN;
|
| + NameDictionary* dict = JSObject::cast(holder)->property_dictionary();
|
| + number_ = dict->FindEntry(name_);
|
| + if (number_ == NameDictionary::kNotFound) return NOT_FOUND;
|
| + property_details_ = dict->DetailsAt(number_);
|
| + if (holder->IsGlobalObject()) {
|
| + if (property_details_.IsDeleted()) return NOT_FOUND;
|
| + PropertyCell* cell = PropertyCell::cast(dict->ValueAt(number_));
|
| + if (cell->value()->IsTheHole()) return NOT_FOUND;
|
| + }
|
| + } else {
|
| + DescriptorArray* descriptors = map->instance_descriptors();
|
| + number_ = descriptors->SearchWithCache(*name_, map);
|
| + if (number_ == DescriptorArray::kNotFound) return NOT_FOUND;
|
| + property_details_ = descriptors->GetDetails(number_);
|
| + }
|
| + has_property_ = true;
|
| + switch (property_details_.type()) {
|
| + case v8::internal::CONSTANT:
|
| + case v8::internal::FIELD:
|
| + case v8::internal::NORMAL:
|
| + return DATA;
|
| + case v8::internal::CALLBACKS:
|
| + return ACCESSOR;
|
| + }
|
| + return NOT_FOUND;
|
| +}
|
|
|
| LookupIterator::State LookupIterator::LookupInHolder(Map* map,
|
| JSReceiver* holder) {
|
| STATIC_ASSERT(INTERCEPTOR == BEFORE_PROPERTY);
|
| DisallowHeapAllocation no_gc;
|
| + LookupIterator::State real_name_state = NOT_FOUND;
|
| switch (state_) {
|
| case NOT_FOUND:
|
| if (map->IsJSProxyMap()) return JSPROXY;
|
| @@ -42,36 +73,19 @@ LookupIterator::State LookupIterator::LookupInHolder(Map* map,
|
| // Fall through.
|
| case ACCESS_CHECK:
|
| if (check_interceptor() && map->has_named_interceptor()) {
|
| + Handle<JSReceiver> curHolder = maybe_holder_.ToHandleChecked();
|
| + if (curHolder->IsJSObject() && ((Handle<JSObject>::cast(curHolder))
|
| + ->GetNamedInterceptor()->do_not_interceptor_real_name())) {
|
| + // try to get real name property
|
| + real_name_state = LookupRealNameInHolder(map, holder);
|
| + if (real_name_state == DATA || real_name_state == ACCESSOR)
|
| + return real_name_state;
|
| + }
|
| return INTERCEPTOR;
|
| }
|
| // Fall through.
|
| case INTERCEPTOR:
|
| - if (map->is_dictionary_map()) {
|
| - if (holder == NULL) return UNKNOWN;
|
| - NameDictionary* dict = JSObject::cast(holder)->property_dictionary();
|
| - number_ = dict->FindEntry(name_);
|
| - if (number_ == NameDictionary::kNotFound) return NOT_FOUND;
|
| - property_details_ = dict->DetailsAt(number_);
|
| - if (holder->IsGlobalObject()) {
|
| - if (property_details_.IsDeleted()) return NOT_FOUND;
|
| - PropertyCell* cell = PropertyCell::cast(dict->ValueAt(number_));
|
| - if (cell->value()->IsTheHole()) return NOT_FOUND;
|
| - }
|
| - } else {
|
| - DescriptorArray* descriptors = map->instance_descriptors();
|
| - number_ = descriptors->SearchWithCache(*name_, map);
|
| - if (number_ == DescriptorArray::kNotFound) return NOT_FOUND;
|
| - property_details_ = descriptors->GetDetails(number_);
|
| - }
|
| - has_property_ = true;
|
| - switch (property_details_.type()) {
|
| - case v8::internal::CONSTANT:
|
| - case v8::internal::FIELD:
|
| - case v8::internal::NORMAL:
|
| - return DATA;
|
| - case v8::internal::CALLBACKS:
|
| - return ACCESSOR;
|
| - }
|
| + return LookupRealNameInHolder(map, holder);
|
| case ACCESSOR:
|
| case DATA:
|
| case UNKNOWN:
|
|
|