From 49e42c530ba4ef2a0b580b8a64ba93511a378b75 Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Wed, 20 Apr 2016 17:29:08 -0700 Subject: [PATCH] deps: upgrade to V8 5.0.71.34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick up the latest bug fix from the V8 5.0 branch. Original commit message: V8-Commit: https://github.com/v8/v8/commit/c36773f Version 5.0.71.34 (cherry-pick) Merged 9acbca1 [es6] Fix bug in pattern re-writing BUG=v8:4891 LOG=N R=littledan@chromium.org Review URL: https://codereview.chromium.org/1906633002 . PR-URL: https://github.com/nodejs/node/pull/6320 Reviewed-By: cjihrig - Colin Ihrig Reviewed-By: jasnell - James M Snell Reviewed-By: targos - Michaƫl Zasso --- deps/v8/include/v8-version.h | 2 +- deps/v8/src/parsing/pattern-rewriter.cc | 6 +- deps/v8/test/mjsunit/harmony/destructuring.js | 57 +++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index 1c3e60f95e854b..764cbc55ec503e 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 0 #define V8_BUILD_NUMBER 71 -#define V8_PATCH_LEVEL 33 +#define V8_PATCH_LEVEL 34 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/parsing/pattern-rewriter.cc b/deps/v8/src/parsing/pattern-rewriter.cc index 04b517ebba4ba0..768a9488632675 100644 --- a/deps/v8/src/parsing/pattern-rewriter.cc +++ b/deps/v8/src/parsing/pattern-rewriter.cc @@ -77,7 +77,11 @@ bool Parser::PatternRewriter::IsBindingContext(PatternContext c) const { Parser::PatternRewriter::PatternContext Parser::PatternRewriter::SetAssignmentContextIfNeeded(Expression* node) { PatternContext old_context = context(); - if (node->IsAssignment() && node->AsAssignment()->op() == Token::ASSIGN) { + // AssignmentExpressions may occur in the Initializer position of a + // SingleNameBinding. Such expressions should not prompt a change in the + // pattern's context. + if (node->IsAssignment() && node->AsAssignment()->op() == Token::ASSIGN && + !IsInitializerContext()) { set_context(ASSIGNMENT); } return old_context; diff --git a/deps/v8/test/mjsunit/harmony/destructuring.js b/deps/v8/test/mjsunit/harmony/destructuring.js index b6eb6eab09e815..e84abd112f9a79 100644 --- a/deps/v8/test/mjsunit/harmony/destructuring.js +++ b/deps/v8/test/mjsunit/harmony/destructuring.js @@ -263,6 +263,63 @@ }()); +(function TestAssignmentExprInInitializers() { + { + let x, y; + { + let { x = y = 1 } = {}; + assertSame(x, 1); + assertSame(y, 1); + } + assertSame(undefined, x); + assertSame(1, y); + } + + { + let x, y; + { + let { x: x = y = 1 } = {}; + assertSame(1, x); + assertSame(1, y); + } + assertSame(undefined, x); + assertSame(1, y); + } + + { + let x, y; + { + let [ x = y = 1 ] = []; + assertSame(1, x); + assertSame(1, y); + } + assertSame(undefined, x); + assertSame(1, y); + } + + { + let x, y; + (function({ x = y = 1 }) {}({})); + assertSame(undefined, x); + assertSame(1, y); + } + + { + let x, y; + (function({ x: x = y = 1 }) {}({})); + assertSame(undefined, x); + assertSame(1, y); + } + + { + let x, y; + (function([ x = y = 1 ]) {}([])); + assertSame(undefined, x); + assertSame(1, y); + } +}()); + + (function TestMultipleAccesses() { assertThrows( "'use strict';"+