| Index: src/elements.cc
|
| diff --git a/src/elements.cc b/src/elements.cc
|
| index 0d4e2cb76fcbb956ba81f45ca6f5e5e0549b6551..4e9a0527c366e392d3a5c54661ae0463552f47f1 100644
|
| --- a/src/elements.cc
|
| +++ b/src/elements.cc
|
| @@ -560,9 +560,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| typedef ElementsTraitsParam ElementsTraits;
|
| typedef typename ElementsTraitsParam::BackingStore BackingStore;
|
|
|
| - virtual ElementsKind kind() const FINAL OVERRIDE {
|
| - return ElementsTraits::Kind;
|
| - }
|
| + ElementsKind kind() const FINAL { return ElementsTraits::Kind; }
|
|
|
| static void ValidateContents(Handle<JSObject> holder, int length) {
|
| }
|
| @@ -584,7 +582,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| ElementsAccessorSubclass::ValidateContents(holder, length);
|
| }
|
|
|
| - virtual void Validate(Handle<JSObject> holder) FINAL OVERRIDE {
|
| + void Validate(Handle<JSObject> holder) FINAL {
|
| DisallowHeapAllocation no_gc;
|
| ElementsAccessorSubclass::ValidateImpl(holder);
|
| }
|
| @@ -597,20 +595,16 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| receiver, holder, key, backing_store) != ABSENT;
|
| }
|
|
|
| - virtual bool HasElement(
|
| - Handle<Object> receiver,
|
| - Handle<JSObject> holder,
|
| - uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| + virtual bool HasElement(Handle<Object> receiver, Handle<JSObject> holder,
|
| + uint32_t key,
|
| + Handle<FixedArrayBase> backing_store) FINAL {
|
| return ElementsAccessorSubclass::HasElementImpl(
|
| receiver, holder, key, backing_store);
|
| }
|
|
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Get(
|
| - Handle<Object> receiver,
|
| - Handle<JSObject> holder,
|
| - uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| + Handle<Object> receiver, Handle<JSObject> holder, uint32_t key,
|
| + Handle<FixedArrayBase> backing_store) FINAL {
|
| if (!IsExternalArrayElementsKind(ElementsTraits::Kind) &&
|
| FLAG_trace_js_array_abuse) {
|
| CheckArrayAbuse(holder, "elements read", key);
|
| @@ -638,10 +632,8 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| }
|
|
|
| MUST_USE_RESULT virtual PropertyAttributes GetAttributes(
|
| - Handle<Object> receiver,
|
| - Handle<JSObject> holder,
|
| - uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| + Handle<Object> receiver, Handle<JSObject> holder, uint32_t key,
|
| + Handle<FixedArrayBase> backing_store) FINAL {
|
| return ElementsAccessorSubclass::GetAttributesImpl(
|
| receiver, holder, key, backing_store);
|
| }
|
| @@ -660,10 +652,8 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| }
|
|
|
| MUST_USE_RESULT virtual MaybeHandle<AccessorPair> GetAccessorPair(
|
| - Handle<Object> receiver,
|
| - Handle<JSObject> holder,
|
| - uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| + Handle<Object> receiver, Handle<JSObject> holder, uint32_t key,
|
| + Handle<FixedArrayBase> backing_store) FINAL {
|
| return ElementsAccessorSubclass::GetAccessorPairImpl(
|
| receiver, holder, key, backing_store);
|
| }
|
| @@ -677,8 +667,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| }
|
|
|
| MUST_USE_RESULT virtual MaybeHandle<Object> SetLength(
|
| - Handle<JSArray> array,
|
| - Handle<Object> length) FINAL OVERRIDE {
|
| + Handle<JSArray> array, Handle<Object> length) FINAL {
|
| return ElementsAccessorSubclass::SetLengthImpl(
|
| array, length, handle(array->elements()));
|
| }
|
| @@ -688,10 +677,8 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| Handle<Object> length,
|
| Handle<FixedArrayBase> backing_store);
|
|
|
| - virtual void SetCapacityAndLength(
|
| - Handle<JSArray> array,
|
| - int capacity,
|
| - int length) FINAL OVERRIDE {
|
| + virtual void SetCapacityAndLength(Handle<JSArray> array, int capacity,
|
| + int length) FINAL {
|
| ElementsAccessorSubclass::
|
| SetFastElementsCapacityAndLength(array, capacity, length);
|
| }
|
| @@ -715,13 +702,9 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| UNREACHABLE();
|
| }
|
|
|
| - virtual void CopyElements(
|
| - Handle<FixedArrayBase> from,
|
| - uint32_t from_start,
|
| - ElementsKind from_kind,
|
| - Handle<FixedArrayBase> to,
|
| - uint32_t to_start,
|
| - int copy_size) FINAL OVERRIDE {
|
| + virtual void CopyElements(Handle<FixedArrayBase> from, uint32_t from_start,
|
| + ElementsKind from_kind, Handle<FixedArrayBase> to,
|
| + uint32_t to_start, int copy_size) FINAL {
|
| DCHECK(!from.is_null());
|
| // NOTE: the ElementsAccessorSubclass::CopyElementsImpl() methods
|
| // violate the handlified function signature convention:
|
| @@ -734,13 +717,9 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| kPackedSizeNotKnown, copy_size);
|
| }
|
|
|
| - virtual void CopyElements(
|
| - JSObject* from_holder,
|
| - uint32_t from_start,
|
| - ElementsKind from_kind,
|
| - Handle<FixedArrayBase> to,
|
| - uint32_t to_start,
|
| - int copy_size) FINAL OVERRIDE {
|
| + virtual void CopyElements(JSObject* from_holder, uint32_t from_start,
|
| + ElementsKind from_kind, Handle<FixedArrayBase> to,
|
| + uint32_t to_start, int copy_size) FINAL {
|
| int packed_size = kPackedSizeNotKnown;
|
| bool is_packed = IsFastPackedElementsKind(from_kind) &&
|
| from_holder->IsJSArray();
|
| @@ -767,8 +746,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
|
|
| virtual MaybeHandle<FixedArray> AddElementsToFixedArray(
|
| Handle<Object> receiver, Handle<JSObject> holder, Handle<FixedArray> to,
|
| - Handle<FixedArrayBase> from,
|
| - FixedArray::KeyFilter filter) FINAL OVERRIDE {
|
| + Handle<FixedArrayBase> from, FixedArray::KeyFilter filter) FINAL {
|
| int len0 = to->length();
|
| #ifdef ENABLE_SLOW_DCHECKS
|
| if (FLAG_enable_slow_asserts) {
|
| @@ -852,8 +830,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| return backing_store->length();
|
| }
|
|
|
| - virtual uint32_t GetCapacity(Handle<FixedArrayBase> backing_store)
|
| - FINAL OVERRIDE {
|
| + uint32_t GetCapacity(Handle<FixedArrayBase> backing_store) FINAL {
|
| return ElementsAccessorSubclass::GetCapacityImpl(backing_store);
|
| }
|
|
|
| @@ -863,7 +840,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| }
|
|
|
| virtual uint32_t GetKeyForIndex(Handle<FixedArrayBase> backing_store,
|
| - uint32_t index) FINAL OVERRIDE {
|
| + uint32_t index) FINAL {
|
| return ElementsAccessorSubclass::GetKeyForIndexImpl(backing_store, index);
|
| }
|
|
|
| @@ -997,10 +974,8 @@ class FastElementsAccessor
|
| return isolate->factory()->true_value();
|
| }
|
|
|
| - virtual MaybeHandle<Object> Delete(
|
| - Handle<JSObject> obj,
|
| - uint32_t key,
|
| - JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| + virtual MaybeHandle<Object> Delete(Handle<JSObject> obj, uint32_t key,
|
| + JSReceiver::DeleteMode mode) FINAL {
|
| return DeleteCommon(obj, key, mode);
|
| }
|
|
|
| @@ -1323,9 +1298,7 @@ class TypedElementsAccessor
|
| }
|
|
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Delete(
|
| - Handle<JSObject> obj,
|
| - uint32_t key,
|
| - JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| + Handle<JSObject> obj, uint32_t key, JSReceiver::DeleteMode mode) FINAL {
|
| // External arrays always ignore deletes.
|
| return obj->GetIsolate()->factory()->true_value();
|
| }
|
| @@ -1477,9 +1450,7 @@ class DictionaryElementsAccessor
|
| ElementsKindTraits<DICTIONARY_ELEMENTS> >;
|
|
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Delete(
|
| - Handle<JSObject> obj,
|
| - uint32_t key,
|
| - JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| + Handle<JSObject> obj, uint32_t key, JSReceiver::DeleteMode mode) FINAL {
|
| return DeleteCommon(obj, key, mode);
|
| }
|
|
|
| @@ -1651,9 +1622,7 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
|
| }
|
|
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Delete(
|
| - Handle<JSObject> obj,
|
| - uint32_t key,
|
| - JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| + Handle<JSObject> obj, uint32_t key, JSReceiver::DeleteMode mode) FINAL {
|
| Isolate* isolate = obj->GetIsolate();
|
| Handle<FixedArray> parameter_map(FixedArray::cast(obj->elements()));
|
| Handle<Object> probe = GetParameterMapArg(obj, parameter_map, key);
|
|
|