| Index: src/ia32/stub-cache-ia32.cc
|
| diff --git a/src/ia32/stub-cache-ia32.cc b/src/ia32/stub-cache-ia32.cc
|
| index 9cefe710acab4ea19092b99df23c60bdf9f46f9d..586cd720c865204b508608bc376a1be13ae06377 100644
|
| --- a/src/ia32/stub-cache-ia32.cc
|
| +++ b/src/ia32/stub-cache-ia32.cc
|
| @@ -2699,24 +2699,15 @@ MaybeObject* KeyedStoreStubCompiler::CompileStoreField(JSObject* object,
|
| }
|
|
|
|
|
| -MaybeObject* KeyedStoreStubCompiler::CompileStoreElement(
|
| - Map* receiver_map) {
|
| +MaybeObject* KeyedStoreStubCompiler::CompileStoreElement(Map* receiver_map) {
|
| // ----------- S t a t e -------------
|
| // -- eax : value
|
| // -- ecx : key
|
| // -- edx : receiver
|
| // -- esp[0] : return address
|
| // -----------------------------------
|
| - MaybeObject* maybe_stub;
|
| - if (receiver_map->has_fast_elements()) {
|
| - bool is_js_array = receiver_map->instance_type() == JS_ARRAY_TYPE;
|
| - maybe_stub = KeyedStoreFastElementStub(is_js_array).TryGetCode();
|
| - } else {
|
| - ASSERT(receiver_map->has_external_array_elements());
|
| - JSObject::ElementsKind elements_kind = receiver_map->elements_kind();
|
| - maybe_stub = KeyedStoreExternalArrayStub(elements_kind).TryGetCode();
|
| - }
|
| Code* stub;
|
| + MaybeObject* maybe_stub = ComputeSharedKeyedStoreElementStub(receiver_map);
|
| if (!maybe_stub->To(&stub)) return maybe_stub;
|
| __ DispatchMap(edx,
|
| Handle<Map>(receiver_map),
|
| @@ -3175,15 +3166,8 @@ MaybeObject* KeyedLoadStubCompiler::CompileLoadElement(Map* receiver_map) {
|
| // -- edx : receiver
|
| // -- esp[0] : return address
|
| // -----------------------------------
|
| - MaybeObject* maybe_stub;
|
| - if (receiver_map->has_fast_elements()) {
|
| - maybe_stub = KeyedLoadFastElementStub().TryGetCode();
|
| - } else {
|
| - ASSERT(receiver_map->has_external_array_elements());
|
| - JSObject::ElementsKind elements_kind = receiver_map->elements_kind();
|
| - maybe_stub = KeyedLoadExternalArrayStub(elements_kind).TryGetCode();
|
| - }
|
| Code* stub;
|
| + MaybeObject* maybe_stub = ComputeSharedKeyedLoadElementStub(receiver_map);
|
| if (!maybe_stub->To(&stub)) return maybe_stub;
|
| __ DispatchMap(edx,
|
| Handle<Map>(receiver_map),
|
|
|