From 9c460d7475fd766a7df012e9c92892c264f77723 Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Thu, 8 Sep 2016 09:35:42 -0700 Subject: [PATCH] deps: add back no-op harmony shipping flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add back the no-op harmony shipping flags that were removed in V8 5.1 to increase compatibility with V8 5.0 that we had been shipping before v6.5.0. These flags do nothing. Fixes: https://github.com/nodejs/node/issues/8388 Ref: https://github.com/nodejs/node/pull/8395 PR-URL: https://github.com/nodejs/node/pull/8445 Reviewed-By: addaleax - Anna Henningsen Reviewed-By: thealphanerd - Myles Borins Reviewed-By: jasnell - James M Snell Reviewed-By: evanlucas - Evan Lucas Reviewed-By: targos - Michaël Zasso Reviewed-By: bnoordhuis - Ben Noordhuis --- deps/v8/include/v8-version.h | 2 +- deps/v8/src/flag-definitions.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index 9f61de82936dc4..18fe67b59d172e 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 5 #define V8_MINOR_VERSION 1 #define V8_BUILD_NUMBER 281 -#define V8_PATCH_LEVEL 82 +#define V8_PATCH_LEVEL 83 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/flag-definitions.h b/deps/v8/src/flag-definitions.h index 8450c0c0f93514..eb3dbbb4cfaf00 100644 --- a/deps/v8/src/flag-definitions.h +++ b/deps/v8/src/flag-definitions.h @@ -235,6 +235,20 @@ DEFINE_IMPLICATION(es_staging, move_object_start) // and associated tests are moved from the harmony directory to the appropriate // esN directory. +// no-op flags added back for V8 5.0 compatibility for Node.js v6.x. +#define NODE_NOP_HARMONY_FEATURES(V) \ + V(harmony_default_parameters, "harmony default parameters") \ + V(harmony_destructuring_assignment, "harmony destructuring assignment") \ + V(harmony_destructuring_bind, "harmony destructuring bind") \ + V(harmony_regexps, "harmony regular expression extensions") \ + V(harmony_proxies, "harmony proxies") \ + V(harmony_reflect, "harmony Reflect API") \ + V(harmony_tostring, "harmony toString") + +#define FLAG_NODE_NOP_HARMONY_FEATURES(id, description) \ + DEFINE_BOOL(id, true, "nop flag for " #description) +NODE_NOP_HARMONY_FEATURES(FLAG_NODE_NOP_HARMONY_FEATURES) +#undef FLAG_NODE_NOP_HARMONY_FEATURES #define FLAG_INPROGRESS_FEATURES(id, description) \ DEFINE_BOOL(id, false, "enable " #description " (in progress)")