| Index: src/elements.cc
|
| diff --git a/src/elements.cc b/src/elements.cc
|
| index 6b4f5ec0c5cc89cfacdf4ca5ccef18b8cca29bff..e2127c4638201f5d7f8f46df2db960fd4b17fc95 100644
|
| --- a/src/elements.cc
|
| +++ b/src/elements.cc
|
| @@ -554,7 +554,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| typedef ElementsTraitsParam ElementsTraits;
|
| typedef typename ElementsTraitsParam::BackingStore BackingStore;
|
|
|
| - virtual ElementsKind kind() const V8_FINAL V8_OVERRIDE {
|
| + virtual ElementsKind kind() const FINAL OVERRIDE {
|
| return ElementsTraits::Kind;
|
| }
|
|
|
| @@ -578,7 +578,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| ElementsAccessorSubclass::ValidateContents(holder, length);
|
| }
|
|
|
| - virtual void Validate(Handle<JSObject> holder) V8_FINAL V8_OVERRIDE {
|
| + virtual void Validate(Handle<JSObject> holder) FINAL OVERRIDE {
|
| DisallowHeapAllocation no_gc;
|
| ElementsAccessorSubclass::ValidateImpl(holder);
|
| }
|
| @@ -595,7 +595,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| Handle<Object> receiver,
|
| Handle<JSObject> holder,
|
| uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) V8_FINAL V8_OVERRIDE {
|
| + Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| return ElementsAccessorSubclass::HasElementImpl(
|
| receiver, holder, key, backing_store);
|
| }
|
| @@ -604,7 +604,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| Handle<Object> receiver,
|
| Handle<JSObject> holder,
|
| uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) V8_FINAL V8_OVERRIDE {
|
| + Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| if (!IsExternalArrayElementsKind(ElementsTraits::Kind) &&
|
| FLAG_trace_js_array_abuse) {
|
| CheckArrayAbuse(holder, "elements read", key);
|
| @@ -635,7 +635,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| Handle<Object> receiver,
|
| Handle<JSObject> holder,
|
| uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) V8_FINAL V8_OVERRIDE {
|
| + Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| return ElementsAccessorSubclass::GetAttributesImpl(
|
| receiver, holder, key, backing_store);
|
| }
|
| @@ -657,7 +657,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| Handle<Object> receiver,
|
| Handle<JSObject> holder,
|
| uint32_t key,
|
| - Handle<FixedArrayBase> backing_store) V8_FINAL V8_OVERRIDE {
|
| + Handle<FixedArrayBase> backing_store) FINAL OVERRIDE {
|
| return ElementsAccessorSubclass::GetAccessorPairImpl(
|
| receiver, holder, key, backing_store);
|
| }
|
| @@ -672,7 +672,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
|
|
| MUST_USE_RESULT virtual MaybeHandle<Object> SetLength(
|
| Handle<JSArray> array,
|
| - Handle<Object> length) V8_FINAL V8_OVERRIDE {
|
| + Handle<Object> length) FINAL OVERRIDE {
|
| return ElementsAccessorSubclass::SetLengthImpl(
|
| array, length, handle(array->elements()));
|
| }
|
| @@ -685,7 +685,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| virtual void SetCapacityAndLength(
|
| Handle<JSArray> array,
|
| int capacity,
|
| - int length) V8_FINAL V8_OVERRIDE {
|
| + int length) FINAL OVERRIDE {
|
| ElementsAccessorSubclass::
|
| SetFastElementsCapacityAndLength(array, capacity, length);
|
| }
|
| @@ -700,7 +700,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Delete(
|
| Handle<JSObject> obj,
|
| uint32_t key,
|
| - JSReceiver::DeleteMode mode) V8_OVERRIDE = 0;
|
| + JSReceiver::DeleteMode mode) OVERRIDE = 0;
|
|
|
| static void CopyElementsImpl(Handle<FixedArrayBase> from,
|
| uint32_t from_start,
|
| @@ -718,7 +718,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| ElementsKind from_kind,
|
| Handle<FixedArrayBase> to,
|
| uint32_t to_start,
|
| - int copy_size) V8_FINAL V8_OVERRIDE {
|
| + int copy_size) FINAL OVERRIDE {
|
| DCHECK(!from.is_null());
|
| ElementsAccessorSubclass::CopyElementsImpl(
|
| from, from_start, to, from_kind, to_start, kPackedSizeNotKnown,
|
| @@ -731,7 +731,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| ElementsKind from_kind,
|
| Handle<FixedArrayBase> to,
|
| uint32_t to_start,
|
| - int copy_size) V8_FINAL V8_OVERRIDE {
|
| + int copy_size) FINAL OVERRIDE {
|
| int packed_size = kPackedSizeNotKnown;
|
| bool is_packed = IsFastPackedElementsKind(from_kind) &&
|
| from_holder->IsJSArray();
|
| @@ -751,7 +751,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| Handle<Object> receiver,
|
| Handle<JSObject> holder,
|
| Handle<FixedArray> to,
|
| - Handle<FixedArrayBase> from) V8_FINAL V8_OVERRIDE {
|
| + Handle<FixedArrayBase> from) FINAL OVERRIDE {
|
| int len0 = to->length();
|
| #ifdef ENABLE_SLOW_DCHECKS
|
| if (FLAG_enable_slow_asserts) {
|
| @@ -830,7 +830,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| }
|
|
|
| virtual uint32_t GetCapacity(Handle<FixedArrayBase> backing_store)
|
| - V8_FINAL V8_OVERRIDE {
|
| + FINAL OVERRIDE {
|
| return ElementsAccessorSubclass::GetCapacityImpl(backing_store);
|
| }
|
|
|
| @@ -840,7 +840,7 @@ class ElementsAccessorBase : public ElementsAccessor {
|
| }
|
|
|
| virtual uint32_t GetKeyForIndex(Handle<FixedArrayBase> backing_store,
|
| - uint32_t index) V8_FINAL V8_OVERRIDE {
|
| + uint32_t index) FINAL OVERRIDE {
|
| return ElementsAccessorSubclass::GetKeyForIndexImpl(backing_store, index);
|
| }
|
|
|
| @@ -977,7 +977,7 @@ class FastElementsAccessor
|
| virtual MaybeHandle<Object> Delete(
|
| Handle<JSObject> obj,
|
| uint32_t key,
|
| - JSReceiver::DeleteMode mode) V8_FINAL V8_OVERRIDE {
|
| + JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| return DeleteCommon(obj, key, mode);
|
| }
|
|
|
| @@ -1300,7 +1300,7 @@ class TypedElementsAccessor
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Delete(
|
| Handle<JSObject> obj,
|
| uint32_t key,
|
| - JSReceiver::DeleteMode mode) V8_FINAL V8_OVERRIDE {
|
| + JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| // External arrays always ignore deletes.
|
| return obj->GetIsolate()->factory()->true_value();
|
| }
|
| @@ -1457,7 +1457,7 @@ class DictionaryElementsAccessor
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Delete(
|
| Handle<JSObject> obj,
|
| uint32_t key,
|
| - JSReceiver::DeleteMode mode) V8_FINAL V8_OVERRIDE {
|
| + JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| return DeleteCommon(obj, key, mode);
|
| }
|
|
|
| @@ -1631,7 +1631,7 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
|
| MUST_USE_RESULT virtual MaybeHandle<Object> Delete(
|
| Handle<JSObject> obj,
|
| uint32_t key,
|
| - JSReceiver::DeleteMode mode) V8_FINAL V8_OVERRIDE {
|
| + JSReceiver::DeleteMode mode) FINAL OVERRIDE {
|
| Isolate* isolate = obj->GetIsolate();
|
| Handle<FixedArray> parameter_map(FixedArray::cast(obj->elements()));
|
| Handle<Object> probe = GetParameterMapArg(obj, parameter_map, key);
|
|
|