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

[runtime] Remove receiver==holder check in IntegerIndexedExotic lookup

Browse Source 
This was inconsistent in the spec in case of has vs get, set. Removing
receiver==holder simplifies the lookup; so tentatively removing this
additional check which was broken until yesterday anyway. See
https://github.com/tc39/ecma262/issues/347 for more information.

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

Cr-Commit-Position: refs/heads/master@{#33701}
This commit is contained in:
verwaest 2016-02-03 02:30:05 -08:00 committed by Commit bot
parent 255f4507ec
commit 158cd5cb5e
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lookup.cc
View File

@ -518,18 +518,6 @@ void LookupIterator::WriteDataValue(Handle<Object> value) {
}
bool LookupIterator::IsIntegerIndexedExotic(JSReceiver* holder) {
DCHECK(!IsElement());
if (!name_->IsString()) return false;
if (*receiver_ != holder) return false;
Handle<String> name_string = Handle<String>::cast(name_);
if (name_string->length() == 0) return false;
return IsSpecialIndex(isolate_->unicode_cache(), *name_string);
}
void LookupIterator::InternalizeName() {
if (name_->IsUniqueName()) return;
name_ = factory()->InternalizeString(Handle<String>::cast(name_));
@ -579,6 +567,17 @@ JSReceiver* LookupIterator::NextHolder(Map* map) {
return next;
}
LookupIterator::State LookupIterator::NotFound(JSReceiver* const holder) const {
DCHECK(!IsElement());
if (!holder->IsJSTypedArray() || !name_->IsString()) return NOT_FOUND;
Handle<String> name_string = Handle<String>::cast(name_);
if (name_string->length() == 0) return NOT_FOUND;
return IsSpecialIndex(isolate_->unicode_cache(), *name_string)
? INTEGER_INDEXED_EXOTIC
: NOT_FOUND;
}
LookupIterator::State LookupIterator::LookupInHolder(Map* const map,
JSReceiver* const holder) {
@ -613,18 +612,13 @@ LookupIterator::State LookupIterator::LookupInHolder(Map* const map,
FixedArrayBase* backing_store = js_object->elements();
number_ = accessor->GetEntryForIndex(js_object, backing_store, index_);
if (number_ == kMaxUInt32) {
if (*receiver_ == holder && holder->IsJSTypedArray()) {
return INTEGER_INDEXED_EXOTIC;
}
return NOT_FOUND;
return holder->IsJSTypedArray() ? INTEGER_INDEXED_EXOTIC : NOT_FOUND;
}
property_details_ = accessor->GetDetails(js_object, number_);
} else if (holder->IsJSTypedArray() && IsIntegerIndexedExotic(holder)) {
return INTEGER_INDEXED_EXOTIC;
} else if (!map->is_dictionary_map()) {
DescriptorArray* descriptors = map->instance_descriptors();
int number = descriptors->SearchWithCache(*name_, map);
if (number == DescriptorArray::kNotFound) return NOT_FOUND;
if (number == DescriptorArray::kNotFound) return NotFound(holder);
number_ = static_cast<uint32_t>(number);
property_details_ = descriptors->GetDetails(number_);
} else if (map->IsJSGlobalObjectMap()) {
@ -639,7 +633,7 @@ LookupIterator::State LookupIterator::LookupInHolder(Map* const map,
} else {
NameDictionary* dict = holder->property_dictionary();
int number = dict->FindEntry(name_);
if (number == NameDictionary::kNotFound) return NOT_FOUND;
if (number == NameDictionary::kNotFound) return NotFound(holder);
number_ = static_cast<uint32_t>(number);
property_details_ = dict->DetailsAt(number_);
}

2
src/lookup.h
View File

@ -315,7 +315,7 @@ class LookupIterator final BASE_EMBEDDED {
return GetRootForNonJSReceiver(isolate, receiver, index);
}
inline bool IsIntegerIndexedExotic(JSReceiver* holder);
State NotFound(JSReceiver* const holder) const;
// If configuration_ becomes mutable, update
// HolderIsReceiverOrHiddenPrototype.

2
test/mjsunit/regress/regress-integer-indexed-element.js
View File

@ -4,7 +4,7 @@
var o = {__proto__:new Int32Array(100)};
Object.prototype[1.3] = 10;
assertEquals(10, o[1.3]);
assertEquals(undefined, o[1.3]);
var o = new Int32Array(100);
var o2 = new Int32Array(200);