diff --git a/deps/v8/include/v8-include/v8-internal.h b/deps/v8/include/v8-include/v8-internal.h index 947dbef1dfc6b7d07a8ada3b6e8a9c08d412559c..1e9bbcbc8d9325b2e3baecc70f3d2b5107450cbf 100644 --- a/deps/v8/include/v8-include/v8-internal.h +++ b/deps/v8/include/v8-include/v8-internal.h @@ -517,7 +517,7 @@ class Internals { static const int kExternalOneByteRepresentationTag = 0x0a; static const uint32_t kNumIsolateDataSlots = 4; - static const int kStackGuardSize = 7 * kApiSystemPointerSize; + static const int kStackGuardSize = 8 * kApiSystemPointerSize; static const int kBuiltinTier0EntryTableSize = 7 * kApiSystemPointerSize; static const int kBuiltinTier0TableSize = 7 * kApiSystemPointerSize; static const int kLinearAllocationAreaSize = 3 * kApiSystemPointerSize; diff --git a/deps/v8/include/v8-include/v8-primitive.h b/deps/v8/include/v8-include/v8-primitive.h index ad3386b8bbe438632b0244eee0d79513fb572def..aa664de219243e7323e7987161c43b4c4575d135 100644 --- a/deps/v8/include/v8-include/v8-primitive.h +++ b/deps/v8/include/v8-include/v8-primitive.h @@ -516,7 +516,8 @@ class V8_EXPORT String : public Name { */ class V8_EXPORT Utf8Value { public: - Utf8Value(Isolate* isolate, Local obj); + Utf8Value(Isolate* isolate, Local obj, + WriteOptions options = REPLACE_INVALID_UTF8); ~Utf8Value(); char* operator*() { return str_; } const char* operator*() const { return str_; } diff --git a/deps/v8/include/v8-include/v8-template.h b/deps/v8/include/v8-include/v8-template.h index 11296cd48896ddc94867a304d3db36ec44fc8361..ebfcae113423ad679686deef9d2234c2c00310de 100644 --- a/deps/v8/include/v8-include/v8-template.h +++ b/deps/v8/include/v8-include/v8-template.h @@ -530,6 +530,14 @@ class V8_EXPORT FunctionTemplate : public Template { **/ void Inherit(Local parent); + /** + * Causes the function template to inherit from a parent function. + * This means the function's prototype.__proto__ is set to the parent + * function's prototype. If the parent function is not an ApiFunction, + * return false. + **/ + bool Inherit(Local parent); + /** * A PrototypeTemplate is the template used to create the prototype object * of the function created by this template. diff --git a/deps/v8/include/v8-include/v8-version.h b/deps/v8/include/v8-include/v8-version.h index af0c107ab79307b7a61993e8431959341de59288..4bc652dd7556d2a5f5ae745460c0bba5c998bdf0 100644 --- a/deps/v8/include/v8-include/v8-version.h +++ b/deps/v8/include/v8-include/v8-version.h @@ -14,7 +14,7 @@ #define V8_PATCH_LEVEL 25 #ifdef OHOS_JS_ENGINE -#define V8_INNER_VERSION 2 +#define V8_INNER_VERSION 8 #endif // Use 1 for candidates and 0 otherwise. diff --git a/deps/v8/lib.unstripped/libv8_shared.so b/deps/v8/lib.unstripped/libv8_shared.so index ac8554bb4168279973742128ae2f6737cc85d593..6c9860c0f224caf19349eb49da8e36c69ab48f3a 100755 --- a/deps/v8/lib.unstripped/libv8_shared.so +++ b/deps/v8/lib.unstripped/libv8_shared.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8ee8d36c7bd54c5ce7618401ffd0ca5d8e03a1467ca2c37c219b00a58c47ce7 -size 101992000 +oid sha256:74acaf440f0eaec0d7f9f8084dc811fdfc6d0328781d73f85679ab708645f8bf +size 102010056 diff --git a/deps/v8/libv8_shared.so b/deps/v8/libv8_shared.so index 01073236d73790b7d728190d37403a6a991b13e8..f56d79d4b9f8f72c45b0d4b7b4aed9bd5e3d5cf9 100755 --- a/deps/v8/libv8_shared.so +++ b/deps/v8/libv8_shared.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c9cf567c9614ca5b886c79af23d7431218f8aaa84754e81a3958538b65e9224 +oid sha256:a4331acfb47cca032128015479c4188b1f1414b692770328bbb98853c0ae034e size 17895216 diff --git a/node.gyp b/node.gyp index fec27f08a6e3919f237f8a7a03b81c3dffcf3e70..9e525e70d7a9a3172cd2e85bac8ff7416662b42c 100644 --- a/node.gyp +++ b/node.gyp @@ -471,8 +471,8 @@ } ], [ 'use_node_zlib=="false"' , { 'include_dirs': [ - '<(NDK_SYS_ROOT)/../../../third_party/zlib/include', - '<(NDK_SYS_ROOT)/../../../third_party/zlib', + '../../third_party/zlib/include', + '../../third_party/zlib', ], 'ldflags' : [ '<(NDK_SYS_ROOT)/obj/third_party/zlib/libz.a', @@ -480,7 +480,7 @@ } ], [ 'enable_hilog=="true"' , { 'ldflags' : [ - '<(NDK_SYS_ROOT)/hiviewdfx/hilog_override/libhilog.so', + '<(NDK_SYS_ROOT)/hiviewdfx/hilog/libhilog.so', ], 'defines': [ 'ENABLE_HILOG', @@ -537,12 +537,12 @@ 'jsvm/interface/innerkits', 'jsvm/interface/kits', 'jsvm/src', - '<(NDK_SYS_ROOT)/../../../base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include', - '<(NDK_SYS_ROOT)/../../../base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter', - '<(NDK_SYS_ROOT)/../../../base/hiviewdfx/hilog/interfaces/native/innerkits/include', - '<(NDK_SYS_ROOT)/../../../base/startup/init/interfaces/innerkits/include/param', - '<(NDK_SYS_ROOT)/../../../third_party/libuv/include', - '<(NDK_SYS_ROOT)/../../../third_party/icu/icu4c/source/common', + '../../base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include', + '../../base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter', + '../../base/hiviewdfx/hilog/interfaces/native/innerkits/include', + '../../base/startup/init/interfaces/innerkits/include/param', + '../../third_party/libuv/include', + '../../third_party/icu/icu4c/source/common', '<(NDK_SYS_ROOT)/obj/third_party/openssl/build_all_generated/linux-aarch64/include', '../openssl/include', '<(obj_dir)/../../../v8-include'