Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Remove handle wrappers from basic elements accessors
Browse files Browse the repository at this point in the history 
BUG=
R=yangguo@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#26736}
  • Loading branch information
@verwaest
verwaest committed Feb 19, 2015
1 parent 4a030e8 commit 40b7c51
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 93 deletions.
2 changes: 1 addition & 1 deletion src/builtins.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ BUILTIN(ArraySlice) {
bool packed = true;
ElementsAccessor* accessor = ElementsAccessor::ForKind(kind);
for (int i = k; i < final; i++) {
if (!accessor->HasElement(object, i, elms)) {
if (!accessor->HasElement(*object, i, *elms)) {
packed = false;
break;
}
Expand Down
119 changes: 51 additions & 68 deletions src/elements.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,14 +587,14 @@ class ElementsAccessorBase : public ElementsAccessor {
ElementsAccessorSubclass::ValidateImpl(holder);
}

static bool HasElementImpl(Handle<JSObject> holder, uint32_t key,
Handle<FixedArrayBase> backing_store) {
static bool HasElementImpl(JSObject* holder, uint32_t key,
FixedArrayBase* backing_store) {
return ElementsAccessorSubclass::GetAttributesImpl(holder, key,
backing_store) != ABSENT;
}

virtual bool HasElement(Handle<JSObject> holder, uint32_t key,
Handle<FixedArrayBase> backing_store) FINAL {
virtual bool HasElement(JSObject* holder, uint32_t key,
FixedArrayBase* backing_store) FINAL {
return ElementsAccessorSubclass::HasElementImpl(holder, key, backing_store);
}

Expand All @@ -620,30 +620,25 @@ class ElementsAccessorBase : public ElementsAccessor {
Handle<JSObject> obj,
uint32_t key,
Handle<FixedArrayBase> backing_store) {
if (key < ElementsAccessorSubclass::GetCapacityImpl(backing_store)) {
if (key < ElementsAccessorSubclass::GetCapacityImpl(*backing_store)) {
return BackingStore::get(Handle<BackingStore>::cast(backing_store), key);
} else {
return backing_store->GetIsolate()->factory()->the_hole_value();
}
}

MUST_USE_RESULT virtual PropertyAttributes GetAttributes(
Handle<JSObject> holder, uint32_t key,
Handle<FixedArrayBase> backing_store) FINAL {
JSObject* holder, uint32_t key, FixedArrayBase* backing_store) FINAL {
return ElementsAccessorSubclass::GetAttributesImpl(holder, key,
backing_store);
}

MUST_USE_RESULT static PropertyAttributes GetAttributesImpl(
Handle<JSObject> obj,
uint32_t key,
Handle<FixedArrayBase> backing_store) {
JSObject* obj, uint32_t key, FixedArrayBase* backing_store) {
if (key >= ElementsAccessorSubclass::GetCapacityImpl(backing_store)) {
return ABSENT;
}
return
Handle<BackingStore>::cast(backing_store)->is_the_hole(key)
? ABSENT : NONE;
return BackingStore::cast(backing_store)->is_the_hole(key) ? ABSENT : NONE;
}

MUST_USE_RESULT virtual MaybeHandle<AccessorPair> GetAccessorPair(
Expand Down Expand Up @@ -751,7 +746,7 @@ class ElementsAccessorBase : public ElementsAccessor {

// Optimize if 'other' is empty.
// We cannot optimize if 'this' is empty, as other may have holes.
uint32_t len1 = ElementsAccessorSubclass::GetCapacityImpl(from);
uint32_t len1 = ElementsAccessorSubclass::GetCapacityImpl(*from);
if (len1 == 0) return to;

Isolate* isolate = from->GetIsolate();
Expand All @@ -760,7 +755,7 @@ class ElementsAccessorBase : public ElementsAccessor {
uint32_t extra = 0;
for (uint32_t y = 0; y < len1; y++) {
uint32_t key = ElementsAccessorSubclass::GetKeyForIndexImpl(from, y);
if (ElementsAccessorSubclass::HasElementImpl(holder, key, from)) {
if (ElementsAccessorSubclass::HasElementImpl(*holder, key, *from)) {
Handle<Object> value;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, value,
Expand Down Expand Up @@ -797,7 +792,7 @@ class ElementsAccessorBase : public ElementsAccessor {
for (uint32_t y = 0; y < len1; y++) {
uint32_t key =
ElementsAccessorSubclass::GetKeyForIndexImpl(from, y);
if (ElementsAccessorSubclass::HasElementImpl(holder, key, from)) {
if (ElementsAccessorSubclass::HasElementImpl(*holder, key, *from)) {
Handle<Object> value;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, value,
Expand All @@ -817,11 +812,11 @@ class ElementsAccessorBase : public ElementsAccessor {
}

protected:
static uint32_t GetCapacityImpl(Handle<FixedArrayBase> backing_store) {
static uint32_t GetCapacityImpl(FixedArrayBase* backing_store) {
return backing_store->length();
}

uint32_t GetCapacity(Handle<FixedArrayBase> backing_store) FINAL {
uint32_t GetCapacity(FixedArrayBase* backing_store) FINAL {
return ElementsAccessorSubclass::GetCapacityImpl(backing_store);
}

Expand Down Expand Up @@ -969,14 +964,12 @@ class FastElementsAccessor
return DeleteCommon(obj, key, language_mode);
}

static bool HasElementImpl(
Handle<JSObject> holder,
uint32_t key,
Handle<FixedArrayBase> backing_store) {
static bool HasElementImpl(JSObject* holder, uint32_t key,
FixedArrayBase* backing_store) {
if (key >= static_cast<uint32_t>(backing_store->length())) {
return false;
}
return !Handle<BackingStore>::cast(backing_store)->is_the_hole(key);
return !BackingStore::cast(backing_store)->is_the_hole(key);
}

static void ValidateContents(Handle<JSObject> holder, int length) {
Expand Down Expand Up @@ -1260,17 +1253,15 @@ class TypedElementsAccessor
Handle<JSObject> obj,
uint32_t key,
Handle<FixedArrayBase> backing_store) {
if (key < AccessorClass::GetCapacityImpl(backing_store)) {
if (key < AccessorClass::GetCapacityImpl(*backing_store)) {
return BackingStore::get(Handle<BackingStore>::cast(backing_store), key);
} else {
return backing_store->GetIsolate()->factory()->undefined_value();
}
}

MUST_USE_RESULT static PropertyAttributes GetAttributesImpl(
Handle<JSObject> obj,
uint32_t key,
Handle<FixedArrayBase> backing_store) {
JSObject* obj, uint32_t key, FixedArrayBase* backing_store) {
return
key < AccessorClass::GetCapacityImpl(backing_store)
? NONE : ABSENT;
Expand All @@ -1291,8 +1282,8 @@ class TypedElementsAccessor
return obj->GetIsolate()->factory()->true_value();
}

static bool HasElementImpl(Handle<JSObject> holder, uint32_t key,
Handle<FixedArrayBase> backing_store) {
static bool HasElementImpl(JSObject* holder, uint32_t key,
FixedArrayBase* backing_store) {
uint32_t capacity =
AccessorClass::GetCapacityImpl(backing_store);
return key < capacity;
Expand Down Expand Up @@ -1461,11 +1452,9 @@ class DictionaryElementsAccessor
}

MUST_USE_RESULT static PropertyAttributes GetAttributesImpl(
Handle<JSObject> obj,
uint32_t key,
Handle<FixedArrayBase> backing_store) {
Handle<SeededNumberDictionary> dictionary =
Handle<SeededNumberDictionary>::cast(backing_store);
JSObject* obj, uint32_t key, FixedArrayBase* backing_store) {
SeededNumberDictionary* dictionary =
SeededNumberDictionary::cast(backing_store);
int entry = dictionary->FindEntry(key);
if (entry != SeededNumberDictionary::kNotFound) {
return dictionary->DetailsAt(entry).attributes();
Expand All @@ -1488,10 +1477,9 @@ class DictionaryElementsAccessor
return MaybeHandle<AccessorPair>();
}

static bool HasElementImpl(Handle<JSObject> holder, uint32_t key,
Handle<FixedArrayBase> store) {
Handle<SeededNumberDictionary> backing_store =
Handle<SeededNumberDictionary>::cast(store);
static bool HasElementImpl(JSObject* holder, uint32_t key,
FixedArrayBase* store) {
SeededNumberDictionary* backing_store = SeededNumberDictionary::cast(store);
return backing_store->FindEntry(key) != SeededNumberDictionary::kNotFound;
}

Expand Down Expand Up @@ -1526,23 +1514,22 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
Handle<FixedArrayBase> parameters) {
Isolate* isolate = obj->GetIsolate();
Handle<FixedArray> parameter_map = Handle<FixedArray>::cast(parameters);
Handle<Object> probe = GetParameterMapArg(obj, parameter_map, key);
Object* probe = GetParameterMapArg(*obj, *parameter_map, key);
if (!probe->IsTheHole()) {
DisallowHeapAllocation no_gc;
Context* context = Context::cast(parameter_map->get(0));
int context_index = Handle<Smi>::cast(probe)->value();
int context_index = Smi::cast(probe)->value();
DCHECK(!context->get(context_index)->IsTheHole());
return handle(context->get(context_index), isolate);
} else {
// Object is not mapped, defer to the arguments.
Handle<FixedArray> arguments(FixedArray::cast(parameter_map->get(1)),
isolate);
Handle<Object> result;
ASSIGN_RETURN_ON_EXCEPTION(
isolate, result,
ElementsAccessor::ForArray(arguments)->Get(
receiver, obj, key, arguments),
Object);
ASSIGN_RETURN_ON_EXCEPTION(isolate, result,
ElementsAccessor::ForArray(*arguments)
->Get(receiver, obj, key, arguments),
Object);
// Elements of the arguments object in slow mode might be slow aliases.
if (result->IsAliasedArgumentsEntry()) {
DisallowHeapAllocation no_gc;
Expand All @@ -1558,16 +1545,14 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
}

MUST_USE_RESULT static PropertyAttributes GetAttributesImpl(
Handle<JSObject> obj,
uint32_t key,
Handle<FixedArrayBase> backing_store) {
Handle<FixedArray> parameter_map = Handle<FixedArray>::cast(backing_store);
Handle<Object> probe = GetParameterMapArg(obj, parameter_map, key);
JSObject* obj, uint32_t key, FixedArrayBase* backing_store) {
FixedArray* parameter_map = FixedArray::cast(backing_store);
Object* probe = GetParameterMapArg(obj, parameter_map, key);
if (!probe->IsTheHole()) {
return NONE;
} else {
// If not aliased, check the arguments.
Handle<FixedArray> arguments(FixedArray::cast(parameter_map->get(1)));
FixedArray* arguments = FixedArray::cast(parameter_map->get(1));
return ElementsAccessor::ForArray(arguments)
->GetAttributes(obj, key, arguments);
}
Expand All @@ -1578,13 +1563,13 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
uint32_t key,
Handle<FixedArrayBase> parameters) {
Handle<FixedArray> parameter_map = Handle<FixedArray>::cast(parameters);
Handle<Object> probe = GetParameterMapArg(obj, parameter_map, key);
Object* probe = GetParameterMapArg(*obj, *parameter_map, key);
if (!probe->IsTheHole()) {
return MaybeHandle<AccessorPair>();
} else {
// If not aliased, check the arguments.
Handle<FixedArray> arguments(FixedArray::cast(parameter_map->get(1)));
return ElementsAccessor::ForArray(arguments)
return ElementsAccessor::ForArray(*arguments)
->GetAccessorPair(obj, key, arguments);
}
}
Expand All @@ -1603,7 +1588,8 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
Handle<JSObject> obj, uint32_t key, LanguageMode language_mode) FINAL {
Isolate* isolate = obj->GetIsolate();
Handle<FixedArray> parameter_map(FixedArray::cast(obj->elements()));
Handle<Object> probe = GetParameterMapArg(obj, parameter_map, key);
Handle<Object> probe(GetParameterMapArg(*obj, *parameter_map, key),
isolate);
if (!probe->IsTheHole()) {
// TODO(kmillikin): We could check if this was the last aliased
// parameter, and revert to normal elements in that case. That
Expand Down Expand Up @@ -1632,10 +1618,9 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
UNREACHABLE();
}

static uint32_t GetCapacityImpl(Handle<FixedArrayBase> backing_store) {
Handle<FixedArray> parameter_map = Handle<FixedArray>::cast(backing_store);
Handle<FixedArrayBase> arguments(
FixedArrayBase::cast(parameter_map->get(1)));
static uint32_t GetCapacityImpl(FixedArrayBase* backing_store) {
FixedArray* parameter_map = FixedArray::cast(backing_store);
FixedArrayBase* arguments = FixedArrayBase::cast(parameter_map->get(1));
return Max(static_cast<uint32_t>(parameter_map->length() - 2),
ForArray(arguments)->GetCapacity(arguments));
}
Expand All @@ -1646,22 +1631,20 @@ class SloppyArgumentsElementsAccessor : public ElementsAccessorBase<
}

private:
static Handle<Object> GetParameterMapArg(Handle<JSObject> holder,
Handle<FixedArray> parameter_map,
uint32_t key) {
static Object* GetParameterMapArg(JSObject* holder, FixedArray* parameter_map,
uint32_t key) {
Isolate* isolate = holder->GetIsolate();
uint32_t length = holder->IsJSArray()
? Smi::cast(Handle<JSArray>::cast(holder)->length())->value()
: parameter_map->length();
return key < (length - 2)
? handle(parameter_map->get(key + 2), isolate)
: Handle<Object>::cast(isolate->factory()->the_hole_value());
? Smi::cast(JSArray::cast(holder)->length())->value()
: parameter_map->length();
return key < (length - 2) ? parameter_map->get(key + 2)
: isolate->heap()->the_hole_value();
}
};


ElementsAccessor* ElementsAccessor::ForArray(Handle<FixedArrayBase> array) {
return elements_accessors_[ElementsKindForArray(*array)];
ElementsAccessor* ElementsAccessor::ForArray(FixedArrayBase* array) {
return elements_accessors_[ElementsKindForArray(array)];
}


Expand Down
27 changes: 10 additions & 17 deletions src/elements.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,11 @@ class ElementsAccessor {
// in the backing store to use for the check, which must be compatible with
// the ElementsKind of the ElementsAccessor. If backing_store is NULL, the
// holder->elements() is used as the backing store.
virtual bool HasElement(
Handle<JSObject> holder,
uint32_t key,
Handle<FixedArrayBase> backing_store) = 0;
virtual bool HasElement(JSObject* holder, uint32_t key,
FixedArrayBase* backing_store) = 0;

inline bool HasElement(
Handle<JSObject> holder,
uint32_t key) {
return HasElement(holder, key, handle(holder->elements()));
inline bool HasElement(JSObject* holder, uint32_t key) {
return HasElement(holder, key, holder->elements());
}

// Returns the element with the specified key or undefined if there is no such
Expand All @@ -67,14 +63,11 @@ class ElementsAccessor {
// be compatible with the ElementsKind of the ElementsAccessor. If
// backing_store is NULL, the holder->elements() is used as the backing store.
MUST_USE_RESULT virtual PropertyAttributes GetAttributes(
Handle<JSObject> holder,
uint32_t key,
Handle<FixedArrayBase> backing_store) = 0;
JSObject* holder, uint32_t key, FixedArrayBase* backing_store) = 0;

MUST_USE_RESULT inline PropertyAttributes GetAttributes(
Handle<JSObject> holder,
uint32_t key) {
return GetAttributes(holder, key, handle(holder->elements()));
MUST_USE_RESULT inline PropertyAttributes GetAttributes(JSObject* holder,
uint32_t key) {
return GetAttributes(holder, key, holder->elements());
}

// Returns an element's accessors, or NULL if the element does not exist or
Expand Down Expand Up @@ -175,15 +168,15 @@ class ElementsAccessor {
return elements_accessors_[elements_kind];
}

static ElementsAccessor* ForArray(Handle<FixedArrayBase> array);
static ElementsAccessor* ForArray(FixedArrayBase* array);

static void InitializeOncePerProcess();
static void TearDown();

protected:
friend class SloppyArgumentsElementsAccessor;

virtual uint32_t GetCapacity(Handle<FixedArrayBase> backing_store) = 0;
virtual uint32_t GetCapacity(FixedArrayBase* backing_store) = 0;

// Element handlers distinguish between indexes and keys when they manipulate
// elements. Indexes refer to elements in terms of their location in the
Expand Down
8 changes: 4 additions & 4 deletions src/objects.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ MaybeHandle<Object> Object::SetElementWithReceiver(
if (!done &&
js_object->elements() != isolate->heap()->empty_fixed_array()) {
ElementsAccessor* accessor = js_object->GetElementsAccessor();
PropertyAttributes attrs = accessor->GetAttributes(js_object, index);
PropertyAttributes attrs = accessor->GetAttributes(*js_object, index);
if ((attrs & READ_ONLY) != 0) {
return WriteToReadOnlyElement(isolate, receiver, index, value,
language_mode);
Expand All @@ -752,7 +752,7 @@ MaybeHandle<Object> Object::SetElementWithReceiver(
}
Handle<JSObject> target = Handle<JSObject>::cast(receiver);
ElementsAccessor* accessor = target->GetElementsAccessor();
PropertyAttributes attrs = accessor->GetAttributes(target, index);
PropertyAttributes attrs = accessor->GetAttributes(*target, index);
if ((attrs & READ_ONLY) != 0) {
return WriteToReadOnlyElement(isolate, receiver, index, value,
language_mode);
Expand Down Expand Up @@ -4371,7 +4371,7 @@ Maybe<PropertyAttributes> JSObject::GetElementAttributeWithoutInterceptor(
Handle<JSObject> object, Handle<JSReceiver> receiver, uint32_t index,
bool check_prototype) {
PropertyAttributes attr =
object->GetElementsAccessor()->GetAttributes(object, index);
object->GetElementsAccessor()->GetAttributes(*object, index);
if (attr != ABSENT) return maybe(attr);

// Handle [] on String objects.
Expand Down Expand Up @@ -8254,7 +8254,7 @@ MaybeHandle<FixedArray> FixedArray::AddKeysFromArrayLike(

MaybeHandle<FixedArray> FixedArray::UnionOfKeys(Handle<FixedArray> first,
Handle<FixedArray> second) {
ElementsAccessor* accessor = ElementsAccessor::ForArray(second);
ElementsAccessor* accessor = ElementsAccessor::ForArray(*second);
Handle<FixedArray> result;
ASSIGN_RETURN_ON_EXCEPTION(
first->GetIsolate(), result,
Expand Down
Loading

0 comments on commit 40b7c51

Please sign in to comment.