AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[parser] Fix function name variable tracking

Browse Source 
Delay the creation of FunctionNameVariables until we validated the
FormalParameters. This is needed so we don't declare them in cases where
we later get an error, have to reset, and reparse.

Bug: chromium:890553, v8:7926
Change-Id: I742e6f7f71158e3903843bd583dc7943468c18f6
Reviewed-on: https://chromium-review.googlesource.com/1254061
Reviewed-by: Marja Hölttä <marja@chromium.org>
Commit-Queue: Florian Sattler <sattlerf@google.com>
Cr-Commit-Position: refs/heads/master@{#56314}
This commit is contained in:
Florian Sattler 2018-10-01 14:21:41 +02:00 committed by Commit Bot
parent b002829bff
commit 563eeec64c
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/parsing/preparser.cc
View File

@ -210,18 +210,7 @@ PreParser::PreParseResult PreParser::PreParseFunction(
} }
} }
if (!IsArrowFunction(kind) && track_unresolved_variables_ &&
result == kLazyParsingComplete) {
// Declare arguments after parsing the function since lexical 'arguments'
// masks the arguments object. Declare arguments before declaring the
// function var since the arguments object masks 'function arguments'.
function_scope->DeclareArguments(ast_value_factory());
DeclareFunctionNameVar(function_name, function_type, function_scope);
}
use_counts_ = nullptr; use_counts_ = nullptr;
track_unresolved_variables_ = false;
if (result == kLazyParsingAborted) { if (result == kLazyParsingAborted) {
DCHECK(!pending_error_handler()->ErrorUnidentifiableByPreParser()); DCHECK(!pending_error_handler()->ErrorUnidentifiableByPreParser());
@ -229,13 +218,14 @@ PreParser::PreParseResult PreParser::PreParseFunction(
} else if (stack_overflow()) { } else if (stack_overflow()) {
DCHECK(!pending_error_handler()->ErrorUnidentifiableByPreParser()); DCHECK(!pending_error_handler()->ErrorUnidentifiableByPreParser());
return kPreParseStackOverflow; return kPreParseStackOverflow;
} else if (!*ok) { } else if (pending_error_handler()->ErrorUnidentifiableByPreParser()) {
if (pending_error_handler()->ErrorUnidentifiableByPreParser()) { DCHECK(!*ok);
return kPreParseNotIdentifiableError; return kPreParseNotIdentifiableError;
} } else if (!*ok) {
DCHECK(pending_error_handler()->has_pending_error()); DCHECK(pending_error_handler()->has_pending_error());
} else { } else {
DCHECK_EQ(Token::RBRACE, scanner()->peek()); DCHECK_EQ(Token::RBRACE, scanner()->peek());
DCHECK(result == kLazyParsingComplete);
if (!IsArrowFunction(kind)) { if (!IsArrowFunction(kind)) {
// Validate parameter names. We can do this only after parsing the // Validate parameter names. We can do this only after parsing the
@ -243,12 +233,25 @@ PreParser::PreParseResult PreParser::PreParseFunction(
const bool allow_duplicate_parameters = const bool allow_duplicate_parameters =
is_sloppy(function_scope->language_mode()) && formals.is_simple && is_sloppy(function_scope->language_mode()) && formals.is_simple &&
!IsConciseMethod(kind); !IsConciseMethod(kind);
ValidateFormalParameters( ValidateFormalParameters(function_scope->language_mode(),
function_scope->language_mode(), allow_duplicate_parameters, allow_duplicate_parameters, ok);
CHECK_OK_VALUE( if (!*ok) {
pending_error_handler()->ErrorUnidentifiableByPreParser() if (pending_error_handler()->ErrorUnidentifiableByPreParser()) {
? kPreParseNotIdentifiableError return kPreParseNotIdentifiableError;
: kPreParseSuccess)); } else {
return kPreParseSuccess;
}
}
if (track_unresolved_variables_) {
// Declare arguments after parsing the function since lexical
// 'arguments' masks the arguments object. Declare arguments before
// declaring the function var since the arguments object masks 'function
// arguments'.
function_scope->DeclareArguments(ast_value_factory());
DeclareFunctionNameVar(function_name, function_type, function_scope);
}
*produced_preparsed_scope_data = ProducedPreParsedScopeData::For( *produced_preparsed_scope_data = ProducedPreParsedScopeData::For(
preparsed_scope_data_builder_, main_zone()); preparsed_scope_data_builder_, main_zone());

11
test/mjsunit/regress/regress-890553.js Normal file
View File

@ -0,0 +1,11 @@
// Copyright 2018 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.
"use strict";
var s = "function __f_9(func, testName) {" +
"var __v_0 = function __f_10(__v_14, __v_14) {" +
" return __v_16;" +
"}; " +
"}"
assertThrows(function() { eval(s); });