From ba105fdfc3659feace7a34138d8fc51850736ddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sat, 25 Mar 2017 14:48:55 +0100 Subject: [PATCH] deps: cherry-pick b9f682b from upstream V8 Original commit message: Fix bug with illegal spread as single arrow parameter R=adamk@chromium.org BUG=chromium:621496 LOG=N Review-Url: https://codereview.chromium.org/2084703005 Cr-Commit-Position: refs/heads/master@{#37196} Fixes: https://github.com/nodejs/node/issues/12017 PR-URL: https://github.com/nodejs/node/pull/12037 Reviewed-By: Ben Noordhuis Reviewed-By: Myles Borins --- deps/v8/include/v8-version.h | 2 +- deps/v8/src/parsing/parser-base.h | 7 +++++-- .../test/mjsunit/harmony/regress/regress-crbug-621496.js | 7 +++++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 deps/v8/test/mjsunit/harmony/regress/regress-crbug-621496.js diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index d6df3c2e934f6c..d281773473a019 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 96 +#define V8_PATCH_LEVEL 97 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/parsing/parser-base.h b/deps/v8/src/parsing/parser-base.h index d4cc3994578f57..e0e12edbd73623 100644 --- a/deps/v8/src/parsing/parser-base.h +++ b/deps/v8/src/parsing/parser-base.h @@ -1307,8 +1307,11 @@ ParserBase::ParsePrimaryExpression(ExpressionClassifier* classifier, MessageTemplate::kUnexpectedToken, Token::String(Token::ELLIPSIS)); classifier->RecordNonSimpleParameter(); - ExpressionT expr = - this->ParseAssignmentExpression(true, classifier, CHECK_OK); + ExpressionClassifier binding_classifier(this); + ExpressionT expr = this->ParseAssignmentExpression( + true, &binding_classifier, CHECK_OK); + classifier->Accumulate(&binding_classifier, + ExpressionClassifier::AllProductions); if (!this->IsIdentifier(expr) && !IsValidPattern(expr)) { classifier->RecordArrowFormalParametersError( Scanner::Location(ellipsis_pos, scanner()->location().end_pos), diff --git a/deps/v8/test/mjsunit/harmony/regress/regress-crbug-621496.js b/deps/v8/test/mjsunit/harmony/regress/regress-crbug-621496.js new file mode 100644 index 00000000000000..4db7a950394742 --- /dev/null +++ b/deps/v8/test/mjsunit/harmony/regress/regress-crbug-621496.js @@ -0,0 +1,7 @@ +// Copyright 2016 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +(function testIllegalSpreadAsSingleArrowParameter() { + assertThrows("(...[42]) => 42)", SyntaxError) // will core dump, if not fixed +})();