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

Make private symbols non-enumerable

Browse Source 
Methods in the runtime that enumerate over properties should never deal with private symbols. Most commonly such methods only loop over enumerable properties. This fix avoids accidentally handling private symbols in methods that only deal with enumerable properties. Methods that need to look at non-enumerable properties as well still have to manually filter private symbols (e.g., the KeyAccumulator).

BUG=chromium:664411

Review-Url: https://codereview.chromium.org/2499593002
Cr-Commit-Position: refs/heads/master@{#40932}
This commit is contained in:
verwaest 2016-11-11 07:04:49 -08:00 committed by Commit bot
parent f18d56d130
commit 135b9f9360
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lookup.cc
View File

@ -308,6 +308,11 @@ void LookupIterator::PrepareTransitionToDataProperty(
PropertyAttributes attributes, Object::StoreFromKeyed store_mode) { PropertyAttributes attributes, Object::StoreFromKeyed store_mode) {
DCHECK(receiver.is_identical_to(GetStoreTarget())); DCHECK(receiver.is_identical_to(GetStoreTarget()));
if (state_ == TRANSITION) return; if (state_ == TRANSITION) return;
if (!IsElement() && name()->IsPrivate()) {
attributes = static_cast<PropertyAttributes>(attributes | DONT_ENUM);
}
DCHECK(state_ != LookupIterator::ACCESSOR || DCHECK(state_ != LookupIterator::ACCESSOR ||
(GetAccessors()->IsAccessorInfo() && (GetAccessors()->IsAccessorInfo() &&
AccessorInfo::cast(*GetAccessors())->is_special_data_property())); AccessorInfo::cast(*GetAccessors())->is_special_data_property()));
@ -442,6 +447,9 @@ void LookupIterator::TransitionToAccessorProperty(
// handled via a trap. Adding properties to primitive values is not // handled via a trap. Adding properties to primitive values is not
// observable. // observable.
Handle<JSObject> receiver = GetStoreTarget(); Handle<JSObject> receiver = GetStoreTarget();
if (!IsElement() && name()->IsPrivate()) {
attributes = static_cast<PropertyAttributes>(attributes | DONT_ENUM);
}
if (!IsElement() && !receiver->map()->is_dictionary_map()) { if (!IsElement() && !receiver->map()->is_dictionary_map()) {
Handle<Map> old_map(receiver->map(), isolate_); Handle<Map> old_map(receiver->map(), isolate_);

3
src/property.h
View File

@ -36,6 +36,7 @@ class Descriptor BASE_EMBEDDED {
void Init(Handle<Name> key, Handle<Object> value, PropertyDetails details) { void Init(Handle<Name> key, Handle<Object> value, PropertyDetails details) {
DCHECK(key->IsUniqueName()); DCHECK(key->IsUniqueName());
DCHECK_IMPLIES(key->IsPrivate(), !details.IsEnumerable());
key_ = key; key_ = key;
value_ = value; value_ = value;
details_ = details; details_ = details;
@ -44,6 +45,7 @@ class Descriptor BASE_EMBEDDED {
Descriptor(Handle<Name> key, Handle<Object> value, PropertyDetails details) Descriptor(Handle<Name> key, Handle<Object> value, PropertyDetails details)
: key_(key), value_(value), details_(details) { : key_(key), value_(value), details_(details) {
DCHECK(key->IsUniqueName()); DCHECK(key->IsUniqueName());
DCHECK_IMPLIES(key->IsPrivate(), !details_.IsEnumerable());
} }
Descriptor(Handle<Name> key, Handle<Object> value, Descriptor(Handle<Name> key, Handle<Object> value,
@ -53,6 +55,7 @@ class Descriptor BASE_EMBEDDED {
value_(value), value_(value),
details_(attributes, type, representation, field_index) { details_(attributes, type, representation, field_index) {
DCHECK(key->IsUniqueName()); DCHECK(key->IsUniqueName());
DCHECK_IMPLIES(key->IsPrivate(), !details_.IsEnumerable());
} }
friend class DescriptorArray; friend class DescriptorArray;

4
test/mjsunit/harmony/private.js
View File

@ -278,8 +278,8 @@ function TestKeyDescriptor(obj) {
assertEquals(i|0, desc.value) assertEquals(i|0, desc.value)
assertTrue(desc.configurable) assertTrue(desc.configurable)
assertEquals(i % 2 == 0, desc.writable) assertEquals(i % 2 == 0, desc.writable)
assertEquals(i % 2 == 0, desc.enumerable) assertEquals(false, desc.enumerable)
assertEquals(i % 2 == 0, assertEquals(false,
Object.prototype.propertyIsEnumerable.call(obj, symbols[i])) Object.prototype.propertyIsEnumerable.call(obj, symbols[i]))
} }
} }