diff options
author | Joyee Cheung <joyeec9h3@gmail.com> | 2018-11-06 18:05:48 +0800 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2018-11-08 15:01:06 -0800 |
commit | 00d368e5bc63a2009bd12932558eba71f0e1bc5a (patch) | |
tree | ad810068014db2c3481dfcf1fc49d26492a9f1a1 | |
parent | 7d86a5324bc29c21afce8cba3dba508b78d48cd5 (diff) | |
download | android-node-v8-00d368e5bc63a2009bd12932558eba71f0e1bc5a.tar.gz android-node-v8-00d368e5bc63a2009bd12932558eba71f0e1bc5a.tar.bz2 android-node-v8-00d368e5bc63a2009bd12932558eba71f0e1bc5a.zip |
deps: cherry-pick 0483e9a from upstream V8
Original commit message:
[api] Allow embedder to construct an Array from Local<Value>*
Currently to obtain a v8::Array out of a C array or a std::vector,
one needs to loop through the elements and call array->Set() multiple
times, and these calls go into v8::Object::Set() which can be slow.
This patch adds a new Array::New overload that converts a
Local<Value>* with known size into a Local<Array>.
Change-Id: I0a768f0e18eec51e78d58be455482ec6425ca188
Reviewed-on: https://chromium-review.googlesource.com/c/1317049
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Adam Klein <adamk@chromium.org>
Commit-Queue: Joyee Cheung <joyee@igalia.com>
Cr-Commit-Position: refs/heads/master@{#57261}
Refs: https://github.com/v8/v8/commit/0483e9a9abe77a73632fd85b9c0cd608efa9aa0d
PR-URL: https://github.com/nodejs/node/pull/24125
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
-rw-r--r-- | common.gypi | 2 | ||||
-rw-r--r-- | deps/v8/include/v8.h | 6 | ||||
-rw-r--r-- | deps/v8/src/api.cc | 17 | ||||
-rw-r--r-- | deps/v8/test/cctest/test-api.cc | 16 |
4 files changed, 40 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 0ba7c8e816..a7a4d214b9 100644 --- a/common.gypi +++ b/common.gypi @@ -32,7 +32,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.9', + 'v8_embedder_string': '-node.10', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index c48025871a..e1951ec270 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -3779,6 +3779,12 @@ class V8_EXPORT Array : public Object { */ static Local<Array> New(Isolate* isolate, int length = 0); + /** + * Creates a JavaScript array out of a Local<Value> array in C++ + * with a known length. + */ + static Local<Array> New(Isolate* isolate, Local<Value>* elements, + size_t length); V8_INLINE static Array* Cast(Value* obj); private: Array(); diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc index 54d1ba1afc..c1afe8d93b 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -6981,6 +6981,23 @@ Local<v8::Array> v8::Array::New(Isolate* isolate, int length) { return Utils::ToLocal(obj); } +Local<v8::Array> v8::Array::New(Isolate* isolate, Local<Value>* elements, + size_t length) { + i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate); + i::Factory* factory = i_isolate->factory(); + LOG_API(i_isolate, Array, New); + ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate); + int len = static_cast<int>(length); + + i::Handle<i::FixedArray> result = factory->NewFixedArray(len); + for (int i = 0; i < len; i++) { + i::Handle<i::Object> element = Utils::OpenHandle(*elements[i]); + result->set(i, *element); + } + + return Utils::ToLocal( + factory->NewJSArrayWithElements(result, i::PACKED_ELEMENTS, len)); +} uint32_t v8::Array::Length() const { i::Handle<i::JSArray> obj = Utils::OpenHandle(this); diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc index bf5aba2df6..f7365c8f31 100644 --- a/deps/v8/test/cctest/test-api.cc +++ b/deps/v8/test/cctest/test-api.cc @@ -5247,6 +5247,22 @@ THREADED_TEST(Array) { CHECK_EQ(27u, array->Length()); array = v8::Array::New(context->GetIsolate(), -27); CHECK_EQ(0u, array->Length()); + + std::vector<Local<Value>> vector = {v8_num(1), v8_num(2), v8_num(3)}; + array = v8::Array::New(context->GetIsolate(), vector.data(), vector.size()); + CHECK_EQ(vector.size(), array->Length()); + CHECK_EQ(1, arr->Get(context.local(), 0) + .ToLocalChecked() + ->Int32Value(context.local()) + .FromJust()); + CHECK_EQ(2, arr->Get(context.local(), 1) + .ToLocalChecked() + ->Int32Value(context.local()) + .FromJust()); + CHECK_EQ(3, arr->Get(context.local(), 2) + .ToLocalChecked() + ->Int32Value(context.local()) + .FromJust()); } |