deps: add back no-op harmony shipping flags

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: nodejs#8388 Ref: nodejs#8395 PR-URL: nodejs#8445 Reviewed-By: addaleax - Anna Henningsen <[email protected]> Reviewed-By: thealphanerd - Myles Borins <[email protected]> Reviewed-By: jasnell - James M Snell <[email protected]> Reviewed-By: evanlucas - Evan Lucas <[email protected]> Reviewed-By: targos - Michaël Zasso <[email protected]> Reviewed-By: bnoordhuis - Ben Noordhuis <[email protected]>
ofrobots · Sep 13, 2016 · 9c460d7 · 9c460d7
1 parent dd51b1f
commit 9c460d7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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)")