diff options
author | Michaël Zasso <targos@protonmail.com> | 2016-05-27 16:37:42 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2016-06-29 09:04:28 +0200 |
commit | 2cc29517966de7257a2f1b34c58c77225a21e05d (patch) | |
tree | 210bd177df2f06eec16e1e22edafdbcbffe66f8a /deps/v8/src/runtime/runtime-array.cc | |
parent | bbf3838c70aaec1dd296fa75ae334fd1c7866df3 (diff) | |
download | node-new-2cc29517966de7257a2f1b34c58c77225a21e05d.tar.gz |
deps: update V8 to 5.1.281.69
Pick up the latest branch-head for V8 5.1. This branch brings in
improved language support and performance improvements. For full
details: http://v8project.blogspot.com/2016/04/v8-release-51.html
* Picks up the latest branch head for 5.1 [1]
* Edit v8 gitignore to allow trace_event copy
* Update V8 DEP trace_event as per deps/v8/DEPS [2]
[1] https://chromium.googlesource.com/v8/v8.git/+/dc81244
[2] https://chromium.googlesource.com/chromium/src/base/trace_event/common/+/c8c8665
PR-URL: https://github.com/nodejs/node/pull/7016
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/runtime/runtime-array.cc')
-rw-r--r-- | deps/v8/src/runtime/runtime-array.cc | 54 |
1 files changed, 21 insertions, 33 deletions
diff --git a/deps/v8/src/runtime/runtime-array.cc b/deps/v8/src/runtime/runtime-array.cc index f651ed40e1..ab436c2237 100644 --- a/deps/v8/src/runtime/runtime-array.cc +++ b/deps/v8/src/runtime/runtime-array.cc @@ -5,11 +5,12 @@ #include "src/runtime/runtime-utils.h" #include "src/arguments.h" +#include "src/code-stubs.h" #include "src/conversions-inl.h" #include "src/elements.h" #include "src/factory.h" #include "src/isolate-inl.h" -#include "src/key-accumulator.h" +#include "src/keys.h" #include "src/messages.h" #include "src/prototype.h" @@ -29,17 +30,20 @@ RUNTIME_FUNCTION(Runtime_FinishArrayPrototypeSetup) { return Smi::FromInt(0); } - -static void InstallBuiltin(Isolate* isolate, Handle<JSObject> holder, - const char* name, Builtins::Name builtin_name) { +static void InstallCode(Isolate* isolate, Handle<JSObject> holder, + const char* name, Handle<Code> code) { Handle<String> key = isolate->factory()->InternalizeUtf8String(name); - Handle<Code> code(isolate->builtins()->builtin(builtin_name)); Handle<JSFunction> optimized = isolate->factory()->NewFunctionWithoutPrototype(key, code); optimized->shared()->DontAdaptArguments(); JSObject::AddProperty(holder, key, optimized, NONE); } +static void InstallBuiltin(Isolate* isolate, Handle<JSObject> holder, + const char* name, Builtins::Name builtin_name) { + InstallCode(isolate, holder, name, + handle(isolate->builtins()->builtin(builtin_name), isolate)); +} RUNTIME_FUNCTION(Runtime_SpecialArrayFunctions) { HandleScope scope(isolate); @@ -48,7 +52,8 @@ RUNTIME_FUNCTION(Runtime_SpecialArrayFunctions) { isolate->factory()->NewJSObject(isolate->object_function()); InstallBuiltin(isolate, holder, "pop", Builtins::kArrayPop); - InstallBuiltin(isolate, holder, "push", Builtins::kArrayPush); + FastArrayPushStub stub(isolate); + InstallCode(isolate, holder, "push", stub.GetCode()); InstallBuiltin(isolate, holder, "shift", Builtins::kArrayShift); InstallBuiltin(isolate, holder, "unshift", Builtins::kArrayUnshift); InstallBuiltin(isolate, holder, "slice", Builtins::kArraySlice); @@ -88,29 +93,6 @@ RUNTIME_FUNCTION(Runtime_TransitionElementsKind) { } -// Push an object unto an array of objects if it is not already in the -// array. Returns true if the element was pushed on the stack and -// false otherwise. -RUNTIME_FUNCTION(Runtime_PushIfAbsent) { - HandleScope scope(isolate); - DCHECK(args.length() == 2); - CONVERT_ARG_HANDLE_CHECKED(JSArray, array, 0); - CONVERT_ARG_HANDLE_CHECKED(JSReceiver, element, 1); - RUNTIME_ASSERT(array->HasFastSmiOrObjectElements()); - int length = Smi::cast(array->length())->value(); - FixedArray* elements = FixedArray::cast(array->elements()); - for (int i = 0; i < length; i++) { - if (elements->get(i) == *element) return isolate->heap()->false_value(); - } - - // Strict not needed. Used for cycle detection in Array join implementation. - RETURN_FAILURE_ON_EXCEPTION( - isolate, JSObject::AddDataElement(array, length, element, NONE)); - JSObject::ValidateElements(array); - return isolate->heap()->true_value(); -} - - // Moves all own elements of an object, that are below a limit, to positions // starting at zero. All undefined values are placed after non-undefined values, // and are followed by non-existing element. Does not change the length @@ -234,12 +216,19 @@ RUNTIME_FUNCTION(Runtime_GetArrayKeys) { JSObject::CollectOwnElementKeys(current, &accumulator, ALL_PROPERTIES); } // Erase any keys >= length. - // TODO(adamk): Remove this step when the contract of %GetArrayKeys - // is changed to let this happen on the JS side. Handle<FixedArray> keys = accumulator.GetKeys(KEEP_NUMBERS); + int j = 0; for (int i = 0; i < keys->length(); i++) { - if (NumberToUint32(keys->get(i)) >= length) keys->set_undefined(i); + if (NumberToUint32(keys->get(i)) >= length) continue; + if (i != j) keys->set(j, keys->get(i)); + j++; } + + if (j != keys->length()) { + isolate->heap()->RightTrimFixedArray<Heap::CONCURRENT_TO_SWEEPER>( + *keys, keys->length() - j); + } + return *isolate->factory()->NewJSArrayWithElements(keys); } @@ -383,7 +372,6 @@ RUNTIME_FUNCTION(Runtime_ArrayConstructor) { caller_args); } - RUNTIME_FUNCTION(Runtime_InternalArrayConstructor) { HandleScope scope(isolate); Arguments empty_args(0, NULL); |