2012-01-26 21:47:57 +00:00
|
|
|
// Copyright 2012 the V8 project authors. All rights reserved.
|
2014-04-29 06:42:26 +00:00
|
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
|
|
// found in the LICENSE file.
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2015-11-26 16:22:34 +00:00
|
|
|
#include "src/parsing/parser.h"
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2017-04-04 15:44:08 +00:00
|
|
|
#include <algorithm>
|
2016-07-25 10:24:45 +00:00
|
|
|
#include <memory>
|
|
|
|
|
2014-06-03 08:12:43 +00:00
|
|
|
#include "src/api.h"
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
#include "src/ast/ast-expression-rewriter.h"
|
2016-11-28 11:40:22 +00:00
|
|
|
#include "src/ast/ast-function-literal-id-reindexer.h"
|
2016-07-25 08:25:49 +00:00
|
|
|
#include "src/ast/ast-traversal-visitor.h"
|
2016-08-22 11:33:30 +00:00
|
|
|
#include "src/ast/ast.h"
|
2014-09-24 07:08:27 +00:00
|
|
|
#include "src/bailout-reason.h"
|
2014-06-30 13:25:46 +00:00
|
|
|
#include "src/base/platform/platform.h"
|
2014-06-03 08:12:43 +00:00
|
|
|
#include "src/char-predicates-inl.h"
|
2017-04-04 15:44:08 +00:00
|
|
|
#include "src/compiler-dispatcher/compiler-dispatcher.h"
|
2014-06-03 08:12:43 +00:00
|
|
|
#include "src/messages.h"
|
2017-01-09 13:43:28 +00:00
|
|
|
#include "src/objects-inl.h"
|
2016-08-25 11:58:07 +00:00
|
|
|
#include "src/parsing/duplicate-finder.h"
|
2017-07-31 18:23:46 +00:00
|
|
|
#include "src/parsing/expression-scope-reparenter.h"
|
2016-08-22 11:33:30 +00:00
|
|
|
#include "src/parsing/parse-info.h"
|
2015-11-26 16:22:34 +00:00
|
|
|
#include "src/parsing/rewriter.h"
|
2014-09-25 07:16:15 +00:00
|
|
|
#include "src/runtime/runtime.h"
|
2014-06-03 08:12:43 +00:00
|
|
|
#include "src/string-stream.h"
|
2016-02-18 06:12:45 +00:00
|
|
|
#include "src/tracing/trace-event.h"
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2009-05-25 10:05:56 +00:00
|
|
|
namespace v8 {
|
|
|
|
namespace internal {
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2015-03-09 14:51:13 +00:00
|
|
|
ScriptData::ScriptData(const byte* data, int length)
|
|
|
|
: owns_data_(false), rejected_(false), data_(data), length_(length) {
|
|
|
|
if (!IsAligned(reinterpret_cast<intptr_t>(data), kPointerAlignment)) {
|
|
|
|
byte* copy = NewArray<byte>(length);
|
|
|
|
DCHECK(IsAligned(reinterpret_cast<intptr_t>(copy), kPointerAlignment));
|
|
|
|
CopyBytes(copy, data, length);
|
|
|
|
data_ = copy;
|
|
|
|
AcquireDataOwnership();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-10 10:28:05 +00:00
|
|
|
FunctionEntry ParseData::GetFunctionEntry(int start) {
|
2010-08-27 08:26:29 +00:00
|
|
|
// The current pre-data entry must be a FunctionEntry with the given
|
|
|
|
// start position.
|
2014-07-10 10:28:05 +00:00
|
|
|
if ((function_index_ + FunctionEntry::kSize <= Length()) &&
|
|
|
|
(static_cast<int>(Data()[function_index_]) == start)) {
|
2010-09-07 12:52:16 +00:00
|
|
|
int index = function_index_;
|
|
|
|
function_index_ += FunctionEntry::kSize;
|
2014-07-10 10:28:05 +00:00
|
|
|
Vector<unsigned> subvector(&(Data()[index]), FunctionEntry::kSize);
|
|
|
|
return FunctionEntry(subvector);
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
return FunctionEntry();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-10 10:28:05 +00:00
|
|
|
int ParseData::FunctionCount() {
|
|
|
|
int functions_size = FunctionsSize();
|
|
|
|
if (functions_size < 0) return 0;
|
|
|
|
if (functions_size % FunctionEntry::kSize != 0) return 0;
|
|
|
|
return functions_size / FunctionEntry::kSize;
|
2010-09-07 12:52:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-10 10:28:05 +00:00
|
|
|
bool ParseData::IsSane() {
|
2014-11-17 12:16:27 +00:00
|
|
|
if (!IsAligned(script_data_->length(), sizeof(unsigned))) return false;
|
2010-09-07 12:52:16 +00:00
|
|
|
// Check that the header data is valid and doesn't specify
|
|
|
|
// point to positions outside the store.
|
2014-07-10 10:28:05 +00:00
|
|
|
int data_length = Length();
|
|
|
|
if (data_length < PreparseDataConstants::kHeaderSize) return false;
|
|
|
|
if (Magic() != PreparseDataConstants::kMagicNumber) return false;
|
|
|
|
if (Version() != PreparseDataConstants::kCurrentVersion) return false;
|
2010-09-07 12:52:16 +00:00
|
|
|
// Check that the space allocated for function entries is sane.
|
2014-07-10 10:28:05 +00:00
|
|
|
int functions_size = FunctionsSize();
|
2010-09-07 12:52:16 +00:00
|
|
|
if (functions_size < 0) return false;
|
|
|
|
if (functions_size % FunctionEntry::kSize != 0) return false;
|
2010-09-15 10:54:35 +00:00
|
|
|
// Check that the total size has room for header and function entries.
|
2010-09-07 12:52:16 +00:00
|
|
|
int minimum_size =
|
2010-11-23 11:46:36 +00:00
|
|
|
PreparseDataConstants::kHeaderSize + functions_size;
|
2014-07-10 10:28:05 +00:00
|
|
|
if (data_length < minimum_size) return false;
|
2008-07-03 15:10:15 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-10 10:28:05 +00:00
|
|
|
void ParseData::Initialize() {
|
|
|
|
// Prepares state for use.
|
|
|
|
int data_length = Length();
|
|
|
|
if (data_length >= PreparseDataConstants::kHeaderSize) {
|
|
|
|
function_index_ = PreparseDataConstants::kHeaderSize;
|
2010-08-25 06:46:53 +00:00
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-10 10:28:05 +00:00
|
|
|
unsigned ParseData::Magic() {
|
|
|
|
return Data()[PreparseDataConstants::kMagicOffset];
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-10 10:28:05 +00:00
|
|
|
unsigned ParseData::Version() {
|
|
|
|
return Data()[PreparseDataConstants::kVersionOffset];
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-07-10 10:28:05 +00:00
|
|
|
int ParseData::FunctionsSize() {
|
|
|
|
return static_cast<int>(Data()[PreparseDataConstants::kFunctionsSizeOffset]);
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
2016-07-19 11:13:27 +00:00
|
|
|
// Helper for putting parts of the parse results into a temporary zone when
|
|
|
|
// parsing inner function bodies.
|
|
|
|
class DiscardableZoneScope {
|
|
|
|
public:
|
|
|
|
DiscardableZoneScope(Parser* parser, Zone* temp_zone, bool use_temp_zone)
|
2017-05-17 11:41:00 +00:00
|
|
|
: fni_(parser->ast_value_factory_, temp_zone),
|
2016-07-19 11:13:27 +00:00
|
|
|
parser_(parser),
|
2016-08-04 19:15:18 +00:00
|
|
|
prev_fni_(parser->fni_),
|
2016-11-21 14:58:46 +00:00
|
|
|
prev_zone_(parser->zone_),
|
|
|
|
prev_allow_lazy_(parser->allow_lazy_),
|
|
|
|
prev_temp_zoned_(parser->temp_zoned_) {
|
2016-07-19 11:13:27 +00:00
|
|
|
if (use_temp_zone) {
|
2016-11-21 14:58:46 +00:00
|
|
|
DCHECK(!parser_->temp_zoned_);
|
|
|
|
parser_->allow_lazy_ = false;
|
|
|
|
parser_->temp_zoned_ = true;
|
2016-07-19 11:13:27 +00:00
|
|
|
parser_->fni_ = &fni_;
|
2016-08-04 19:15:18 +00:00
|
|
|
parser_->zone_ = temp_zone;
|
2017-05-17 11:41:00 +00:00
|
|
|
parser_->factory()->set_zone(temp_zone);
|
2016-09-27 09:48:17 +00:00
|
|
|
if (parser_->reusable_preparser_ != nullptr) {
|
|
|
|
parser_->reusable_preparser_->zone_ = temp_zone;
|
2016-10-10 09:22:22 +00:00
|
|
|
parser_->reusable_preparser_->factory()->set_zone(temp_zone);
|
2016-09-27 09:48:17 +00:00
|
|
|
}
|
2016-07-19 11:13:27 +00:00
|
|
|
}
|
|
|
|
}
|
2016-09-28 15:58:22 +00:00
|
|
|
void Reset() {
|
2016-08-04 19:15:18 +00:00
|
|
|
parser_->fni_ = prev_fni_;
|
|
|
|
parser_->zone_ = prev_zone_;
|
2017-05-17 11:41:00 +00:00
|
|
|
parser_->factory()->set_zone(prev_zone_);
|
2016-11-21 14:58:46 +00:00
|
|
|
parser_->allow_lazy_ = prev_allow_lazy_;
|
|
|
|
parser_->temp_zoned_ = prev_temp_zoned_;
|
2016-09-27 09:48:17 +00:00
|
|
|
if (parser_->reusable_preparser_ != nullptr) {
|
|
|
|
parser_->reusable_preparser_->zone_ = prev_zone_;
|
2016-10-10 09:22:22 +00:00
|
|
|
parser_->reusable_preparser_->factory()->set_zone(prev_zone_);
|
2016-09-27 09:48:17 +00:00
|
|
|
}
|
2016-08-04 19:15:18 +00:00
|
|
|
}
|
2016-09-28 15:58:22 +00:00
|
|
|
~DiscardableZoneScope() { Reset(); }
|
2016-07-19 11:13:27 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
FuncNameInferrer fni_;
|
|
|
|
Parser* parser_;
|
|
|
|
FuncNameInferrer* prev_fni_;
|
2016-08-04 19:15:18 +00:00
|
|
|
Zone* prev_zone_;
|
2016-11-21 14:58:46 +00:00
|
|
|
bool prev_allow_lazy_;
|
|
|
|
bool prev_temp_zoned_;
|
2016-08-04 19:15:18 +00:00
|
|
|
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(DiscardableZoneScope);
|
2016-07-19 11:13:27 +00:00
|
|
|
};
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2015-03-09 14:51:13 +00:00
|
|
|
void Parser::SetCachedData(ParseInfo* info) {
|
2016-10-13 14:01:44 +00:00
|
|
|
DCHECK_NULL(cached_parse_data_);
|
|
|
|
if (consume_cached_parse_data()) {
|
2016-11-21 14:58:46 +00:00
|
|
|
if (allow_lazy_) {
|
|
|
|
cached_parse_data_ = ParseData::FromCachedData(*info->cached_data());
|
|
|
|
if (cached_parse_data_ != nullptr) return;
|
2014-07-10 10:28:05 +00:00
|
|
|
}
|
2016-11-21 14:58:46 +00:00
|
|
|
compile_options_ = ScriptCompiler::kNoCompileOptions;
|
2014-07-10 10:28:05 +00:00
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
2016-02-01 17:44:23 +00:00
|
|
|
FunctionLiteral* Parser::DefaultConstructor(const AstRawString* name,
|
2016-12-29 22:12:51 +00:00
|
|
|
bool call_super, int pos,
|
|
|
|
int end_pos) {
|
2014-11-07 16:39:00 +00:00
|
|
|
int expected_property_count = -1;
|
2016-10-13 12:34:37 +00:00
|
|
|
const int parameter_count = 0;
|
2015-02-11 17:22:50 +00:00
|
|
|
|
2017-01-03 19:37:23 +00:00
|
|
|
FunctionKind kind = call_super ? FunctionKind::kDefaultDerivedConstructor
|
2015-02-12 20:06:52 +00:00
|
|
|
: FunctionKind::kDefaultBaseConstructor;
|
2016-08-05 14:30:54 +00:00
|
|
|
DeclarationScope* function_scope = NewFunctionScope(kind);
|
2016-12-29 22:12:51 +00:00
|
|
|
SetLanguageMode(function_scope, STRICT);
|
2014-11-07 16:39:00 +00:00
|
|
|
// Set start and end position to the same value
|
|
|
|
function_scope->set_start_position(pos);
|
|
|
|
function_scope->set_end_position(pos);
|
|
|
|
ZoneList<Statement*>* body = NULL;
|
|
|
|
|
|
|
|
{
|
2017-02-20 10:41:29 +00:00
|
|
|
FunctionState function_state(&function_state_, &scope_, function_scope);
|
2014-11-07 16:39:00 +00:00
|
|
|
|
2015-02-11 17:22:50 +00:00
|
|
|
body = new (zone()) ZoneList<Statement*>(call_super ? 2 : 1, zone());
|
2014-11-07 16:39:00 +00:00
|
|
|
if (call_super) {
|
2016-12-01 09:42:07 +00:00
|
|
|
// Create a SuperCallReference and handle in BytecodeGenerator.
|
2016-06-13 18:07:18 +00:00
|
|
|
auto constructor_args_name = ast_value_factory()->empty_string();
|
|
|
|
bool is_duplicate;
|
|
|
|
bool is_rest = true;
|
|
|
|
bool is_optional = false;
|
2016-07-20 08:57:53 +00:00
|
|
|
Variable* constructor_args = function_scope->DeclareParameter(
|
|
|
|
constructor_args_name, TEMPORARY, is_optional, is_rest, &is_duplicate,
|
2017-03-31 08:40:38 +00:00
|
|
|
ast_value_factory(), pos);
|
2016-06-13 18:07:18 +00:00
|
|
|
|
2014-11-07 16:39:00 +00:00
|
|
|
ZoneList<Expression*>* args =
|
2015-09-09 17:45:43 +00:00
|
|
|
new (zone()) ZoneList<Expression*>(1, zone());
|
2016-06-13 18:07:18 +00:00
|
|
|
Spread* spread_args = factory()->NewSpread(
|
|
|
|
factory()->NewVariableProxy(constructor_args), pos, pos);
|
2016-12-01 09:42:07 +00:00
|
|
|
|
|
|
|
args->Add(spread_args, zone());
|
|
|
|
Expression* super_call_ref = NewSuperCallReference(pos);
|
|
|
|
Expression* call = factory()->NewCall(super_call_ref, args, pos);
|
2015-02-12 20:06:52 +00:00
|
|
|
body->Add(factory()->NewReturnStatement(call, pos), zone());
|
2014-11-07 16:39:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
expected_property_count = function_state.expected_property_count();
|
|
|
|
}
|
|
|
|
|
|
|
|
FunctionLiteral* function_literal = factory()->NewFunctionLiteral(
|
2017-02-15 15:12:13 +00:00
|
|
|
name, function_scope, body, expected_property_count, parameter_count,
|
|
|
|
parameter_count, FunctionLiteral::kNoDuplicateParameters,
|
2016-11-09 15:36:50 +00:00
|
|
|
FunctionLiteral::kAnonymousExpression, default_eager_compile_hint(), pos,
|
2016-11-28 11:40:22 +00:00
|
|
|
true, GetNextFunctionLiteralId());
|
2014-11-07 16:39:00 +00:00
|
|
|
|
|
|
|
return function_literal;
|
|
|
|
}
|
|
|
|
|
2008-07-03 15:10:15 +00:00
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// The CHECK_OK macro is a convenient macro to enforce error
|
|
|
|
// handling for functions that may fail (by returning !*ok).
|
|
|
|
//
|
|
|
|
// CAUTION: This macro appends extra statements after a call,
|
|
|
|
// thus it must never be used where only a single statement
|
|
|
|
// is correct (e.g. an if statement branch w/o braces)!
|
|
|
|
|
2016-09-01 10:22:54 +00:00
|
|
|
#define CHECK_OK_VALUE(x) ok); \
|
|
|
|
if (!*ok) return x; \
|
2008-07-03 15:10:15 +00:00
|
|
|
((void)0
|
|
|
|
#define DUMMY ) // to make indentation work
|
|
|
|
#undef DUMMY
|
|
|
|
|
2016-09-01 10:22:54 +00:00
|
|
|
#define CHECK_OK CHECK_OK_VALUE(nullptr)
|
|
|
|
#define CHECK_OK_VOID CHECK_OK_VALUE(this->Void())
|
2016-07-19 08:03:43 +00:00
|
|
|
|
|
|
|
#define CHECK_FAILED /**/); \
|
2016-07-19 19:45:50 +00:00
|
|
|
if (failed_) return nullptr; \
|
2008-12-01 15:32:20 +00:00
|
|
|
((void)0
|
|
|
|
#define DUMMY ) // to make indentation work
|
|
|
|
#undef DUMMY
|
2008-07-03 15:10:15 +00:00
|
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Implementation of Parser
|
|
|
|
|
2016-08-24 10:08:34 +00:00
|
|
|
bool Parser::ShortcutNumericLiteralBinaryExpression(Expression** x,
|
|
|
|
Expression* y,
|
|
|
|
Token::Value op, int pos) {
|
2014-06-24 14:03:24 +00:00
|
|
|
if ((*x)->AsLiteral() && (*x)->AsLiteral()->raw_value()->IsNumber() &&
|
|
|
|
y->AsLiteral() && y->AsLiteral()->raw_value()->IsNumber()) {
|
|
|
|
double x_val = (*x)->AsLiteral()->raw_value()->AsNumber();
|
|
|
|
double y_val = y->AsLiteral()->raw_value()->AsNumber();
|
2014-03-17 13:54:42 +00:00
|
|
|
switch (op) {
|
|
|
|
case Token::ADD:
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(x_val + y_val, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
case Token::SUB:
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(x_val - y_val, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
case Token::MUL:
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(x_val * y_val, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
case Token::DIV:
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(x_val / y_val, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
case Token::BIT_OR: {
|
|
|
|
int value = DoubleToInt32(x_val) | DoubleToInt32(y_val);
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(value, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
case Token::BIT_AND: {
|
|
|
|
int value = DoubleToInt32(x_val) & DoubleToInt32(y_val);
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(value, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
case Token::BIT_XOR: {
|
|
|
|
int value = DoubleToInt32(x_val) ^ DoubleToInt32(y_val);
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(value, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
case Token::SHL: {
|
|
|
|
int value = DoubleToInt32(x_val) << (DoubleToInt32(y_val) & 0x1f);
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(value, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
case Token::SHR: {
|
|
|
|
uint32_t shift = DoubleToInt32(y_val) & 0x1f;
|
|
|
|
uint32_t value = DoubleToUint32(x_val) >> shift;
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(value, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
case Token::SAR: {
|
|
|
|
uint32_t shift = DoubleToInt32(y_val) & 0x1f;
|
|
|
|
int value = ArithmeticShiftRight(DoubleToInt32(x_val), shift);
|
2017-05-11 09:26:33 +00:00
|
|
|
*x = factory()->NewNumberLiteral(value, pos);
|
2014-03-17 13:54:42 +00:00
|
|
|
return true;
|
|
|
|
}
|
2016-03-18 13:53:52 +00:00
|
|
|
case Token::EXP: {
|
2016-04-25 19:33:09 +00:00
|
|
|
double value = Pow(x_val, y_val);
|
2016-03-18 13:53:52 +00:00
|
|
|
int int_value = static_cast<int>(value);
|
2016-08-24 10:08:34 +00:00
|
|
|
*x = factory()->NewNumberLiteral(
|
2017-05-11 09:26:33 +00:00
|
|
|
int_value == value && value != -0.0 ? int_value : value, pos);
|
2016-03-18 13:53:52 +00:00
|
|
|
return true;
|
|
|
|
}
|
2014-03-17 13:54:42 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-08-24 10:22:12 +00:00
|
|
|
Expression* Parser::BuildUnaryExpression(Expression* expression,
|
|
|
|
Token::Value op, int pos) {
|
2014-08-04 11:34:54 +00:00
|
|
|
DCHECK(expression != NULL);
|
2014-06-03 07:40:43 +00:00
|
|
|
if (expression->IsLiteral()) {
|
2014-06-24 14:03:24 +00:00
|
|
|
const AstValue* literal = expression->AsLiteral()->raw_value();
|
2014-03-19 14:08:47 +00:00
|
|
|
if (op == Token::NOT) {
|
|
|
|
// Convert the literal to a boolean condition and negate it.
|
|
|
|
bool condition = literal->BooleanValue();
|
2016-08-24 10:22:12 +00:00
|
|
|
return factory()->NewBooleanLiteral(!condition, pos);
|
2014-03-19 14:08:47 +00:00
|
|
|
} else if (literal->IsNumber()) {
|
|
|
|
// Compute some expressions involving only number literals.
|
2014-06-24 14:03:24 +00:00
|
|
|
double value = literal->AsNumber();
|
2014-03-19 14:08:47 +00:00
|
|
|
switch (op) {
|
|
|
|
case Token::ADD:
|
|
|
|
return expression;
|
|
|
|
case Token::SUB:
|
2017-05-11 09:26:33 +00:00
|
|
|
return factory()->NewNumberLiteral(-value, pos);
|
2014-03-19 14:08:47 +00:00
|
|
|
case Token::BIT_NOT:
|
2017-05-11 09:26:33 +00:00
|
|
|
return factory()->NewNumberLiteral(~DoubleToInt32(value), pos);
|
2014-03-19 14:08:47 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-24 10:22:12 +00:00
|
|
|
return factory()->NewUnaryOperation(op, expression, pos);
|
2014-03-19 14:08:47 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* Parser::NewThrowError(Runtime::FunctionId id,
|
|
|
|
MessageTemplate::Template message,
|
|
|
|
const AstRawString* arg, int pos) {
|
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone());
|
|
|
|
args->Add(factory()->NewSmiLiteral(message, pos), zone());
|
|
|
|
args->Add(factory()->NewStringLiteral(arg, pos), zone());
|
|
|
|
CallRuntime* call_constructor = factory()->NewCallRuntime(id, args, pos);
|
|
|
|
return factory()->NewThrow(call_constructor, pos);
|
2014-04-02 11:03:05 +00:00
|
|
|
}
|
|
|
|
|
2016-08-25 08:44:59 +00:00
|
|
|
Expression* Parser::NewSuperPropertyReference(int pos) {
|
2015-06-04 16:22:29 +00:00
|
|
|
// this_function[home_object_symbol]
|
2016-08-25 08:44:59 +00:00
|
|
|
VariableProxy* this_function_proxy =
|
|
|
|
NewUnresolved(ast_value_factory()->this_function_string(), pos);
|
2017-02-09 16:05:53 +00:00
|
|
|
Expression* home_object_symbol_literal = factory()->NewSymbolLiteral(
|
|
|
|
AstSymbol::kHomeObjectSymbol, kNoSourcePosition);
|
2016-08-25 08:44:59 +00:00
|
|
|
Expression* home_object = factory()->NewProperty(
|
2015-06-04 16:22:29 +00:00
|
|
|
this_function_proxy, home_object_symbol_literal, pos);
|
2016-08-25 08:44:59 +00:00
|
|
|
return factory()->NewSuperPropertyReference(
|
2016-08-11 12:04:02 +00:00
|
|
|
ThisExpression(pos)->AsVariableProxy(), home_object, pos);
|
2014-08-18 12:35:34 +00:00
|
|
|
}
|
2014-02-14 11:24:26 +00:00
|
|
|
|
2016-08-25 08:44:59 +00:00
|
|
|
Expression* Parser::NewSuperCallReference(int pos) {
|
|
|
|
VariableProxy* new_target_proxy =
|
|
|
|
NewUnresolved(ast_value_factory()->new_target_string(), pos);
|
|
|
|
VariableProxy* this_function_proxy =
|
|
|
|
NewUnresolved(ast_value_factory()->this_function_string(), pos);
|
|
|
|
return factory()->NewSuperCallReference(
|
|
|
|
ThisExpression(pos)->AsVariableProxy(), new_target_proxy,
|
|
|
|
this_function_proxy, pos);
|
2016-08-11 12:04:02 +00:00
|
|
|
}
|
|
|
|
|
2016-08-25 08:44:59 +00:00
|
|
|
Expression* Parser::NewTargetExpression(int pos) {
|
2016-10-25 07:59:05 +00:00
|
|
|
auto proxy = NewUnresolved(ast_value_factory()->new_target_string(), pos);
|
2015-08-13 18:06:04 +00:00
|
|
|
proxy->set_is_new_target();
|
|
|
|
return proxy;
|
2015-06-09 15:43:07 +00:00
|
|
|
}
|
|
|
|
|
2016-08-25 08:44:59 +00:00
|
|
|
Expression* Parser::FunctionSentExpression(int pos) {
|
2016-06-21 12:12:47 +00:00
|
|
|
// We desugar function.sent into %_GeneratorGetInputOrDebugPos(generator).
|
2016-08-25 08:44:59 +00:00
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(1, zone());
|
2017-06-09 23:55:01 +00:00
|
|
|
VariableProxy* generator = factory()->NewVariableProxy(
|
|
|
|
function_state_->scope()->generator_object_var());
|
2016-08-25 08:44:59 +00:00
|
|
|
args->Add(generator, zone());
|
|
|
|
return factory()->NewCallRuntime(Runtime::kInlineGeneratorGetInputOrDebugPos,
|
|
|
|
args, pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
Literal* Parser::ExpressionFromLiteral(Token::Value token, int pos) {
|
2014-02-14 11:24:26 +00:00
|
|
|
switch (token) {
|
|
|
|
case Token::NULL_LITERAL:
|
2016-08-25 08:44:59 +00:00
|
|
|
return factory()->NewNullLiteral(pos);
|
2014-02-14 11:24:26 +00:00
|
|
|
case Token::TRUE_LITERAL:
|
2016-08-25 08:44:59 +00:00
|
|
|
return factory()->NewBooleanLiteral(true, pos);
|
2014-02-14 11:24:26 +00:00
|
|
|
case Token::FALSE_LITERAL:
|
2016-08-25 08:44:59 +00:00
|
|
|
return factory()->NewBooleanLiteral(false, pos);
|
2015-03-03 11:04:49 +00:00
|
|
|
case Token::SMI: {
|
2016-11-09 16:11:56 +00:00
|
|
|
uint32_t value = scanner()->smi_value();
|
2016-08-25 08:44:59 +00:00
|
|
|
return factory()->NewSmiLiteral(value, pos);
|
2015-03-03 11:04:49 +00:00
|
|
|
}
|
2014-02-14 11:24:26 +00:00
|
|
|
case Token::NUMBER: {
|
2016-08-25 08:44:59 +00:00
|
|
|
double value = scanner()->DoubleValue();
|
2017-05-11 09:26:33 +00:00
|
|
|
return factory()->NewNumberLiteral(value, pos);
|
2014-02-14 11:24:26 +00:00
|
|
|
}
|
|
|
|
default:
|
2014-08-04 11:34:54 +00:00
|
|
|
DCHECK(false);
|
2014-02-14 11:24:26 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-09-08 11:03:46 +00:00
|
|
|
Expression* Parser::NewV8Intrinsic(const AstRawString* name,
|
|
|
|
ZoneList<Expression*>* args, int pos,
|
|
|
|
bool* ok) {
|
|
|
|
if (extension_ != nullptr) {
|
|
|
|
// The extension structures are only accessible while parsing the
|
|
|
|
// very first time, not when reparsing because of lazy compilation.
|
|
|
|
GetClosureScope()->ForceEagerCompilation();
|
|
|
|
}
|
|
|
|
|
2016-09-12 11:35:40 +00:00
|
|
|
DCHECK(name->is_one_byte());
|
|
|
|
const Runtime::Function* function =
|
|
|
|
Runtime::FunctionForName(name->raw_data(), name->length());
|
2016-09-08 11:03:46 +00:00
|
|
|
|
|
|
|
if (function != nullptr) {
|
|
|
|
// Check for possible name clash.
|
|
|
|
DCHECK_EQ(Context::kNotFound,
|
2016-09-12 11:35:40 +00:00
|
|
|
Context::IntrinsicIndexForName(name->raw_data(), name->length()));
|
2016-09-08 11:03:46 +00:00
|
|
|
// Check for built-in IS_VAR macro.
|
|
|
|
if (function->function_id == Runtime::kIS_VAR) {
|
|
|
|
DCHECK_EQ(Runtime::RUNTIME, function->intrinsic_type);
|
|
|
|
// %IS_VAR(x) evaluates to x if x is a variable,
|
|
|
|
// leads to a parse error otherwise. Could be implemented as an
|
|
|
|
// inline function %_IS_VAR(x) to eliminate this special case.
|
|
|
|
if (args->length() == 1 && args->at(0)->AsVariableProxy() != nullptr) {
|
|
|
|
return args->at(0);
|
|
|
|
} else {
|
|
|
|
ReportMessage(MessageTemplate::kNotIsvar);
|
|
|
|
*ok = false;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the expected number of arguments are being passed.
|
|
|
|
if (function->nargs != -1 && function->nargs != args->length()) {
|
|
|
|
ReportMessage(MessageTemplate::kRuntimeWrongNumArgs);
|
|
|
|
*ok = false;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return factory()->NewCallRuntime(function, args, pos);
|
|
|
|
}
|
|
|
|
|
2016-09-12 11:35:40 +00:00
|
|
|
int context_index =
|
|
|
|
Context::IntrinsicIndexForName(name->raw_data(), name->length());
|
2016-09-08 11:03:46 +00:00
|
|
|
|
|
|
|
// Check that the function is defined.
|
|
|
|
if (context_index == Context::kNotFound) {
|
|
|
|
ReportMessage(MessageTemplate::kNotDefined, name);
|
|
|
|
*ok = false;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return factory()->NewCallRuntime(context_index, args, pos);
|
|
|
|
}
|
|
|
|
|
2015-03-09 14:51:13 +00:00
|
|
|
Parser::Parser(ParseInfo* info)
|
2016-08-23 12:54:32 +00:00
|
|
|
: ParserBase<Parser>(info->zone(), &scanner_, info->stack_limit(),
|
2017-07-25 10:41:36 +00:00
|
|
|
info->extension(), info->GetOrCreateAstValueFactory(),
|
2017-06-30 10:38:38 +00:00
|
|
|
info->runtime_call_stats(), true),
|
2017-09-29 19:52:15 +00:00
|
|
|
scanner_(info->unicode_cache(), use_counts_),
|
2016-11-07 13:23:01 +00:00
|
|
|
reusable_preparser_(nullptr),
|
2016-11-07 16:34:45 +00:00
|
|
|
mode_(PARSE_EAGERLY), // Lazy mode must be set explicitly.
|
2017-07-12 13:06:09 +00:00
|
|
|
source_range_map_(info->source_range_map()),
|
2016-11-07 13:23:01 +00:00
|
|
|
target_stack_(nullptr),
|
2015-02-12 13:02:30 +00:00
|
|
|
compile_options_(info->compile_options()),
|
2016-10-13 14:01:44 +00:00
|
|
|
cached_parse_data_(nullptr),
|
2014-09-02 11:36:21 +00:00
|
|
|
total_preparse_skipped_(0),
|
2016-11-21 14:58:46 +00:00
|
|
|
temp_zoned_(false),
|
2017-01-25 13:03:19 +00:00
|
|
|
log_(nullptr),
|
2017-06-30 10:38:38 +00:00
|
|
|
consumed_preparsed_scope_data_(info->consumed_preparsed_scope_data()),
|
Implement new Function.prototype.toString --harmony-function-tostring
For functions declared in source code, the .toString() representation
will be an excerpt of the source code.
* For functions declared with the "function" keyword, the excerpt
starts at the "function" or "async" keyword and ends at the final "}".
The previous behavior would start the excerpt at the "(" of the
parameter list, and prepend a canonical `"function " + name` or
similar, which would discard comments and formatting surrounding the
function's name. Anonymous functions declared as function expressions
no longer get the name "anonymous" in their toString representation.
* For methods, the excerpt starts at the "get", "set", "*" (for
generator methods), or property name, whichever comes first.
Previously, the toString representation for methods would use a
canonical prefix before the "(" of the parameter list. Note that any
"static" keyword is omitted.
* For arrow functions and class declarations, the excerpt is unchanged.
For functions created with the Function, GeneratorFunction, or
AsyncFunction constructors:
* The string separating the parameter text and body text is now
"\n) {\n", where previously it was "\n/*``*/) {\n" or ") {\n".
* At one point, newline normalization was required by the spec here,
but that was removed from the spec, and so this CL does not do it.
Included in this CL is a fix for CreateDynamicFunction parsing. ')'
and '`' characters in the parameter string are no longer disallowed,
and Function("a=function(", "}){") is no longer allowed.
BUG=v8:4958, v8:4230
Review-Url: https://codereview.chromium.org/2156303002
Cr-Commit-Position: refs/heads/master@{#43262}
2017-02-16 20:19:24 +00:00
|
|
|
parameters_end_pos_(info->parameters_end_pos()) {
|
2015-03-09 14:51:13 +00:00
|
|
|
// Even though we were passed ParseInfo, we should not store it in
|
2015-02-12 13:02:30 +00:00
|
|
|
// Parser - this makes sure that Isolate is not accidentally accessed via
|
2015-03-09 14:51:13 +00:00
|
|
|
// ParseInfo during background parsing.
|
2017-08-21 12:59:45 +00:00
|
|
|
DCHECK(info->character_stream() != nullptr);
|
2016-10-07 09:12:48 +00:00
|
|
|
// Determine if functions can be lazily compiled. This is necessary to
|
|
|
|
// allow some of our builtin JS files to be lazily compiled. These
|
|
|
|
// builtins cannot be handled lazily by the parser, since we have to know
|
|
|
|
// if a function uses the special natives syntax, which is something the
|
|
|
|
// parser records.
|
|
|
|
// If the debugger requests compilation for break points, we cannot be
|
|
|
|
// aggressive about lazy compilation, because it might trigger compilation
|
|
|
|
// of functions without an outer context when setting a breakpoint through
|
|
|
|
// Debug::FindSharedFunctionInfoInScript
|
2017-09-26 08:48:52 +00:00
|
|
|
// We also compile eagerly for kProduceExhaustiveCodeCache.
|
|
|
|
bool can_compile_lazily = FLAG_lazy && !info->is_eager();
|
2016-10-07 09:12:48 +00:00
|
|
|
|
|
|
|
set_default_eager_compile_hint(can_compile_lazily
|
|
|
|
? FunctionLiteral::kShouldLazyCompile
|
|
|
|
: FunctionLiteral::kShouldEagerCompile);
|
2016-11-16 12:40:16 +00:00
|
|
|
allow_lazy_ = FLAG_lazy && info->allow_lazy_parsing() && !info->is_native() &&
|
|
|
|
info->extension() == nullptr && can_compile_lazily;
|
2014-11-20 10:51:49 +00:00
|
|
|
set_allow_natives(FLAG_allow_natives_syntax || info->is_native());
|
2015-10-21 02:55:47 +00:00
|
|
|
set_allow_harmony_do_expressions(FLAG_harmony_do_expressions);
|
2016-02-17 00:18:38 +00:00
|
|
|
set_allow_harmony_function_sent(FLAG_harmony_function_sent);
|
2016-05-27 18:22:29 +00:00
|
|
|
set_allow_harmony_restrictive_generators(FLAG_harmony_restrictive_generators);
|
2016-09-16 00:42:30 +00:00
|
|
|
set_allow_harmony_class_fields(FLAG_harmony_class_fields);
|
2017-01-18 01:05:17 +00:00
|
|
|
set_allow_harmony_object_rest_spread(FLAG_harmony_object_rest_spread);
|
2017-01-31 18:58:53 +00:00
|
|
|
set_allow_harmony_dynamic_import(FLAG_harmony_dynamic_import);
|
2017-02-15 19:39:06 +00:00
|
|
|
set_allow_harmony_async_iteration(FLAG_harmony_async_iteration);
|
2017-02-22 21:20:32 +00:00
|
|
|
set_allow_harmony_template_escapes(FLAG_harmony_template_escapes);
|
2014-06-30 13:35:16 +00:00
|
|
|
for (int feature = 0; feature < v8::Isolate::kUseCounterFeatureCount;
|
|
|
|
++feature) {
|
|
|
|
use_counts_[feature] = 0;
|
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
2016-09-15 19:47:11 +00:00
|
|
|
void Parser::DeserializeScopeChain(
|
|
|
|
ParseInfo* info, MaybeHandle<ScopeInfo> maybe_outer_scope_info) {
|
2016-08-03 13:30:23 +00:00
|
|
|
// TODO(wingo): Add an outer SCRIPT_SCOPE corresponding to the native
|
|
|
|
// context, which will have the "this" binding for script scopes.
|
2016-08-05 14:30:54 +00:00
|
|
|
DeclarationScope* script_scope = NewScriptScope();
|
|
|
|
info->set_script_scope(script_scope);
|
|
|
|
Scope* scope = script_scope;
|
2016-09-15 19:47:11 +00:00
|
|
|
Handle<ScopeInfo> outer_scope_info;
|
|
|
|
if (maybe_outer_scope_info.ToHandle(&outer_scope_info)) {
|
2017-03-22 14:43:57 +00:00
|
|
|
DCHECK(ThreadId::Current().Equals(
|
|
|
|
outer_scope_info->GetIsolate()->thread_id()));
|
2016-09-15 16:41:03 +00:00
|
|
|
scope = Scope::DeserializeScopeChain(
|
2017-03-22 14:43:57 +00:00
|
|
|
zone(), *outer_scope_info, script_scope, ast_value_factory(),
|
|
|
|
Scope::DeserializationMode::kScopesOnly);
|
2016-08-31 14:25:28 +00:00
|
|
|
DCHECK(!info->is_module() || scope->is_module_scope());
|
2016-08-03 13:30:23 +00:00
|
|
|
}
|
|
|
|
original_scope_ = scope;
|
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2017-08-22 10:53:10 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
void MaybeResetCharacterStream(ParseInfo* info, FunctionLiteral* literal) {
|
|
|
|
// Don't reset the character stream if there is an asm.js module since it will
|
|
|
|
// be used again by the asm-parser.
|
|
|
|
if (!FLAG_stress_validate_asm &&
|
|
|
|
(literal == nullptr || !literal->scope()->ContainsAsmModule())) {
|
|
|
|
info->ResetCharacterStream();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
2015-03-09 14:51:13 +00:00
|
|
|
FunctionLiteral* Parser::ParseProgram(Isolate* isolate, ParseInfo* info) {
|
2013-10-29 11:44:04 +00:00
|
|
|
// TODO(bmeurer): We temporarily need to pass allow_nesting = true here,
|
|
|
|
// see comment for HistogramTimerScope class.
|
2014-09-02 11:36:21 +00:00
|
|
|
|
2015-02-12 13:02:30 +00:00
|
|
|
// It's OK to use the Isolate & counters here, since this function is only
|
|
|
|
// called in the main thread.
|
|
|
|
DCHECK(parsing_on_main_thread_);
|
2016-11-15 16:08:16 +00:00
|
|
|
RuntimeCallTimerScope runtime_timer(
|
|
|
|
runtime_call_stats_, info->is_eval() ? &RuntimeCallStats::ParseEval
|
|
|
|
: &RuntimeCallStats::ParseProgram);
|
2016-10-14 14:08:53 +00:00
|
|
|
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"), "V8.ParseProgram");
|
2014-06-30 13:25:46 +00:00
|
|
|
base::ElapsedTimer timer;
|
2013-08-29 09:15:13 +00:00
|
|
|
if (FLAG_trace_parse) {
|
|
|
|
timer.Start();
|
|
|
|
}
|
2014-09-11 09:52:36 +00:00
|
|
|
fni_ = new (zone()) FuncNameInferrer(ast_value_factory(), zone());
|
2008-07-03 15:10:15 +00:00
|
|
|
|
|
|
|
// Initialize parser state.
|
2016-11-07 13:23:01 +00:00
|
|
|
ParserLogger logger;
|
Change ScriptCompiler::CompileOptions to allow for two 'cache' modes
(parser or code) and to be explicit about cache consumption or production
(rather than making presence of cached_data imply one or the other.)
Also add a --cache flag to d8, to allow testing the functionality.
-----------------------------
API change
Reason: Currently, V8 supports a 'parser cache' for repeatedly executing the same script. We'd like to add a 2nd mode that would cache code, and would like to let the embedder decide which mode they chose (if any).
Note: Previously, the 'use cached data' property was implied by the presence of the cached data itself. (That is, kNoCompileOptions and source->cached_data != NULL.) That is no longer sufficient, since the presence of data is no longer sufficient to determine /which kind/ of data is present.
Changes from old behaviour:
- If you previously didn't use caching, nothing changes.
Example:
v8::CompileUnbound(isolate, source, kNoCompileOptions);
- If you previously used caching, it worked like this:
- 1st run:
v8::CompileUnbound(isolate, source, kProduceToCache);
Then, source->cached_data would contain the
data-to-be cached. This remains the same, except you
need to tell V8 which type of data you want.
v8::CompileUnbound(isolate, source, kProduceParserCache);
- 2nd run:
v8::CompileUnbound(isolate, source, kNoCompileOptions);
with source->cached_data set to the data you received in
the first run. This will now ignore the cached data, and
you need to explicitly tell V8 to use it:
v8::CompileUnbound(isolate, source, kConsumeParserCache);
-----------------------------
BUG=
R=marja@chromium.org, yangguo@chromium.org
Review URL: https://codereview.chromium.org/389573006
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22431 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2014-07-16 12:18:33 +00:00
|
|
|
|
2014-11-17 12:16:27 +00:00
|
|
|
if (produce_cached_parse_data()) {
|
2016-11-21 14:58:46 +00:00
|
|
|
if (allow_lazy_) {
|
|
|
|
log_ = &logger;
|
|
|
|
} else {
|
|
|
|
compile_options_ = ScriptCompiler::kNoCompileOptions;
|
|
|
|
}
|
2014-11-17 12:16:27 +00:00
|
|
|
} else if (consume_cached_parse_data()) {
|
2014-07-10 10:28:05 +00:00
|
|
|
cached_parse_data_->Initialize();
|
2014-03-19 13:24:13 +00:00
|
|
|
}
|
|
|
|
|
2016-09-15 19:47:11 +00:00
|
|
|
DeserializeScopeChain(info, info->maybe_outer_scope_info());
|
2016-08-03 13:30:23 +00:00
|
|
|
|
2017-08-21 12:59:45 +00:00
|
|
|
scanner_.Initialize(info->character_stream(), info->is_module());
|
|
|
|
FunctionLiteral* result = DoParseProgram(info);
|
2017-08-22 10:53:10 +00:00
|
|
|
MaybeResetCharacterStream(info, result);
|
2014-09-12 09:12:08 +00:00
|
|
|
|
2015-02-20 09:39:32 +00:00
|
|
|
HandleSourceURLComments(isolate, info->script());
|
2012-07-18 11:22:46 +00:00
|
|
|
|
2016-11-07 13:23:01 +00:00
|
|
|
if (FLAG_trace_parse && result != nullptr) {
|
2013-08-29 09:15:13 +00:00
|
|
|
double ms = timer.Elapsed().InMillisecondsF();
|
2015-02-12 13:02:30 +00:00
|
|
|
if (info->is_eval()) {
|
2012-07-18 11:22:46 +00:00
|
|
|
PrintF("[parsing eval");
|
2015-02-12 13:02:30 +00:00
|
|
|
} else if (info->script()->name()->IsString()) {
|
|
|
|
String* name = String::cast(info->script()->name());
|
2016-07-25 10:24:45 +00:00
|
|
|
std::unique_ptr<char[]> name_chars = name->ToCString();
|
2013-12-09 07:41:20 +00:00
|
|
|
PrintF("[parsing script: %s", name_chars.get());
|
2012-07-18 11:22:46 +00:00
|
|
|
} else {
|
|
|
|
PrintF("[parsing script");
|
|
|
|
}
|
|
|
|
PrintF(" - took %0.3f ms]\n", ms);
|
|
|
|
}
|
2016-11-07 13:23:01 +00:00
|
|
|
if (produce_cached_parse_data() && result != nullptr) {
|
|
|
|
*info->cached_data() = logger.GetScriptData();
|
2014-03-19 13:24:13 +00:00
|
|
|
}
|
2016-11-07 13:23:01 +00:00
|
|
|
log_ = nullptr;
|
2012-07-18 11:22:46 +00:00
|
|
|
return result;
|
2010-12-07 14:03:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-04-16 12:42:43 +00:00
|
|
|
FunctionLiteral* Parser::DoParseProgram(ParseInfo* info) {
|
2015-02-12 13:02:30 +00:00
|
|
|
// Note that this function can be called from the main thread or from a
|
|
|
|
// background thread. We should not access anything Isolate / heap dependent
|
2015-03-09 14:51:13 +00:00
|
|
|
// via ParseInfo, and also not pass it forward.
|
2017-02-20 10:41:29 +00:00
|
|
|
DCHECK_NULL(scope_);
|
2016-07-19 10:06:38 +00:00
|
|
|
DCHECK_NULL(target_stack_);
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2016-11-16 12:40:16 +00:00
|
|
|
ParsingModeScope mode(this, allow_lazy_ ? PARSE_LAZILY : PARSE_EAGERLY);
|
2016-11-28 11:40:22 +00:00
|
|
|
ResetFunctionLiteralId();
|
|
|
|
DCHECK(info->function_literal_id() == FunctionLiteral::kIdTypeTopLevel ||
|
|
|
|
info->function_literal_id() == FunctionLiteral::kIdTypeInvalid);
|
2015-04-27 12:13:45 +00:00
|
|
|
|
2008-07-03 15:10:15 +00:00
|
|
|
FunctionLiteral* result = NULL;
|
2014-09-12 09:12:08 +00:00
|
|
|
{
|
2016-08-05 14:30:54 +00:00
|
|
|
Scope* outer = original_scope_;
|
2016-08-30 11:52:58 +00:00
|
|
|
DCHECK_NOT_NULL(outer);
|
2016-09-30 07:53:43 +00:00
|
|
|
parsing_module_ = info->is_module();
|
2012-03-15 13:02:21 +00:00
|
|
|
if (info->is_eval()) {
|
2016-08-05 14:30:54 +00:00
|
|
|
outer = NewEvalScope(outer);
|
2016-09-30 07:53:43 +00:00
|
|
|
} else if (parsing_module_) {
|
2016-08-18 08:50:55 +00:00
|
|
|
DCHECK_EQ(outer, info->script_scope());
|
|
|
|
outer = NewModuleScope(info->script_scope());
|
2011-11-15 13:48:40 +00:00
|
|
|
}
|
2015-04-16 12:42:43 +00:00
|
|
|
|
2016-08-05 14:30:54 +00:00
|
|
|
DeclarationScope* scope = outer->AsDeclarationScope();
|
|
|
|
|
2015-04-16 12:42:43 +00:00
|
|
|
scope->set_start_position(0);
|
2012-08-28 11:25:08 +00:00
|
|
|
|
2017-02-20 10:41:29 +00:00
|
|
|
FunctionState function_state(&function_state_, &scope_, scope);
|
2013-04-02 17:34:59 +00:00
|
|
|
|
2012-06-11 12:42:31 +00:00
|
|
|
ZoneList<Statement*>* body = new(zone()) ZoneList<Statement*>(16, zone());
|
2008-07-03 15:10:15 +00:00
|
|
|
bool ok = true;
|
2014-02-14 12:13:33 +00:00
|
|
|
int beg_pos = scanner()->location().beg_pos;
|
2016-04-29 18:12:57 +00:00
|
|
|
if (parsing_module_) {
|
2016-09-12 12:54:47 +00:00
|
|
|
// Declare the special module parameter.
|
|
|
|
auto name = ast_value_factory()->empty_string();
|
2017-06-09 10:40:22 +00:00
|
|
|
bool is_duplicate = false;
|
2016-09-12 12:54:47 +00:00
|
|
|
bool is_rest = false;
|
|
|
|
bool is_optional = false;
|
2017-03-31 08:40:38 +00:00
|
|
|
auto var =
|
|
|
|
scope->DeclareParameter(name, VAR, is_optional, is_rest,
|
|
|
|
&is_duplicate, ast_value_factory(), beg_pos);
|
2016-09-12 12:54:47 +00:00
|
|
|
DCHECK(!is_duplicate);
|
|
|
|
var->AllocateTo(VariableLocation::PARAMETER, 0);
|
|
|
|
|
2016-12-12 09:57:17 +00:00
|
|
|
PrepareGeneratorVariables();
|
2017-05-24 13:54:57 +00:00
|
|
|
scope->ForceContextAllocation();
|
2016-09-30 07:53:43 +00:00
|
|
|
Expression* initial_yield =
|
|
|
|
BuildInitialYield(kNoSourcePosition, kGeneratorFunction);
|
|
|
|
body->Add(
|
|
|
|
factory()->NewExpressionStatement(initial_yield, kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
|
2015-02-25 23:00:10 +00:00
|
|
|
ParseModuleItemList(body, &ok);
|
2016-07-18 07:27:10 +00:00
|
|
|
ok = ok &&
|
2016-08-18 08:50:55 +00:00
|
|
|
module()->Validate(this->scope()->AsModuleScope(),
|
2016-08-05 14:30:54 +00:00
|
|
|
&pending_error_handler_, zone());
|
2015-01-27 21:06:36 +00:00
|
|
|
} else {
|
2016-04-22 13:37:10 +00:00
|
|
|
// Don't count the mode in the use counters--give the program a chance
|
|
|
|
// to enable script-wide strict mode below.
|
2016-07-19 10:06:38 +00:00
|
|
|
this->scope()->SetLanguageMode(info->language_mode());
|
2015-04-27 12:13:45 +00:00
|
|
|
ParseStatementList(body, Token::EOS, &ok);
|
2015-01-27 21:06:36 +00:00
|
|
|
}
|
2014-07-02 07:01:31 +00:00
|
|
|
|
2015-04-16 12:42:43 +00:00
|
|
|
// The parser will peek but not consume EOS. Our scope logically goes all
|
|
|
|
// the way to the EOS, though.
|
|
|
|
scope->set_end_position(scanner()->peek_location().beg_pos);
|
|
|
|
|
2015-02-04 09:34:05 +00:00
|
|
|
if (ok && is_strict(language_mode())) {
|
2014-12-18 22:01:25 +00:00
|
|
|
CheckStrictOctalLiteral(beg_pos, scanner()->location().end_pos, &ok);
|
2015-07-10 16:39:47 +00:00
|
|
|
}
|
2016-04-08 00:29:37 +00:00
|
|
|
if (ok && is_sloppy(language_mode())) {
|
2015-09-30 23:48:26 +00:00
|
|
|
// TODO(littledan): Function bindings on the global object that modify
|
|
|
|
// pre-existing bindings should be made writable, enumerable and
|
|
|
|
// nonconfigurable if possible, whereas this code will leave attributes
|
|
|
|
// unchanged if the property already exists.
|
2016-09-15 16:41:03 +00:00
|
|
|
InsertSloppyBlockFunctionVarBindings(scope);
|
2015-09-30 23:48:26 +00:00
|
|
|
}
|
2016-03-10 23:19:31 +00:00
|
|
|
if (ok) {
|
2016-08-05 14:30:54 +00:00
|
|
|
CheckConflictingVarDeclarations(scope, &ok);
|
2011-09-01 12:31:18 +00:00
|
|
|
}
|
|
|
|
|
2013-03-07 15:46:14 +00:00
|
|
|
if (ok && info->parse_restriction() == ONLY_SINGLE_FUNCTION_LITERAL) {
|
|
|
|
if (body->length() != 1 ||
|
|
|
|
!body->at(0)->IsExpressionStatement() ||
|
|
|
|
!body->at(0)->AsExpressionStatement()->
|
|
|
|
expression()->IsFunctionLiteral()) {
|
2015-05-18 08:34:05 +00:00
|
|
|
ReportMessage(MessageTemplate::kSingleFunctionLiteral);
|
2013-03-07 15:46:14 +00:00
|
|
|
ok = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-03 15:10:15 +00:00
|
|
|
if (ok) {
|
2016-08-23 16:34:39 +00:00
|
|
|
RewriteDestructuringAssignments();
|
2016-09-12 12:54:47 +00:00
|
|
|
int parameter_count = parsing_module_ ? 1 : 0;
|
2016-02-19 02:50:58 +00:00
|
|
|
result = factory()->NewScriptOrEvalFunctionLiteral(
|
2017-02-15 15:12:13 +00:00
|
|
|
scope, body, function_state.expected_property_count(),
|
|
|
|
parameter_count);
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-15 17:19:55 +00:00
|
|
|
info->set_max_function_literal_id(GetLastFunctionLiteralId());
|
|
|
|
|
2008-07-03 15:10:15 +00:00
|
|
|
// Make sure the target stack is empty.
|
2014-08-04 11:34:54 +00:00
|
|
|
DCHECK(target_stack_ == NULL);
|
2008-07-03 15:10:15 +00:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2017-07-21 09:32:32 +00:00
|
|
|
FunctionLiteral* Parser::ParseFunction(Isolate* isolate, ParseInfo* info,
|
|
|
|
Handle<SharedFunctionInfo> shared_info) {
|
2015-02-12 13:02:30 +00:00
|
|
|
// It's OK to use the Isolate & counters here, since this function is only
|
|
|
|
// called in the main thread.
|
|
|
|
DCHECK(parsing_on_main_thread_);
|
2016-11-15 16:08:16 +00:00
|
|
|
RuntimeCallTimerScope runtime_timer(runtime_call_stats_,
|
2016-10-14 14:08:53 +00:00
|
|
|
&RuntimeCallStats::ParseFunction);
|
|
|
|
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"), "V8.ParseFunction");
|
2014-06-30 13:25:46 +00:00
|
|
|
base::ElapsedTimer timer;
|
2013-08-29 09:15:13 +00:00
|
|
|
if (FLAG_trace_parse) {
|
|
|
|
timer.Start();
|
|
|
|
}
|
2016-09-15 19:47:11 +00:00
|
|
|
DeserializeScopeChain(info, info->maybe_outer_scope_info());
|
2017-09-15 08:13:10 +00:00
|
|
|
DCHECK_EQ(factory()->zone(), info->zone());
|
2012-07-18 11:22:46 +00:00
|
|
|
|
2010-12-07 14:03:59 +00:00
|
|
|
// Initialize parser state.
|
2017-08-21 12:59:45 +00:00
|
|
|
Handle<String> name(shared_info->name());
|
|
|
|
info->set_function_name(ast_value_factory()->GetString(name));
|
|
|
|
scanner_.Initialize(info->character_stream(), info->is_module());
|
|
|
|
|
|
|
|
FunctionLiteral* result = DoParseFunction(info, info->function_name());
|
2017-08-22 10:53:10 +00:00
|
|
|
MaybeResetCharacterStream(info, result);
|
2017-08-21 12:59:45 +00:00
|
|
|
if (result != nullptr) {
|
|
|
|
Handle<String> inferred_name(shared_info->inferred_name());
|
|
|
|
result->set_inferred_name(inferred_name);
|
2010-12-07 14:03:59 +00:00
|
|
|
}
|
2012-07-18 11:22:46 +00:00
|
|
|
|
|
|
|
if (FLAG_trace_parse && result != NULL) {
|
2013-08-29 09:15:13 +00:00
|
|
|
double ms = timer.Elapsed().InMillisecondsF();
|
2016-09-20 10:30:01 +00:00
|
|
|
// We need to make sure that the debug-name is available.
|
|
|
|
ast_value_factory()->Internalize(isolate);
|
2016-07-25 10:24:45 +00:00
|
|
|
std::unique_ptr<char[]> name_chars = result->debug_name()->ToCString();
|
2013-12-09 07:41:20 +00:00
|
|
|
PrintF("[parsing function: %s - took %0.3f ms]\n", name_chars.get(), ms);
|
2012-07-18 11:22:46 +00:00
|
|
|
}
|
|
|
|
return result;
|
2010-12-07 14:03:59 +00:00
|
|
|
}
|
|
|
|
|
2016-08-04 08:51:29 +00:00
|
|
|
static FunctionLiteral::FunctionType ComputeFunctionType(ParseInfo* info) {
|
|
|
|
if (info->is_declaration()) {
|
2016-02-19 02:50:58 +00:00
|
|
|
return FunctionLiteral::kDeclaration;
|
2016-08-04 08:51:29 +00:00
|
|
|
} else if (info->is_named_expression()) {
|
2016-02-19 02:50:58 +00:00
|
|
|
return FunctionLiteral::kNamedExpression;
|
2016-08-04 08:51:29 +00:00
|
|
|
} else if (IsConciseMethod(info->function_kind()) ||
|
|
|
|
IsAccessorFunction(info->function_kind())) {
|
2016-02-19 02:50:58 +00:00
|
|
|
return FunctionLiteral::kAccessorOrMethod;
|
|
|
|
}
|
|
|
|
return FunctionLiteral::kAnonymousExpression;
|
|
|
|
}
|
2010-12-07 14:03:59 +00:00
|
|
|
|
2017-08-18 20:34:14 +00:00
|
|
|
FunctionLiteral* Parser::DoParseFunction(ParseInfo* info,
|
|
|
|
const AstRawString* raw_name) {
|
2017-04-06 11:58:38 +00:00
|
|
|
DCHECK_NOT_NULL(raw_name);
|
2017-02-20 10:41:29 +00:00
|
|
|
DCHECK_NULL(scope_);
|
2016-07-19 10:06:38 +00:00
|
|
|
DCHECK_NULL(target_stack_);
|
2010-12-07 14:03:59 +00:00
|
|
|
|
2014-09-11 09:52:36 +00:00
|
|
|
DCHECK(ast_value_factory());
|
|
|
|
fni_ = new (zone()) FuncNameInferrer(ast_value_factory(), zone());
|
2014-06-24 14:03:24 +00:00
|
|
|
fni_->PushEnclosingName(raw_name);
|
2010-08-23 13:26:03 +00:00
|
|
|
|
2016-11-28 11:40:22 +00:00
|
|
|
ResetFunctionLiteralId();
|
|
|
|
DCHECK_LT(0, info->function_literal_id());
|
|
|
|
SkipFunctionLiterals(info->function_literal_id() - 1);
|
|
|
|
|
2012-08-07 14:47:36 +00:00
|
|
|
ParsingModeScope parsing_mode(this, PARSE_EAGERLY);
|
2008-07-03 15:10:15 +00:00
|
|
|
|
|
|
|
// Place holder for the result.
|
2016-07-19 10:06:38 +00:00
|
|
|
FunctionLiteral* result = nullptr;
|
2008-07-03 15:10:15 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
// Parse the function literal.
|
2016-08-30 11:52:58 +00:00
|
|
|
Scope* outer = original_scope_;
|
2016-09-27 09:49:26 +00:00
|
|
|
DeclarationScope* outer_function = outer->GetClosureScope();
|
2016-08-30 11:52:58 +00:00
|
|
|
DCHECK(outer);
|
2017-02-20 10:41:29 +00:00
|
|
|
FunctionState function_state(&function_state_, &scope_, outer_function);
|
|
|
|
BlockState block_state(&scope_, outer);
|
2016-08-30 11:52:58 +00:00
|
|
|
DCHECK(is_sloppy(outer->language_mode()) ||
|
2015-02-12 13:02:30 +00:00
|
|
|
is_strict(info->language_mode()));
|
2016-08-04 08:51:29 +00:00
|
|
|
FunctionLiteral::FunctionType function_type = ComputeFunctionType(info);
|
2016-09-28 21:23:53 +00:00
|
|
|
FunctionKind kind = info->function_kind();
|
2008-07-03 15:10:15 +00:00
|
|
|
bool ok = true;
|
2014-07-21 09:58:01 +00:00
|
|
|
|
2016-09-28 21:23:53 +00:00
|
|
|
if (IsArrowFunction(kind)) {
|
2017-01-10 23:27:02 +00:00
|
|
|
if (IsAsyncFunction(kind)) {
|
2016-05-16 23:17:13 +00:00
|
|
|
DCHECK(!scanner()->HasAnyLineTerminatorAfterNext());
|
2016-07-11 19:28:56 +00:00
|
|
|
if (!Check(Token::ASYNC)) {
|
|
|
|
CHECK(stack_overflow());
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
if (!(peek_any_identifier() || peek() == Token::LPAREN)) {
|
|
|
|
CHECK(stack_overflow());
|
|
|
|
return nullptr;
|
|
|
|
}
|
2016-05-16 23:17:13 +00:00
|
|
|
}
|
|
|
|
|
2016-01-14 19:20:56 +00:00
|
|
|
// TODO(adamk): We should construct this scope from the ScopeInfo.
|
2016-09-28 21:23:53 +00:00
|
|
|
DeclarationScope* scope = NewFunctionScope(kind);
|
2016-01-14 19:20:56 +00:00
|
|
|
|
2017-02-28 18:47:15 +00:00
|
|
|
// This bit only needs to be explicitly set because we're
|
2016-01-14 19:20:56 +00:00
|
|
|
// not passing the ScopeInfo to the Scope constructor.
|
2016-08-04 08:51:29 +00:00
|
|
|
SetLanguageMode(scope, info->language_mode());
|
2016-01-14 19:20:56 +00:00
|
|
|
|
2016-08-04 08:51:29 +00:00
|
|
|
scope->set_start_position(info->start_position());
|
2016-02-19 15:58:57 +00:00
|
|
|
ExpressionClassifier formals_classifier(this);
|
2015-07-23 11:53:31 +00:00
|
|
|
ParserFormalParameters formals(scope);
|
2017-04-04 19:12:52 +00:00
|
|
|
int rewritable_length =
|
|
|
|
function_state.destructuring_assignments_to_rewrite().length();
|
2015-06-15 17:06:34 +00:00
|
|
|
{
|
|
|
|
// Parsing patterns as variable reference expression creates
|
2017-03-31 08:40:38 +00:00
|
|
|
// NewUnresolved references in current scope. Enter arrow function
|
2015-06-15 17:06:34 +00:00
|
|
|
// scope for formal parameter parsing.
|
2017-02-20 10:41:29 +00:00
|
|
|
BlockState block_state(&scope_, scope);
|
2015-06-15 17:06:34 +00:00
|
|
|
if (Check(Token::LPAREN)) {
|
|
|
|
// '(' StrictFormalParameters ')'
|
2016-09-01 08:58:15 +00:00
|
|
|
ParseFormalParameterList(&formals, &ok);
|
2015-06-15 17:06:34 +00:00
|
|
|
if (ok) ok = Check(Token::RPAREN);
|
|
|
|
} else {
|
|
|
|
// BindingIdentifier
|
2016-09-01 08:58:15 +00:00
|
|
|
ParseFormalParameter(&formals, &ok);
|
2017-06-09 10:40:22 +00:00
|
|
|
if (ok) {
|
|
|
|
DeclareFormalParameters(formals.scope, formals.params,
|
|
|
|
formals.is_simple);
|
|
|
|
}
|
2015-06-15 17:06:34 +00:00
|
|
|
}
|
2015-04-21 14:44:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-20 00:17:41 +00:00
|
|
|
if (ok) {
|
2016-11-28 11:40:22 +00:00
|
|
|
if (GetLastFunctionLiteralId() != info->function_literal_id() - 1) {
|
|
|
|
// If there were FunctionLiterals in the parameters, we need to
|
|
|
|
// renumber them to shift down so the next function literal id for
|
|
|
|
// the arrow function is the one requested.
|
|
|
|
AstFunctionLiteralIdReindexer reindexer(
|
|
|
|
stack_limit_,
|
|
|
|
(info->function_literal_id() - 1) - GetLastFunctionLiteralId());
|
2016-11-28 11:46:57 +00:00
|
|
|
for (auto p : formals.params) {
|
|
|
|
if (p->pattern != nullptr) reindexer.Reindex(p->pattern);
|
|
|
|
if (p->initializer != nullptr) reindexer.Reindex(p->initializer);
|
2016-11-28 11:40:22 +00:00
|
|
|
}
|
|
|
|
ResetFunctionLiteralId();
|
|
|
|
SkipFunctionLiterals(info->function_literal_id() - 1);
|
|
|
|
}
|
|
|
|
|
2015-10-14 17:39:37 +00:00
|
|
|
// Pass `accept_IN=true` to ParseArrowFunctionLiteral --- This should
|
|
|
|
// not be observable, or else the preparser would have failed.
|
2017-04-04 19:12:52 +00:00
|
|
|
Expression* expression =
|
|
|
|
ParseArrowFunctionLiteral(true, formals, rewritable_length, &ok);
|
2015-04-21 14:44:18 +00:00
|
|
|
if (ok) {
|
|
|
|
// Scanning must end at the same position that was recorded
|
|
|
|
// previously. If not, parsing has been interrupted due to a stack
|
|
|
|
// overflow, at which point the partially parsed arrow function
|
|
|
|
// concise body happens to be a valid expression. This is a problem
|
|
|
|
// only for arrow functions with single expression bodies, since there
|
|
|
|
// is no end token such as "}" for normal functions.
|
2016-08-04 08:51:29 +00:00
|
|
|
if (scanner()->location().end_pos == info->end_position()) {
|
2015-04-21 14:44:18 +00:00
|
|
|
// The pre-parser saw an arrow function here, so the full parser
|
|
|
|
// must produce a FunctionLiteral.
|
|
|
|
DCHECK(expression->IsFunctionLiteral());
|
|
|
|
result = expression->AsFunctionLiteral();
|
2017-03-28 05:53:26 +00:00
|
|
|
// Rewrite destructuring assignments in the parameters. (The ones
|
|
|
|
// inside the function body are rewritten by
|
|
|
|
// ParseArrowFunctionLiteral.)
|
|
|
|
RewriteDestructuringAssignments();
|
2015-04-21 14:44:18 +00:00
|
|
|
} else {
|
|
|
|
ok = false;
|
|
|
|
}
|
2015-03-20 00:17:41 +00:00
|
|
|
}
|
|
|
|
}
|
2016-09-28 21:23:53 +00:00
|
|
|
} else if (IsDefaultConstructor(kind)) {
|
2016-08-30 11:52:58 +00:00
|
|
|
DCHECK_EQ(scope(), outer);
|
2017-01-03 19:37:23 +00:00
|
|
|
result = DefaultConstructor(raw_name, IsDerivedConstructor(kind),
|
2016-12-29 22:12:51 +00:00
|
|
|
info->start_position(), info->end_position());
|
2014-07-21 09:58:01 +00:00
|
|
|
} else {
|
2016-09-28 21:23:53 +00:00
|
|
|
result = ParseFunctionLiteral(
|
2017-08-18 20:34:14 +00:00
|
|
|
raw_name, Scanner::Location::invalid(), kSkipFunctionNameCheck, kind,
|
2016-09-28 21:23:53 +00:00
|
|
|
kNoSourcePosition, function_type, info->language_mode(), &ok);
|
2014-07-21 09:58:01 +00:00
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
// Make sure the results agree.
|
2016-07-19 10:06:38 +00:00
|
|
|
DCHECK(ok == (result != nullptr));
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure the target stack is empty.
|
2016-07-19 10:06:38 +00:00
|
|
|
DCHECK_NULL(target_stack_);
|
2016-11-28 11:40:22 +00:00
|
|
|
DCHECK_IMPLIES(result,
|
|
|
|
info->function_literal_id() == result->function_literal_id());
|
2008-07-03 15:10:15 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2015-01-27 21:06:36 +00:00
|
|
|
Statement* Parser::ParseModuleItem(bool* ok) {
|
2016-07-18 07:27:10 +00:00
|
|
|
// ecma262/#prod-ModuleItem
|
2015-01-27 21:06:36 +00:00
|
|
|
// ModuleItem :
|
|
|
|
// ImportDeclaration
|
|
|
|
// ExportDeclaration
|
|
|
|
// StatementListItem
|
2012-02-20 14:02:59 +00:00
|
|
|
|
2017-01-31 18:58:53 +00:00
|
|
|
Token::Value next = peek();
|
|
|
|
|
|
|
|
if (next == Token::EXPORT) {
|
|
|
|
return ParseExportDeclaration(ok);
|
2012-02-20 14:02:59 +00:00
|
|
|
}
|
2017-01-31 18:58:53 +00:00
|
|
|
|
|
|
|
// We must be careful not to parse a dynamic import expression as an import
|
|
|
|
// declaration.
|
|
|
|
if (next == Token::IMPORT &&
|
|
|
|
(!allow_harmony_dynamic_import() || PeekAhead() != Token::LPAREN)) {
|
|
|
|
ParseImportDeclaration(CHECK_OK);
|
|
|
|
return factory()->NewEmptyStatement(kNoSourcePosition);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ParseStatementListItem(ok);
|
2012-02-20 14:02:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-19 19:45:50 +00:00
|
|
|
void Parser::ParseModuleItemList(ZoneList<Statement*>* body, bool* ok) {
|
2016-07-18 07:27:10 +00:00
|
|
|
// ecma262/#prod-Module
|
2015-01-27 21:06:36 +00:00
|
|
|
// Module :
|
|
|
|
// ModuleBody?
|
|
|
|
//
|
2016-07-18 07:27:10 +00:00
|
|
|
// ecma262/#prod-ModuleItemList
|
2015-01-27 21:06:36 +00:00
|
|
|
// ModuleBody :
|
|
|
|
// ModuleItem*
|
2012-02-20 14:02:59 +00:00
|
|
|
|
2016-07-19 10:06:38 +00:00
|
|
|
DCHECK(scope()->is_module_scope());
|
2015-02-24 22:39:26 +00:00
|
|
|
while (peek() != Token::EOS) {
|
2016-07-19 19:45:50 +00:00
|
|
|
Statement* stat = ParseModuleItem(CHECK_OK_VOID);
|
2015-02-24 22:39:26 +00:00
|
|
|
if (stat && !stat->IsEmpty()) {
|
|
|
|
body->Add(stat, zone());
|
2012-02-20 14:02:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-02-26 18:40:50 +00:00
|
|
|
const AstRawString* Parser::ParseModuleSpecifier(bool* ok) {
|
2015-02-06 17:52:20 +00:00
|
|
|
// ModuleSpecifier :
|
|
|
|
// StringLiteral
|
2012-02-20 14:02:59 +00:00
|
|
|
|
|
|
|
Expect(Token::STRING, CHECK_OK);
|
2016-08-25 08:44:59 +00:00
|
|
|
return GetSymbol();
|
2012-02-20 14:02:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-19 19:45:50 +00:00
|
|
|
void Parser::ParseExportClause(ZoneList<const AstRawString*>* export_names,
|
|
|
|
ZoneList<Scanner::Location>* export_locations,
|
|
|
|
ZoneList<const AstRawString*>* local_names,
|
|
|
|
Scanner::Location* reserved_loc, bool* ok) {
|
2015-01-30 03:26:50 +00:00
|
|
|
// ExportClause :
|
2015-01-28 19:18:37 +00:00
|
|
|
// '{' '}'
|
2015-01-30 03:26:50 +00:00
|
|
|
// '{' ExportsList '}'
|
|
|
|
// '{' ExportsList ',' '}'
|
2015-01-28 19:18:37 +00:00
|
|
|
//
|
2015-01-30 03:26:50 +00:00
|
|
|
// ExportsList :
|
|
|
|
// ExportSpecifier
|
|
|
|
// ExportsList ',' ExportSpecifier
|
2015-01-28 19:18:37 +00:00
|
|
|
//
|
2015-01-30 03:26:50 +00:00
|
|
|
// ExportSpecifier :
|
2015-01-28 19:18:37 +00:00
|
|
|
// IdentifierName
|
|
|
|
// IdentifierName 'as' IdentifierName
|
|
|
|
|
2016-07-19 19:45:50 +00:00
|
|
|
Expect(Token::LBRACE, CHECK_OK_VOID);
|
2015-01-28 19:18:37 +00:00
|
|
|
|
2015-01-30 03:26:50 +00:00
|
|
|
Token::Value name_tok;
|
|
|
|
while ((name_tok = peek()) != Token::RBRACE) {
|
|
|
|
// Keep track of the first reserved word encountered in case our
|
|
|
|
// caller needs to report an error.
|
|
|
|
if (!reserved_loc->IsValid() &&
|
2016-04-29 18:12:57 +00:00
|
|
|
!Token::IsIdentifier(name_tok, STRICT, false, parsing_module_)) {
|
2015-01-30 03:26:50 +00:00
|
|
|
*reserved_loc = scanner()->location();
|
|
|
|
}
|
2016-07-19 19:45:50 +00:00
|
|
|
const AstRawString* local_name = ParseIdentifierName(CHECK_OK_VOID);
|
2015-01-28 19:18:37 +00:00
|
|
|
const AstRawString* export_name = NULL;
|
2016-10-26 15:09:47 +00:00
|
|
|
Scanner::Location location = scanner()->location();
|
2017-03-28 12:13:28 +00:00
|
|
|
if (CheckContextualKeyword(Token::AS)) {
|
2016-07-19 19:45:50 +00:00
|
|
|
export_name = ParseIdentifierName(CHECK_OK_VOID);
|
2016-10-26 15:09:47 +00:00
|
|
|
// Set the location to the whole "a as b" string, so that it makes sense
|
|
|
|
// both for errors due to "a" and for errors due to "b".
|
|
|
|
location.end_pos = scanner()->location().end_pos;
|
2015-01-28 19:18:37 +00:00
|
|
|
}
|
2015-02-19 20:14:55 +00:00
|
|
|
if (export_name == NULL) {
|
|
|
|
export_name = local_name;
|
|
|
|
}
|
|
|
|
export_names->Add(export_name, zone());
|
|
|
|
local_names->Add(local_name, zone());
|
2016-10-26 15:09:47 +00:00
|
|
|
export_locations->Add(location, zone());
|
2015-01-28 19:18:37 +00:00
|
|
|
if (peek() == Token::RBRACE) break;
|
2016-07-19 19:45:50 +00:00
|
|
|
Expect(Token::COMMA, CHECK_OK_VOID);
|
2015-01-28 19:18:37 +00:00
|
|
|
}
|
|
|
|
|
2016-07-19 19:45:50 +00:00
|
|
|
Expect(Token::RBRACE, CHECK_OK_VOID);
|
2015-01-28 19:18:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
ZoneList<const Parser::NamedImport*>* Parser::ParseNamedImports(
|
|
|
|
int pos, bool* ok) {
|
2015-01-30 03:26:50 +00:00
|
|
|
// NamedImports :
|
|
|
|
// '{' '}'
|
|
|
|
// '{' ImportsList '}'
|
|
|
|
// '{' ImportsList ',' '}'
|
|
|
|
//
|
|
|
|
// ImportsList :
|
|
|
|
// ImportSpecifier
|
|
|
|
// ImportsList ',' ImportSpecifier
|
|
|
|
//
|
|
|
|
// ImportSpecifier :
|
|
|
|
// BindingIdentifier
|
|
|
|
// IdentifierName 'as' BindingIdentifier
|
|
|
|
|
|
|
|
Expect(Token::LBRACE, CHECK_OK);
|
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
auto result = new (zone()) ZoneList<const NamedImport*>(1, zone());
|
2015-02-25 19:40:39 +00:00
|
|
|
while (peek() != Token::RBRACE) {
|
|
|
|
const AstRawString* import_name = ParseIdentifierName(CHECK_OK);
|
|
|
|
const AstRawString* local_name = import_name;
|
2016-10-26 15:09:47 +00:00
|
|
|
Scanner::Location location = scanner()->location();
|
2015-01-30 03:26:50 +00:00
|
|
|
// In the presence of 'as', the left-side of the 'as' can
|
|
|
|
// be any IdentifierName. But without 'as', it must be a valid
|
2015-02-25 19:40:39 +00:00
|
|
|
// BindingIdentifier.
|
2017-03-28 12:13:28 +00:00
|
|
|
if (CheckContextualKeyword(Token::AS)) {
|
2015-02-25 19:40:39 +00:00
|
|
|
local_name = ParseIdentifierName(CHECK_OK);
|
|
|
|
}
|
2016-04-29 18:12:57 +00:00
|
|
|
if (!Token::IsIdentifier(scanner()->current_token(), STRICT, false,
|
|
|
|
parsing_module_)) {
|
2015-01-30 03:26:50 +00:00
|
|
|
*ok = false;
|
2015-05-18 08:34:05 +00:00
|
|
|
ReportMessage(MessageTemplate::kUnexpectedReserved);
|
2016-07-18 07:27:10 +00:00
|
|
|
return nullptr;
|
2015-02-25 19:40:39 +00:00
|
|
|
} else if (IsEvalOrArguments(local_name)) {
|
2015-01-30 03:26:50 +00:00
|
|
|
*ok = false;
|
2015-05-18 08:34:05 +00:00
|
|
|
ReportMessage(MessageTemplate::kStrictEvalArguments);
|
2016-07-18 07:27:10 +00:00
|
|
|
return nullptr;
|
2015-01-30 03:26:50 +00:00
|
|
|
}
|
2016-07-18 07:27:10 +00:00
|
|
|
|
2016-10-27 12:37:22 +00:00
|
|
|
DeclareVariable(local_name, CONST, kNeedsInitialization, position(),
|
|
|
|
CHECK_OK);
|
2016-07-18 07:27:10 +00:00
|
|
|
|
2016-10-26 15:09:47 +00:00
|
|
|
NamedImport* import =
|
|
|
|
new (zone()) NamedImport(import_name, local_name, location);
|
2016-07-18 07:27:10 +00:00
|
|
|
result->Add(import, zone());
|
|
|
|
|
2015-01-30 03:26:50 +00:00
|
|
|
if (peek() == Token::RBRACE) break;
|
|
|
|
Expect(Token::COMMA, CHECK_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
Expect(Token::RBRACE, CHECK_OK);
|
2015-02-26 18:40:50 +00:00
|
|
|
return result;
|
2015-01-30 03:26:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-19 19:45:50 +00:00
|
|
|
void Parser::ParseImportDeclaration(bool* ok) {
|
2015-01-30 03:26:50 +00:00
|
|
|
// ImportDeclaration :
|
|
|
|
// 'import' ImportClause 'from' ModuleSpecifier ';'
|
|
|
|
// 'import' ModuleSpecifier ';'
|
2012-02-29 12:12:52 +00:00
|
|
|
//
|
2015-01-30 03:26:50 +00:00
|
|
|
// ImportClause :
|
2016-07-18 07:27:10 +00:00
|
|
|
// ImportedDefaultBinding
|
2015-01-30 03:26:50 +00:00
|
|
|
// NameSpaceImport
|
|
|
|
// NamedImports
|
|
|
|
// ImportedDefaultBinding ',' NameSpaceImport
|
|
|
|
// ImportedDefaultBinding ',' NamedImports
|
|
|
|
//
|
|
|
|
// NameSpaceImport :
|
|
|
|
// '*' 'as' ImportedBinding
|
2012-02-29 12:12:52 +00:00
|
|
|
|
2013-10-14 09:24:58 +00:00
|
|
|
int pos = peek_position();
|
2016-07-19 19:45:50 +00:00
|
|
|
Expect(Token::IMPORT, CHECK_OK_VOID);
|
2015-01-30 03:26:50 +00:00
|
|
|
|
|
|
|
Token::Value tok = peek();
|
|
|
|
|
|
|
|
// 'import' ModuleSpecifier ';'
|
|
|
|
if (tok == Token::STRING) {
|
2017-06-21 12:30:56 +00:00
|
|
|
Scanner::Location specifier_loc = scanner()->peek_location();
|
2016-07-19 19:45:50 +00:00
|
|
|
const AstRawString* module_specifier = ParseModuleSpecifier(CHECK_OK_VOID);
|
|
|
|
ExpectSemicolon(CHECK_OK_VOID);
|
2017-06-21 12:30:56 +00:00
|
|
|
module()->AddEmptyImport(module_specifier, specifier_loc);
|
2016-07-19 19:45:50 +00:00
|
|
|
return;
|
2015-01-30 03:26:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Parse ImportedDefaultBinding if present.
|
2016-07-18 07:27:10 +00:00
|
|
|
const AstRawString* import_default_binding = nullptr;
|
|
|
|
Scanner::Location import_default_binding_loc;
|
2015-01-30 03:26:50 +00:00
|
|
|
if (tok != Token::MUL && tok != Token::LBRACE) {
|
2016-07-18 07:27:10 +00:00
|
|
|
import_default_binding =
|
2016-07-19 19:45:50 +00:00
|
|
|
ParseIdentifier(kDontAllowRestrictedIdentifiers, CHECK_OK_VOID);
|
2016-07-18 07:27:10 +00:00
|
|
|
import_default_binding_loc = scanner()->location();
|
2016-10-27 12:37:22 +00:00
|
|
|
DeclareVariable(import_default_binding, CONST, kNeedsInitialization, pos,
|
|
|
|
CHECK_OK_VOID);
|
2015-01-30 03:26:50 +00:00
|
|
|
}
|
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
// Parse NameSpaceImport or NamedImports if present.
|
|
|
|
const AstRawString* module_namespace_binding = nullptr;
|
|
|
|
Scanner::Location module_namespace_binding_loc;
|
|
|
|
const ZoneList<const NamedImport*>* named_imports = nullptr;
|
|
|
|
if (import_default_binding == nullptr || Check(Token::COMMA)) {
|
2015-01-30 03:26:50 +00:00
|
|
|
switch (peek()) {
|
|
|
|
case Token::MUL: {
|
|
|
|
Consume(Token::MUL);
|
2017-03-28 12:13:28 +00:00
|
|
|
ExpectContextualKeyword(Token::AS, CHECK_OK_VOID);
|
2016-07-18 07:27:10 +00:00
|
|
|
module_namespace_binding =
|
2016-07-19 19:45:50 +00:00
|
|
|
ParseIdentifier(kDontAllowRestrictedIdentifiers, CHECK_OK_VOID);
|
2016-07-18 07:27:10 +00:00
|
|
|
module_namespace_binding_loc = scanner()->location();
|
2016-08-09 08:48:34 +00:00
|
|
|
DeclareVariable(module_namespace_binding, CONST, kCreatedInitialized,
|
|
|
|
pos, CHECK_OK_VOID);
|
2015-01-30 03:26:50 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-02-29 12:12:52 +00:00
|
|
|
|
2015-01-30 03:26:50 +00:00
|
|
|
case Token::LBRACE:
|
2016-07-19 19:45:50 +00:00
|
|
|
named_imports = ParseNamedImports(pos, CHECK_OK_VOID);
|
2015-01-30 03:26:50 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
*ok = false;
|
|
|
|
ReportUnexpectedToken(scanner()->current_token());
|
2016-07-19 19:45:50 +00:00
|
|
|
return;
|
2015-01-30 03:26:50 +00:00
|
|
|
}
|
2012-02-29 12:12:52 +00:00
|
|
|
}
|
|
|
|
|
2017-03-28 12:13:28 +00:00
|
|
|
ExpectContextualKeyword(Token::FROM, CHECK_OK_VOID);
|
2017-06-21 12:30:56 +00:00
|
|
|
Scanner::Location specifier_loc = scanner()->peek_location();
|
2016-07-19 19:45:50 +00:00
|
|
|
const AstRawString* module_specifier = ParseModuleSpecifier(CHECK_OK_VOID);
|
|
|
|
ExpectSemicolon(CHECK_OK_VOID);
|
2015-04-09 22:09:44 +00:00
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
// Now that we have all the information, we can make the appropriate
|
|
|
|
// declarations.
|
|
|
|
|
2016-08-09 08:48:34 +00:00
|
|
|
// TODO(neis): Would prefer to call DeclareVariable for each case below rather
|
|
|
|
// than above and in ParseNamedImports, but then a possible error message
|
|
|
|
// would point to the wrong location. Maybe have a DeclareAt version of
|
|
|
|
// Declare that takes a location?
|
2016-07-18 07:27:10 +00:00
|
|
|
|
2016-08-08 09:46:51 +00:00
|
|
|
if (module_namespace_binding != nullptr) {
|
|
|
|
module()->AddStarImport(module_namespace_binding, module_specifier,
|
2017-06-21 12:30:56 +00:00
|
|
|
module_namespace_binding_loc, specifier_loc,
|
|
|
|
zone());
|
2016-08-08 09:46:51 +00:00
|
|
|
}
|
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
if (import_default_binding != nullptr) {
|
2016-07-19 10:06:38 +00:00
|
|
|
module()->AddImport(ast_value_factory()->default_string(),
|
|
|
|
import_default_binding, module_specifier,
|
2017-06-21 12:30:56 +00:00
|
|
|
import_default_binding_loc, specifier_loc, zone());
|
2015-01-30 03:26:50 +00:00
|
|
|
}
|
2015-01-27 21:06:36 +00:00
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
if (named_imports != nullptr) {
|
|
|
|
if (named_imports->length() == 0) {
|
2017-06-21 12:30:56 +00:00
|
|
|
module()->AddEmptyImport(module_specifier, specifier_loc);
|
2016-07-18 07:27:10 +00:00
|
|
|
} else {
|
|
|
|
for (int i = 0; i < named_imports->length(); ++i) {
|
|
|
|
const NamedImport* import = named_imports->at(i);
|
2016-07-19 10:06:38 +00:00
|
|
|
module()->AddImport(import->import_name, import->local_name,
|
2017-06-21 12:30:56 +00:00
|
|
|
module_specifier, import->location, specifier_loc,
|
|
|
|
zone());
|
2016-07-18 07:27:10 +00:00
|
|
|
}
|
2015-02-26 18:40:50 +00:00
|
|
|
}
|
2012-02-29 12:12:52 +00:00
|
|
|
}
|
2012-02-20 14:02:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-01-28 19:18:37 +00:00
|
|
|
Statement* Parser::ParseExportDefault(bool* ok) {
|
|
|
|
// Supports the following productions, starting after the 'default' token:
|
2016-07-18 07:27:10 +00:00
|
|
|
// 'export' 'default' HoistableDeclaration
|
2015-01-28 19:18:37 +00:00
|
|
|
// 'export' 'default' ClassDeclaration
|
|
|
|
// 'export' 'default' AssignmentExpression[In] ';'
|
|
|
|
|
2015-02-19 20:14:55 +00:00
|
|
|
Expect(Token::DEFAULT, CHECK_OK);
|
|
|
|
Scanner::Location default_loc = scanner()->location();
|
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
ZoneList<const AstRawString*> local_names(1, zone());
|
2016-01-15 20:38:16 +00:00
|
|
|
Statement* result = nullptr;
|
2015-01-28 19:18:37 +00:00
|
|
|
switch (peek()) {
|
2016-07-01 09:20:23 +00:00
|
|
|
case Token::FUNCTION:
|
2016-07-18 07:27:10 +00:00
|
|
|
result = ParseHoistableDeclaration(&local_names, true, CHECK_OK);
|
2015-01-28 19:18:37 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case Token::CLASS:
|
2016-01-15 20:38:16 +00:00
|
|
|
Consume(Token::CLASS);
|
2016-07-18 07:27:10 +00:00
|
|
|
result = ParseClassDeclaration(&local_names, true, CHECK_OK);
|
2015-01-28 19:18:37 +00:00
|
|
|
break;
|
|
|
|
|
2016-05-16 23:17:13 +00:00
|
|
|
case Token::ASYNC:
|
2017-01-10 23:27:02 +00:00
|
|
|
if (PeekAhead() == Token::FUNCTION &&
|
2016-05-16 23:17:13 +00:00
|
|
|
!scanner()->HasAnyLineTerminatorAfterNext()) {
|
|
|
|
Consume(Token::ASYNC);
|
2016-07-18 07:27:10 +00:00
|
|
|
result = ParseAsyncFunctionDeclaration(&local_names, true, CHECK_OK);
|
2016-05-16 23:17:13 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* falls through */
|
|
|
|
|
2015-01-28 19:18:37 +00:00
|
|
|
default: {
|
2016-07-18 07:27:10 +00:00
|
|
|
int pos = position();
|
2016-02-19 15:58:57 +00:00
|
|
|
ExpressionClassifier classifier(this);
|
2016-09-01 08:58:15 +00:00
|
|
|
Expression* value = ParseAssignmentExpression(true, CHECK_OK);
|
|
|
|
RewriteNonPattern(CHECK_OK);
|
2016-07-18 07:27:10 +00:00
|
|
|
SetFunctionName(value, ast_value_factory()->default_string());
|
|
|
|
|
|
|
|
const AstRawString* local_name =
|
|
|
|
ast_value_factory()->star_default_star_string();
|
|
|
|
local_names.Add(local_name, zone());
|
|
|
|
|
|
|
|
// It's fine to declare this as CONST because the user has no way of
|
|
|
|
// writing to it.
|
2016-08-09 08:48:34 +00:00
|
|
|
Declaration* decl = DeclareVariable(local_name, CONST, pos, CHECK_OK);
|
|
|
|
decl->proxy()->var()->set_initializer_position(position());
|
2016-07-18 07:27:10 +00:00
|
|
|
|
|
|
|
Assignment* assignment = factory()->NewAssignment(
|
2016-08-09 08:48:34 +00:00
|
|
|
Token::INIT, decl->proxy(), value, kNoSourcePosition);
|
2017-02-27 16:22:25 +00:00
|
|
|
result = IgnoreCompletion(
|
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition));
|
2015-04-22 12:35:05 +00:00
|
|
|
|
2015-01-28 19:18:37 +00:00
|
|
|
ExpectSemicolon(CHECK_OK);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
DCHECK_EQ(local_names.length(), 1);
|
2016-07-19 10:06:38 +00:00
|
|
|
module()->AddExport(local_names.first(),
|
|
|
|
ast_value_factory()->default_string(), default_loc,
|
|
|
|
zone());
|
2015-01-28 19:18:37 +00:00
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
DCHECK_NOT_NULL(result);
|
2015-01-28 19:18:37 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2012-02-29 12:12:52 +00:00
|
|
|
Statement* Parser::ParseExportDeclaration(bool* ok) {
|
|
|
|
// ExportDeclaration:
|
2015-01-28 19:18:37 +00:00
|
|
|
// 'export' '*' 'from' ModuleSpecifier ';'
|
|
|
|
// 'export' ExportClause ('from' ModuleSpecifier)? ';'
|
|
|
|
// 'export' VariableStatement
|
|
|
|
// 'export' Declaration
|
|
|
|
// 'export' 'default' ... (handled in ParseExportDefault)
|
2012-02-29 12:12:52 +00:00
|
|
|
|
|
|
|
Expect(Token::EXPORT, CHECK_OK);
|
2016-10-26 15:09:47 +00:00
|
|
|
int pos = position();
|
2012-02-29 12:12:52 +00:00
|
|
|
|
2016-07-18 07:27:10 +00:00
|
|
|
Statement* result = nullptr;
|
2014-06-24 14:03:24 +00:00
|
|
|
ZoneList<const AstRawString*> names(1, zone());
|
2016-10-26 15:09:47 +00:00
|
|
|
Scanner::Location loc = scanner()->peek_location();
|
2012-02-29 12:12:52 +00:00
|
|
|
switch (peek()) {
|
2015-01-28 19:18:37 +00:00
|
|
|
case Token::DEFAULT:
|
|
|
|
return ParseExportDefault(ok);
|
|
|
|
|
|
|
|
case Token::MUL: {
|
|
|
|
Consume(Token::MUL);
|
2016-10-26 15:09:47 +00:00
|
|
|
loc = scanner()->location();
|
2017-03-28 12:13:28 +00:00
|
|
|
ExpectContextualKeyword(Token::FROM, CHECK_OK);
|
2017-06-21 12:30:56 +00:00
|
|
|
Scanner::Location specifier_loc = scanner()->peek_location();
|
2015-02-26 18:40:50 +00:00
|
|
|
const AstRawString* module_specifier = ParseModuleSpecifier(CHECK_OK);
|
2015-04-17 22:45:15 +00:00
|
|
|
ExpectSemicolon(CHECK_OK);
|
2017-06-21 12:30:56 +00:00
|
|
|
module()->AddStarExport(module_specifier, loc, specifier_loc, zone());
|
2015-02-19 20:14:55 +00:00
|
|
|
return factory()->NewEmptyStatement(pos);
|
2012-02-29 12:12:52 +00:00
|
|
|
}
|
|
|
|
|
2015-01-30 03:26:50 +00:00
|
|
|
case Token::LBRACE: {
|
|
|
|
// There are two cases here:
|
|
|
|
//
|
|
|
|
// 'export' ExportClause ';'
|
|
|
|
// and
|
|
|
|
// 'export' ExportClause FromClause ';'
|
|
|
|
//
|
|
|
|
// In the first case, the exported identifiers in ExportClause must
|
|
|
|
// not be reserved words, while in the latter they may be. We
|
|
|
|
// pass in a location that gets filled with the first reserved word
|
|
|
|
// encountered, and then throw a SyntaxError if we are in the
|
|
|
|
// non-FromClause case.
|
|
|
|
Scanner::Location reserved_loc = Scanner::Location::invalid();
|
2015-02-19 20:14:55 +00:00
|
|
|
ZoneList<const AstRawString*> export_names(1, zone());
|
|
|
|
ZoneList<Scanner::Location> export_locations(1, zone());
|
2016-07-18 07:27:10 +00:00
|
|
|
ZoneList<const AstRawString*> original_names(1, zone());
|
|
|
|
ParseExportClause(&export_names, &export_locations, &original_names,
|
2015-02-19 20:14:55 +00:00
|
|
|
&reserved_loc, CHECK_OK);
|
2016-07-18 07:27:10 +00:00
|
|
|
const AstRawString* module_specifier = nullptr;
|
2017-06-21 12:30:56 +00:00
|
|
|
Scanner::Location specifier_loc;
|
2017-03-28 12:13:28 +00:00
|
|
|
if (CheckContextualKeyword(Token::FROM)) {
|
2017-06-21 12:30:56 +00:00
|
|
|
specifier_loc = scanner()->peek_location();
|
2016-07-18 07:27:10 +00:00
|
|
|
module_specifier = ParseModuleSpecifier(CHECK_OK);
|
2015-01-30 03:26:50 +00:00
|
|
|
} else if (reserved_loc.IsValid()) {
|
|
|
|
// No FromClause, so reserved words are invalid in ExportClause.
|
|
|
|
*ok = false;
|
2015-05-18 08:34:05 +00:00
|
|
|
ReportMessageAt(reserved_loc, MessageTemplate::kUnexpectedReserved);
|
2016-07-18 07:27:10 +00:00
|
|
|
return nullptr;
|
2015-01-28 19:18:37 +00:00
|
|
|
}
|
|
|
|
ExpectSemicolon(CHECK_OK);
|
2015-02-19 20:14:55 +00:00
|
|
|
const int length = export_names.length();
|
2016-07-18 07:27:10 +00:00
|
|
|
DCHECK_EQ(length, original_names.length());
|
2015-02-19 20:14:55 +00:00
|
|
|
DCHECK_EQ(length, export_locations.length());
|
2016-07-18 07:27:10 +00:00
|
|
|
if (module_specifier == nullptr) {
|
2015-02-19 20:14:55 +00:00
|
|
|
for (int i = 0; i < length; ++i) {
|
2016-07-19 10:06:38 +00:00
|
|
|
module()->AddExport(original_names[i], export_names[i],
|
|
|
|
export_locations[i], zone());
|
2015-02-19 20:14:55 +00:00
|
|
|
}
|
2016-07-18 07:27:10 +00:00
|
|
|
} else if (length == 0) {
|
2017-06-21 12:30:56 +00:00
|
|
|
module()->AddEmptyImport(module_specifier, specifier_loc);
|
2015-02-19 20:14:55 +00:00
|
|
|
} else {
|
|
|
|
for (int i = 0; i < length; ++i) {
|
2016-07-19 10:06:38 +00:00
|
|
|
module()->AddExport(original_names[i], export_names[i],
|
2017-06-21 12:30:56 +00:00
|
|
|
module_specifier, export_locations[i],
|
|
|
|
specifier_loc, zone());
|
2015-02-19 20:14:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return factory()->NewEmptyStatement(pos);
|
2015-01-30 03:26:50 +00:00
|
|
|
}
|
2015-01-28 19:18:37 +00:00
|
|
|
|
2012-02-29 12:12:52 +00:00
|
|
|
case Token::FUNCTION:
|
2016-07-01 09:20:23 +00:00
|
|
|
result = ParseHoistableDeclaration(&names, false, CHECK_OK);
|
2012-02-29 12:12:52 +00:00
|
|
|
break;
|
|
|
|
|
2014-09-16 22:15:39 +00:00
|
|
|
case Token::CLASS:
|
2016-01-15 20:38:16 +00:00
|
|
|
Consume(Token::CLASS);
|
2016-07-01 09:20:23 +00:00
|
|
|
result = ParseClassDeclaration(&names, false, CHECK_OK);
|
2014-09-16 22:15:39 +00:00
|
|
|
break;
|
|
|
|
|
2012-02-29 12:12:52 +00:00
|
|
|
case Token::VAR:
|
|
|
|
case Token::LET:
|
|
|
|
case Token::CONST:
|
2015-01-27 21:06:36 +00:00
|
|
|
result = ParseVariableStatement(kStatementListItem, &names, CHECK_OK);
|
2012-02-29 12:12:52 +00:00
|
|
|
break;
|
|
|
|
|
2016-05-16 23:17:13 +00:00
|
|
|
case Token::ASYNC:
|
2017-01-10 23:27:02 +00:00
|
|
|
// TODO(neis): Why don't we have the same check here as in
|
|
|
|
// ParseStatementListItem?
|
|
|
|
Consume(Token::ASYNC);
|
|
|
|
result = ParseAsyncFunctionDeclaration(&names, false, CHECK_OK);
|
|
|
|
break;
|
2016-05-16 23:17:13 +00:00
|
|
|
|
2012-02-29 12:12:52 +00:00
|
|
|
default:
|
|
|
|
*ok = false;
|
2014-02-14 12:13:33 +00:00
|
|
|
ReportUnexpectedToken(scanner()->current_token());
|
2016-07-18 07:27:10 +00:00
|
|
|
return nullptr;
|
2012-02-29 12:12:52 +00:00
|
|
|
}
|
2016-10-26 15:09:47 +00:00
|
|
|
loc.end_pos = scanner()->location().end_pos;
|
2012-02-29 12:12:52 +00:00
|
|
|
|
2016-07-19 10:06:38 +00:00
|
|
|
ModuleDescriptor* descriptor = module();
|
2014-07-30 13:54:45 +00:00
|
|
|
for (int i = 0; i < names.length(); ++i) {
|
2016-10-26 15:09:47 +00:00
|
|
|
descriptor->AddExport(names[i], names[i], loc, zone());
|
2012-02-29 12:12:52 +00:00
|
|
|
}
|
|
|
|
|
2015-02-19 20:14:55 +00:00
|
|
|
DCHECK_NOT_NULL(result);
|
2012-02-29 12:12:52 +00:00
|
|
|
return result;
|
2012-02-20 14:02:59 +00:00
|
|
|
}
|
|
|
|
|
2016-08-11 12:04:02 +00:00
|
|
|
VariableProxy* Parser::NewUnresolved(const AstRawString* name, int begin_pos,
|
2016-10-25 07:59:05 +00:00
|
|
|
VariableKind kind) {
|
|
|
|
return scope()->NewUnresolved(factory(), name, begin_pos, kind);
|
2016-08-11 12:04:02 +00:00
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2016-08-11 12:04:02 +00:00
|
|
|
VariableProxy* Parser::NewUnresolved(const AstRawString* name) {
|
2016-10-25 07:59:05 +00:00
|
|
|
return scope()->NewUnresolved(factory(), name, scanner()->location().beg_pos);
|
2012-02-28 10:12:39 +00:00
|
|
|
}
|
|
|
|
|
2016-08-09 08:48:34 +00:00
|
|
|
Declaration* Parser::DeclareVariable(const AstRawString* name,
|
|
|
|
VariableMode mode, int pos, bool* ok) {
|
2016-09-07 08:47:48 +00:00
|
|
|
return DeclareVariable(name, mode, Variable::DefaultInitializationFlag(mode),
|
|
|
|
pos, ok);
|
2016-08-09 08:48:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Declaration* Parser::DeclareVariable(const AstRawString* name,
|
|
|
|
VariableMode mode, InitializationFlag init,
|
|
|
|
int pos, bool* ok) {
|
2016-08-08 10:23:34 +00:00
|
|
|
DCHECK_NOT_NULL(name);
|
2016-09-19 20:07:01 +00:00
|
|
|
VariableProxy* proxy = factory()->NewVariableProxy(
|
2016-10-25 07:59:05 +00:00
|
|
|
name, NORMAL_VARIABLE, scanner()->location().beg_pos);
|
2017-08-18 17:26:54 +00:00
|
|
|
Declaration* declaration;
|
|
|
|
if (mode == VAR && !scope()->is_declaration_scope()) {
|
|
|
|
DCHECK(scope()->is_block_scope() || scope()->is_with_scope());
|
|
|
|
declaration = factory()->NewNestedVariableDeclaration(proxy, scope(), pos);
|
|
|
|
} else {
|
|
|
|
declaration = factory()->NewVariableDeclaration(proxy, pos);
|
|
|
|
}
|
2016-10-27 11:03:06 +00:00
|
|
|
Declare(declaration, DeclarationDescriptor::NORMAL, mode, init, ok, nullptr,
|
|
|
|
scanner()->location().end_pos);
|
|
|
|
if (!*ok) return nullptr;
|
2016-08-09 08:48:34 +00:00
|
|
|
return declaration;
|
2016-07-18 07:27:10 +00:00
|
|
|
}
|
|
|
|
|
2015-06-22 14:15:53 +00:00
|
|
|
Variable* Parser::Declare(Declaration* declaration,
|
|
|
|
DeclarationDescriptor::Kind declaration_kind,
|
2016-08-10 08:10:18 +00:00
|
|
|
VariableMode mode, InitializationFlag init, bool* ok,
|
2016-10-27 11:03:06 +00:00
|
|
|
Scope* scope, int var_end_pos) {
|
2016-08-29 12:36:30 +00:00
|
|
|
if (scope == nullptr) {
|
|
|
|
scope = this->scope();
|
|
|
|
}
|
|
|
|
bool sloppy_mode_block_scope_function_redefinition = false;
|
|
|
|
Variable* variable = scope->DeclareVariable(
|
|
|
|
declaration, mode, init, allow_harmony_restrictive_generators(),
|
|
|
|
&sloppy_mode_block_scope_function_redefinition, ok);
|
|
|
|
if (!*ok) {
|
2016-10-27 11:03:06 +00:00
|
|
|
// If we only have the start position of a proxy, we can't highlight the
|
|
|
|
// whole variable name. Pretend its length is 1 so that we highlight at
|
|
|
|
// least the first character.
|
|
|
|
Scanner::Location loc(declaration->proxy()->position(),
|
|
|
|
var_end_pos != kNoSourcePosition
|
|
|
|
? var_end_pos
|
|
|
|
: declaration->proxy()->position() + 1);
|
2017-10-05 00:30:10 +00:00
|
|
|
if (declaration_kind == DeclarationDescriptor::PARAMETER) {
|
|
|
|
ReportMessageAt(loc, MessageTemplate::kParamDupe);
|
|
|
|
} else {
|
2016-10-27 11:03:06 +00:00
|
|
|
ReportMessageAt(loc, MessageTemplate::kVarRedeclaration,
|
|
|
|
declaration->proxy()->raw_name());
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
2016-08-31 18:58:21 +00:00
|
|
|
return nullptr;
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
2016-08-29 12:36:30 +00:00
|
|
|
if (sloppy_mode_block_scope_function_redefinition) {
|
|
|
|
++use_counts_[v8::Isolate::kSloppyModeBlockScopedFunctionRedefinition];
|
|
|
|
}
|
|
|
|
return variable;
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
2016-08-31 08:31:36 +00:00
|
|
|
Block* Parser::BuildInitializationBlock(
|
|
|
|
DeclarationParsingResult* parsing_result,
|
2015-05-15 09:56:31 +00:00
|
|
|
ZoneList<const AstRawString*>* names, bool* ok) {
|
2017-08-29 18:20:42 +00:00
|
|
|
Block* result = factory()->NewBlock(1, true);
|
2016-08-31 08:31:36 +00:00
|
|
|
for (auto declaration : parsing_result->declarations) {
|
2017-08-09 21:45:27 +00:00
|
|
|
DeclareAndInitializeVariables(result, &(parsing_result->descriptor),
|
|
|
|
&declaration, names, CHECK_OK);
|
2015-05-15 09:56:31 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-09-09 07:57:59 +00:00
|
|
|
Statement* Parser::DeclareFunction(const AstRawString* variable_name,
|
2017-01-16 12:07:57 +00:00
|
|
|
FunctionLiteral* function, VariableMode mode,
|
2017-02-06 22:29:11 +00:00
|
|
|
int pos, bool is_sloppy_block_function,
|
2016-09-09 07:57:59 +00:00
|
|
|
ZoneList<const AstRawString*>* names,
|
|
|
|
bool* ok) {
|
2016-09-19 20:07:01 +00:00
|
|
|
VariableProxy* proxy =
|
|
|
|
factory()->NewVariableProxy(variable_name, NORMAL_VARIABLE);
|
2017-01-31 13:35:52 +00:00
|
|
|
|
2016-09-09 07:57:59 +00:00
|
|
|
Declaration* declaration =
|
2017-08-18 17:26:54 +00:00
|
|
|
factory()->NewFunctionDeclaration(proxy, function, pos);
|
2016-09-09 07:57:59 +00:00
|
|
|
Declare(declaration, DeclarationDescriptor::NORMAL, mode, kCreatedInitialized,
|
|
|
|
CHECK_OK);
|
|
|
|
if (names) names->Add(variable_name, zone());
|
2017-01-16 12:07:57 +00:00
|
|
|
if (is_sloppy_block_function) {
|
|
|
|
SloppyBlockFunctionStatement* statement =
|
|
|
|
factory()->NewSloppyBlockFunctionStatement();
|
2017-02-07 08:12:55 +00:00
|
|
|
GetDeclarationScope()->DeclareSloppyBlockFunction(variable_name, scope(),
|
|
|
|
statement);
|
2017-01-16 12:07:57 +00:00
|
|
|
return statement;
|
2016-09-09 07:57:59 +00:00
|
|
|
}
|
|
|
|
return factory()->NewEmptyStatement(kNoSourcePosition);
|
|
|
|
}
|
|
|
|
|
2016-09-28 13:42:20 +00:00
|
|
|
Statement* Parser::DeclareClass(const AstRawString* variable_name,
|
|
|
|
Expression* value,
|
|
|
|
ZoneList<const AstRawString*>* names,
|
|
|
|
int class_token_pos, int end_pos, bool* ok) {
|
|
|
|
Declaration* decl =
|
|
|
|
DeclareVariable(variable_name, LET, class_token_pos, CHECK_OK);
|
|
|
|
decl->proxy()->var()->set_initializer_position(end_pos);
|
2017-02-28 12:40:46 +00:00
|
|
|
if (names) names->Add(variable_name, zone());
|
|
|
|
|
2016-09-28 13:42:20 +00:00
|
|
|
Assignment* assignment = factory()->NewAssignment(Token::INIT, decl->proxy(),
|
|
|
|
value, class_token_pos);
|
2017-02-27 16:22:25 +00:00
|
|
|
return IgnoreCompletion(
|
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition));
|
2016-09-28 13:42:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Statement* Parser::DeclareNative(const AstRawString* name, int pos, bool* ok) {
|
|
|
|
// Make sure that the function containing the native declaration
|
|
|
|
// isn't lazily compiled. The extension structures are only
|
|
|
|
// accessible while parsing the first time not when reparsing
|
|
|
|
// because of lazy compilation.
|
|
|
|
GetClosureScope()->ForceEagerCompilation();
|
|
|
|
|
|
|
|
// TODO(1240846): It's weird that native function declarations are
|
|
|
|
// introduced dynamically when we meet their declarations, whereas
|
|
|
|
// other functions are set up when entering the surrounding scope.
|
|
|
|
Declaration* decl = DeclareVariable(name, VAR, pos, CHECK_OK);
|
|
|
|
NativeFunctionLiteral* lit =
|
|
|
|
factory()->NewNativeFunctionLiteral(name, extension_, kNoSourcePosition);
|
|
|
|
return factory()->NewExpressionStatement(
|
|
|
|
factory()->NewAssignment(Token::INIT, decl->proxy(), lit,
|
|
|
|
kNoSourcePosition),
|
|
|
|
pos);
|
|
|
|
}
|
|
|
|
|
2016-09-10 17:04:50 +00:00
|
|
|
ZoneList<const AstRawString*>* Parser::DeclareLabel(
|
|
|
|
ZoneList<const AstRawString*>* labels, VariableProxy* var, bool* ok) {
|
2016-12-02 12:10:46 +00:00
|
|
|
DCHECK(IsIdentifier(var));
|
2016-09-10 17:04:50 +00:00
|
|
|
const AstRawString* label = var->raw_name();
|
|
|
|
// TODO(1240780): We don't check for redeclaration of labels
|
|
|
|
// during preparsing since keeping track of the set of active
|
|
|
|
// labels requires nontrivial changes to the way scopes are
|
|
|
|
// structured. However, these are probably changes we want to
|
|
|
|
// make later anyway so we should go back and fix this then.
|
|
|
|
if (ContainsLabel(labels, label) || TargetStackContainsLabel(label)) {
|
|
|
|
ReportMessage(MessageTemplate::kLabelRedeclaration, label);
|
|
|
|
*ok = false;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
if (labels == nullptr) {
|
|
|
|
labels = new (zone()) ZoneList<const AstRawString*>(1, zone());
|
|
|
|
}
|
|
|
|
labels->Add(label, zone());
|
|
|
|
// Remove the "ghost" variable that turned out to be a label
|
|
|
|
// from the top scope. This way, we don't try to resolve it
|
|
|
|
// during the scope processing.
|
|
|
|
scope()->RemoveUnresolved(var);
|
|
|
|
return labels;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Parser::ContainsLabel(ZoneList<const AstRawString*>* labels,
|
|
|
|
const AstRawString* label) {
|
|
|
|
DCHECK_NOT_NULL(label);
|
|
|
|
if (labels != nullptr) {
|
|
|
|
for (int i = labels->length(); i-- > 0;) {
|
|
|
|
if (labels->at(i) == label) return true;
|
2014-06-05 08:41:29 +00:00
|
|
|
}
|
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-02-27 16:22:25 +00:00
|
|
|
Block* Parser::IgnoreCompletion(Statement* statement) {
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* block = factory()->NewBlock(1, true);
|
2017-02-27 16:22:25 +00:00
|
|
|
block->statements()->Add(statement, zone());
|
|
|
|
return block;
|
|
|
|
}
|
|
|
|
|
2016-09-10 17:04:50 +00:00
|
|
|
Expression* Parser::RewriteReturn(Expression* return_value, int pos) {
|
2017-01-03 19:37:23 +00:00
|
|
|
if (IsDerivedConstructor(function_state_->kind())) {
|
2017-03-31 06:01:01 +00:00
|
|
|
// For subclass constructors we need to return this in case of undefined;
|
|
|
|
// other primitive values trigger an exception in the ConstructStub.
|
2016-09-10 17:04:50 +00:00
|
|
|
//
|
|
|
|
// return expr;
|
|
|
|
//
|
|
|
|
// Is rewritten as:
|
|
|
|
//
|
2017-03-31 06:01:01 +00:00
|
|
|
// return (temp = expr) === undefined ? this : temp;
|
2016-09-10 17:04:50 +00:00
|
|
|
|
|
|
|
// temp = expr
|
|
|
|
Variable* temp = NewTemporary(ast_value_factory()->empty_string());
|
|
|
|
Assignment* assign = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(temp), return_value, pos);
|
|
|
|
|
|
|
|
// temp === undefined
|
|
|
|
Expression* is_undefined = factory()->NewCompareOperation(
|
|
|
|
Token::EQ_STRICT, assign,
|
|
|
|
factory()->NewUndefinedLiteral(kNoSourcePosition), pos);
|
|
|
|
|
2017-03-31 06:01:01 +00:00
|
|
|
// is_undefined ? this : temp
|
|
|
|
return_value =
|
|
|
|
factory()->NewConditional(is_undefined, ThisExpression(pos),
|
|
|
|
factory()->NewVariableProxy(temp), pos);
|
2016-09-10 17:04:50 +00:00
|
|
|
}
|
|
|
|
return return_value;
|
|
|
|
}
|
|
|
|
|
2016-09-10 18:04:54 +00:00
|
|
|
Expression* Parser::RewriteDoExpression(Block* body, int pos, bool* ok) {
|
|
|
|
Variable* result = NewTemporary(ast_value_factory()->dot_result_string());
|
|
|
|
DoExpression* expr = factory()->NewDoExpression(body, result, pos);
|
|
|
|
if (!Rewriter::Rewrite(this, GetClosureScope(), expr, ast_value_factory())) {
|
|
|
|
*ok = false;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
return expr;
|
|
|
|
}
|
|
|
|
|
2017-08-30 21:59:48 +00:00
|
|
|
Statement* Parser::RewriteSwitchStatement(SwitchStatement* switch_statement,
|
2017-07-12 13:06:09 +00:00
|
|
|
Scope* scope) {
|
2015-08-24 18:57:08 +00:00
|
|
|
// In order to get the CaseClauses to execute in their own lexical scope,
|
|
|
|
// but without requiring downstream code to have special scope handling
|
|
|
|
// code for switch statements, desugar into blocks as follows:
|
|
|
|
// { // To group the statements--harmless to evaluate Expression in scope
|
|
|
|
// .tag_variable = Expression;
|
|
|
|
// { // To give CaseClauses a scope
|
|
|
|
// switch (.tag_variable) { CaseClause* }
|
|
|
|
// }
|
|
|
|
// }
|
2017-08-30 21:59:48 +00:00
|
|
|
DCHECK_NOT_NULL(scope);
|
|
|
|
DCHECK(scope->is_block_scope());
|
|
|
|
DCHECK_GE(switch_statement->position(), scope->start_position());
|
|
|
|
DCHECK_LT(switch_statement->position(), scope->end_position());
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* switch_block = factory()->NewBlock(2, false);
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2017-08-30 21:59:48 +00:00
|
|
|
Expression* tag = switch_statement->tag();
|
2015-08-24 18:57:08 +00:00
|
|
|
Variable* tag_variable =
|
2016-08-09 19:49:25 +00:00
|
|
|
NewTemporary(ast_value_factory()->dot_switch_tag_string());
|
2015-08-24 18:57:08 +00:00
|
|
|
Assignment* tag_assign = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(tag_variable), tag,
|
|
|
|
tag->position());
|
2017-08-30 21:59:48 +00:00
|
|
|
// Wrap with IgnoreCompletion so the tag isn't returned as the completion
|
|
|
|
// value, in case the switch statements don't have a value.
|
|
|
|
Statement* tag_statement = IgnoreCompletion(
|
|
|
|
factory()->NewExpressionStatement(tag_assign, kNoSourcePosition));
|
2015-10-01 13:59:36 +00:00
|
|
|
switch_block->statements()->Add(tag_statement, zone());
|
2015-08-24 18:57:08 +00:00
|
|
|
|
2017-08-30 21:59:48 +00:00
|
|
|
switch_statement->set_tag(factory()->NewVariableProxy(tag_variable));
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* cases_block = factory()->NewBlock(1, false);
|
2016-09-12 09:39:34 +00:00
|
|
|
cases_block->statements()->Add(switch_statement, zone());
|
|
|
|
cases_block->set_scope(scope);
|
2015-10-01 13:59:36 +00:00
|
|
|
switch_block->statements()->Add(cases_block, zone());
|
2015-08-24 18:57:08 +00:00
|
|
|
return switch_block;
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
2016-09-16 09:12:14 +00:00
|
|
|
void Parser::RewriteCatchPattern(CatchInfo* catch_info, bool* ok) {
|
|
|
|
if (catch_info->name == nullptr) {
|
|
|
|
DCHECK_NOT_NULL(catch_info->pattern);
|
|
|
|
catch_info->name = ast_value_factory()->dot_catch_string();
|
|
|
|
}
|
2017-03-03 08:28:54 +00:00
|
|
|
Variable* catch_variable =
|
|
|
|
catch_info->scope->DeclareLocal(catch_info->name, VAR);
|
2016-09-16 09:12:14 +00:00
|
|
|
if (catch_info->pattern != nullptr) {
|
|
|
|
DeclarationDescriptor descriptor;
|
|
|
|
descriptor.declaration_kind = DeclarationDescriptor::NORMAL;
|
|
|
|
descriptor.scope = scope();
|
|
|
|
descriptor.mode = LET;
|
|
|
|
descriptor.declaration_pos = catch_info->pattern->position();
|
|
|
|
descriptor.initialization_pos = catch_info->pattern->position();
|
|
|
|
|
|
|
|
// Initializer position for variables declared by the pattern.
|
|
|
|
const int initializer_position = position();
|
|
|
|
|
|
|
|
DeclarationParsingResult::Declaration decl(
|
|
|
|
catch_info->pattern, initializer_position,
|
2017-03-03 08:28:54 +00:00
|
|
|
factory()->NewVariableProxy(catch_variable));
|
2016-09-16 09:12:14 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
catch_info->init_block = factory()->NewBlock(8, true);
|
2017-08-09 21:45:27 +00:00
|
|
|
DeclareAndInitializeVariables(catch_info->init_block, &descriptor, &decl,
|
|
|
|
&catch_info->bound_names, ok);
|
2016-09-16 09:12:14 +00:00
|
|
|
} else {
|
|
|
|
catch_info->bound_names.Add(catch_info->name, zone());
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
2016-09-16 09:12:14 +00:00
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2016-09-16 09:12:14 +00:00
|
|
|
void Parser::ValidateCatchBlock(const CatchInfo& catch_info, bool* ok) {
|
|
|
|
// Check for `catch(e) { let e; }` and similar errors.
|
|
|
|
Scope* inner_block_scope = catch_info.inner_block->scope();
|
|
|
|
if (inner_block_scope != nullptr) {
|
|
|
|
Declaration* decl = inner_block_scope->CheckLexDeclarationsConflictingWith(
|
|
|
|
catch_info.bound_names);
|
|
|
|
if (decl != nullptr) {
|
|
|
|
const AstRawString* name = decl->proxy()->raw_name();
|
|
|
|
int position = decl->proxy()->position();
|
|
|
|
Scanner::Location location =
|
|
|
|
position == kNoSourcePosition
|
|
|
|
? Scanner::Location::invalid()
|
|
|
|
: Scanner::Location(position, position + 1);
|
|
|
|
ReportMessageAt(location, MessageTemplate::kVarRedeclaration, name);
|
|
|
|
*ok = false;
|
2015-11-05 20:21:20 +00:00
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
2016-09-16 09:12:14 +00:00
|
|
|
}
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2016-09-16 09:12:14 +00:00
|
|
|
Statement* Parser::RewriteTryStatement(Block* try_block, Block* catch_block,
|
2017-07-07 12:04:58 +00:00
|
|
|
const SourceRange& catch_range,
|
2016-09-16 09:12:14 +00:00
|
|
|
Block* finally_block,
|
2017-07-07 12:04:58 +00:00
|
|
|
const SourceRange& finally_range,
|
2016-09-16 09:12:14 +00:00
|
|
|
const CatchInfo& catch_info, int pos) {
|
2008-07-03 15:10:15 +00:00
|
|
|
// Simplify the AST nodes by converting:
|
2011-06-08 13:55:33 +00:00
|
|
|
// 'try B0 catch B1 finally B2'
|
2008-07-03 15:10:15 +00:00
|
|
|
// to:
|
2011-06-08 13:55:33 +00:00
|
|
|
// 'try { try B0 catch B1 } finally B2'
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2016-09-16 09:12:14 +00:00
|
|
|
if (catch_block != nullptr && finally_block != nullptr) {
|
2011-06-30 14:37:55 +00:00
|
|
|
// If we have both, create an inner try/catch.
|
2017-10-05 08:30:58 +00:00
|
|
|
DCHECK_NOT_NULL(catch_info.scope);
|
2016-07-22 06:04:07 +00:00
|
|
|
TryCatchStatement* statement;
|
2016-12-14 21:03:47 +00:00
|
|
|
statement = factory()->NewTryCatchStatement(try_block, catch_info.scope,
|
2017-07-12 13:06:09 +00:00
|
|
|
catch_block, kNoSourcePosition);
|
|
|
|
RecordTryCatchStatementSourceRange(statement, catch_range);
|
2016-07-22 06:04:07 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
try_block = factory()->NewBlock(1, false);
|
2015-10-01 13:59:36 +00:00
|
|
|
try_block->statements()->Add(statement, zone());
|
2016-09-16 09:12:14 +00:00
|
|
|
catch_block = nullptr; // Clear to indicate it's been handled.
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
2016-09-16 09:12:14 +00:00
|
|
|
if (catch_block != nullptr) {
|
|
|
|
DCHECK_NULL(finally_block);
|
2017-10-05 08:30:58 +00:00
|
|
|
DCHECK_NOT_NULL(catch_info.scope);
|
2017-07-12 13:06:09 +00:00
|
|
|
TryCatchStatement* stmt = factory()->NewTryCatchStatement(
|
|
|
|
try_block, catch_info.scope, catch_block, pos);
|
|
|
|
RecordTryCatchStatementSourceRange(stmt, catch_range);
|
|
|
|
return stmt;
|
2010-11-02 11:45:47 +00:00
|
|
|
} else {
|
2016-09-16 09:12:14 +00:00
|
|
|
DCHECK_NOT_NULL(finally_block);
|
2017-07-12 13:06:09 +00:00
|
|
|
TryFinallyStatement* stmt =
|
|
|
|
factory()->NewTryFinallyStatement(try_block, finally_block, pos);
|
|
|
|
RecordTryFinallyStatementSourceRange(stmt, finally_range);
|
|
|
|
return stmt;
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-20 08:58:54 +00:00
|
|
|
void Parser::ParseAndRewriteGeneratorFunctionBody(int pos, FunctionKind kind,
|
|
|
|
ZoneList<Statement*>* body,
|
|
|
|
bool* ok) {
|
2017-06-05 19:54:14 +00:00
|
|
|
// For ES6 Generators, we just prepend the initial yield.
|
|
|
|
Expression* initial_yield = BuildInitialYield(pos, kind);
|
|
|
|
body->Add(factory()->NewExpressionStatement(initial_yield, kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
ParseStatementList(body, Token::RBRACE, ok);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Parser::ParseAndRewriteAsyncGeneratorFunctionBody(
|
|
|
|
int pos, FunctionKind kind, ZoneList<Statement*>* body, bool* ok) {
|
2017-03-22 04:34:36 +00:00
|
|
|
// For ES2017 Async Generators, we produce:
|
|
|
|
//
|
|
|
|
// try {
|
|
|
|
// InitialYield;
|
|
|
|
// ...body...;
|
|
|
|
// return undefined; // See comment below
|
|
|
|
// } catch (.catch) {
|
|
|
|
// %AsyncGeneratorReject(generator, .catch);
|
|
|
|
// } finally {
|
|
|
|
// %_GeneratorClose(generator);
|
|
|
|
// }
|
|
|
|
//
|
2017-01-20 08:58:54 +00:00
|
|
|
// - InitialYield yields the actual generator object.
|
|
|
|
// - Any return statement inside the body will have its argument wrapped
|
2017-03-22 04:34:36 +00:00
|
|
|
// in an iterator result object with a "done" property set to `true`.
|
2017-01-20 08:58:54 +00:00
|
|
|
// - If the generator terminates for whatever reason, we must close it.
|
|
|
|
// Hence the finally clause.
|
2017-03-22 04:34:36 +00:00
|
|
|
// - BytecodeGenerator performs special handling for ReturnStatements in
|
|
|
|
// async generator functions, resolving the appropriate Promise with an
|
|
|
|
// "done" iterator result object containing a Promise-unwrapped value.
|
2017-06-05 19:54:14 +00:00
|
|
|
DCHECK(IsAsyncGeneratorFunction(kind));
|
2017-01-20 08:58:54 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* try_block = factory()->NewBlock(3, false);
|
2017-01-20 08:58:54 +00:00
|
|
|
Expression* initial_yield = BuildInitialYield(pos, kind);
|
|
|
|
try_block->statements()->Add(
|
|
|
|
factory()->NewExpressionStatement(initial_yield, kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
ParseStatementList(try_block->statements(), Token::RBRACE, ok);
|
|
|
|
if (!*ok) return;
|
|
|
|
|
2017-06-05 19:54:14 +00:00
|
|
|
// Don't create iterator result for async generators, as the resume methods
|
|
|
|
// will create it.
|
|
|
|
Statement* final_return = BuildReturnStatement(
|
|
|
|
factory()->NewUndefinedLiteral(kNoSourcePosition), kNoSourcePosition);
|
|
|
|
try_block->statements()->Add(final_return, zone());
|
2017-03-22 04:34:36 +00:00
|
|
|
|
2017-06-05 19:54:14 +00:00
|
|
|
// For AsyncGenerators, a top-level catch block will reject the Promise.
|
2017-09-07 12:05:46 +00:00
|
|
|
Scope* catch_scope = NewHiddenCatchScope();
|
2017-03-22 04:34:36 +00:00
|
|
|
|
2017-06-05 19:54:14 +00:00
|
|
|
ZoneList<Expression*>* reject_args =
|
|
|
|
new (zone()) ZoneList<Expression*>(2, zone());
|
2017-06-09 23:55:01 +00:00
|
|
|
reject_args->Add(factory()->NewVariableProxy(
|
|
|
|
function_state_->scope()->generator_object_var()),
|
|
|
|
zone());
|
2017-06-05 19:54:14 +00:00
|
|
|
reject_args->Add(factory()->NewVariableProxy(catch_scope->catch_variable()),
|
|
|
|
zone());
|
2017-03-22 04:34:36 +00:00
|
|
|
|
2017-06-05 19:54:14 +00:00
|
|
|
Expression* reject_call = factory()->NewCallRuntime(
|
|
|
|
Runtime::kInlineAsyncGeneratorReject, reject_args, kNoSourcePosition);
|
|
|
|
Block* catch_block = IgnoreCompletion(
|
|
|
|
factory()->NewReturnStatement(reject_call, kNoSourcePosition));
|
2017-03-22 04:34:36 +00:00
|
|
|
|
2017-06-05 19:54:14 +00:00
|
|
|
TryStatement* try_catch = factory()->NewTryCatchStatementForAsyncAwait(
|
|
|
|
try_block, catch_scope, catch_block, kNoSourcePosition);
|
2017-03-22 04:34:36 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
try_block = factory()->NewBlock(1, false);
|
2017-06-05 19:54:14 +00:00
|
|
|
try_block->statements()->Add(try_catch, zone());
|
2017-01-20 08:58:54 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* finally_block = factory()->NewBlock(1, false);
|
2017-06-05 19:54:14 +00:00
|
|
|
ZoneList<Expression*>* close_args =
|
|
|
|
new (zone()) ZoneList<Expression*>(1, zone());
|
2017-06-09 23:55:01 +00:00
|
|
|
VariableProxy* call_proxy = factory()->NewVariableProxy(
|
|
|
|
function_state_->scope()->generator_object_var());
|
2017-06-05 19:54:14 +00:00
|
|
|
close_args->Add(call_proxy, zone());
|
|
|
|
Expression* close_call = factory()->NewCallRuntime(
|
|
|
|
Runtime::kInlineGeneratorClose, close_args, kNoSourcePosition);
|
2017-01-20 08:58:54 +00:00
|
|
|
finally_block->statements()->Add(
|
2017-06-05 19:54:14 +00:00
|
|
|
factory()->NewExpressionStatement(close_call, kNoSourcePosition), zone());
|
2017-01-20 08:58:54 +00:00
|
|
|
|
|
|
|
body->Add(factory()->NewTryFinallyStatement(try_block, finally_block,
|
|
|
|
kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
}
|
|
|
|
|
|
|
|
void Parser::CreateFunctionNameAssignment(
|
|
|
|
const AstRawString* function_name, int pos,
|
|
|
|
FunctionLiteral::FunctionType function_type,
|
|
|
|
DeclarationScope* function_scope, ZoneList<Statement*>* result, int index) {
|
|
|
|
if (function_type == FunctionLiteral::kNamedExpression) {
|
|
|
|
StatementT statement = factory()->NewEmptyStatement(kNoSourcePosition);
|
|
|
|
if (function_scope->LookupLocal(function_name) == nullptr) {
|
|
|
|
// Now that we know the language mode, we can create the const assignment
|
|
|
|
// in the previously reserved spot.
|
|
|
|
DCHECK_EQ(function_scope, scope());
|
|
|
|
Variable* fvar = function_scope->DeclareFunctionVar(function_name);
|
|
|
|
VariableProxy* fproxy = factory()->NewVariableProxy(fvar);
|
|
|
|
statement = factory()->NewExpressionStatement(
|
|
|
|
factory()->NewAssignment(Token::INIT, fproxy,
|
|
|
|
factory()->NewThisFunction(pos),
|
|
|
|
kNoSourcePosition),
|
|
|
|
kNoSourcePosition);
|
|
|
|
}
|
|
|
|
result->Set(index, statement);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-15 19:39:06 +00:00
|
|
|
// [if (IteratorType == kNormal)]
|
|
|
|
// !%_IsJSReceiver(result = iterator.next()) &&
|
|
|
|
// %ThrowIteratorResultNotAnObject(result)
|
|
|
|
// [else if (IteratorType == kAsync)]
|
|
|
|
// !%_IsJSReceiver(result = Await(iterator.next())) &&
|
|
|
|
// %ThrowIteratorResultNotAnObject(result)
|
|
|
|
// [endif]
|
2015-05-20 08:08:26 +00:00
|
|
|
Expression* Parser::BuildIteratorNextResult(Expression* iterator,
|
2017-02-15 19:39:06 +00:00
|
|
|
Variable* result, IteratorType type,
|
|
|
|
int pos) {
|
2015-05-20 08:08:26 +00:00
|
|
|
Expression* next_literal = factory()->NewStringLiteral(
|
2016-06-30 09:26:30 +00:00
|
|
|
ast_value_factory()->next_string(), kNoSourcePosition);
|
2015-05-20 08:08:26 +00:00
|
|
|
Expression* next_property =
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewProperty(iterator, next_literal, kNoSourcePosition);
|
2015-05-20 08:08:26 +00:00
|
|
|
ZoneList<Expression*>* next_arguments =
|
|
|
|
new (zone()) ZoneList<Expression*>(0, zone());
|
|
|
|
Expression* next_call =
|
2017-05-24 12:12:53 +00:00
|
|
|
factory()->NewCall(next_property, next_arguments, kNoSourcePosition);
|
2017-02-15 19:39:06 +00:00
|
|
|
if (type == IteratorType::kAsync) {
|
2017-07-14 15:20:23 +00:00
|
|
|
next_call = factory()->NewAwait(next_call, pos);
|
2017-02-15 19:39:06 +00:00
|
|
|
}
|
2015-05-20 08:08:26 +00:00
|
|
|
Expression* result_proxy = factory()->NewVariableProxy(result);
|
|
|
|
Expression* left =
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, result_proxy, next_call, pos);
|
|
|
|
|
2015-11-30 11:56:11 +00:00
|
|
|
// %_IsJSReceiver(...)
|
2015-05-20 08:08:26 +00:00
|
|
|
ZoneList<Expression*>* is_spec_object_args =
|
|
|
|
new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
is_spec_object_args->Add(left, zone());
|
|
|
|
Expression* is_spec_object_call = factory()->NewCallRuntime(
|
2015-11-30 11:56:11 +00:00
|
|
|
Runtime::kInlineIsJSReceiver, is_spec_object_args, pos);
|
2015-05-20 08:08:26 +00:00
|
|
|
|
|
|
|
// %ThrowIteratorResultNotAnObject(result)
|
|
|
|
Expression* result_proxy_again = factory()->NewVariableProxy(result);
|
|
|
|
ZoneList<Expression*>* throw_arguments =
|
|
|
|
new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
throw_arguments->Add(result_proxy_again, zone());
|
|
|
|
Expression* throw_call = factory()->NewCallRuntime(
|
2015-08-26 11:16:38 +00:00
|
|
|
Runtime::kThrowIteratorResultNotAnObject, throw_arguments, pos);
|
2015-05-20 08:08:26 +00:00
|
|
|
|
|
|
|
return factory()->NewBinaryOperation(
|
|
|
|
Token::AND,
|
|
|
|
factory()->NewUnaryOperation(Token::NOT, is_spec_object_call, pos),
|
|
|
|
throw_call, pos);
|
|
|
|
}
|
|
|
|
|
2016-07-07 08:15:11 +00:00
|
|
|
Statement* Parser::InitializeForEachStatement(ForEachStatement* stmt,
|
|
|
|
Expression* each,
|
|
|
|
Expression* subject,
|
2017-05-24 12:12:53 +00:00
|
|
|
Statement* body) {
|
2013-06-07 11:12:21 +00:00
|
|
|
ForOfStatement* for_of = stmt->AsForOfStatement();
|
|
|
|
if (for_of != NULL) {
|
2016-07-07 08:15:11 +00:00
|
|
|
const bool finalize = true;
|
|
|
|
return InitializeForOfStatement(for_of, each, subject, body, finalize,
|
2017-05-24 12:12:53 +00:00
|
|
|
IteratorType::kNormal, each->position());
|
2013-06-07 11:12:21 +00:00
|
|
|
} else {
|
2016-03-07 19:52:12 +00:00
|
|
|
if (each->IsArrayLiteral() || each->IsObjectLiteral()) {
|
2016-08-09 19:49:25 +00:00
|
|
|
Variable* temp = NewTemporary(ast_value_factory()->empty_string());
|
2015-12-11 19:38:57 +00:00
|
|
|
VariableProxy* temp_proxy = factory()->NewVariableProxy(temp);
|
2017-08-09 21:45:27 +00:00
|
|
|
Expression* assign_each =
|
|
|
|
RewriteDestructuringAssignment(factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, each, temp_proxy, kNoSourcePosition));
|
2017-08-29 18:01:54 +00:00
|
|
|
auto block = factory()->NewBlock(2, false);
|
2016-06-30 09:26:30 +00:00
|
|
|
block->statements()->Add(
|
|
|
|
factory()->NewExpressionStatement(assign_each, kNoSourcePosition),
|
|
|
|
zone());
|
2015-12-11 19:38:57 +00:00
|
|
|
block->statements()->Add(body, zone());
|
|
|
|
body = block;
|
|
|
|
each = factory()->NewVariableProxy(temp);
|
|
|
|
}
|
2016-12-08 10:05:43 +00:00
|
|
|
MarkExpressionAsAssigned(each);
|
2016-05-12 16:24:59 +00:00
|
|
|
stmt->AsForInStatement()->Initialize(each, subject, body);
|
2013-06-07 11:12:21 +00:00
|
|
|
}
|
2016-07-07 08:15:11 +00:00
|
|
|
return stmt;
|
2013-06-07 11:12:21 +00:00
|
|
|
}
|
|
|
|
|
2016-09-21 10:38:56 +00:00
|
|
|
// Special case for legacy for
|
|
|
|
//
|
|
|
|
// for (var x = initializer in enumerable) body
|
|
|
|
//
|
|
|
|
// An initialization block of the form
|
|
|
|
//
|
|
|
|
// {
|
|
|
|
// x = initializer;
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// is returned in this case. It has reserved space for two statements,
|
|
|
|
// so that (later on during parsing), the equivalent of
|
|
|
|
//
|
|
|
|
// for (x in enumerable) body
|
|
|
|
//
|
|
|
|
// is added as a second statement to it.
|
|
|
|
Block* Parser::RewriteForVarInLegacy(const ForInfo& for_info) {
|
|
|
|
const DeclarationParsingResult::Declaration& decl =
|
|
|
|
for_info.parsing_result.declarations[0];
|
|
|
|
if (!IsLexicalVariableMode(for_info.parsing_result.descriptor.mode) &&
|
|
|
|
decl.pattern->IsVariableProxy() && decl.initializer != nullptr) {
|
|
|
|
++use_counts_[v8::Isolate::kForInInitializer];
|
|
|
|
const AstRawString* name = decl.pattern->AsVariableProxy()->raw_name();
|
|
|
|
VariableProxy* single_var = NewUnresolved(name);
|
2017-08-29 18:20:42 +00:00
|
|
|
Block* init_block = factory()->NewBlock(2, true);
|
2016-09-21 10:38:56 +00:00
|
|
|
init_block->statements()->Add(
|
|
|
|
factory()->NewExpressionStatement(
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, single_var,
|
|
|
|
decl.initializer, kNoSourcePosition),
|
|
|
|
kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
return init_block;
|
|
|
|
}
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Rewrite a for-in/of statement of the form
|
|
|
|
//
|
|
|
|
// for (let/const/var x in/of e) b
|
|
|
|
//
|
|
|
|
// into
|
|
|
|
//
|
|
|
|
// {
|
2017-07-25 17:59:06 +00:00
|
|
|
// var temp;
|
|
|
|
// for (temp in/of e) {
|
|
|
|
// let/const/var x = temp;
|
2016-09-21 10:38:56 +00:00
|
|
|
// b;
|
|
|
|
// }
|
|
|
|
// let x; // for TDZ
|
|
|
|
// }
|
|
|
|
void Parser::DesugarBindingInForEachStatement(ForInfo* for_info,
|
|
|
|
Block** body_block,
|
|
|
|
Expression** each_variable,
|
|
|
|
bool* ok) {
|
2017-09-07 11:53:26 +00:00
|
|
|
DCHECK_EQ(1, for_info->parsing_result.declarations.size());
|
2016-09-21 10:38:56 +00:00
|
|
|
DeclarationParsingResult::Declaration& decl =
|
|
|
|
for_info->parsing_result.declarations[0];
|
|
|
|
Variable* temp = NewTemporary(ast_value_factory()->dot_for_string());
|
2017-08-29 18:01:54 +00:00
|
|
|
auto each_initialization_block = factory()->NewBlock(1, true);
|
2016-09-21 10:38:56 +00:00
|
|
|
{
|
|
|
|
auto descriptor = for_info->parsing_result.descriptor;
|
|
|
|
descriptor.declaration_pos = kNoSourcePosition;
|
|
|
|
descriptor.initialization_pos = kNoSourcePosition;
|
2017-07-25 17:59:06 +00:00
|
|
|
descriptor.scope = scope();
|
2016-09-21 10:38:56 +00:00
|
|
|
decl.initializer = factory()->NewVariableProxy(temp);
|
|
|
|
|
|
|
|
bool is_for_var_of =
|
|
|
|
for_info->mode == ForEachStatement::ITERATE &&
|
|
|
|
for_info->parsing_result.descriptor.mode == VariableMode::VAR;
|
2017-02-06 10:40:00 +00:00
|
|
|
bool collect_names =
|
|
|
|
IsLexicalVariableMode(for_info->parsing_result.descriptor.mode) ||
|
|
|
|
is_for_var_of;
|
2016-09-21 10:38:56 +00:00
|
|
|
|
2017-08-09 21:45:27 +00:00
|
|
|
DeclareAndInitializeVariables(
|
|
|
|
each_initialization_block, &descriptor, &decl,
|
2017-02-06 10:40:00 +00:00
|
|
|
collect_names ? &for_info->bound_names : nullptr, CHECK_OK_VOID);
|
2016-09-21 10:38:56 +00:00
|
|
|
|
|
|
|
// Annex B.3.5 prohibits the form
|
|
|
|
// `try {} catch(e) { for (var e of {}); }`
|
|
|
|
// So if we are parsing a statement like `for (var ... of ...)`
|
|
|
|
// we need to walk up the scope chain and look for catch scopes
|
|
|
|
// which have a simple binding, then compare their binding against
|
|
|
|
// all of the names declared in the init of the for-of we're
|
|
|
|
// parsing.
|
|
|
|
if (is_for_var_of) {
|
|
|
|
Scope* catch_scope = scope();
|
|
|
|
while (catch_scope != nullptr && !catch_scope->is_declaration_scope()) {
|
|
|
|
if (catch_scope->is_catch_scope()) {
|
2017-03-03 08:28:54 +00:00
|
|
|
auto name = catch_scope->catch_variable()->raw_name();
|
2016-09-21 10:38:56 +00:00
|
|
|
// If it's a simple binding and the name is declared in the for loop.
|
|
|
|
if (name != ast_value_factory()->dot_catch_string() &&
|
|
|
|
for_info->bound_names.Contains(name)) {
|
|
|
|
ReportMessageAt(for_info->parsing_result.bindings_loc,
|
|
|
|
MessageTemplate::kVarRedeclaration, name);
|
|
|
|
*ok = false;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch_scope = catch_scope->outer_scope();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
*body_block = factory()->NewBlock(3, false);
|
2016-09-21 10:38:56 +00:00
|
|
|
(*body_block)->statements()->Add(each_initialization_block, zone());
|
2016-10-25 07:59:05 +00:00
|
|
|
*each_variable = factory()->NewVariableProxy(temp, for_info->position);
|
2016-09-21 10:38:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Create a TDZ for any lexically-bound names in for in/of statements.
|
|
|
|
Block* Parser::CreateForEachStatementTDZ(Block* init_block,
|
|
|
|
const ForInfo& for_info, bool* ok) {
|
|
|
|
if (IsLexicalVariableMode(for_info.parsing_result.descriptor.mode)) {
|
|
|
|
DCHECK_NULL(init_block);
|
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
init_block = factory()->NewBlock(1, false);
|
2016-09-21 10:38:56 +00:00
|
|
|
|
|
|
|
for (int i = 0; i < for_info.bound_names.length(); ++i) {
|
|
|
|
// TODO(adamk): This needs to be some sort of special
|
|
|
|
// INTERNAL variable that's invisible to the debugger
|
|
|
|
// but visible to everything else.
|
|
|
|
Declaration* tdz_decl = DeclareVariable(for_info.bound_names[i], LET,
|
|
|
|
kNoSourcePosition, CHECK_OK);
|
|
|
|
tdz_decl->proxy()->var()->set_initializer_position(position());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return init_block;
|
|
|
|
}
|
|
|
|
|
2017-02-15 19:39:06 +00:00
|
|
|
Statement* Parser::InitializeForOfStatement(
|
|
|
|
ForOfStatement* for_of, Expression* each, Expression* iterable,
|
|
|
|
Statement* body, bool finalize, IteratorType type, int next_result_pos) {
|
2016-07-07 08:15:11 +00:00
|
|
|
// Create the auxiliary expressions needed for iterating over the iterable,
|
|
|
|
// and initialize the given ForOfStatement with them.
|
|
|
|
// If finalize is true, also instrument the loop with code that performs the
|
|
|
|
// proper ES6 iterator finalization. In that case, the result is not
|
|
|
|
// immediately a ForOfStatement.
|
|
|
|
const int nopos = kNoSourcePosition;
|
|
|
|
auto avfactory = ast_value_factory();
|
|
|
|
|
2016-12-08 10:05:43 +00:00
|
|
|
Variable* iterator = NewTemporary(avfactory->dot_iterator_string());
|
|
|
|
Variable* result = NewTemporary(avfactory->dot_result_string());
|
2016-08-09 19:49:25 +00:00
|
|
|
Variable* completion = NewTemporary(avfactory->empty_string());
|
2016-03-07 19:52:12 +00:00
|
|
|
|
2017-02-15 19:39:06 +00:00
|
|
|
// iterator = GetIterator(iterable, type)
|
2016-07-07 08:15:11 +00:00
|
|
|
Expression* assign_iterator;
|
|
|
|
{
|
|
|
|
assign_iterator = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(iterator),
|
2017-02-15 19:39:06 +00:00
|
|
|
factory()->NewGetIterator(iterable, type, iterable->position()),
|
[ignition] desugar GetIterator() via bytecode rather than via AST
Introduces:
- a new AST node representing the GetIterator() algorithm in the specification, to be used by ForOfStatement, YieldExpression (in the case of delegating yield*), and the future `for-await-of` loop proposed in http://tc39.github.io/proposal-async-iteration/#sec-async-iterator-value-unwrap-functions.
- a new opcode (JumpIfJSReceiver), which is useful for `if Type(object) is not Object` checks which are common throughout the specification. This node is easily eliminated by TurboFan.
The AST node is desugared specially in bytecode, rather than manually when building the AST. The benefit of this is that desugaring in the BytecodeGenerator is much simpler and easier to understand than desugaring the AST.
This also reduces parse time very slightly, and allows us to use LoadIC rather than KeyedLoadIC, which seems to have better baseline performance. This results in a ~20% improvement in test/js-perf-test/Iterators micro-benchmarks, which I believe owes to the use of the slightly faster LoadIC as opposed to the KeyedLoadIC in the baseline case. Both produce identical optimized code via TurboFan when the type check can be eliminated, and the load can be replaced with a constant value.
BUG=v8:4280
R=bmeurer@chromium.org, rmcilroy@chromium.org, adamk@chromium.org, neis@chromium.org, jarin@chromium.org
TBR=rossberg@chromium.org
Review-Url: https://codereview.chromium.org/2557593004
Cr-Commit-Position: refs/heads/master@{#41555}
2016-12-07 15:19:52 +00:00
|
|
|
iterable->position());
|
2016-07-07 08:15:11 +00:00
|
|
|
}
|
2016-03-07 19:52:12 +00:00
|
|
|
|
2017-02-15 19:39:06 +00:00
|
|
|
// [if (IteratorType == kNormal)]
|
|
|
|
// !%_IsJSReceiver(result = iterator.next()) &&
|
|
|
|
// %ThrowIteratorResultNotAnObject(result)
|
|
|
|
// [else if (IteratorType == kAsync)]
|
|
|
|
// !%_IsJSReceiver(result = Await(iterator.next())) &&
|
|
|
|
// %ThrowIteratorResultNotAnObject(result)
|
|
|
|
// [endif]
|
2016-07-07 08:15:11 +00:00
|
|
|
Expression* next_result;
|
2016-03-07 19:52:12 +00:00
|
|
|
{
|
|
|
|
Expression* iterator_proxy = factory()->NewVariableProxy(iterator);
|
|
|
|
next_result =
|
2017-02-15 19:39:06 +00:00
|
|
|
BuildIteratorNextResult(iterator_proxy, result, type, next_result_pos);
|
2016-03-07 19:52:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// result.done
|
2016-07-07 08:15:11 +00:00
|
|
|
Expression* result_done;
|
2016-03-07 19:52:12 +00:00
|
|
|
{
|
|
|
|
Expression* done_literal = factory()->NewStringLiteral(
|
2016-06-30 09:26:30 +00:00
|
|
|
ast_value_factory()->done_string(), kNoSourcePosition);
|
2016-03-07 19:52:12 +00:00
|
|
|
Expression* result_proxy = factory()->NewVariableProxy(result);
|
2016-06-30 09:26:30 +00:00
|
|
|
result_done =
|
|
|
|
factory()->NewProperty(result_proxy, done_literal, kNoSourcePosition);
|
2016-03-07 19:52:12 +00:00
|
|
|
}
|
|
|
|
|
2016-07-07 08:15:11 +00:00
|
|
|
// result.value
|
|
|
|
Expression* result_value;
|
2016-03-07 19:52:12 +00:00
|
|
|
{
|
2016-07-07 08:15:11 +00:00
|
|
|
Expression* value_literal =
|
|
|
|
factory()->NewStringLiteral(avfactory->value_string(), nopos);
|
2016-03-07 19:52:12 +00:00
|
|
|
Expression* result_proxy = factory()->NewVariableProxy(result);
|
2016-07-07 08:15:11 +00:00
|
|
|
result_value = factory()->NewProperty(result_proxy, value_literal, nopos);
|
|
|
|
}
|
|
|
|
|
2017-08-14 21:28:20 +00:00
|
|
|
// {{tmp = #result_value, completion = kAbruptCompletion, tmp}}
|
2016-07-07 08:15:11 +00:00
|
|
|
// Expression* result_value (gets overwritten)
|
|
|
|
if (finalize) {
|
2017-08-14 21:28:20 +00:00
|
|
|
Variable* tmp = NewTemporary(avfactory->empty_string());
|
|
|
|
Expression* save_result = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(tmp), result_value, nopos);
|
2016-07-07 08:15:11 +00:00
|
|
|
|
2017-08-14 21:28:20 +00:00
|
|
|
Expression* set_completion_abrupt = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(completion),
|
|
|
|
factory()->NewSmiLiteral(Parser::kAbruptCompletion, nopos), nopos);
|
2016-07-07 08:15:11 +00:00
|
|
|
|
2017-08-14 21:28:20 +00:00
|
|
|
result_value = factory()->NewBinaryOperation(Token::COMMA, save_result,
|
|
|
|
set_completion_abrupt, nopos);
|
|
|
|
result_value = factory()->NewBinaryOperation(
|
|
|
|
Token::COMMA, result_value, factory()->NewVariableProxy(tmp), nopos);
|
2016-07-07 08:15:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// each = #result_value;
|
|
|
|
Expression* assign_each;
|
|
|
|
{
|
|
|
|
assign_each =
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, each, result_value, nopos);
|
2016-03-07 19:52:12 +00:00
|
|
|
if (each->IsArrayLiteral() || each->IsObjectLiteral()) {
|
2017-08-09 21:45:27 +00:00
|
|
|
assign_each = RewriteDestructuringAssignment(assign_each->AsAssignment());
|
2016-03-07 19:52:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-07 08:15:11 +00:00
|
|
|
// {{completion = kNormalCompletion;}}
|
|
|
|
Statement* set_completion_normal;
|
|
|
|
if (finalize) {
|
|
|
|
Expression* proxy = factory()->NewVariableProxy(completion);
|
|
|
|
Expression* assignment = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, proxy,
|
|
|
|
factory()->NewSmiLiteral(Parser::kNormalCompletion, nopos), nopos);
|
|
|
|
|
2017-02-27 16:22:25 +00:00
|
|
|
set_completion_normal =
|
|
|
|
IgnoreCompletion(factory()->NewExpressionStatement(assignment, nopos));
|
2016-07-07 08:15:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// { #loop-body; #set_completion_normal }
|
|
|
|
// Statement* body (gets overwritten)
|
|
|
|
if (finalize) {
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* block = factory()->NewBlock(2, false);
|
2016-07-07 08:15:11 +00:00
|
|
|
block->statements()->Add(body, zone());
|
|
|
|
block->statements()->Add(set_completion_normal, zone());
|
|
|
|
body = block;
|
|
|
|
}
|
|
|
|
|
2016-05-12 16:24:59 +00:00
|
|
|
for_of->Initialize(body, iterator, assign_iterator, next_result, result_done,
|
|
|
|
assign_each);
|
2017-02-15 19:39:06 +00:00
|
|
|
return finalize ? FinalizeForOfStatement(for_of, completion, type, nopos)
|
|
|
|
: for_of;
|
2016-03-07 19:52:12 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 18:34:30 +00:00
|
|
|
Statement* Parser::DesugarLexicalBindingsInForStatement(
|
2014-06-24 14:03:24 +00:00
|
|
|
ForStatement* loop, Statement* init, Expression* cond, Statement* next,
|
2017-08-15 17:52:52 +00:00
|
|
|
Statement* body, Scope* inner_scope, const ForInfo& for_info, bool* ok) {
|
2015-10-08 13:56:49 +00:00
|
|
|
// ES6 13.7.4.8 specifies that on each loop iteration the let variables are
|
|
|
|
// copied into a new environment. Moreover, the "next" statement must be
|
|
|
|
// evaluated not in the environment of the just completed iteration but in
|
|
|
|
// that of the upcoming one. We achieve this with the following desugaring.
|
|
|
|
// Extra care is needed to preserve the completion value of the original loop.
|
2014-05-26 08:07:02 +00:00
|
|
|
//
|
2015-10-08 13:56:49 +00:00
|
|
|
// We are given a for statement of the form
|
2014-05-26 08:07:02 +00:00
|
|
|
//
|
2015-03-03 18:34:30 +00:00
|
|
|
// labels: for (let/const x = i; cond; next) body
|
2014-05-26 08:07:02 +00:00
|
|
|
//
|
2015-10-08 13:56:49 +00:00
|
|
|
// and rewrite it as follows. Here we write {{ ... }} for init-blocks, ie.,
|
|
|
|
// blocks whose ignore_completion_value_ flag is set.
|
2014-05-26 08:07:02 +00:00
|
|
|
//
|
|
|
|
// {
|
2015-03-03 18:34:30 +00:00
|
|
|
// let/const x = i;
|
2014-11-14 19:32:53 +00:00
|
|
|
// temp_x = x;
|
|
|
|
// first = 1;
|
2015-06-18 11:54:03 +00:00
|
|
|
// undefined;
|
2014-11-14 19:32:53 +00:00
|
|
|
// outer: for (;;) {
|
2015-10-08 13:56:49 +00:00
|
|
|
// let/const x = temp_x;
|
|
|
|
// {{ if (first == 1) {
|
|
|
|
// first = 0;
|
|
|
|
// } else {
|
|
|
|
// next;
|
|
|
|
// }
|
|
|
|
// flag = 1;
|
|
|
|
// if (!cond) break;
|
|
|
|
// }}
|
2014-11-14 19:32:53 +00:00
|
|
|
// labels: for (; flag == 1; flag = 0, temp_x = x) {
|
2015-10-08 13:56:49 +00:00
|
|
|
// body
|
2014-11-14 19:32:53 +00:00
|
|
|
// }
|
2015-10-08 13:56:49 +00:00
|
|
|
// {{ if (flag == 1) // Body used break.
|
|
|
|
// break;
|
|
|
|
// }}
|
2014-11-14 19:32:53 +00:00
|
|
|
// }
|
2014-05-26 08:07:02 +00:00
|
|
|
// }
|
|
|
|
|
2016-09-21 10:38:56 +00:00
|
|
|
DCHECK(for_info.bound_names.length() > 0);
|
|
|
|
ZoneList<Variable*> temps(for_info.bound_names.length(), zone());
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* outer_block =
|
|
|
|
factory()->NewBlock(for_info.bound_names.length() + 4, false);
|
2014-11-14 19:32:53 +00:00
|
|
|
|
2015-03-03 18:34:30 +00:00
|
|
|
// Add statement: let/const x = i.
|
2015-10-01 13:59:36 +00:00
|
|
|
outer_block->statements()->Add(init, zone());
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2014-09-11 09:52:36 +00:00
|
|
|
const AstRawString* temp_name = ast_value_factory()->dot_for_string();
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2015-03-03 18:34:30 +00:00
|
|
|
// For each lexical variable x:
|
2014-05-26 08:07:02 +00:00
|
|
|
// make statement: temp_x = x.
|
2016-09-21 10:38:56 +00:00
|
|
|
for (int i = 0; i < for_info.bound_names.length(); i++) {
|
|
|
|
VariableProxy* proxy = NewUnresolved(for_info.bound_names[i]);
|
2016-08-09 19:49:25 +00:00
|
|
|
Variable* temp = NewTemporary(temp_name);
|
2014-05-26 08:07:02 +00:00
|
|
|
VariableProxy* temp_proxy = factory()->NewVariableProxy(temp);
|
2016-06-30 09:26:30 +00:00
|
|
|
Assignment* assignment = factory()->NewAssignment(Token::ASSIGN, temp_proxy,
|
|
|
|
proxy, kNoSourcePosition);
|
|
|
|
Statement* assignment_statement =
|
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition);
|
2015-10-01 13:59:36 +00:00
|
|
|
outer_block->statements()->Add(assignment_statement, zone());
|
2014-05-26 08:07:02 +00:00
|
|
|
temps.Add(temp, zone());
|
|
|
|
}
|
|
|
|
|
2014-11-14 19:32:53 +00:00
|
|
|
Variable* first = NULL;
|
|
|
|
// Make statement: first = 1.
|
|
|
|
if (next) {
|
2016-08-09 19:49:25 +00:00
|
|
|
first = NewTemporary(temp_name);
|
2014-11-14 19:32:53 +00:00
|
|
|
VariableProxy* first_proxy = factory()->NewVariableProxy(first);
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* const1 = factory()->NewSmiLiteral(1, kNoSourcePosition);
|
2014-05-26 08:07:02 +00:00
|
|
|
Assignment* assignment = factory()->NewAssignment(
|
2016-06-30 09:26:30 +00:00
|
|
|
Token::ASSIGN, first_proxy, const1, kNoSourcePosition);
|
2014-11-14 19:32:53 +00:00
|
|
|
Statement* assignment_statement =
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition);
|
2015-10-01 13:59:36 +00:00
|
|
|
outer_block->statements()->Add(assignment_statement, zone());
|
2014-05-26 08:07:02 +00:00
|
|
|
}
|
|
|
|
|
2015-06-18 11:54:03 +00:00
|
|
|
// make statement: undefined;
|
2015-10-01 13:59:36 +00:00
|
|
|
outer_block->statements()->Add(
|
2015-06-18 11:54:03 +00:00
|
|
|
factory()->NewExpressionStatement(
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewUndefinedLiteral(kNoSourcePosition), kNoSourcePosition),
|
2015-06-18 11:54:03 +00:00
|
|
|
zone());
|
|
|
|
|
2014-11-14 19:32:53 +00:00
|
|
|
// Make statement: outer: for (;;)
|
|
|
|
// Note that we don't actually create the label, or set this loop up as an
|
|
|
|
// explicit break target, instead handing it directly to those nodes that
|
|
|
|
// need to know about it. This should be safe because we don't run any code
|
|
|
|
// in this function that looks up break targets.
|
|
|
|
ForStatement* outer_loop =
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewForStatement(NULL, kNoSourcePosition);
|
2015-10-01 13:59:36 +00:00
|
|
|
outer_block->statements()->Add(outer_loop, zone());
|
2016-07-19 10:06:38 +00:00
|
|
|
outer_block->set_scope(scope());
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* inner_block = factory()->NewBlock(3, false);
|
2016-01-14 19:25:09 +00:00
|
|
|
{
|
2017-02-20 10:41:29 +00:00
|
|
|
BlockState block_state(&scope_, inner_scope);
|
2016-01-14 19:25:09 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* ignore_completion_block =
|
|
|
|
factory()->NewBlock(for_info.bound_names.length() + 3, true);
|
2016-09-21 10:38:56 +00:00
|
|
|
ZoneList<Variable*> inner_vars(for_info.bound_names.length(), zone());
|
2016-01-14 19:25:09 +00:00
|
|
|
// For each let variable x:
|
|
|
|
// make statement: let/const x = temp_x.
|
2016-09-21 10:38:56 +00:00
|
|
|
for (int i = 0; i < for_info.bound_names.length(); i++) {
|
|
|
|
Declaration* decl = DeclareVariable(
|
|
|
|
for_info.bound_names[i], for_info.parsing_result.descriptor.mode,
|
|
|
|
kNoSourcePosition, CHECK_OK);
|
2016-08-09 08:48:34 +00:00
|
|
|
inner_vars.Add(decl->proxy()->var(), zone());
|
2016-01-14 19:25:09 +00:00
|
|
|
VariableProxy* temp_proxy = factory()->NewVariableProxy(temps.at(i));
|
|
|
|
Assignment* assignment = factory()->NewAssignment(
|
2016-08-09 08:48:34 +00:00
|
|
|
Token::INIT, decl->proxy(), temp_proxy, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
Statement* assignment_statement =
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition);
|
2017-08-29 18:20:42 +00:00
|
|
|
int declaration_pos = for_info.parsing_result.descriptor.declaration_pos;
|
|
|
|
DCHECK(declaration_pos != kNoSourcePosition);
|
|
|
|
decl->proxy()->var()->set_initializer_position(declaration_pos);
|
2016-01-14 19:25:09 +00:00
|
|
|
ignore_completion_block->statements()->Add(assignment_statement, zone());
|
|
|
|
}
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2016-01-14 19:25:09 +00:00
|
|
|
// Make statement: if (first == 1) { first = 0; } else { next; }
|
|
|
|
if (next) {
|
|
|
|
DCHECK(first);
|
|
|
|
Expression* compare = NULL;
|
|
|
|
// Make compare expression: first == 1.
|
|
|
|
{
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* const1 = factory()->NewSmiLiteral(1, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
VariableProxy* first_proxy = factory()->NewVariableProxy(first);
|
|
|
|
compare = factory()->NewCompareOperation(Token::EQ, first_proxy, const1,
|
2016-06-30 09:26:30 +00:00
|
|
|
kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
}
|
|
|
|
Statement* clear_first = NULL;
|
|
|
|
// Make statement: first = 0.
|
|
|
|
{
|
|
|
|
VariableProxy* first_proxy = factory()->NewVariableProxy(first);
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* const0 = factory()->NewSmiLiteral(0, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
Assignment* assignment = factory()->NewAssignment(
|
2016-06-30 09:26:30 +00:00
|
|
|
Token::ASSIGN, first_proxy, const0, kNoSourcePosition);
|
|
|
|
clear_first =
|
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
}
|
|
|
|
Statement* clear_first_or_next = factory()->NewIfStatement(
|
2016-06-30 09:26:30 +00:00
|
|
|
compare, clear_first, next, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
ignore_completion_block->statements()->Add(clear_first_or_next, zone());
|
2014-05-26 08:07:02 +00:00
|
|
|
}
|
2016-01-14 19:25:09 +00:00
|
|
|
|
2016-08-09 19:49:25 +00:00
|
|
|
Variable* flag = NewTemporary(temp_name);
|
2016-01-14 19:25:09 +00:00
|
|
|
// Make statement: flag = 1.
|
2014-05-26 08:07:02 +00:00
|
|
|
{
|
2016-01-14 19:25:09 +00:00
|
|
|
VariableProxy* flag_proxy = factory()->NewVariableProxy(flag);
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* const1 = factory()->NewSmiLiteral(1, kNoSourcePosition);
|
2014-05-26 08:07:02 +00:00
|
|
|
Assignment* assignment = factory()->NewAssignment(
|
2016-06-30 09:26:30 +00:00
|
|
|
Token::ASSIGN, flag_proxy, const1, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
Statement* assignment_statement =
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
ignore_completion_block->statements()->Add(assignment_statement, zone());
|
2014-05-26 08:07:02 +00:00
|
|
|
}
|
2015-10-08 13:56:49 +00:00
|
|
|
|
2016-01-14 19:25:09 +00:00
|
|
|
// Make statement: if (!cond) break.
|
|
|
|
if (cond) {
|
|
|
|
Statement* stop =
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewBreakStatement(outer_loop, kNoSourcePosition);
|
|
|
|
Statement* noop = factory()->NewEmptyStatement(kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
ignore_completion_block->statements()->Add(
|
|
|
|
factory()->NewIfStatement(cond, noop, stop, cond->position()),
|
|
|
|
zone());
|
|
|
|
}
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2016-01-14 19:25:09 +00:00
|
|
|
inner_block->statements()->Add(ignore_completion_block, zone());
|
|
|
|
// Make cond expression for main loop: flag == 1.
|
|
|
|
Expression* flag_cond = NULL;
|
2014-11-14 19:32:53 +00:00
|
|
|
{
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* const1 = factory()->NewSmiLiteral(1, kNoSourcePosition);
|
2014-11-14 19:32:53 +00:00
|
|
|
VariableProxy* flag_proxy = factory()->NewVariableProxy(flag);
|
2016-01-14 19:25:09 +00:00
|
|
|
flag_cond = factory()->NewCompareOperation(Token::EQ, flag_proxy, const1,
|
2016-06-30 09:26:30 +00:00
|
|
|
kNoSourcePosition);
|
2014-11-14 19:32:53 +00:00
|
|
|
}
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2016-01-14 19:25:09 +00:00
|
|
|
// Create chain of expressions "flag = 0, temp_x = x, ..."
|
|
|
|
Statement* compound_next_statement = NULL;
|
|
|
|
{
|
|
|
|
Expression* compound_next = NULL;
|
|
|
|
// Make expression: flag = 0.
|
|
|
|
{
|
|
|
|
VariableProxy* flag_proxy = factory()->NewVariableProxy(flag);
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* const0 = factory()->NewSmiLiteral(0, kNoSourcePosition);
|
|
|
|
compound_next = factory()->NewAssignment(Token::ASSIGN, flag_proxy,
|
|
|
|
const0, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
}
|
2014-11-14 19:32:53 +00:00
|
|
|
|
2016-01-14 19:25:09 +00:00
|
|
|
// Make the comma-separated list of temp_x = x assignments.
|
|
|
|
int inner_var_proxy_pos = scanner()->location().beg_pos;
|
2016-09-21 10:38:56 +00:00
|
|
|
for (int i = 0; i < for_info.bound_names.length(); i++) {
|
2016-01-14 19:25:09 +00:00
|
|
|
VariableProxy* temp_proxy = factory()->NewVariableProxy(temps.at(i));
|
|
|
|
VariableProxy* proxy =
|
|
|
|
factory()->NewVariableProxy(inner_vars.at(i), inner_var_proxy_pos);
|
|
|
|
Assignment* assignment = factory()->NewAssignment(
|
2016-06-30 09:26:30 +00:00
|
|
|
Token::ASSIGN, temp_proxy, proxy, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
compound_next = factory()->NewBinaryOperation(
|
2016-06-30 09:26:30 +00:00
|
|
|
Token::COMMA, compound_next, assignment, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
}
|
2014-11-14 19:32:53 +00:00
|
|
|
|
2016-06-30 09:26:30 +00:00
|
|
|
compound_next_statement =
|
|
|
|
factory()->NewExpressionStatement(compound_next, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
}
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2016-01-14 19:25:09 +00:00
|
|
|
// Make statement: labels: for (; flag == 1; flag = 0, temp_x = x)
|
|
|
|
// Note that we re-use the original loop node, which retains its labels
|
|
|
|
// and ensures that any break or continue statements in body point to
|
|
|
|
// the right place.
|
|
|
|
loop->Initialize(NULL, flag_cond, compound_next_statement, body);
|
|
|
|
inner_block->statements()->Add(loop, zone());
|
|
|
|
|
|
|
|
// Make statement: {{if (flag == 1) break;}}
|
2014-11-14 19:32:53 +00:00
|
|
|
{
|
2016-01-14 19:25:09 +00:00
|
|
|
Expression* compare = NULL;
|
|
|
|
// Make compare expresion: flag == 1.
|
|
|
|
{
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* const1 = factory()->NewSmiLiteral(1, kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
VariableProxy* flag_proxy = factory()->NewVariableProxy(flag);
|
|
|
|
compare = factory()->NewCompareOperation(Token::EQ, flag_proxy, const1,
|
2016-06-30 09:26:30 +00:00
|
|
|
kNoSourcePosition);
|
2016-01-14 19:25:09 +00:00
|
|
|
}
|
|
|
|
Statement* stop =
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewBreakStatement(outer_loop, kNoSourcePosition);
|
|
|
|
Statement* empty = factory()->NewEmptyStatement(kNoSourcePosition);
|
|
|
|
Statement* if_flag_break =
|
|
|
|
factory()->NewIfStatement(compare, stop, empty, kNoSourcePosition);
|
2017-02-27 16:22:25 +00:00
|
|
|
inner_block->statements()->Add(IgnoreCompletion(if_flag_break), zone());
|
2016-01-14 19:25:09 +00:00
|
|
|
}
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2016-01-14 19:25:09 +00:00
|
|
|
inner_block->set_scope(inner_scope);
|
|
|
|
}
|
2014-05-26 08:07:02 +00:00
|
|
|
|
2017-07-12 13:06:09 +00:00
|
|
|
outer_loop->Initialize(NULL, NULL, NULL, inner_block);
|
|
|
|
|
2014-05-26 08:07:02 +00:00
|
|
|
return outer_block;
|
|
|
|
}
|
|
|
|
|
2016-09-27 18:01:58 +00:00
|
|
|
void Parser::AddArrowFunctionFormalParameters(
|
2016-04-20 20:48:32 +00:00
|
|
|
ParserFormalParameters* parameters, Expression* expr, int end_pos,
|
|
|
|
bool* ok) {
|
2015-04-21 14:44:18 +00:00
|
|
|
// ArrowFunctionFormals ::
|
2015-06-10 16:11:25 +00:00
|
|
|
// Binary(Token::COMMA, NonTailArrowFunctionFormals, Tail)
|
|
|
|
// Tail
|
|
|
|
// NonTailArrowFunctionFormals ::
|
|
|
|
// Binary(Token::COMMA, NonTailArrowFunctionFormals, VariableProxy)
|
|
|
|
// VariableProxy
|
|
|
|
// Tail ::
|
2015-04-21 14:44:18 +00:00
|
|
|
// VariableProxy
|
2015-06-10 16:11:25 +00:00
|
|
|
// Spread(VariableProxy)
|
2015-04-21 14:44:18 +00:00
|
|
|
//
|
|
|
|
// As we need to visit the parameters in left-to-right order, we recurse on
|
|
|
|
// the left-hand side of comma expressions.
|
|
|
|
//
|
|
|
|
if (expr->IsBinaryOperation()) {
|
|
|
|
BinaryOperation* binop = expr->AsBinaryOperation();
|
2015-05-13 13:32:27 +00:00
|
|
|
// The classifier has already run, so we know that the expression is a valid
|
|
|
|
// arrow function formals production.
|
|
|
|
DCHECK_EQ(binop->op(), Token::COMMA);
|
2015-04-21 14:44:18 +00:00
|
|
|
Expression* left = binop->left();
|
|
|
|
Expression* right = binop->right();
|
2016-04-20 20:48:32 +00:00
|
|
|
int comma_pos = binop->position();
|
2016-09-27 18:01:58 +00:00
|
|
|
AddArrowFunctionFormalParameters(parameters, left, comma_pos,
|
|
|
|
CHECK_OK_VOID);
|
2015-04-21 14:44:18 +00:00
|
|
|
// LHS of comma expression should be unparenthesized.
|
|
|
|
expr = right;
|
|
|
|
}
|
2015-04-21 11:09:53 +00:00
|
|
|
|
2015-06-10 16:11:25 +00:00
|
|
|
// Only the right-most expression may be a rest parameter.
|
2015-07-23 11:53:31 +00:00
|
|
|
DCHECK(!parameters->has_rest);
|
2015-06-10 16:11:25 +00:00
|
|
|
|
2015-07-23 11:53:31 +00:00
|
|
|
bool is_rest = expr->IsSpread();
|
2015-07-23 14:28:59 +00:00
|
|
|
if (is_rest) {
|
|
|
|
expr = expr->AsSpread()->expression();
|
|
|
|
parameters->has_rest = true;
|
|
|
|
}
|
2017-09-25 05:31:24 +00:00
|
|
|
DCHECK_IMPLIES(parameters->is_simple, !is_rest);
|
|
|
|
DCHECK_IMPLIES(parameters->is_simple, expr->IsVariableProxy());
|
2015-06-10 16:11:25 +00:00
|
|
|
|
2015-08-24 18:00:59 +00:00
|
|
|
Expression* initializer = nullptr;
|
2016-07-22 23:28:10 +00:00
|
|
|
if (expr->IsAssignment()) {
|
2017-08-19 01:24:34 +00:00
|
|
|
if (expr->IsRewritableExpression()) {
|
|
|
|
// This expression was parsed as a possible destructuring assignment.
|
|
|
|
// Mark it as already-rewritten to avoid an unnecessary visit later.
|
|
|
|
expr->AsRewritableExpression()->set_rewritten();
|
|
|
|
}
|
2015-08-24 18:00:59 +00:00
|
|
|
Assignment* assignment = expr->AsAssignment();
|
2017-08-16 16:50:09 +00:00
|
|
|
DCHECK(!assignment->IsCompoundAssignment());
|
2015-08-24 18:00:59 +00:00
|
|
|
initializer = assignment->value();
|
|
|
|
expr = assignment->target();
|
2015-08-17 12:01:55 +00:00
|
|
|
}
|
|
|
|
|
2017-02-20 16:01:12 +00:00
|
|
|
AddFormalParameter(parameters, expr, initializer,
|
|
|
|
end_pos, is_rest);
|
2015-08-05 12:00:41 +00:00
|
|
|
}
|
|
|
|
|
2016-09-27 18:01:58 +00:00
|
|
|
void Parser::DeclareArrowFunctionFormalParameters(
|
2015-08-05 12:00:41 +00:00
|
|
|
ParserFormalParameters* parameters, Expression* expr,
|
2016-07-22 23:28:10 +00:00
|
|
|
const Scanner::Location& params_loc, Scanner::Location* duplicate_loc,
|
2016-09-27 18:01:58 +00:00
|
|
|
bool* ok) {
|
2015-08-26 09:36:39 +00:00
|
|
|
if (expr->IsEmptyParentheses()) return;
|
|
|
|
|
2016-09-27 18:01:58 +00:00
|
|
|
AddArrowFunctionFormalParameters(parameters, expr, params_loc.end_pos,
|
|
|
|
CHECK_OK_VOID);
|
2016-07-22 23:28:10 +00:00
|
|
|
|
2016-10-13 12:34:37 +00:00
|
|
|
if (parameters->arity > Code::kMaxArguments) {
|
2016-08-25 08:48:45 +00:00
|
|
|
ReportMessageAt(params_loc, MessageTemplate::kMalformedArrowFunParamList);
|
2016-04-20 20:48:32 +00:00
|
|
|
*ok = false;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-06-09 10:40:22 +00:00
|
|
|
bool has_duplicate = false;
|
|
|
|
DeclareFormalParameters(parameters->scope, parameters->params,
|
|
|
|
parameters->is_simple, &has_duplicate);
|
|
|
|
if (has_duplicate) {
|
|
|
|
*duplicate_loc = scanner()->location();
|
2015-06-10 16:11:25 +00:00
|
|
|
}
|
2015-08-07 11:38:20 +00:00
|
|
|
DCHECK_EQ(parameters->is_simple, parameters->scope->has_simple_parameters());
|
Implement handling of arrow functions in the parser
Arrow functions are parsed from ParseAssignmentExpression(). Handling the
parameter list is done by letting ParseConditionalExpression() parse a comma
separated list of identifiers, and it returns a tree of BinaryOperation nodes
with VariableProxy leaves, or a single VariableProxy if there is only one
parameter. When the arrow token "=>" is found, the VariableProxy nodes are
passed to ParseArrowFunctionLiteral(), which will then skip parsing the
paramaeter list. This avoids having to rewind when the arrow is found and
restart parsing the parameter list.
Note that the empty parameter list "()" is handled directly in
ParsePrimaryExpression(): after is has consumed the opening parenthesis,
if a closing parenthesis follows, then the only valid input is an arrow
function. In this case, ParsePrimaryExpression() directly calls
ParseArrowFunctionLiteral(), to avoid needing to return a sentinel value
to signal the empty parameter list. Because it will consume the body of
the arrow function, ParseAssignmentExpression() will not see the arrow
"=>" token as next, and return the already-parser expression.
The implementation is done in ParserBase, so it was needed to do some
additions to ParserBase, ParserTraits and PreParserTraits. Some of the
glue code can be removed later on when more more functionality is moved
to ParserBase.
Additionally, this adds a runtime flag "harmony_arrow_functions"
(disabled by default); enabling "harmony" will enable it as well.
BUG=v8:2700
LOG=N
R=marja@chromium.org
Review URL: https://codereview.chromium.org/383983002
Patch from Adrián Pérez de Castro <aperez@igalia.com>.
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22366 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2014-07-14 07:55:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-12 09:57:17 +00:00
|
|
|
void Parser::PrepareGeneratorVariables() {
|
2017-05-24 13:54:57 +00:00
|
|
|
// The code produced for generators relies on forced context allocation of
|
|
|
|
// parameters (it does not restore the frame's parameters upon resume).
|
|
|
|
function_state_->scope()->ForceContextAllocationForParameters();
|
2016-09-30 07:53:43 +00:00
|
|
|
|
|
|
|
// Calling a generator returns a generator object. That object is stored
|
|
|
|
// in a temporary variable, a definition that is used by "yield"
|
|
|
|
// expressions.
|
2017-02-10 14:38:58 +00:00
|
|
|
function_state_->scope()->DeclareGeneratorObjectVar(
|
|
|
|
ast_value_factory()->dot_generator_object_string());
|
2016-09-30 07:53:43 +00:00
|
|
|
}
|
2015-06-26 21:39:43 +00:00
|
|
|
|
2013-06-06 13:28:22 +00:00
|
|
|
FunctionLiteral* Parser::ParseFunctionLiteral(
|
2014-09-10 16:39:42 +00:00
|
|
|
const AstRawString* function_name, Scanner::Location function_name_location,
|
2015-07-09 21:31:11 +00:00
|
|
|
FunctionNameValidity function_name_validity, FunctionKind kind,
|
|
|
|
int function_token_pos, FunctionLiteral::FunctionType function_type,
|
2015-07-15 09:14:49 +00:00
|
|
|
LanguageMode language_mode, bool* ok) {
|
2008-07-03 15:10:15 +00:00
|
|
|
// Function ::
|
|
|
|
// '(' FormalParameterList? ')' '{' FunctionBody '}'
|
2014-06-17 07:23:26 +00:00
|
|
|
//
|
|
|
|
// Getter ::
|
|
|
|
// '(' ')' '{' FunctionBody '}'
|
|
|
|
//
|
|
|
|
// Setter ::
|
|
|
|
// '(' PropertySetParameterList ')' '{' FunctionBody '}'
|
2008-07-03 15:10:15 +00:00
|
|
|
|
2016-06-30 09:26:30 +00:00
|
|
|
int pos = function_token_pos == kNoSourcePosition ? peek_position()
|
|
|
|
: function_token_pos;
|
2013-10-14 09:24:58 +00:00
|
|
|
|
2011-08-08 16:14:46 +00:00
|
|
|
// Anonymous functions were passed either the empty symbol or a null
|
|
|
|
// handle as the function name. Remember if we were passed a non-empty
|
|
|
|
// handle to decide whether to invoke function name inference.
|
2014-06-24 14:03:24 +00:00
|
|
|
bool should_infer_name = function_name == NULL;
|
2011-08-08 16:14:46 +00:00
|
|
|
|
2017-06-19 15:13:45 +00:00
|
|
|
// We want a non-null handle as the function name by default. We will handle
|
|
|
|
// the "function does not have a shared name" case later.
|
|
|
|
if (should_infer_name) {
|
|
|
|
function_name = ast_value_factory()->empty_string();
|
|
|
|
}
|
|
|
|
|
2016-08-04 19:15:18 +00:00
|
|
|
FunctionLiteral::EagerCompileHint eager_compile_hint =
|
2016-11-18 14:56:32 +00:00
|
|
|
function_state_->next_function_is_likely_called()
|
2016-08-04 19:15:18 +00:00
|
|
|
? FunctionLiteral::kShouldEagerCompile
|
2016-10-07 09:12:48 +00:00
|
|
|
: default_eager_compile_hint();
|
2016-08-04 19:15:18 +00:00
|
|
|
|
|
|
|
// Determine if the function can be parsed lazily. Lazy parsing is
|
|
|
|
// different from lazy compilation; we need to parse more eagerly than we
|
|
|
|
// compile.
|
|
|
|
|
|
|
|
// We can only parse lazily if we also compile lazily. The heuristics for lazy
|
|
|
|
// compilation are:
|
|
|
|
// - It must not have been prohibited by the caller to Parse (some callers
|
|
|
|
// need a full AST).
|
|
|
|
// - The outer scope must allow lazy compilation of inner functions.
|
|
|
|
// - The function mustn't be a function expression with an open parenthesis
|
|
|
|
// before; we consider that a hint that the function will be called
|
|
|
|
// immediately, and it would be a waste of time to make it lazily
|
|
|
|
// compiled.
|
|
|
|
// These are all things we can know at this point, without looking at the
|
|
|
|
// function itself.
|
|
|
|
|
2016-09-27 09:48:17 +00:00
|
|
|
// We separate between lazy parsing top level functions and lazy parsing inner
|
|
|
|
// functions, because the latter needs to do more work. In particular, we need
|
|
|
|
// to track unresolved variables to distinguish between these cases:
|
2016-08-04 19:15:18 +00:00
|
|
|
// (function foo() {
|
|
|
|
// bar = function() { return 1; }
|
|
|
|
// })();
|
|
|
|
// and
|
|
|
|
// (function foo() {
|
|
|
|
// var a = 1;
|
|
|
|
// bar = function() { return a; }
|
|
|
|
// })();
|
|
|
|
|
|
|
|
// Now foo will be parsed eagerly and compiled eagerly (optimization: assume
|
|
|
|
// parenthesis before the function means that it will be called
|
2016-09-27 09:48:17 +00:00
|
|
|
// immediately). bar can be parsed lazily, but we need to parse it in a mode
|
|
|
|
// that tracks unresolved variables.
|
2016-11-07 16:34:45 +00:00
|
|
|
DCHECK_IMPLIES(parse_lazily(), FLAG_lazy);
|
2016-11-16 12:40:16 +00:00
|
|
|
DCHECK_IMPLIES(parse_lazily(), allow_lazy_);
|
2016-11-07 16:34:45 +00:00
|
|
|
DCHECK_IMPLIES(parse_lazily(), extension_ == nullptr);
|
2016-09-27 09:48:17 +00:00
|
|
|
|
2017-04-24 08:49:35 +00:00
|
|
|
const bool is_lazy =
|
|
|
|
eager_compile_hint == FunctionLiteral::kShouldLazyCompile;
|
|
|
|
const bool is_top_level =
|
|
|
|
impl()->AllowsLazyParsingWithoutUnresolvedVariables();
|
|
|
|
const bool is_lazy_top_level_function = is_lazy && is_top_level;
|
|
|
|
const bool is_lazy_inner_function = is_lazy && !is_top_level;
|
2017-07-13 00:23:37 +00:00
|
|
|
const bool is_expression =
|
|
|
|
function_type == FunctionLiteral::kAnonymousExpression ||
|
|
|
|
function_type == FunctionLiteral::kNamedExpression;
|
2016-09-27 09:48:17 +00:00
|
|
|
|
2016-11-16 18:51:32 +00:00
|
|
|
RuntimeCallTimerScope runtime_timer(
|
|
|
|
runtime_call_stats_,
|
|
|
|
parsing_on_main_thread_
|
|
|
|
? &RuntimeCallStats::ParseFunctionLiteral
|
|
|
|
: &RuntimeCallStats::ParseBackgroundFunctionLiteral);
|
2016-11-15 16:08:16 +00:00
|
|
|
|
2016-09-27 09:48:17 +00:00
|
|
|
// Determine whether we can still lazy parse the inner function.
|
2016-08-04 19:15:18 +00:00
|
|
|
// The preconditions are:
|
|
|
|
// - Lazy compilation has to be enabled.
|
|
|
|
// - Neither V8 natives nor native function declarations can be allowed,
|
|
|
|
// since parsing one would retroactively force the function to be
|
|
|
|
// eagerly compiled.
|
|
|
|
// - The invoker of this parser can't depend on the AST being eagerly
|
|
|
|
// built (either because the function is about to be compiled, or
|
|
|
|
// because the AST is going to be inspected for some reason).
|
|
|
|
// - Because of the above, we can't be attempting to parse a
|
|
|
|
// FunctionExpression; even without enclosing parentheses it might be
|
|
|
|
// immediately invoked.
|
|
|
|
// - The function literal shouldn't be hinted to eagerly compile.
|
2016-09-27 09:48:17 +00:00
|
|
|
|
|
|
|
// Inner functions will be parsed using a temporary Zone. After parsing, we
|
|
|
|
// will migrate unresolved variable into a Scope in the main Zone.
|
2017-04-24 08:49:35 +00:00
|
|
|
|
|
|
|
const bool should_preparse_inner =
|
|
|
|
parse_lazily() && FLAG_lazy_inner_functions && is_lazy_inner_function &&
|
2017-07-13 00:23:37 +00:00
|
|
|
(!is_expression || FLAG_aggressive_lazy_inner_functions);
|
2017-04-24 08:49:35 +00:00
|
|
|
|
|
|
|
// This may be modified later to reflect preparsing decision taken
|
2017-08-18 20:34:14 +00:00
|
|
|
bool should_preparse =
|
|
|
|
(parse_lazily() && is_lazy_top_level_function) || should_preparse_inner;
|
2016-08-04 19:15:18 +00:00
|
|
|
|
|
|
|
ZoneList<Statement*>* body = nullptr;
|
2011-11-25 09:36:31 +00:00
|
|
|
int expected_property_count = -1;
|
2016-11-04 15:04:03 +00:00
|
|
|
int num_parameters = -1;
|
|
|
|
int function_length = -1;
|
|
|
|
bool has_duplicate_parameters = false;
|
2016-11-28 11:40:22 +00:00
|
|
|
int function_literal_id = GetNextFunctionLiteralId();
|
2017-06-30 10:38:38 +00:00
|
|
|
ProducedPreParsedScopeData* produced_preparsed_scope_data = nullptr;
|
2016-09-28 15:58:22 +00:00
|
|
|
|
2016-11-24 16:06:43 +00:00
|
|
|
Zone* outer_zone = zone();
|
|
|
|
DeclarationScope* scope;
|
2016-09-28 15:58:22 +00:00
|
|
|
|
2014-06-24 14:03:24 +00:00
|
|
|
{
|
2016-08-04 19:15:18 +00:00
|
|
|
// Temporary zones can nest. When we migrate free variables (see below), we
|
|
|
|
// need to recreate them in the previous Zone.
|
2017-05-17 11:41:00 +00:00
|
|
|
AstNodeFactory previous_zone_ast_node_factory(ast_value_factory(), zone());
|
2016-08-04 19:15:18 +00:00
|
|
|
|
|
|
|
// Open a new zone scope, which sets our AstNodeFactory to allocate in the
|
|
|
|
// new temporary zone if the preconditions are satisfied, and ensures that
|
|
|
|
// the previous zone is always restored after parsing the body. To be able
|
|
|
|
// to do scope analysis correctly after full parsing, we migrate needed
|
2016-09-28 13:36:30 +00:00
|
|
|
// information when the function is parsed.
|
2016-10-17 12:12:30 +00:00
|
|
|
Zone temp_zone(zone()->allocator(), ZONE_NAME);
|
2017-04-24 08:49:35 +00:00
|
|
|
DiscardableZoneScope zone_scope(this, &temp_zone, should_preparse);
|
2016-11-24 16:06:43 +00:00
|
|
|
|
|
|
|
// This Scope lives in the main zone. We'll migrate data into that zone
|
|
|
|
// later.
|
|
|
|
scope = NewFunctionScope(kind, outer_zone);
|
|
|
|
SetLanguageMode(scope, language_mode);
|
2016-08-01 13:25:39 +00:00
|
|
|
#ifdef DEBUG
|
2016-11-24 16:06:43 +00:00
|
|
|
scope->SetScopeName(function_name);
|
2017-04-24 08:49:35 +00:00
|
|
|
if (should_preparse) scope->set_needs_migration();
|
2016-08-01 13:25:39 +00:00
|
|
|
#endif
|
2017-08-18 20:34:14 +00:00
|
|
|
|
|
|
|
Expect(Token::LPAREN, CHECK_OK);
|
2016-11-24 16:06:43 +00:00
|
|
|
scope->set_start_position(scanner()->location().beg_pos);
|
|
|
|
|
2016-09-27 09:48:17 +00:00
|
|
|
// Eager or lazy parse? If is_lazy_top_level_function, we'll parse
|
2016-11-04 15:04:03 +00:00
|
|
|
// lazily. We'll call SkipFunction, which may decide to
|
|
|
|
// abort lazy parsing if it suspects that wasn't a good idea. If so (in
|
|
|
|
// which case the parser is expected to have backtracked), or if we didn't
|
|
|
|
// try to lazy parse in the first place, we'll have to parse eagerly.
|
2017-04-24 08:49:35 +00:00
|
|
|
if (should_preparse) {
|
|
|
|
DCHECK(parse_lazily());
|
2017-08-18 20:34:14 +00:00
|
|
|
DCHECK(is_lazy_top_level_function || is_lazy_inner_function);
|
2016-09-01 10:22:54 +00:00
|
|
|
Scanner::BookmarkScope bookmark(scanner());
|
2016-09-20 09:43:41 +00:00
|
|
|
bookmark.Set();
|
2017-06-22 13:09:01 +00:00
|
|
|
LazyParsingResult result = SkipFunction(
|
|
|
|
function_name, kind, function_type, scope, &num_parameters,
|
2017-06-30 10:38:38 +00:00
|
|
|
&produced_preparsed_scope_data, is_lazy_inner_function,
|
|
|
|
is_lazy_top_level_function, CHECK_OK);
|
2015-09-02 21:10:51 +00:00
|
|
|
|
2016-09-01 10:22:54 +00:00
|
|
|
if (result == kLazyParsingAborted) {
|
2017-05-02 09:47:54 +00:00
|
|
|
DCHECK(is_lazy_top_level_function);
|
2016-09-20 13:47:31 +00:00
|
|
|
bookmark.Apply();
|
2015-05-06 10:21:20 +00:00
|
|
|
// This is probably an initialization function. Inform the compiler it
|
Reland "[Compiler] Remove code aging support."
> This reverts commit 42d3d36bc3b4e76cbdf883432dcc3647526fbf58.
>
> Original change's description:
> > [Compiler] Remove code aging support.
> >
> > Code aging is no longer supported by any remaining compilers now
> > that full codegen has been removed. This CL removes all vestiges of
> > code aging.
> >
> > BUG=v8:6409
> >
> > Change-Id: I945ebcc20c7c55120550c8ee36188bfa042ea65e
> > Reviewed-on: https://chromium-review.googlesource.com/619153
> > Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
> > Reviewed-by: Yang Guo <yangguo@chromium.org>
> > Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> > Reviewed-by: Marja Hölttä <marja@chromium.org>
> > Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#47501}
>
> TBR=ulan@chromium.org,rmcilroy@chromium.org,marja@chromium.org,yangguo@chromium.org,mstarzinger@chromium.org,rodolph.perfetta@arm.com
>
> Change-Id: I9d8b2985e2d472697908270d93a35eb7ef9c88a8
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: v8:6409
> Reviewed-on: https://chromium-review.googlesource.com/625998
> Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
> Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#47506}
TBR=ulan@chromium.org,rmcilroy@chromium.org,marja@chromium.org,yangguo@chromium.org,mstarzinger@chromium.org,rodolph.perfetta@arm.com
Change-Id: I68785c6be7686e874b3848103e3a34483eaeb519
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:6409
Reviewed-on: https://chromium-review.googlesource.com/625919
Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47535}
2017-08-23 08:22:33 +00:00
|
|
|
// should also eager-compile this function.
|
2015-05-06 10:21:20 +00:00
|
|
|
eager_compile_hint = FunctionLiteral::kShouldEagerCompile;
|
2016-09-29 13:29:04 +00:00
|
|
|
scope->ResetAfterPreparsing(ast_value_factory(), true);
|
2016-09-28 15:58:22 +00:00
|
|
|
zone_scope.Reset();
|
2017-04-24 08:49:35 +00:00
|
|
|
// Trigger eager (re-)parsing, just below this block.
|
|
|
|
should_preparse = false;
|
2017-04-04 15:44:08 +00:00
|
|
|
}
|
2015-05-06 10:21:20 +00:00
|
|
|
}
|
2016-09-28 13:36:30 +00:00
|
|
|
|
2017-04-24 08:49:35 +00:00
|
|
|
if (should_preparse) {
|
2017-06-30 10:38:38 +00:00
|
|
|
scope->AnalyzePartially(&previous_zone_ast_node_factory);
|
2017-04-24 08:49:35 +00:00
|
|
|
} else {
|
2017-02-15 15:12:13 +00:00
|
|
|
body = ParseFunction(function_name, pos, kind, function_type, scope,
|
|
|
|
&num_parameters, &function_length,
|
|
|
|
&has_duplicate_parameters, &expected_property_count,
|
|
|
|
CHECK_OK);
|
2016-09-28 13:36:30 +00:00
|
|
|
}
|
|
|
|
|
2017-04-24 08:49:35 +00:00
|
|
|
DCHECK_EQ(should_preparse, temp_zoned_);
|
|
|
|
if (V8_UNLIKELY(FLAG_trace_preparse)) {
|
2016-10-18 08:00:03 +00:00
|
|
|
PrintF(" [%s]: %i-%i %.*s\n",
|
2017-04-24 08:49:35 +00:00
|
|
|
should_preparse ? (is_top_level ? "Preparse no-resolution"
|
|
|
|
: "Preparse resolution")
|
|
|
|
: "Full parse",
|
2016-10-18 08:00:03 +00:00
|
|
|
scope->start_position(), scope->end_position(),
|
|
|
|
function_name->byte_length(), function_name->raw_data());
|
2016-11-16 12:33:36 +00:00
|
|
|
}
|
2016-12-01 17:09:04 +00:00
|
|
|
if (V8_UNLIKELY(FLAG_runtime_stats)) {
|
2017-04-24 08:49:35 +00:00
|
|
|
if (should_preparse) {
|
|
|
|
RuntimeCallStats::CounterId counter_id =
|
2016-12-01 17:09:04 +00:00
|
|
|
parsing_on_main_thread_
|
|
|
|
? &RuntimeCallStats::PreParseWithVariableResolution
|
2017-04-24 08:49:35 +00:00
|
|
|
: &RuntimeCallStats::PreParseBackgroundWithVariableResolution;
|
|
|
|
if (is_top_level) {
|
|
|
|
counter_id =
|
|
|
|
parsing_on_main_thread_
|
|
|
|
? &RuntimeCallStats::PreParseNoVariableResolution
|
|
|
|
: &RuntimeCallStats::PreParseBackgroundNoVariableResolution;
|
|
|
|
}
|
|
|
|
RuntimeCallStats::CorrectCurrentCounterId(runtime_call_stats_,
|
|
|
|
counter_id);
|
2016-12-01 17:09:04 +00:00
|
|
|
}
|
2016-10-18 08:00:03 +00:00
|
|
|
}
|
|
|
|
|
2016-11-04 15:04:03 +00:00
|
|
|
// Validate function name. We can do this only after parsing the function,
|
|
|
|
// since the function can declare itself strict.
|
2015-07-15 09:14:49 +00:00
|
|
|
language_mode = scope->language_mode();
|
|
|
|
CheckFunctionName(language_mode, function_name, function_name_validity,
|
2015-07-09 21:31:11 +00:00
|
|
|
function_name_location, CHECK_OK);
|
2015-02-06 18:04:11 +00:00
|
|
|
|
2015-07-15 09:14:49 +00:00
|
|
|
if (is_strict(language_mode)) {
|
2014-12-18 22:01:25 +00:00
|
|
|
CheckStrictOctalLiteral(scope->start_position(), scope->end_position(),
|
|
|
|
CHECK_OK);
|
2015-07-10 16:39:47 +00:00
|
|
|
}
|
2016-03-10 23:19:31 +00:00
|
|
|
CheckConflictingVarDeclarations(scope, CHECK_OK);
|
2016-08-04 19:15:18 +00:00
|
|
|
} // DiscardableZoneScope goes out of scope.
|
2011-09-01 12:31:18 +00:00
|
|
|
|
2015-04-21 11:09:53 +00:00
|
|
|
FunctionLiteral::ParameterFlag duplicate_parameters =
|
2015-05-13 11:45:04 +00:00
|
|
|
has_duplicate_parameters ? FunctionLiteral::kHasDuplicateParameters
|
|
|
|
: FunctionLiteral::kNoDuplicateParameters;
|
2015-04-21 11:09:53 +00:00
|
|
|
|
2016-08-04 19:15:18 +00:00
|
|
|
// Note that the FunctionLiteral needs to be created in the main Zone again.
|
2014-07-21 09:58:01 +00:00
|
|
|
FunctionLiteral* function_literal = factory()->NewFunctionLiteral(
|
2017-02-15 15:12:13 +00:00
|
|
|
function_name, scope, body, expected_property_count, num_parameters,
|
|
|
|
function_length, duplicate_parameters, function_type, eager_compile_hint,
|
2017-06-30 10:38:38 +00:00
|
|
|
pos, true, function_literal_id, produced_preparsed_scope_data);
|
2013-10-14 09:24:58 +00:00
|
|
|
function_literal->set_function_token_position(function_token_pos);
|
2011-04-07 14:45:34 +00:00
|
|
|
|
2016-09-02 11:44:48 +00:00
|
|
|
if (should_infer_name) {
|
|
|
|
DCHECK_NOT_NULL(fni_);
|
|
|
|
fni_->AddFunction(function_literal);
|
|
|
|
}
|
2011-04-07 14:45:34 +00:00
|
|
|
return function_literal;
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
2017-06-22 13:09:01 +00:00
|
|
|
Parser::LazyParsingResult Parser::SkipFunction(
|
|
|
|
const AstRawString* function_name, FunctionKind kind,
|
|
|
|
FunctionLiteral::FunctionType function_type,
|
|
|
|
DeclarationScope* function_scope, int* num_parameters,
|
2017-06-30 10:38:38 +00:00
|
|
|
ProducedPreParsedScopeData** produced_preparsed_scope_data,
|
2017-06-22 13:09:01 +00:00
|
|
|
bool is_inner_function, bool may_abort, bool* ok) {
|
2017-04-04 15:44:08 +00:00
|
|
|
FunctionState function_state(&function_state_, &scope_, function_scope);
|
|
|
|
|
2016-11-04 15:04:03 +00:00
|
|
|
DCHECK_NE(kNoSourcePosition, function_scope->start_position());
|
Implement new Function.prototype.toString --harmony-function-tostring
For functions declared in source code, the .toString() representation
will be an excerpt of the source code.
* For functions declared with the "function" keyword, the excerpt
starts at the "function" or "async" keyword and ends at the final "}".
The previous behavior would start the excerpt at the "(" of the
parameter list, and prepend a canonical `"function " + name` or
similar, which would discard comments and formatting surrounding the
function's name. Anonymous functions declared as function expressions
no longer get the name "anonymous" in their toString representation.
* For methods, the excerpt starts at the "get", "set", "*" (for
generator methods), or property name, whichever comes first.
Previously, the toString representation for methods would use a
canonical prefix before the "(" of the parameter list. Note that any
"static" keyword is omitted.
* For arrow functions and class declarations, the excerpt is unchanged.
For functions created with the Function, GeneratorFunction, or
AsyncFunction constructors:
* The string separating the parameter text and body text is now
"\n) {\n", where previously it was "\n/*``*/) {\n" or ") {\n".
* At one point, newline normalization was required by the spec here,
but that was removed from the spec, and so this CL does not do it.
Included in this CL is a fix for CreateDynamicFunction parsing. ')'
and '`' characters in the parameter string are no longer disallowed,
and Function("a=function(", "}){") is no longer allowed.
BUG=v8:4958, v8:4230
Review-Url: https://codereview.chromium.org/2156303002
Cr-Commit-Position: refs/heads/master@{#43262}
2017-02-16 20:19:24 +00:00
|
|
|
DCHECK_EQ(kNoSourcePosition, parameters_end_pos_);
|
2014-11-17 12:16:27 +00:00
|
|
|
if (produce_cached_parse_data()) CHECK(log_);
|
2014-10-01 16:54:42 +00:00
|
|
|
|
2016-11-04 15:04:03 +00:00
|
|
|
DCHECK_IMPLIES(IsArrowFunction(kind),
|
|
|
|
scanner()->current_token() == Token::ARROW);
|
|
|
|
|
2016-09-27 09:48:17 +00:00
|
|
|
// Inner functions are not part of the cached data.
|
|
|
|
if (!is_inner_function && consume_cached_parse_data() &&
|
|
|
|
!cached_parse_data_->rejected()) {
|
2016-11-04 15:04:03 +00:00
|
|
|
// If we have cached data, we use it to skip parsing the function. The data
|
|
|
|
// contains the information we need to construct the lazy function.
|
2014-04-15 08:29:24 +00:00
|
|
|
FunctionEntry entry =
|
2016-11-04 15:04:03 +00:00
|
|
|
cached_parse_data_->GetFunctionEntry(function_scope->start_position());
|
2014-12-08 11:47:44 +00:00
|
|
|
// Check that cached data is valid. If not, mark it as invalid (the embedder
|
|
|
|
// handles it). Note that end position greater than end of stream is safe,
|
|
|
|
// and hard to check.
|
2016-11-04 15:04:03 +00:00
|
|
|
if (entry.is_valid() &&
|
|
|
|
entry.end_pos() > function_scope->start_position()) {
|
|
|
|
total_preparse_skipped_ += entry.end_pos() - position();
|
|
|
|
function_scope->set_end_position(entry.end_pos());
|
2014-12-08 11:47:44 +00:00
|
|
|
scanner()->SeekForward(entry.end_pos() - 1);
|
2016-09-01 10:22:54 +00:00
|
|
|
Expect(Token::RBRACE, CHECK_OK_VALUE(kLazyParsingComplete));
|
2016-11-04 15:04:03 +00:00
|
|
|
*num_parameters = entry.num_parameters();
|
|
|
|
SetLanguageMode(function_scope, entry.language_mode());
|
|
|
|
if (entry.uses_super_property())
|
|
|
|
function_scope->RecordSuperPropertyUsage();
|
2016-11-28 11:40:22 +00:00
|
|
|
SkipFunctionLiterals(entry.num_inner_functions());
|
2016-09-01 10:22:54 +00:00
|
|
|
return kLazyParsingComplete;
|
2014-04-15 08:29:24 +00:00
|
|
|
}
|
2014-12-08 11:47:44 +00:00
|
|
|
cached_parse_data_->Reject();
|
|
|
|
}
|
2016-11-15 16:50:24 +00:00
|
|
|
|
2017-03-15 12:51:28 +00:00
|
|
|
// FIXME(marja): There are 3 ways to skip functions now. Unify them.
|
2017-06-30 10:38:38 +00:00
|
|
|
DCHECK_NOT_NULL(consumed_preparsed_scope_data_);
|
|
|
|
if (consumed_preparsed_scope_data_->HasData()) {
|
2017-08-16 08:19:06 +00:00
|
|
|
DCHECK(FLAG_preparser_scope_analysis);
|
2017-06-30 10:38:38 +00:00
|
|
|
int end_position;
|
|
|
|
LanguageMode language_mode;
|
|
|
|
int num_inner_functions;
|
|
|
|
bool uses_super_property;
|
|
|
|
*produced_preparsed_scope_data =
|
|
|
|
consumed_preparsed_scope_data_->GetDataForSkippableFunction(
|
|
|
|
main_zone(), function_scope->start_position(), &end_position,
|
|
|
|
num_parameters, &num_inner_functions, &uses_super_property,
|
|
|
|
&language_mode);
|
|
|
|
|
|
|
|
function_scope->outer_scope()->SetMustUsePreParsedScopeData();
|
|
|
|
function_scope->set_is_skipped_function(true);
|
|
|
|
function_scope->set_end_position(end_position);
|
|
|
|
scanner()->SeekForward(end_position - 1);
|
|
|
|
Expect(Token::RBRACE, CHECK_OK_VALUE(kLazyParsingComplete));
|
|
|
|
SetLanguageMode(function_scope, language_mode);
|
|
|
|
if (uses_super_property) {
|
|
|
|
function_scope->RecordSuperPropertyUsage();
|
2017-03-13 16:16:52 +00:00
|
|
|
}
|
2017-06-30 10:38:38 +00:00
|
|
|
SkipFunctionLiterals(num_inner_functions);
|
|
|
|
return kLazyParsingComplete;
|
2017-03-13 16:16:52 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 11:47:44 +00:00
|
|
|
// With no cached data, we partially parse the function, without building an
|
|
|
|
// AST. This gathers the data needed to build a lazy function.
|
2016-11-15 16:50:24 +00:00
|
|
|
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"), "V8.PreParse");
|
|
|
|
|
|
|
|
// Aborting inner function preparsing would leave scopes in an inconsistent
|
|
|
|
// state; we don't parse inner functions in the abortable mode anyway.
|
|
|
|
DCHECK(!is_inner_function || !may_abort);
|
|
|
|
|
2017-03-10 09:16:55 +00:00
|
|
|
PreParser::PreParseResult result = reusable_preparser()->PreParseFunction(
|
2017-06-22 13:09:01 +00:00
|
|
|
function_name, kind, function_type, function_scope, parsing_module_,
|
2017-06-30 10:38:38 +00:00
|
|
|
is_inner_function, may_abort, use_counts_, produced_preparsed_scope_data);
|
2016-09-27 09:49:26 +00:00
|
|
|
|
2016-09-01 10:22:54 +00:00
|
|
|
// Return immediately if pre-parser decided to abort parsing.
|
2016-09-28 13:36:30 +00:00
|
|
|
if (result == PreParser::kPreParseAbort) return kLazyParsingAborted;
|
2014-12-08 11:47:44 +00:00
|
|
|
if (result == PreParser::kPreParseStackOverflow) {
|
|
|
|
// Propagate stack overflow.
|
|
|
|
set_stack_overflow();
|
|
|
|
*ok = false;
|
2016-09-01 10:22:54 +00:00
|
|
|
return kLazyParsingComplete;
|
2014-12-08 11:47:44 +00:00
|
|
|
}
|
2016-11-15 10:15:43 +00:00
|
|
|
if (pending_error_handler_.has_pending_error()) {
|
2014-12-08 11:47:44 +00:00
|
|
|
*ok = false;
|
2016-09-01 10:22:54 +00:00
|
|
|
return kLazyParsingComplete;
|
2014-12-08 11:47:44 +00:00
|
|
|
}
|
2017-03-10 09:16:55 +00:00
|
|
|
PreParserLogger* logger = reusable_preparser()->logger();
|
2016-11-07 13:23:01 +00:00
|
|
|
function_scope->set_end_position(logger->end());
|
2016-09-01 10:22:54 +00:00
|
|
|
Expect(Token::RBRACE, CHECK_OK_VALUE(kLazyParsingComplete));
|
2016-11-04 15:04:03 +00:00
|
|
|
total_preparse_skipped_ +=
|
|
|
|
function_scope->end_position() - function_scope->start_position();
|
2016-11-07 13:23:01 +00:00
|
|
|
*num_parameters = logger->num_parameters();
|
2016-11-28 11:40:22 +00:00
|
|
|
SkipFunctionLiterals(logger->num_inner_functions());
|
2016-09-27 09:48:17 +00:00
|
|
|
if (!is_inner_function && produce_cached_parse_data()) {
|
2014-12-08 11:47:44 +00:00
|
|
|
DCHECK(log_);
|
2017-04-19 19:20:10 +00:00
|
|
|
log_->LogFunction(function_scope->start_position(),
|
|
|
|
function_scope->end_position(), *num_parameters,
|
|
|
|
language_mode(), function_scope->uses_super_property(),
|
|
|
|
logger->num_inner_functions());
|
2014-04-15 08:29:24 +00:00
|
|
|
}
|
2016-09-01 10:22:54 +00:00
|
|
|
return kLazyParsingComplete;
|
2014-04-15 08:29:24 +00:00
|
|
|
}
|
|
|
|
|
2017-06-15 21:24:37 +00:00
|
|
|
Statement* Parser::BuildAssertIsCoercible(Variable* var,
|
|
|
|
ObjectLiteral* pattern) {
|
2015-05-18 20:15:08 +00:00
|
|
|
// if (var === null || var === undefined)
|
|
|
|
// throw /* type error kNonCoercible) */;
|
2017-06-15 21:24:37 +00:00
|
|
|
auto source_position = pattern->position();
|
|
|
|
const AstRawString* property = ast_value_factory()->empty_string();
|
|
|
|
MessageTemplate::Template msg = MessageTemplate::kNonCoercible;
|
|
|
|
for (ObjectLiteralProperty* literal_property : *pattern->properties()) {
|
|
|
|
Expression* key = literal_property->key();
|
|
|
|
if (key->IsPropertyName()) {
|
|
|
|
property = key->AsLiteral()->AsRawPropertyName();
|
|
|
|
msg = MessageTemplate::kNonCoercibleWithProperty;
|
|
|
|
source_position = key->position();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2015-05-18 20:15:08 +00:00
|
|
|
|
|
|
|
Expression* condition = factory()->NewBinaryOperation(
|
2016-06-30 09:26:30 +00:00
|
|
|
Token::OR,
|
2015-05-18 20:15:08 +00:00
|
|
|
factory()->NewCompareOperation(
|
|
|
|
Token::EQ_STRICT, factory()->NewVariableProxy(var),
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewUndefinedLiteral(kNoSourcePosition), kNoSourcePosition),
|
|
|
|
factory()->NewCompareOperation(
|
|
|
|
Token::EQ_STRICT, factory()->NewVariableProxy(var),
|
|
|
|
factory()->NewNullLiteral(kNoSourcePosition), kNoSourcePosition),
|
|
|
|
kNoSourcePosition);
|
2016-08-25 08:48:45 +00:00
|
|
|
Expression* throw_type_error =
|
2017-06-15 21:24:37 +00:00
|
|
|
NewThrowTypeError(msg, property, source_position);
|
2015-05-18 20:15:08 +00:00
|
|
|
IfStatement* if_statement = factory()->NewIfStatement(
|
2016-06-30 09:26:30 +00:00
|
|
|
condition,
|
|
|
|
factory()->NewExpressionStatement(throw_type_error, kNoSourcePosition),
|
|
|
|
factory()->NewEmptyStatement(kNoSourcePosition), kNoSourcePosition);
|
2015-05-18 20:15:08 +00:00
|
|
|
return if_statement;
|
|
|
|
}
|
|
|
|
|
2016-07-25 08:25:49 +00:00
|
|
|
class InitializerRewriter final
|
|
|
|
: public AstTraversalVisitor<InitializerRewriter> {
|
2015-12-04 17:20:10 +00:00
|
|
|
public:
|
2017-08-09 21:45:27 +00:00
|
|
|
InitializerRewriter(uintptr_t stack_limit, Expression* root, Parser* parser)
|
|
|
|
: AstTraversalVisitor(stack_limit, root), parser_(parser) {}
|
2015-12-04 17:20:10 +00:00
|
|
|
|
|
|
|
private:
|
2016-07-25 08:25:49 +00:00
|
|
|
// This is required so that the overriden Visit* methods can be
|
|
|
|
// called by the base class (template).
|
|
|
|
friend class AstTraversalVisitor<InitializerRewriter>;
|
2015-12-04 17:20:10 +00:00
|
|
|
|
2016-07-25 08:25:49 +00:00
|
|
|
// Just rewrite destructuring assignments wrapped in RewritableExpressions.
|
|
|
|
void VisitRewritableExpression(RewritableExpression* to_rewrite) {
|
|
|
|
if (to_rewrite->is_rewritten()) return;
|
2017-09-07 12:05:46 +00:00
|
|
|
parser_->RewriteDestructuringAssignment(to_rewrite);
|
2017-01-12 15:52:00 +00:00
|
|
|
AstTraversalVisitor::VisitRewritableExpression(to_rewrite);
|
2015-12-04 17:20:10 +00:00
|
|
|
}
|
|
|
|
|
2016-04-05 18:41:44 +00:00
|
|
|
// Code in function literals does not need to be eagerly rewritten, it will be
|
|
|
|
// rewritten when scheduled.
|
2016-07-25 08:25:49 +00:00
|
|
|
void VisitFunctionLiteral(FunctionLiteral* expr) {}
|
2016-04-05 18:41:44 +00:00
|
|
|
|
2015-12-04 17:20:10 +00:00
|
|
|
Parser* parser_;
|
|
|
|
};
|
|
|
|
|
2017-08-09 21:45:27 +00:00
|
|
|
void Parser::RewriteParameterInitializer(Expression* expr) {
|
|
|
|
InitializerRewriter rewriter(stack_limit_, expr, this);
|
2015-12-04 17:20:10 +00:00
|
|
|
rewriter.Run();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-06-22 14:15:53 +00:00
|
|
|
Block* Parser::BuildParameterInitializationBlock(
|
2015-07-23 11:53:31 +00:00
|
|
|
const ParserFormalParameters& parameters, bool* ok) {
|
2015-07-23 14:28:59 +00:00
|
|
|
DCHECK(!parameters.is_simple);
|
2016-07-19 10:06:38 +00:00
|
|
|
DCHECK(scope()->is_function_scope());
|
[parser] Skipping inner funcs: simplify rest parameter handling.
With the params (a, b, ...c) the param / variable declaration order used to be
"temp, temp, c, a, b". Now it is "temp, temp, a, b, c" as you'd expect. This
makes it easier for PreParser to match the parameter order of Parser.
R=verwaest@chromium.org
BUG=v8:5516
Change-Id: I79da04ef3f812bf52c032bed6263c009fecb7988
Reviewed-on: https://chromium-review.googlesource.com/447677
Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Commit-Queue: Marja Hölttä <marja@chromium.org>
Cr-Commit-Position: refs/heads/master@{#43490}
2017-02-28 14:01:36 +00:00
|
|
|
DCHECK_EQ(scope(), parameters.scope);
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* init_block = factory()->NewBlock(1, true);
|
2016-11-28 11:23:38 +00:00
|
|
|
int index = 0;
|
|
|
|
for (auto parameter : parameters.params) {
|
2015-06-22 14:15:53 +00:00
|
|
|
DeclarationDescriptor descriptor;
|
|
|
|
descriptor.declaration_kind = DeclarationDescriptor::PARAMETER;
|
2016-07-19 10:06:38 +00:00
|
|
|
descriptor.scope = scope();
|
2015-06-22 14:15:53 +00:00
|
|
|
descriptor.mode = LET;
|
2016-11-28 11:23:38 +00:00
|
|
|
descriptor.declaration_pos = parameter->pattern->position();
|
2015-11-25 01:30:33 +00:00
|
|
|
// The position that will be used by the AssignmentExpression
|
|
|
|
// which copies from the temp parameter to the pattern.
|
|
|
|
//
|
2016-06-30 09:26:30 +00:00
|
|
|
// TODO(adamk): Should this be kNoSourcePosition, since
|
2015-11-25 01:30:33 +00:00
|
|
|
// it's just copying from a temp var to the real param var?
|
2016-11-28 11:23:38 +00:00
|
|
|
descriptor.initialization_pos = parameter->pattern->position();
|
2015-08-17 12:01:55 +00:00
|
|
|
Expression* initial_value =
|
2016-11-28 11:23:38 +00:00
|
|
|
factory()->NewVariableProxy(parameters.scope->parameter(index));
|
|
|
|
if (parameter->initializer != nullptr) {
|
2015-08-17 12:01:55 +00:00
|
|
|
// IS_UNDEFINED($param) ? initializer : $param
|
2015-12-04 17:20:10 +00:00
|
|
|
|
|
|
|
// Ensure initializer is rewritten
|
2017-08-09 21:45:27 +00:00
|
|
|
RewriteParameterInitializer(parameter->initializer);
|
2015-12-04 17:20:10 +00:00
|
|
|
|
2015-08-17 12:01:55 +00:00
|
|
|
auto condition = factory()->NewCompareOperation(
|
|
|
|
Token::EQ_STRICT,
|
2016-11-28 11:23:38 +00:00
|
|
|
factory()->NewVariableProxy(parameters.scope->parameter(index)),
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewUndefinedLiteral(kNoSourcePosition), kNoSourcePosition);
|
2015-08-17 12:01:55 +00:00
|
|
|
initial_value = factory()->NewConditional(
|
2016-11-28 11:23:38 +00:00
|
|
|
condition, parameter->initializer, initial_value, kNoSourcePosition);
|
|
|
|
descriptor.initialization_pos = parameter->initializer->position();
|
2015-08-17 12:01:55 +00:00
|
|
|
}
|
[es6] Parameter scopes for sloppy eval
This CL is a nightmare! For the utterly irrelevant edge case of a sloppy function with non-simple parameters and a call to direct eval, like here,
let x = 1;
function f(g = () => x) {
var y
eval("var x = 2")
return g() + x // f() = 3
}
we have to do all of the following, on top of the declaration block ("varblock") contexts we already introduce around the body:
- Introduce the ability for varblock contexts to have both a ScopeInfo and an extension object (e.g., the body varblock in the example will contain both a static var y and a dynamic var x). No other scope needs that. Since there are no context slots left, a special new struct is introduced that pairs up scope info and extension object.
- When declaring lookup slots in the runtime, this new struct is allocated in the case where an extension object has to be added to a block scope (at which point the block's extension slot still contains a plain ScopeInfo).
- While at it, introduce some abstraction to access context extension slots in a more controlled manner, in order to keep special-casing to a minimum.
- Make sure that even empty varblock contexts do not get optimised away when they contain a sloppy eval, so that they can host the potential extension object.
- Extend dynamic search for declaration contexts (used by sloppy direct eval) to recognize varblock contexts.
- In the parser, if a function has a sloppy direct eval, introduce an additional varblock scope around each non-simple (desugared) parameter, as required by the spec to contain possible dynamic var bindings.
- In the pattern rewriter, add the ability to hoist the named variables the pattern declares to an outer scope. That is required because the actual destructuring has to be evaluated inside the protecting varblock scope, but the bindings that the desugaring introduces are in the outer scope.
- ScopeInfos need to save the information whether a block is a varblock, to make sloppy eval calls work correctly that deserialise them as part of the scope chain.
- Add the ability to materialize block scopes with extension objects in the debugger. Likewise, enable setting extension variables in block scopes via the debugger interface.
- While at it, refactor and unify some respective code in the debugger.
Sorry, this CL is large. I could try to split it up, but everything is rather entangled.
@mstarzinger: Please review the changes to contexts.
@yangguo: Please have a look at the debugger stuff.
R=littledan@chromium.org, mstarzinger@chromium.org, yangguo@chromium.org
BUG=v8:811,v8:2160
LOG=N
Review URL: https://codereview.chromium.org/1292753007
Cr-Commit-Position: refs/heads/master@{#30295}
2015-08-21 10:58:35 +00:00
|
|
|
|
2016-07-19 10:06:38 +00:00
|
|
|
Scope* param_scope = scope();
|
[es6] Parameter scopes for sloppy eval
This CL is a nightmare! For the utterly irrelevant edge case of a sloppy function with non-simple parameters and a call to direct eval, like here,
let x = 1;
function f(g = () => x) {
var y
eval("var x = 2")
return g() + x // f() = 3
}
we have to do all of the following, on top of the declaration block ("varblock") contexts we already introduce around the body:
- Introduce the ability for varblock contexts to have both a ScopeInfo and an extension object (e.g., the body varblock in the example will contain both a static var y and a dynamic var x). No other scope needs that. Since there are no context slots left, a special new struct is introduced that pairs up scope info and extension object.
- When declaring lookup slots in the runtime, this new struct is allocated in the case where an extension object has to be added to a block scope (at which point the block's extension slot still contains a plain ScopeInfo).
- While at it, introduce some abstraction to access context extension slots in a more controlled manner, in order to keep special-casing to a minimum.
- Make sure that even empty varblock contexts do not get optimised away when they contain a sloppy eval, so that they can host the potential extension object.
- Extend dynamic search for declaration contexts (used by sloppy direct eval) to recognize varblock contexts.
- In the parser, if a function has a sloppy direct eval, introduce an additional varblock scope around each non-simple (desugared) parameter, as required by the spec to contain possible dynamic var bindings.
- In the pattern rewriter, add the ability to hoist the named variables the pattern declares to an outer scope. That is required because the actual destructuring has to be evaluated inside the protecting varblock scope, but the bindings that the desugaring introduces are in the outer scope.
- ScopeInfos need to save the information whether a block is a varblock, to make sloppy eval calls work correctly that deserialise them as part of the scope chain.
- Add the ability to materialize block scopes with extension objects in the debugger. Likewise, enable setting extension variables in block scopes via the debugger interface.
- While at it, refactor and unify some respective code in the debugger.
Sorry, this CL is large. I could try to split it up, but everything is rather entangled.
@mstarzinger: Please review the changes to contexts.
@yangguo: Please have a look at the debugger stuff.
R=littledan@chromium.org, mstarzinger@chromium.org, yangguo@chromium.org
BUG=v8:811,v8:2160
LOG=N
Review URL: https://codereview.chromium.org/1292753007
Cr-Commit-Position: refs/heads/master@{#30295}
2015-08-21 10:58:35 +00:00
|
|
|
Block* param_block = init_block;
|
2017-08-09 17:43:46 +00:00
|
|
|
if (!parameter->is_simple() &&
|
|
|
|
scope()->AsDeclarationScope()->calls_sloppy_eval()) {
|
2016-08-05 14:30:54 +00:00
|
|
|
param_scope = NewVarblockScope();
|
2016-04-22 10:46:42 +00:00
|
|
|
param_scope->set_start_position(descriptor.initialization_pos);
|
2016-11-28 11:23:38 +00:00
|
|
|
param_scope->set_end_position(parameter->initializer_end_position);
|
2016-06-14 16:46:32 +00:00
|
|
|
param_scope->RecordEvalCall();
|
2017-08-29 18:01:54 +00:00
|
|
|
param_block = factory()->NewBlock(8, true);
|
[es6] Parameter scopes for sloppy eval
This CL is a nightmare! For the utterly irrelevant edge case of a sloppy function with non-simple parameters and a call to direct eval, like here,
let x = 1;
function f(g = () => x) {
var y
eval("var x = 2")
return g() + x // f() = 3
}
we have to do all of the following, on top of the declaration block ("varblock") contexts we already introduce around the body:
- Introduce the ability for varblock contexts to have both a ScopeInfo and an extension object (e.g., the body varblock in the example will contain both a static var y and a dynamic var x). No other scope needs that. Since there are no context slots left, a special new struct is introduced that pairs up scope info and extension object.
- When declaring lookup slots in the runtime, this new struct is allocated in the case where an extension object has to be added to a block scope (at which point the block's extension slot still contains a plain ScopeInfo).
- While at it, introduce some abstraction to access context extension slots in a more controlled manner, in order to keep special-casing to a minimum.
- Make sure that even empty varblock contexts do not get optimised away when they contain a sloppy eval, so that they can host the potential extension object.
- Extend dynamic search for declaration contexts (used by sloppy direct eval) to recognize varblock contexts.
- In the parser, if a function has a sloppy direct eval, introduce an additional varblock scope around each non-simple (desugared) parameter, as required by the spec to contain possible dynamic var bindings.
- In the pattern rewriter, add the ability to hoist the named variables the pattern declares to an outer scope. That is required because the actual destructuring has to be evaluated inside the protecting varblock scope, but the bindings that the desugaring introduces are in the outer scope.
- ScopeInfos need to save the information whether a block is a varblock, to make sloppy eval calls work correctly that deserialise them as part of the scope chain.
- Add the ability to materialize block scopes with extension objects in the debugger. Likewise, enable setting extension variables in block scopes via the debugger interface.
- While at it, refactor and unify some respective code in the debugger.
Sorry, this CL is large. I could try to split it up, but everything is rather entangled.
@mstarzinger: Please review the changes to contexts.
@yangguo: Please have a look at the debugger stuff.
R=littledan@chromium.org, mstarzinger@chromium.org, yangguo@chromium.org
BUG=v8:811,v8:2160
LOG=N
Review URL: https://codereview.chromium.org/1292753007
Cr-Commit-Position: refs/heads/master@{#30295}
2015-08-21 10:58:35 +00:00
|
|
|
param_block->set_scope(param_scope);
|
2016-06-22 21:07:53 +00:00
|
|
|
// Pass the appropriate scope in so that PatternRewriter can appropriately
|
|
|
|
// rewrite inner initializers of the pattern to param_scope
|
|
|
|
descriptor.scope = param_scope;
|
|
|
|
// Rewrite the outer initializer to point to param_scope
|
2017-07-25 17:59:06 +00:00
|
|
|
ReparentExpressionScope(stack_limit(), initial_value, param_scope);
|
[es6] Parameter scopes for sloppy eval
This CL is a nightmare! For the utterly irrelevant edge case of a sloppy function with non-simple parameters and a call to direct eval, like here,
let x = 1;
function f(g = () => x) {
var y
eval("var x = 2")
return g() + x // f() = 3
}
we have to do all of the following, on top of the declaration block ("varblock") contexts we already introduce around the body:
- Introduce the ability for varblock contexts to have both a ScopeInfo and an extension object (e.g., the body varblock in the example will contain both a static var y and a dynamic var x). No other scope needs that. Since there are no context slots left, a special new struct is introduced that pairs up scope info and extension object.
- When declaring lookup slots in the runtime, this new struct is allocated in the case where an extension object has to be added to a block scope (at which point the block's extension slot still contains a plain ScopeInfo).
- While at it, introduce some abstraction to access context extension slots in a more controlled manner, in order to keep special-casing to a minimum.
- Make sure that even empty varblock contexts do not get optimised away when they contain a sloppy eval, so that they can host the potential extension object.
- Extend dynamic search for declaration contexts (used by sloppy direct eval) to recognize varblock contexts.
- In the parser, if a function has a sloppy direct eval, introduce an additional varblock scope around each non-simple (desugared) parameter, as required by the spec to contain possible dynamic var bindings.
- In the pattern rewriter, add the ability to hoist the named variables the pattern declares to an outer scope. That is required because the actual destructuring has to be evaluated inside the protecting varblock scope, but the bindings that the desugaring introduces are in the outer scope.
- ScopeInfos need to save the information whether a block is a varblock, to make sloppy eval calls work correctly that deserialise them as part of the scope chain.
- Add the ability to materialize block scopes with extension objects in the debugger. Likewise, enable setting extension variables in block scopes via the debugger interface.
- While at it, refactor and unify some respective code in the debugger.
Sorry, this CL is large. I could try to split it up, but everything is rather entangled.
@mstarzinger: Please review the changes to contexts.
@yangguo: Please have a look at the debugger stuff.
R=littledan@chromium.org, mstarzinger@chromium.org, yangguo@chromium.org
BUG=v8:811,v8:2160
LOG=N
Review URL: https://codereview.chromium.org/1292753007
Cr-Commit-Position: refs/heads/master@{#30295}
2015-08-21 10:58:35 +00:00
|
|
|
}
|
|
|
|
|
2017-02-20 10:41:29 +00:00
|
|
|
BlockState block_state(&scope_, param_scope);
|
2016-08-08 19:19:30 +00:00
|
|
|
DeclarationParsingResult::Declaration decl(
|
2016-11-28 11:23:38 +00:00
|
|
|
parameter->pattern, parameter->initializer_end_position, initial_value);
|
2017-08-09 21:45:27 +00:00
|
|
|
DeclareAndInitializeVariables(param_block, &descriptor, &decl, nullptr,
|
|
|
|
CHECK_OK);
|
2016-08-08 19:19:30 +00:00
|
|
|
|
|
|
|
if (param_block != init_block) {
|
2017-02-20 10:41:29 +00:00
|
|
|
param_scope = param_scope->FinalizeBlockScope();
|
[es6] Parameter scopes for sloppy eval
This CL is a nightmare! For the utterly irrelevant edge case of a sloppy function with non-simple parameters and a call to direct eval, like here,
let x = 1;
function f(g = () => x) {
var y
eval("var x = 2")
return g() + x // f() = 3
}
we have to do all of the following, on top of the declaration block ("varblock") contexts we already introduce around the body:
- Introduce the ability for varblock contexts to have both a ScopeInfo and an extension object (e.g., the body varblock in the example will contain both a static var y and a dynamic var x). No other scope needs that. Since there are no context slots left, a special new struct is introduced that pairs up scope info and extension object.
- When declaring lookup slots in the runtime, this new struct is allocated in the case where an extension object has to be added to a block scope (at which point the block's extension slot still contains a plain ScopeInfo).
- While at it, introduce some abstraction to access context extension slots in a more controlled manner, in order to keep special-casing to a minimum.
- Make sure that even empty varblock contexts do not get optimised away when they contain a sloppy eval, so that they can host the potential extension object.
- Extend dynamic search for declaration contexts (used by sloppy direct eval) to recognize varblock contexts.
- In the parser, if a function has a sloppy direct eval, introduce an additional varblock scope around each non-simple (desugared) parameter, as required by the spec to contain possible dynamic var bindings.
- In the pattern rewriter, add the ability to hoist the named variables the pattern declares to an outer scope. That is required because the actual destructuring has to be evaluated inside the protecting varblock scope, but the bindings that the desugaring introduces are in the outer scope.
- ScopeInfos need to save the information whether a block is a varblock, to make sloppy eval calls work correctly that deserialise them as part of the scope chain.
- Add the ability to materialize block scopes with extension objects in the debugger. Likewise, enable setting extension variables in block scopes via the debugger interface.
- While at it, refactor and unify some respective code in the debugger.
Sorry, this CL is large. I could try to split it up, but everything is rather entangled.
@mstarzinger: Please review the changes to contexts.
@yangguo: Please have a look at the debugger stuff.
R=littledan@chromium.org, mstarzinger@chromium.org, yangguo@chromium.org
BUG=v8:811,v8:2160
LOG=N
Review URL: https://codereview.chromium.org/1292753007
Cr-Commit-Position: refs/heads/master@{#30295}
2015-08-21 10:58:35 +00:00
|
|
|
if (param_scope != nullptr) {
|
|
|
|
CheckConflictingVarDeclarations(param_scope, CHECK_OK);
|
|
|
|
}
|
2015-10-01 13:59:36 +00:00
|
|
|
init_block->statements()->Add(param_block, zone());
|
[es6] Parameter scopes for sloppy eval
This CL is a nightmare! For the utterly irrelevant edge case of a sloppy function with non-simple parameters and a call to direct eval, like here,
let x = 1;
function f(g = () => x) {
var y
eval("var x = 2")
return g() + x // f() = 3
}
we have to do all of the following, on top of the declaration block ("varblock") contexts we already introduce around the body:
- Introduce the ability for varblock contexts to have both a ScopeInfo and an extension object (e.g., the body varblock in the example will contain both a static var y and a dynamic var x). No other scope needs that. Since there are no context slots left, a special new struct is introduced that pairs up scope info and extension object.
- When declaring lookup slots in the runtime, this new struct is allocated in the case where an extension object has to be added to a block scope (at which point the block's extension slot still contains a plain ScopeInfo).
- While at it, introduce some abstraction to access context extension slots in a more controlled manner, in order to keep special-casing to a minimum.
- Make sure that even empty varblock contexts do not get optimised away when they contain a sloppy eval, so that they can host the potential extension object.
- Extend dynamic search for declaration contexts (used by sloppy direct eval) to recognize varblock contexts.
- In the parser, if a function has a sloppy direct eval, introduce an additional varblock scope around each non-simple (desugared) parameter, as required by the spec to contain possible dynamic var bindings.
- In the pattern rewriter, add the ability to hoist the named variables the pattern declares to an outer scope. That is required because the actual destructuring has to be evaluated inside the protecting varblock scope, but the bindings that the desugaring introduces are in the outer scope.
- ScopeInfos need to save the information whether a block is a varblock, to make sloppy eval calls work correctly that deserialise them as part of the scope chain.
- Add the ability to materialize block scopes with extension objects in the debugger. Likewise, enable setting extension variables in block scopes via the debugger interface.
- While at it, refactor and unify some respective code in the debugger.
Sorry, this CL is large. I could try to split it up, but everything is rather entangled.
@mstarzinger: Please review the changes to contexts.
@yangguo: Please have a look at the debugger stuff.
R=littledan@chromium.org, mstarzinger@chromium.org, yangguo@chromium.org
BUG=v8:811,v8:2160
LOG=N
Review URL: https://codereview.chromium.org/1292753007
Cr-Commit-Position: refs/heads/master@{#30295}
2015-08-21 10:58:35 +00:00
|
|
|
}
|
2016-11-28 11:23:38 +00:00
|
|
|
++index;
|
2015-06-22 14:15:53 +00:00
|
|
|
}
|
|
|
|
return init_block;
|
|
|
|
}
|
|
|
|
|
2017-09-07 12:05:46 +00:00
|
|
|
Scope* Parser::NewHiddenCatchScope() {
|
|
|
|
Scope* catch_scope = NewScopeWithParent(scope(), CATCH_SCOPE);
|
2017-03-02 14:14:43 +00:00
|
|
|
catch_scope->DeclareLocal(ast_value_factory()->dot_catch_string(), VAR);
|
|
|
|
catch_scope->set_is_hidden();
|
|
|
|
return catch_scope;
|
|
|
|
}
|
|
|
|
|
2017-01-20 08:58:54 +00:00
|
|
|
Block* Parser::BuildRejectPromiseOnException(Block* inner_block) {
|
2016-09-23 22:23:50 +00:00
|
|
|
// .promise = %AsyncFunctionPromiseCreate();
|
2016-08-26 22:17:52 +00:00
|
|
|
// try {
|
|
|
|
// <inner_block>
|
|
|
|
// } catch (.catch) {
|
|
|
|
// %RejectPromise(.promise, .catch);
|
|
|
|
// return .promise;
|
|
|
|
// } finally {
|
2016-09-23 22:23:50 +00:00
|
|
|
// %AsyncFunctionPromiseRelease(.promise);
|
2016-08-26 22:17:52 +00:00
|
|
|
// }
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* result = factory()->NewBlock(2, true);
|
2016-08-26 22:17:52 +00:00
|
|
|
|
2016-09-23 22:23:50 +00:00
|
|
|
// .promise = %AsyncFunctionPromiseCreate();
|
2016-08-26 22:17:52 +00:00
|
|
|
Statement* set_promise;
|
|
|
|
{
|
|
|
|
Expression* create_promise = factory()->NewCallRuntime(
|
2016-09-23 22:23:50 +00:00
|
|
|
Context::ASYNC_FUNCTION_PROMISE_CREATE_INDEX,
|
2016-08-26 22:17:52 +00:00
|
|
|
new (zone()) ZoneList<Expression*>(0, zone()), kNoSourcePosition);
|
|
|
|
Assignment* assign_promise = factory()->NewAssignment(
|
2017-02-16 09:57:03 +00:00
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(PromiseVariable()),
|
2016-09-20 21:30:45 +00:00
|
|
|
create_promise, kNoSourcePosition);
|
2016-08-26 22:17:52 +00:00
|
|
|
set_promise =
|
|
|
|
factory()->NewExpressionStatement(assign_promise, kNoSourcePosition);
|
|
|
|
}
|
|
|
|
result->statements()->Add(set_promise, zone());
|
|
|
|
|
|
|
|
// catch (.catch) { return %RejectPromise(.promise, .catch), .promise }
|
2017-09-07 12:05:46 +00:00
|
|
|
Scope* catch_scope = NewHiddenCatchScope();
|
2016-05-17 00:26:53 +00:00
|
|
|
|
2016-08-26 22:17:52 +00:00
|
|
|
Expression* promise_reject = BuildRejectPromise(
|
2017-03-02 14:14:43 +00:00
|
|
|
factory()->NewVariableProxy(catch_scope->catch_variable()),
|
|
|
|
kNoSourcePosition);
|
2017-02-27 16:22:25 +00:00
|
|
|
Block* catch_block = IgnoreCompletion(
|
|
|
|
factory()->NewReturnStatement(promise_reject, kNoSourcePosition));
|
2016-08-26 22:17:52 +00:00
|
|
|
|
2016-09-13 20:49:54 +00:00
|
|
|
TryStatement* try_catch_statement =
|
2017-03-03 08:28:54 +00:00
|
|
|
factory()->NewTryCatchStatementForAsyncAwait(
|
|
|
|
inner_block, catch_scope, catch_block, kNoSourcePosition);
|
2016-08-26 22:17:52 +00:00
|
|
|
|
|
|
|
// There is no TryCatchFinally node, so wrap it in an outer try/finally
|
2017-02-27 16:22:25 +00:00
|
|
|
Block* outer_try_block = IgnoreCompletion(try_catch_statement);
|
2016-08-26 22:17:52 +00:00
|
|
|
|
2016-09-23 22:23:50 +00:00
|
|
|
// finally { %AsyncFunctionPromiseRelease(.promise) }
|
2017-02-27 16:22:25 +00:00
|
|
|
Block* finally_block;
|
2016-08-26 22:17:52 +00:00
|
|
|
{
|
2016-09-23 22:23:50 +00:00
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(PromiseVariable()), zone());
|
|
|
|
Expression* call_promise_release = factory()->NewCallRuntime(
|
|
|
|
Context::ASYNC_FUNCTION_PROMISE_RELEASE_INDEX, args, kNoSourcePosition);
|
|
|
|
Statement* promise_release = factory()->NewExpressionStatement(
|
|
|
|
call_promise_release, kNoSourcePosition);
|
2017-02-27 16:22:25 +00:00
|
|
|
finally_block = IgnoreCompletion(promise_release);
|
2016-08-26 22:17:52 +00:00
|
|
|
}
|
2016-05-17 00:26:53 +00:00
|
|
|
|
2016-08-26 22:17:52 +00:00
|
|
|
Statement* try_finally_statement = factory()->NewTryFinallyStatement(
|
|
|
|
outer_try_block, finally_block, kNoSourcePosition);
|
|
|
|
|
|
|
|
result->statements()->Add(try_finally_statement, zone());
|
|
|
|
return result;
|
2016-05-17 00:26:53 +00:00
|
|
|
}
|
|
|
|
|
2016-08-26 22:17:52 +00:00
|
|
|
Expression* Parser::BuildResolvePromise(Expression* value, int pos) {
|
|
|
|
// %ResolvePromise(.promise, value), .promise
|
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone());
|
2016-09-20 21:30:45 +00:00
|
|
|
args->Add(factory()->NewVariableProxy(PromiseVariable()), zone());
|
2016-05-17 00:26:53 +00:00
|
|
|
args->Add(value, zone());
|
2016-08-26 22:17:52 +00:00
|
|
|
Expression* call_runtime =
|
|
|
|
factory()->NewCallRuntime(Context::PROMISE_RESOLVE_INDEX, args, pos);
|
2016-09-20 21:30:45 +00:00
|
|
|
return factory()->NewBinaryOperation(
|
|
|
|
Token::COMMA, call_runtime,
|
|
|
|
factory()->NewVariableProxy(PromiseVariable()), pos);
|
2016-05-17 00:26:53 +00:00
|
|
|
}
|
|
|
|
|
2016-08-26 22:17:52 +00:00
|
|
|
Expression* Parser::BuildRejectPromise(Expression* value, int pos) {
|
2017-01-19 08:50:41 +00:00
|
|
|
// %promise_internal_reject(.promise, value, false), .promise
|
|
|
|
// Disables the additional debug event for the rejection since a debug event
|
|
|
|
// already happened for the exception that got us here.
|
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(3, zone());
|
2016-09-20 21:30:45 +00:00
|
|
|
args->Add(factory()->NewVariableProxy(PromiseVariable()), zone());
|
2016-05-17 00:26:53 +00:00
|
|
|
args->Add(value, zone());
|
2017-01-19 08:50:41 +00:00
|
|
|
args->Add(factory()->NewBooleanLiteral(false, pos), zone());
|
2016-08-26 22:17:52 +00:00
|
|
|
Expression* call_runtime = factory()->NewCallRuntime(
|
2017-01-19 08:50:41 +00:00
|
|
|
Context::PROMISE_INTERNAL_REJECT_INDEX, args, pos);
|
2016-09-20 21:30:45 +00:00
|
|
|
return factory()->NewBinaryOperation(
|
|
|
|
Token::COMMA, call_runtime,
|
|
|
|
factory()->NewVariableProxy(PromiseVariable()), pos);
|
2016-08-26 22:17:52 +00:00
|
|
|
}
|
|
|
|
|
2016-09-20 21:30:45 +00:00
|
|
|
Variable* Parser::PromiseVariable() {
|
|
|
|
// Based on the various compilation paths, there are many different code
|
|
|
|
// paths which may be the first to access the Promise temporary. Whichever
|
|
|
|
// comes first should create it and stash it in the FunctionState.
|
2017-06-09 23:55:01 +00:00
|
|
|
Variable* promise = function_state_->scope()->promise_var();
|
|
|
|
if (promise == nullptr) {
|
2017-02-10 14:38:58 +00:00
|
|
|
promise = function_state_->scope()->DeclarePromiseVar(
|
|
|
|
ast_value_factory()->empty_string());
|
2016-09-20 21:30:45 +00:00
|
|
|
}
|
|
|
|
return promise;
|
2016-05-17 00:26:53 +00:00
|
|
|
}
|
2015-06-22 14:15:53 +00:00
|
|
|
|
2016-09-30 07:53:43 +00:00
|
|
|
Expression* Parser::BuildInitialYield(int pos, FunctionKind kind) {
|
2017-06-09 23:55:01 +00:00
|
|
|
Expression* yield_result = factory()->NewVariableProxy(
|
|
|
|
function_state_->scope()->generator_object_var());
|
2016-09-30 07:53:43 +00:00
|
|
|
// The position of the yield is important for reporting the exception
|
|
|
|
// caused by calling the .throw method on a generator suspended at the
|
|
|
|
// initial yield (i.e. right after generator instantiation).
|
2017-07-14 15:20:23 +00:00
|
|
|
return factory()->NewYield(yield_result, scope()->start_position(),
|
|
|
|
Suspend::kOnExceptionThrow);
|
2016-09-30 07:53:43 +00:00
|
|
|
}
|
|
|
|
|
2016-11-04 15:04:03 +00:00
|
|
|
ZoneList<Statement*>* Parser::ParseFunction(
|
|
|
|
const AstRawString* function_name, int pos, FunctionKind kind,
|
|
|
|
FunctionLiteral::FunctionType function_type,
|
|
|
|
DeclarationScope* function_scope, int* num_parameters, int* function_length,
|
2017-02-15 15:12:13 +00:00
|
|
|
bool* has_duplicate_parameters, int* expected_property_count, bool* ok) {
|
2016-11-21 14:58:46 +00:00
|
|
|
ParsingModeScope mode(this, allow_lazy_ ? PARSE_LAZILY : PARSE_EAGERLY);
|
|
|
|
|
2017-02-20 10:41:29 +00:00
|
|
|
FunctionState function_state(&function_state_, &scope_, function_scope);
|
2016-11-04 15:04:03 +00:00
|
|
|
|
2016-12-02 12:34:58 +00:00
|
|
|
DuplicateFinder duplicate_finder;
|
2016-11-04 15:04:03 +00:00
|
|
|
ExpressionClassifier formals_classifier(this, &duplicate_finder);
|
|
|
|
|
Implement new Function.prototype.toString --harmony-function-tostring
For functions declared in source code, the .toString() representation
will be an excerpt of the source code.
* For functions declared with the "function" keyword, the excerpt
starts at the "function" or "async" keyword and ends at the final "}".
The previous behavior would start the excerpt at the "(" of the
parameter list, and prepend a canonical `"function " + name` or
similar, which would discard comments and formatting surrounding the
function's name. Anonymous functions declared as function expressions
no longer get the name "anonymous" in their toString representation.
* For methods, the excerpt starts at the "get", "set", "*" (for
generator methods), or property name, whichever comes first.
Previously, the toString representation for methods would use a
canonical prefix before the "(" of the parameter list. Note that any
"static" keyword is omitted.
* For arrow functions and class declarations, the excerpt is unchanged.
For functions created with the Function, GeneratorFunction, or
AsyncFunction constructors:
* The string separating the parameter text and body text is now
"\n) {\n", where previously it was "\n/*``*/) {\n" or ") {\n".
* At one point, newline normalization was required by the spec here,
but that was removed from the spec, and so this CL does not do it.
Included in this CL is a fix for CreateDynamicFunction parsing. ')'
and '`' characters in the parameter string are no longer disallowed,
and Function("a=function(", "}){") is no longer allowed.
BUG=v8:4958, v8:4230
Review-Url: https://codereview.chromium.org/2156303002
Cr-Commit-Position: refs/heads/master@{#43262}
2017-02-16 20:19:24 +00:00
|
|
|
int expected_parameters_end_pos = parameters_end_pos_;
|
|
|
|
if (expected_parameters_end_pos != kNoSourcePosition) {
|
|
|
|
// This is the first function encountered in a CreateDynamicFunction eval.
|
|
|
|
parameters_end_pos_ = kNoSourcePosition;
|
2017-06-19 15:13:45 +00:00
|
|
|
// The function name should have been ignored, giving us the empty string
|
Implement new Function.prototype.toString --harmony-function-tostring
For functions declared in source code, the .toString() representation
will be an excerpt of the source code.
* For functions declared with the "function" keyword, the excerpt
starts at the "function" or "async" keyword and ends at the final "}".
The previous behavior would start the excerpt at the "(" of the
parameter list, and prepend a canonical `"function " + name` or
similar, which would discard comments and formatting surrounding the
function's name. Anonymous functions declared as function expressions
no longer get the name "anonymous" in their toString representation.
* For methods, the excerpt starts at the "get", "set", "*" (for
generator methods), or property name, whichever comes first.
Previously, the toString representation for methods would use a
canonical prefix before the "(" of the parameter list. Note that any
"static" keyword is omitted.
* For arrow functions and class declarations, the excerpt is unchanged.
For functions created with the Function, GeneratorFunction, or
AsyncFunction constructors:
* The string separating the parameter text and body text is now
"\n) {\n", where previously it was "\n/*``*/) {\n" or ") {\n".
* At one point, newline normalization was required by the spec here,
but that was removed from the spec, and so this CL does not do it.
Included in this CL is a fix for CreateDynamicFunction parsing. ')'
and '`' characters in the parameter string are no longer disallowed,
and Function("a=function(", "}){") is no longer allowed.
BUG=v8:4958, v8:4230
Review-Url: https://codereview.chromium.org/2156303002
Cr-Commit-Position: refs/heads/master@{#43262}
2017-02-16 20:19:24 +00:00
|
|
|
// here.
|
2017-06-19 15:13:45 +00:00
|
|
|
DCHECK_EQ(function_name, ast_value_factory()->empty_string());
|
Implement new Function.prototype.toString --harmony-function-tostring
For functions declared in source code, the .toString() representation
will be an excerpt of the source code.
* For functions declared with the "function" keyword, the excerpt
starts at the "function" or "async" keyword and ends at the final "}".
The previous behavior would start the excerpt at the "(" of the
parameter list, and prepend a canonical `"function " + name` or
similar, which would discard comments and formatting surrounding the
function's name. Anonymous functions declared as function expressions
no longer get the name "anonymous" in their toString representation.
* For methods, the excerpt starts at the "get", "set", "*" (for
generator methods), or property name, whichever comes first.
Previously, the toString representation for methods would use a
canonical prefix before the "(" of the parameter list. Note that any
"static" keyword is omitted.
* For arrow functions and class declarations, the excerpt is unchanged.
For functions created with the Function, GeneratorFunction, or
AsyncFunction constructors:
* The string separating the parameter text and body text is now
"\n) {\n", where previously it was "\n/*``*/) {\n" or ") {\n".
* At one point, newline normalization was required by the spec here,
but that was removed from the spec, and so this CL does not do it.
Included in this CL is a fix for CreateDynamicFunction parsing. ')'
and '`' characters in the parameter string are no longer disallowed,
and Function("a=function(", "}){") is no longer allowed.
BUG=v8:4958, v8:4230
Review-Url: https://codereview.chromium.org/2156303002
Cr-Commit-Position: refs/heads/master@{#43262}
2017-02-16 20:19:24 +00:00
|
|
|
}
|
|
|
|
|
2016-11-04 15:04:03 +00:00
|
|
|
ParserFormalParameters formals(function_scope);
|
|
|
|
ParseFormalParameterList(&formals, CHECK_OK);
|
Implement new Function.prototype.toString --harmony-function-tostring
For functions declared in source code, the .toString() representation
will be an excerpt of the source code.
* For functions declared with the "function" keyword, the excerpt
starts at the "function" or "async" keyword and ends at the final "}".
The previous behavior would start the excerpt at the "(" of the
parameter list, and prepend a canonical `"function " + name` or
similar, which would discard comments and formatting surrounding the
function's name. Anonymous functions declared as function expressions
no longer get the name "anonymous" in their toString representation.
* For methods, the excerpt starts at the "get", "set", "*" (for
generator methods), or property name, whichever comes first.
Previously, the toString representation for methods would use a
canonical prefix before the "(" of the parameter list. Note that any
"static" keyword is omitted.
* For arrow functions and class declarations, the excerpt is unchanged.
For functions created with the Function, GeneratorFunction, or
AsyncFunction constructors:
* The string separating the parameter text and body text is now
"\n) {\n", where previously it was "\n/*``*/) {\n" or ") {\n".
* At one point, newline normalization was required by the spec here,
but that was removed from the spec, and so this CL does not do it.
Included in this CL is a fix for CreateDynamicFunction parsing. ')'
and '`' characters in the parameter string are no longer disallowed,
and Function("a=function(", "}){") is no longer allowed.
BUG=v8:4958, v8:4230
Review-Url: https://codereview.chromium.org/2156303002
Cr-Commit-Position: refs/heads/master@{#43262}
2017-02-16 20:19:24 +00:00
|
|
|
if (expected_parameters_end_pos != kNoSourcePosition) {
|
|
|
|
// Check for '(' or ')' shenanigans in the parameter string for dynamic
|
|
|
|
// functions.
|
|
|
|
int position = peek_position();
|
|
|
|
if (position < expected_parameters_end_pos) {
|
|
|
|
ReportMessageAt(Scanner::Location(position, position + 1),
|
|
|
|
MessageTemplate::kArgStringTerminatesParametersEarly);
|
|
|
|
*ok = false;
|
|
|
|
return nullptr;
|
|
|
|
} else if (position > expected_parameters_end_pos) {
|
|
|
|
ReportMessageAt(Scanner::Location(expected_parameters_end_pos - 2,
|
|
|
|
expected_parameters_end_pos),
|
|
|
|
MessageTemplate::kUnexpectedEndOfArgString);
|
|
|
|
*ok = false;
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
}
|
2016-11-04 15:04:03 +00:00
|
|
|
Expect(Token::RPAREN, CHECK_OK);
|
|
|
|
int formals_end_position = scanner()->location().end_pos;
|
|
|
|
*num_parameters = formals.num_parameters();
|
|
|
|
*function_length = formals.function_length;
|
|
|
|
|
|
|
|
CheckArityRestrictions(formals.arity, kind, formals.has_rest,
|
|
|
|
function_scope->start_position(), formals_end_position,
|
|
|
|
CHECK_OK);
|
|
|
|
Expect(Token::LBRACE, CHECK_OK);
|
|
|
|
|
2017-01-20 08:58:54 +00:00
|
|
|
ZoneList<Statement*>* body = new (zone()) ZoneList<Statement*>(8, zone());
|
|
|
|
ParseFunctionBody(body, function_name, pos, formals, kind, function_type, ok);
|
2016-11-04 15:04:03 +00:00
|
|
|
|
|
|
|
// Validate parameter names. We can do this only after parsing the function,
|
|
|
|
// since the function can declare itself strict.
|
|
|
|
const bool allow_duplicate_parameters =
|
|
|
|
is_sloppy(function_scope->language_mode()) && formals.is_simple &&
|
|
|
|
!IsConciseMethod(kind);
|
|
|
|
ValidateFormalParameters(function_scope->language_mode(),
|
|
|
|
allow_duplicate_parameters, CHECK_OK);
|
|
|
|
|
|
|
|
RewriteDestructuringAssignments();
|
|
|
|
|
|
|
|
*has_duplicate_parameters =
|
|
|
|
!classifier()->is_valid_formal_parameter_list_without_duplicates();
|
|
|
|
|
|
|
|
*expected_property_count = function_state.expected_property_count();
|
|
|
|
return body;
|
|
|
|
}
|
|
|
|
|
2017-02-13 09:39:49 +00:00
|
|
|
void Parser::DeclareClassVariable(const AstRawString* name,
|
2016-09-28 13:42:20 +00:00
|
|
|
ClassInfo* class_info, int class_token_pos,
|
|
|
|
bool* ok) {
|
2016-08-01 13:25:39 +00:00
|
|
|
#ifdef DEBUG
|
2016-07-19 10:06:38 +00:00
|
|
|
scope()->SetScopeName(name);
|
2016-08-01 13:25:39 +00:00
|
|
|
#endif
|
2014-11-14 15:05:05 +00:00
|
|
|
|
2016-08-01 09:04:13 +00:00
|
|
|
if (name != nullptr) {
|
2017-09-15 00:57:13 +00:00
|
|
|
VariableProxy* proxy = factory()->NewVariableProxy(name, NORMAL_VARIABLE);
|
2017-08-18 17:26:54 +00:00
|
|
|
Declaration* declaration =
|
2017-09-15 00:57:13 +00:00
|
|
|
factory()->NewVariableDeclaration(proxy, class_token_pos);
|
|
|
|
class_info->variable =
|
|
|
|
Declare(declaration, DeclarationDescriptor::NORMAL, CONST,
|
|
|
|
Variable::DefaultInitializationFlag(CONST), ok);
|
2016-09-28 13:42:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// This method declares a property of the given class. It updates the
|
|
|
|
// following fields of class_info, as appropriate:
|
|
|
|
// - constructor
|
|
|
|
// - properties
|
|
|
|
void Parser::DeclareClassProperty(const AstRawString* class_name,
|
|
|
|
ClassLiteralProperty* property,
|
2016-11-28 11:40:22 +00:00
|
|
|
ClassLiteralProperty::Kind kind,
|
|
|
|
bool is_static, bool is_constructor,
|
2016-09-28 13:42:20 +00:00
|
|
|
ClassInfo* class_info, bool* ok) {
|
2016-11-28 11:40:22 +00:00
|
|
|
if (is_constructor) {
|
|
|
|
DCHECK(!class_info->constructor);
|
2017-08-28 19:42:27 +00:00
|
|
|
class_info->constructor = property->value()->AsFunctionLiteral();
|
2016-09-28 13:42:20 +00:00
|
|
|
DCHECK_NOT_NULL(class_info->constructor);
|
|
|
|
class_info->constructor->set_raw_name(
|
2017-03-23 17:28:42 +00:00
|
|
|
class_name != nullptr ? ast_value_factory()->NewConsString(class_name)
|
2017-06-06 16:23:49 +00:00
|
|
|
: nullptr);
|
2016-09-28 13:42:20 +00:00
|
|
|
return;
|
2016-09-28 11:16:08 +00:00
|
|
|
}
|
|
|
|
|
2016-09-28 13:42:20 +00:00
|
|
|
if (property->kind() == ClassLiteralProperty::FIELD) {
|
|
|
|
DCHECK(allow_harmony_class_fields());
|
2016-12-16 19:52:27 +00:00
|
|
|
// TODO(littledan): Implement class fields
|
2016-09-28 13:42:20 +00:00
|
|
|
}
|
|
|
|
class_info->properties->Add(property, zone());
|
|
|
|
}
|
|
|
|
|
2017-05-04 17:00:44 +00:00
|
|
|
// This method generates a ClassLiteral AST node.
|
2016-09-28 13:42:20 +00:00
|
|
|
// It uses the following fields of class_info:
|
|
|
|
// - constructor (if missing, it updates it with a default constructor)
|
|
|
|
// - proxy
|
|
|
|
// - extends
|
|
|
|
// - properties
|
2016-12-07 10:34:15 +00:00
|
|
|
// - has_name_static_property
|
|
|
|
// - has_static_computed_names
|
2017-05-04 17:00:44 +00:00
|
|
|
Expression* Parser::RewriteClassLiteral(Scope* block_scope,
|
|
|
|
const AstRawString* name,
|
2016-09-28 13:42:20 +00:00
|
|
|
ClassInfo* class_info, int pos,
|
2017-05-15 13:41:09 +00:00
|
|
|
int end_pos, bool* ok) {
|
2017-05-04 17:00:44 +00:00
|
|
|
DCHECK_NOT_NULL(block_scope);
|
|
|
|
DCHECK_EQ(block_scope->scope_type(), BLOCK_SCOPE);
|
|
|
|
DCHECK_EQ(block_scope->language_mode(), STRICT);
|
2014-11-14 15:05:05 +00:00
|
|
|
|
2016-09-28 13:42:20 +00:00
|
|
|
bool has_extends = class_info->extends != nullptr;
|
|
|
|
bool has_default_constructor = class_info->constructor == nullptr;
|
2016-09-16 00:42:30 +00:00
|
|
|
if (has_default_constructor) {
|
2016-12-29 22:12:51 +00:00
|
|
|
class_info->constructor =
|
|
|
|
DefaultConstructor(name, has_extends, pos, end_pos);
|
2014-11-14 15:05:05 +00:00
|
|
|
}
|
|
|
|
|
2016-08-01 09:04:13 +00:00
|
|
|
if (name != nullptr) {
|
2017-09-15 00:57:13 +00:00
|
|
|
DCHECK_NOT_NULL(class_info->variable);
|
|
|
|
class_info->variable->set_initializer_position(end_pos);
|
2014-11-14 15:05:05 +00:00
|
|
|
}
|
|
|
|
|
2016-07-25 19:16:21 +00:00
|
|
|
ClassLiteral* class_literal = factory()->NewClassLiteral(
|
2017-09-15 00:57:13 +00:00
|
|
|
block_scope, class_info->variable, class_info->extends,
|
2017-05-04 17:00:44 +00:00
|
|
|
class_info->constructor, class_info->properties, pos, end_pos,
|
2016-12-07 10:34:15 +00:00
|
|
|
class_info->has_name_static_property,
|
2017-05-04 17:00:44 +00:00
|
|
|
class_info->has_static_computed_names, class_info->is_anonymous);
|
2016-07-25 19:16:21 +00:00
|
|
|
|
2016-11-15 21:57:25 +00:00
|
|
|
AddFunctionForNameInference(class_info->constructor);
|
2016-07-25 19:16:21 +00:00
|
|
|
|
2017-05-04 17:00:44 +00:00
|
|
|
return class_literal;
|
2014-11-14 15:05:05 +00:00
|
|
|
}
|
|
|
|
|
2013-10-14 09:24:58 +00:00
|
|
|
Literal* Parser::GetLiteralUndefined(int position) {
|
2014-06-24 14:03:24 +00:00
|
|
|
return factory()->NewUndefinedLiteral(position);
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-09-01 12:31:18 +00:00
|
|
|
void Parser::CheckConflictingVarDeclarations(Scope* scope, bool* ok) {
|
|
|
|
Declaration* decl = scope->CheckConflictingVarDeclarations();
|
|
|
|
if (decl != NULL) {
|
2015-10-01 10:42:23 +00:00
|
|
|
// In ES6, conflicting variable bindings are early errors.
|
2014-06-24 14:03:24 +00:00
|
|
|
const AstRawString* name = decl->proxy()->raw_name();
|
2011-09-01 12:31:18 +00:00
|
|
|
int position = decl->proxy()->position();
|
2016-06-30 09:26:30 +00:00
|
|
|
Scanner::Location location =
|
|
|
|
position == kNoSourcePosition
|
|
|
|
? Scanner::Location::invalid()
|
|
|
|
: Scanner::Location(position, position + 1);
|
2016-08-19 08:11:04 +00:00
|
|
|
ReportMessageAt(location, MessageTemplate::kVarRedeclaration, name);
|
2011-09-01 12:31:18 +00:00
|
|
|
*ok = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-10-01 10:42:23 +00:00
|
|
|
void Parser::InsertShadowingVarBindingInitializers(Block* inner_block) {
|
|
|
|
// For each var-binding that shadows a parameter, insert an assignment
|
|
|
|
// initializing the variable with the parameter.
|
|
|
|
Scope* inner_scope = inner_block->scope();
|
|
|
|
DCHECK(inner_scope->is_declaration_scope());
|
|
|
|
Scope* function_scope = inner_scope->outer_scope();
|
|
|
|
DCHECK(function_scope->is_function_scope());
|
2017-02-20 10:41:29 +00:00
|
|
|
BlockState block_state(&scope_, inner_scope);
|
2016-11-02 14:08:33 +00:00
|
|
|
for (Declaration* decl : *inner_scope->declarations()) {
|
2016-08-10 08:10:18 +00:00
|
|
|
if (decl->proxy()->var()->mode() != VAR || !decl->IsVariableDeclaration()) {
|
|
|
|
continue;
|
|
|
|
}
|
2015-10-01 10:42:23 +00:00
|
|
|
const AstRawString* name = decl->proxy()->raw_name();
|
|
|
|
Variable* parameter = function_scope->LookupLocal(name);
|
|
|
|
if (parameter == nullptr) continue;
|
2016-08-11 12:04:02 +00:00
|
|
|
VariableProxy* to = NewUnresolved(name);
|
2015-10-01 10:42:23 +00:00
|
|
|
VariableProxy* from = factory()->NewVariableProxy(parameter);
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* assignment =
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, to, from, kNoSourcePosition);
|
|
|
|
Statement* statement =
|
|
|
|
factory()->NewExpressionStatement(assignment, kNoSourcePosition);
|
2015-10-01 10:42:23 +00:00
|
|
|
inner_block->statements()->InsertAt(0, statement, zone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-15 16:41:03 +00:00
|
|
|
void Parser::InsertSloppyBlockFunctionVarBindings(DeclarationScope* scope) {
|
|
|
|
// For the outermost eval scope, we cannot hoist during parsing: let
|
|
|
|
// declarations in the surrounding scope may prevent hoisting, but the
|
|
|
|
// information is unaccessible during parsing. In this case, we hoist later in
|
|
|
|
// DeclarationScope::Analyze.
|
|
|
|
if (scope->is_eval_scope() && scope->outer_scope() == original_scope_) {
|
|
|
|
return;
|
2015-09-21 04:30:50 +00:00
|
|
|
}
|
2016-09-15 16:41:03 +00:00
|
|
|
scope->HoistSloppyBlockFunctions(factory());
|
2015-09-21 04:30:50 +00:00
|
|
|
}
|
|
|
|
|
2008-07-03 15:10:15 +00:00
|
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// Parser support
|
|
|
|
|
2014-06-24 14:03:24 +00:00
|
|
|
bool Parser::TargetStackContainsLabel(const AstRawString* label) {
|
2016-09-05 13:42:01 +00:00
|
|
|
for (ParserTarget* t = target_stack_; t != NULL; t = t->previous()) {
|
2015-01-15 19:18:05 +00:00
|
|
|
if (ContainsLabel(t->statement()->labels(), label)) return true;
|
2008-07-03 15:10:15 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-06-24 14:03:24 +00:00
|
|
|
BreakableStatement* Parser::LookupBreakTarget(const AstRawString* label,
|
|
|
|
bool* ok) {
|
|
|
|
bool anonymous = label == NULL;
|
2016-09-05 13:42:01 +00:00
|
|
|
for (ParserTarget* t = target_stack_; t != NULL; t = t->previous()) {
|
2015-01-15 19:18:05 +00:00
|
|
|
BreakableStatement* stat = t->statement();
|
2008-07-03 15:10:15 +00:00
|
|
|
if ((anonymous && stat->is_target_for_anonymous()) ||
|
|
|
|
(!anonymous && ContainsLabel(stat->labels(), label))) {
|
|
|
|
return stat;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-06-24 14:03:24 +00:00
|
|
|
IterationStatement* Parser::LookupContinueTarget(const AstRawString* label,
|
2008-07-03 15:10:15 +00:00
|
|
|
bool* ok) {
|
2014-06-24 14:03:24 +00:00
|
|
|
bool anonymous = label == NULL;
|
2016-09-05 13:42:01 +00:00
|
|
|
for (ParserTarget* t = target_stack_; t != NULL; t = t->previous()) {
|
2015-01-15 19:18:05 +00:00
|
|
|
IterationStatement* stat = t->statement()->AsIterationStatement();
|
2008-07-03 15:10:15 +00:00
|
|
|
if (stat == NULL) continue;
|
|
|
|
|
2014-08-04 11:34:54 +00:00
|
|
|
DCHECK(stat->is_target_for_anonymous());
|
2008-07-03 15:10:15 +00:00
|
|
|
if (anonymous || ContainsLabel(stat->labels(), label)) {
|
|
|
|
return stat;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-02-20 09:39:32 +00:00
|
|
|
void Parser::HandleSourceURLComments(Isolate* isolate, Handle<Script> script) {
|
2016-08-10 08:40:24 +00:00
|
|
|
Handle<String> source_url = scanner_.SourceUrl(isolate);
|
|
|
|
if (!source_url.is_null()) {
|
2015-02-20 09:39:32 +00:00
|
|
|
script->set_source_url(*source_url);
|
2014-07-02 07:01:31 +00:00
|
|
|
}
|
2016-08-10 08:40:24 +00:00
|
|
|
Handle<String> source_mapping_url = scanner_.SourceMappingUrl(isolate);
|
|
|
|
if (!source_mapping_url.is_null()) {
|
2015-02-20 09:39:32 +00:00
|
|
|
script->set_source_mapping_url(*source_mapping_url);
|
2014-07-02 07:01:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-10 15:01:29 +00:00
|
|
|
void Parser::ReportErrors(Isolate* isolate, Handle<Script> script) {
|
|
|
|
if (stack_overflow()) {
|
|
|
|
isolate->StackOverflow();
|
|
|
|
} else {
|
|
|
|
DCHECK(pending_error_handler_.has_pending_error());
|
|
|
|
// Internalize ast values for throwing the pending error.
|
|
|
|
ast_value_factory()->Internalize(isolate);
|
|
|
|
pending_error_handler_.ThrowPendingError(isolate, script);
|
2014-09-02 11:36:21 +00:00
|
|
|
}
|
2017-02-10 15:01:29 +00:00
|
|
|
}
|
2014-09-02 11:36:21 +00:00
|
|
|
|
2017-02-10 15:01:29 +00:00
|
|
|
void Parser::UpdateStatistics(Isolate* isolate, Handle<Script> script) {
|
2014-09-02 11:36:21 +00:00
|
|
|
// Move statistics to Isolate.
|
2014-06-30 13:35:16 +00:00
|
|
|
for (int feature = 0; feature < v8::Isolate::kUseCounterFeatureCount;
|
|
|
|
++feature) {
|
2016-06-14 21:39:36 +00:00
|
|
|
if (use_counts_[feature] > 0) {
|
2015-02-20 09:39:32 +00:00
|
|
|
isolate->CountUsage(v8::Isolate::UseCounterFeature(feature));
|
2014-06-30 13:35:16 +00:00
|
|
|
}
|
|
|
|
}
|
2016-01-27 18:18:25 +00:00
|
|
|
if (scanner_.FoundHtmlComment()) {
|
|
|
|
isolate->CountUsage(v8::Isolate::kHtmlComment);
|
|
|
|
if (script->line_offset() == 0 && script->column_offset() == 0) {
|
|
|
|
isolate->CountUsage(v8::Isolate::kHtmlCommentInExternalScript);
|
|
|
|
}
|
|
|
|
}
|
2015-02-20 09:39:32 +00:00
|
|
|
isolate->counters()->total_preparse_skipped()->Increment(
|
2014-09-02 11:36:21 +00:00
|
|
|
total_preparse_skipped_);
|
2014-06-30 13:35:16 +00:00
|
|
|
}
|
|
|
|
|
2015-03-09 14:51:13 +00:00
|
|
|
void Parser::ParseOnBackground(ParseInfo* info) {
|
2015-02-12 13:02:30 +00:00
|
|
|
parsing_on_main_thread_ = false;
|
|
|
|
|
2015-08-19 16:51:37 +00:00
|
|
|
DCHECK(info->literal() == NULL);
|
2014-09-12 09:12:08 +00:00
|
|
|
FunctionLiteral* result = NULL;
|
|
|
|
|
2016-11-07 13:23:01 +00:00
|
|
|
ParserLogger logger;
|
2016-11-21 14:58:46 +00:00
|
|
|
if (produce_cached_parse_data()) {
|
|
|
|
if (allow_lazy_) {
|
|
|
|
log_ = &logger;
|
|
|
|
} else {
|
|
|
|
compile_options_ = ScriptCompiler::kNoCompileOptions;
|
|
|
|
}
|
|
|
|
}
|
2014-09-12 09:12:08 +00:00
|
|
|
|
2017-08-21 12:59:45 +00:00
|
|
|
scanner_.Initialize(info->character_stream(), info->is_module());
|
2016-09-15 19:47:11 +00:00
|
|
|
DCHECK(info->maybe_outer_scope_info().is_null());
|
2014-09-12 09:12:08 +00:00
|
|
|
|
2016-08-03 13:30:23 +00:00
|
|
|
DCHECK(original_scope_);
|
|
|
|
|
2014-09-12 09:12:08 +00:00
|
|
|
// When streaming, we don't know the length of the source until we have parsed
|
|
|
|
// it. The raw data can be UTF-8, so we wouldn't know the source length until
|
|
|
|
// we have decoded it anyway even if we knew the raw data length (which we
|
|
|
|
// don't). We work around this by storing all the scopes which need their end
|
|
|
|
// position set at the end of the script (the top scope and possible eval
|
|
|
|
// scopes) and set their end position after we know the script length.
|
2016-10-11 10:36:56 +00:00
|
|
|
if (info->is_toplevel()) {
|
2016-08-05 13:18:42 +00:00
|
|
|
fni_ = new (zone()) FuncNameInferrer(ast_value_factory(), zone());
|
|
|
|
result = DoParseProgram(info);
|
2016-10-11 10:36:56 +00:00
|
|
|
} else {
|
2017-08-18 20:34:14 +00:00
|
|
|
result = DoParseFunction(info, info->function_name());
|
2016-08-05 13:18:42 +00:00
|
|
|
}
|
2017-08-22 10:53:10 +00:00
|
|
|
MaybeResetCharacterStream(info, result);
|
2014-09-12 09:12:08 +00:00
|
|
|
|
2015-03-09 14:51:13 +00:00
|
|
|
info->set_literal(result);
|
2014-09-12 09:12:08 +00:00
|
|
|
|
|
|
|
// We cannot internalize on a background thread; a foreground task will take
|
2017-05-22 21:51:45 +00:00
|
|
|
// care of calling AstValueFactory::Internalize just before compilation.
|
2014-09-12 09:12:08 +00:00
|
|
|
|
2014-11-17 12:16:27 +00:00
|
|
|
if (produce_cached_parse_data()) {
|
2016-11-07 13:23:01 +00:00
|
|
|
if (result != NULL) *info->cached_data() = logger.GetScriptData();
|
2014-09-12 09:12:08 +00:00
|
|
|
log_ = NULL;
|
|
|
|
}
|
2016-12-12 23:14:50 +00:00
|
|
|
if (FLAG_runtime_stats &
|
|
|
|
v8::tracing::TracingCategoryObserver::ENABLED_BY_TRACING) {
|
|
|
|
auto value = v8::tracing::TracedValue::Create();
|
|
|
|
runtime_call_stats_->Dump(value.get());
|
|
|
|
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("v8.runtime_stats"),
|
|
|
|
"V8.RuntimeStats", TRACE_EVENT_SCOPE_THREAD,
|
|
|
|
"runtime-call-stats", std::move(value));
|
2016-11-15 16:08:16 +00:00
|
|
|
}
|
2014-09-12 09:12:08 +00:00
|
|
|
}
|
2014-11-14 18:53:41 +00:00
|
|
|
|
2016-08-23 16:34:39 +00:00
|
|
|
Parser::TemplateLiteralState Parser::OpenTemplateLiteral(int pos) {
|
|
|
|
return new (zone()) TemplateLiteral(zone(), pos);
|
2014-11-14 18:53:41 +00:00
|
|
|
}
|
|
|
|
|
2017-02-22 21:20:32 +00:00
|
|
|
void Parser::AddTemplateSpan(TemplateLiteralState* state, bool should_cook,
|
|
|
|
bool tail) {
|
|
|
|
DCHECK(should_cook || allow_harmony_template_escapes());
|
2014-11-14 18:53:41 +00:00
|
|
|
int pos = scanner()->location().beg_pos;
|
|
|
|
int end = scanner()->location().end_pos - (tail ? 1 : 2);
|
2014-12-03 14:17:16 +00:00
|
|
|
const AstRawString* trv = scanner()->CurrentRawSymbol(ast_value_factory());
|
|
|
|
Literal* raw = factory()->NewStringLiteral(trv, pos);
|
2017-02-22 21:20:32 +00:00
|
|
|
if (should_cook) {
|
|
|
|
const AstRawString* tv = scanner()->CurrentSymbol(ast_value_factory());
|
|
|
|
Literal* cooked = factory()->NewStringLiteral(tv, pos);
|
|
|
|
(*state)->AddTemplateSpan(cooked, raw, end, zone());
|
|
|
|
} else {
|
|
|
|
(*state)->AddTemplateSpan(GetLiteralUndefined(pos), raw, end, zone());
|
|
|
|
}
|
2014-11-14 18:53:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Parser::AddTemplateExpression(TemplateLiteralState* state,
|
|
|
|
Expression* expression) {
|
|
|
|
(*state)->AddExpression(expression, zone());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Expression* Parser::CloseTemplateLiteral(TemplateLiteralState* state, int start,
|
|
|
|
Expression* tag) {
|
|
|
|
TemplateLiteral* lit = *state;
|
|
|
|
int pos = lit->position();
|
2017-09-22 09:57:29 +00:00
|
|
|
const ZoneList<Literal*>* cooked_strings = lit->cooked();
|
|
|
|
const ZoneList<Literal*>* raw_strings = lit->raw();
|
2014-11-14 18:53:41 +00:00
|
|
|
const ZoneList<Expression*>* expressions = lit->expressions();
|
2014-12-03 14:17:16 +00:00
|
|
|
DCHECK_EQ(cooked_strings->length(), raw_strings->length());
|
|
|
|
DCHECK_EQ(cooked_strings->length(), expressions->length() + 1);
|
2014-11-14 18:53:41 +00:00
|
|
|
|
|
|
|
if (!tag) {
|
|
|
|
// Build tree of BinaryOps to simplify code-generation
|
2015-03-24 12:43:50 +00:00
|
|
|
Expression* expr = cooked_strings->at(0);
|
|
|
|
int i = 0;
|
|
|
|
while (i < expressions->length()) {
|
|
|
|
Expression* sub = expressions->at(i++);
|
|
|
|
Expression* cooked_str = cooked_strings->at(i);
|
|
|
|
|
|
|
|
// Let middle be ToString(sub).
|
|
|
|
ZoneList<Expression*>* args =
|
|
|
|
new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
args->Add(sub, zone());
|
2015-09-23 21:46:37 +00:00
|
|
|
Expression* middle = factory()->NewCallRuntime(Runtime::kInlineToString,
|
|
|
|
args, sub->position());
|
2014-11-14 18:53:41 +00:00
|
|
|
|
|
|
|
expr = factory()->NewBinaryOperation(
|
2015-03-24 12:43:50 +00:00
|
|
|
Token::ADD, factory()->NewBinaryOperation(
|
|
|
|
Token::ADD, expr, middle, expr->position()),
|
|
|
|
cooked_str, sub->position());
|
2014-11-14 18:53:41 +00:00
|
|
|
}
|
|
|
|
return expr;
|
|
|
|
} else {
|
2017-09-22 09:57:29 +00:00
|
|
|
// GetTemplateObject
|
|
|
|
const int32_t hash = ComputeTemplateLiteralHash(lit);
|
|
|
|
Expression* template_object = factory()->NewGetTemplateObject(
|
|
|
|
const_cast<ZoneList<Literal*>*>(cooked_strings),
|
|
|
|
const_cast<ZoneList<Literal*>*>(raw_strings), hash, pos);
|
2014-11-14 18:53:41 +00:00
|
|
|
|
|
|
|
// Call TagFn
|
|
|
|
ZoneList<Expression*>* call_args =
|
|
|
|
new (zone()) ZoneList<Expression*>(expressions->length() + 1, zone());
|
2017-09-22 09:57:29 +00:00
|
|
|
call_args->Add(template_object, zone());
|
2014-11-14 18:53:41 +00:00
|
|
|
call_args->AddAll(*expressions, zone());
|
|
|
|
return factory()->NewCall(tag, call_args, pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-22 09:57:29 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
// http://burtleburtle.net/bob/hash/integer.html
|
|
|
|
uint32_t HalfAvalance(uint32_t a) {
|
|
|
|
a = (a + 0x479ab41d) + (a << 8);
|
|
|
|
a = (a ^ 0xe4aa10ce) ^ (a >> 5);
|
|
|
|
a = (a + 0x9942f0a6) - (a << 14);
|
|
|
|
a = (a ^ 0x5aedd67d) ^ (a >> 3);
|
|
|
|
a = (a + 0x17bea992) + (a << 7);
|
|
|
|
return a;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
2014-11-14 18:53:41 +00:00
|
|
|
|
2017-09-22 09:57:29 +00:00
|
|
|
int32_t Parser::ComputeTemplateLiteralHash(const TemplateLiteral* lit) {
|
|
|
|
const ZoneList<Literal*>* raw_strings = lit->raw();
|
2014-12-03 14:17:16 +00:00
|
|
|
int total = raw_strings->length();
|
2017-09-22 09:57:29 +00:00
|
|
|
DCHECK_GT(total, 0);
|
2014-11-14 18:53:41 +00:00
|
|
|
|
2014-11-27 15:47:42 +00:00
|
|
|
uint32_t running_hash = 0;
|
2014-11-20 22:37:31 +00:00
|
|
|
|
2014-11-14 18:53:41 +00:00
|
|
|
for (int index = 0; index < total; ++index) {
|
2014-11-20 22:37:31 +00:00
|
|
|
if (index) {
|
2014-11-27 15:47:42 +00:00
|
|
|
running_hash = StringHasher::ComputeRunningHashOneByte(
|
|
|
|
running_hash, "${}", 3);
|
2014-11-20 22:37:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-03 14:17:16 +00:00
|
|
|
const AstRawString* raw_string =
|
|
|
|
raw_strings->at(index)->AsLiteral()->raw_value()->AsString();
|
|
|
|
if (raw_string->is_one_byte()) {
|
|
|
|
const char* data = reinterpret_cast<const char*>(raw_string->raw_data());
|
|
|
|
running_hash = StringHasher::ComputeRunningHashOneByte(
|
|
|
|
running_hash, data, raw_string->length());
|
2014-11-26 17:15:47 +00:00
|
|
|
} else {
|
2014-12-03 14:17:16 +00:00
|
|
|
const uc16* data = reinterpret_cast<const uc16*>(raw_string->raw_data());
|
|
|
|
running_hash = StringHasher::ComputeRunningHash(running_hash, data,
|
|
|
|
raw_string->length());
|
2014-11-26 17:15:47 +00:00
|
|
|
}
|
2014-11-14 18:53:41 +00:00
|
|
|
}
|
|
|
|
|
2017-09-22 09:57:29 +00:00
|
|
|
// Pass {running_hash} throught a decent 'half avalance' hash function
|
|
|
|
// and take the most significant bits (in Smi range).
|
|
|
|
return static_cast<int32_t>(HalfAvalance(running_hash)) >>
|
|
|
|
(sizeof(int32_t) * CHAR_BIT - kSmiValueSize);
|
2014-11-14 18:53:41 +00:00
|
|
|
}
|
2015-04-09 19:37:14 +00:00
|
|
|
|
2017-01-23 09:03:35 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
bool OnlyLastArgIsSpread(ZoneList<Expression*>* args) {
|
|
|
|
for (int i = 0; i < args->length() - 1; i++) {
|
|
|
|
if (args->at(i)->IsSpread()) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return args->at(args->length() - 1)->IsSpread();
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
2016-08-26 07:45:53 +00:00
|
|
|
ZoneList<Expression*>* Parser::PrepareSpreadArguments(
|
|
|
|
ZoneList<Expression*>* list) {
|
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(1, zone());
|
2017-01-18 17:06:17 +00:00
|
|
|
if (list->length() == 1) {
|
|
|
|
// Spread-call with single spread argument produces an InternalArray
|
|
|
|
// containing the values from the array.
|
|
|
|
//
|
|
|
|
// Function is called or constructed with the produced array of arguments
|
|
|
|
//
|
|
|
|
// EG: Apply(Func, Spread(spread0))
|
|
|
|
ZoneList<Expression*>* spread_list =
|
|
|
|
new (zone()) ZoneList<Expression*>(0, zone());
|
|
|
|
spread_list->Add(list->at(0)->AsSpread()->expression(), zone());
|
|
|
|
args->Add(factory()->NewCallRuntime(Runtime::kSpreadIterablePrepare,
|
|
|
|
spread_list, kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
return args;
|
|
|
|
} else {
|
|
|
|
// Spread-call with multiple arguments produces array literals for each
|
|
|
|
// sequences of unspread arguments, and converts each spread iterable to
|
|
|
|
// an Internal array. Finally, all of these produced arrays are flattened
|
|
|
|
// into a single InternalArray, containing the arguments for the call.
|
|
|
|
//
|
|
|
|
// EG: Apply(Func, Flatten([unspread0, unspread1], Spread(spread0),
|
|
|
|
// Spread(spread1), [unspread2, unspread3]))
|
|
|
|
int i = 0;
|
|
|
|
int n = list->length();
|
|
|
|
while (i < n) {
|
|
|
|
if (!list->at(i)->IsSpread()) {
|
|
|
|
ZoneList<Expression*>* unspread =
|
|
|
|
new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
|
|
|
|
// Push array of unspread parameters
|
|
|
|
while (i < n && !list->at(i)->IsSpread()) {
|
|
|
|
unspread->Add(list->at(i++), zone());
|
|
|
|
}
|
2017-01-30 12:31:35 +00:00
|
|
|
args->Add(factory()->NewArrayLiteral(unspread, kNoSourcePosition),
|
2017-01-18 17:06:17 +00:00
|
|
|
zone());
|
2015-04-09 19:37:14 +00:00
|
|
|
|
2017-01-18 17:06:17 +00:00
|
|
|
if (i == n) break;
|
2015-04-09 19:37:14 +00:00
|
|
|
}
|
2017-01-18 12:58:58 +00:00
|
|
|
|
2017-01-18 17:06:17 +00:00
|
|
|
// Push eagerly spread argument
|
|
|
|
ZoneList<Expression*>* spread_list =
|
|
|
|
new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
spread_list->Add(list->at(i++)->AsSpread()->expression(), zone());
|
|
|
|
args->Add(factory()->NewCallRuntime(Context::SPREAD_ITERABLE_INDEX,
|
|
|
|
spread_list, kNoSourcePosition),
|
|
|
|
zone());
|
2015-04-09 19:37:14 +00:00
|
|
|
}
|
|
|
|
|
2017-01-18 17:06:17 +00:00
|
|
|
list = new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
list->Add(factory()->NewCallRuntime(Context::SPREAD_ARGUMENTS_INDEX, args,
|
|
|
|
kNoSourcePosition),
|
2015-04-09 19:37:14 +00:00
|
|
|
zone());
|
2017-01-18 17:06:17 +00:00
|
|
|
return list;
|
2015-04-09 19:37:14 +00:00
|
|
|
}
|
2017-01-18 17:06:17 +00:00
|
|
|
UNREACHABLE();
|
2015-04-09 19:37:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Expression* Parser::SpreadCall(Expression* function,
|
2017-01-23 09:03:35 +00:00
|
|
|
ZoneList<Expression*>* args, int pos,
|
|
|
|
Call::PossiblyEval is_possibly_eval) {
|
2017-07-13 18:06:15 +00:00
|
|
|
// Handle this case in BytecodeGenerator.
|
|
|
|
if (OnlyLastArgIsSpread(args)) {
|
2017-01-23 09:03:35 +00:00
|
|
|
return factory()->NewCall(function, args, pos);
|
|
|
|
}
|
|
|
|
|
2015-06-02 22:04:25 +00:00
|
|
|
if (function->IsSuperCallReference()) {
|
2015-04-09 19:37:14 +00:00
|
|
|
// Super calls
|
2015-12-11 16:38:44 +00:00
|
|
|
// $super_constructor = %_GetSuperConstructor(<this-function>)
|
|
|
|
// %reflect_construct($super_constructor, args, new.target)
|
2016-12-01 09:42:07 +00:00
|
|
|
|
|
|
|
args = PrepareSpreadArguments(args);
|
2015-07-16 15:07:47 +00:00
|
|
|
ZoneList<Expression*>* tmp = new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
tmp->Add(function->AsSuperCallReference()->this_function_var(), zone());
|
2015-12-11 15:48:48 +00:00
|
|
|
Expression* super_constructor = factory()->NewCallRuntime(
|
|
|
|
Runtime::kInlineGetSuperConstructor, tmp, pos);
|
|
|
|
args->InsertAt(0, super_constructor, zone());
|
2015-06-02 22:04:25 +00:00
|
|
|
args->Add(function->AsSuperCallReference()->new_target_var(), zone());
|
2015-08-26 11:16:38 +00:00
|
|
|
return factory()->NewCallRuntime(Context::REFLECT_CONSTRUCT_INDEX, args,
|
|
|
|
pos);
|
2015-04-09 19:37:14 +00:00
|
|
|
} else {
|
2016-12-01 09:42:07 +00:00
|
|
|
args = PrepareSpreadArguments(args);
|
2015-04-09 19:37:14 +00:00
|
|
|
if (function->IsProperty()) {
|
|
|
|
// Method calls
|
2015-05-14 22:59:22 +00:00
|
|
|
if (function->AsProperty()->IsSuperAccess()) {
|
2016-08-11 12:04:02 +00:00
|
|
|
Expression* home = ThisExpression(kNoSourcePosition);
|
2015-05-14 22:59:22 +00:00
|
|
|
args->InsertAt(0, function, zone());
|
|
|
|
args->InsertAt(1, home, zone());
|
|
|
|
} else {
|
2016-08-09 19:49:25 +00:00
|
|
|
Variable* temp = NewTemporary(ast_value_factory()->empty_string());
|
2015-05-14 22:59:22 +00:00
|
|
|
VariableProxy* obj = factory()->NewVariableProxy(temp);
|
|
|
|
Assignment* assign_obj = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, obj, function->AsProperty()->obj(),
|
2016-06-30 09:26:30 +00:00
|
|
|
kNoSourcePosition);
|
2015-05-14 22:59:22 +00:00
|
|
|
function = factory()->NewProperty(
|
2016-06-30 09:26:30 +00:00
|
|
|
assign_obj, function->AsProperty()->key(), kNoSourcePosition);
|
2015-05-14 22:59:22 +00:00
|
|
|
args->InsertAt(0, function, zone());
|
|
|
|
obj = factory()->NewVariableProxy(temp);
|
|
|
|
args->InsertAt(1, obj, zone());
|
|
|
|
}
|
2015-04-09 19:37:14 +00:00
|
|
|
} else {
|
|
|
|
// Non-method calls
|
|
|
|
args->InsertAt(0, function, zone());
|
2016-06-30 09:26:30 +00:00
|
|
|
args->InsertAt(1, factory()->NewUndefinedLiteral(kNoSourcePosition),
|
2015-04-09 19:37:14 +00:00
|
|
|
zone());
|
|
|
|
}
|
2015-08-26 11:16:38 +00:00
|
|
|
return factory()->NewCallRuntime(Context::REFLECT_APPLY_INDEX, args, pos);
|
2015-04-09 19:37:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Expression* Parser::SpreadCallNew(Expression* function,
|
2016-08-26 07:45:53 +00:00
|
|
|
ZoneList<Expression*>* args, int pos) {
|
2017-01-23 09:03:35 +00:00
|
|
|
if (OnlyLastArgIsSpread(args)) {
|
|
|
|
// Handle in BytecodeGenerator.
|
|
|
|
return factory()->NewCallNew(function, args, pos);
|
|
|
|
}
|
2016-12-01 09:42:07 +00:00
|
|
|
args = PrepareSpreadArguments(args);
|
2015-04-09 19:37:14 +00:00
|
|
|
args->InsertAt(0, function, zone());
|
|
|
|
|
2015-08-26 11:16:38 +00:00
|
|
|
return factory()->NewCallRuntime(Context::REFLECT_CONSTRUCT_INDEX, args, pos);
|
2015-04-09 19:37:14 +00:00
|
|
|
}
|
2015-11-05 19:52:36 +00:00
|
|
|
|
|
|
|
|
|
|
|
void Parser::SetLanguageMode(Scope* scope, LanguageMode mode) {
|
|
|
|
v8::Isolate::UseCounterFeature feature;
|
|
|
|
if (is_sloppy(mode))
|
|
|
|
feature = v8::Isolate::kSloppyMode;
|
|
|
|
else if (is_strict(mode))
|
|
|
|
feature = v8::Isolate::kStrictMode;
|
|
|
|
else
|
|
|
|
UNREACHABLE();
|
|
|
|
++use_counts_[feature];
|
|
|
|
scope->SetLanguageMode(mode);
|
|
|
|
}
|
|
|
|
|
2016-09-05 13:42:01 +00:00
|
|
|
void Parser::SetAsmModule() {
|
|
|
|
// Store the usage count; The actual use counter on the isolate is
|
|
|
|
// incremented after parsing is done.
|
|
|
|
++use_counts_[v8::Isolate::kUseAsm];
|
|
|
|
DCHECK(scope()->is_declaration_scope());
|
|
|
|
scope()->AsDeclarationScope()->set_asm_module();
|
2015-11-05 19:52:36 +00:00
|
|
|
}
|
|
|
|
|
2016-08-25 08:48:45 +00:00
|
|
|
Expression* Parser::ExpressionListToExpression(ZoneList<Expression*>* args) {
|
2016-05-16 23:17:13 +00:00
|
|
|
Expression* expr = args->at(0);
|
|
|
|
for (int i = 1; i < args->length(); ++i) {
|
2016-08-25 08:48:45 +00:00
|
|
|
expr = factory()->NewBinaryOperation(Token::COMMA, expr, args->at(i),
|
|
|
|
expr->position());
|
2016-05-16 23:17:13 +00:00
|
|
|
}
|
|
|
|
return expr;
|
|
|
|
}
|
|
|
|
|
2016-09-27 18:01:58 +00:00
|
|
|
// This method completes the desugaring of the body of async_function.
|
|
|
|
void Parser::RewriteAsyncFunctionBody(ZoneList<Statement*>* body, Block* block,
|
|
|
|
Expression* return_value, bool* ok) {
|
|
|
|
// function async_function() {
|
2016-12-12 09:57:17 +00:00
|
|
|
// .generator_object = %CreateJSGeneratorObject();
|
2016-09-27 18:01:58 +00:00
|
|
|
// BuildRejectPromiseOnException({
|
|
|
|
// ... block ...
|
|
|
|
// return %ResolvePromise(.promise, expr), .promise;
|
|
|
|
// })
|
|
|
|
// }
|
|
|
|
|
|
|
|
return_value = BuildResolvePromise(return_value, return_value->position());
|
|
|
|
block->statements()->Add(
|
|
|
|
factory()->NewReturnStatement(return_value, return_value->position()),
|
|
|
|
zone());
|
2017-01-20 08:58:54 +00:00
|
|
|
block = BuildRejectPromiseOnException(block);
|
2016-09-27 18:01:58 +00:00
|
|
|
body->Add(block, zone());
|
|
|
|
}
|
|
|
|
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
class NonPatternRewriter : public AstExpressionRewriter {
|
|
|
|
public:
|
|
|
|
NonPatternRewriter(uintptr_t stack_limit, Parser* parser)
|
|
|
|
: AstExpressionRewriter(stack_limit), parser_(parser) {}
|
|
|
|
~NonPatternRewriter() override {}
|
|
|
|
|
|
|
|
private:
|
|
|
|
bool RewriteExpression(Expression* expr) override {
|
2016-02-19 15:58:57 +00:00
|
|
|
if (expr->IsRewritableExpression()) return true;
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
// Rewrite only what could have been a pattern but is not.
|
|
|
|
if (expr->IsArrayLiteral()) {
|
|
|
|
// Spread rewriting in array literals.
|
|
|
|
ArrayLiteral* lit = expr->AsArrayLiteral();
|
|
|
|
VisitExpressions(lit->values());
|
|
|
|
replacement_ = parser_->RewriteSpreads(lit);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (expr->IsObjectLiteral()) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (expr->IsBinaryOperation() &&
|
|
|
|
expr->AsBinaryOperation()->op() == Token::COMMA) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
// Everything else does not need rewriting.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-09-06 17:43:17 +00:00
|
|
|
void VisitLiteralProperty(LiteralProperty* property) override {
|
2016-02-01 09:18:09 +00:00
|
|
|
if (property == nullptr) return;
|
|
|
|
// Do not rewrite (computed) key expressions
|
|
|
|
AST_REWRITE_PROPERTY(Expression, property, value);
|
|
|
|
}
|
|
|
|
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
Parser* parser_;
|
|
|
|
};
|
|
|
|
|
2016-09-01 08:58:15 +00:00
|
|
|
void Parser::RewriteNonPattern(bool* ok) {
|
|
|
|
ValidateExpression(CHECK_OK_VOID);
|
2016-02-19 15:58:57 +00:00
|
|
|
auto non_patterns_to_rewrite = function_state_->non_patterns_to_rewrite();
|
2016-09-01 08:58:15 +00:00
|
|
|
int begin = classifier()->GetNonPatternBegin();
|
2016-02-19 15:58:57 +00:00
|
|
|
int end = non_patterns_to_rewrite->length();
|
|
|
|
if (begin < end) {
|
|
|
|
NonPatternRewriter rewriter(stack_limit_, this);
|
|
|
|
for (int i = begin; i < end; i++) {
|
|
|
|
DCHECK(non_patterns_to_rewrite->at(i)->IsRewritableExpression());
|
|
|
|
rewriter.Rewrite(non_patterns_to_rewrite->at(i));
|
|
|
|
}
|
|
|
|
non_patterns_to_rewrite->Rewind(begin);
|
2016-01-14 15:46:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-12-04 17:20:10 +00:00
|
|
|
void Parser::RewriteDestructuringAssignments() {
|
2016-02-19 15:58:57 +00:00
|
|
|
const auto& assignments =
|
|
|
|
function_state_->destructuring_assignments_to_rewrite();
|
2015-12-04 17:20:10 +00:00
|
|
|
for (int i = assignments.length() - 1; i >= 0; --i) {
|
|
|
|
// Rewrite list in reverse, so that nested assignment patterns are rewritten
|
|
|
|
// correctly.
|
2016-02-19 15:58:57 +00:00
|
|
|
const DestructuringAssignment& pair = assignments.at(i);
|
|
|
|
RewritableExpression* to_rewrite =
|
|
|
|
pair.assignment->AsRewritableExpression();
|
2015-12-04 17:20:10 +00:00
|
|
|
DCHECK_NOT_NULL(to_rewrite);
|
|
|
|
if (!to_rewrite->is_rewritten()) {
|
2016-11-24 09:47:57 +00:00
|
|
|
// Since this function is called at the end of parsing the program,
|
|
|
|
// pair.scope may already have been removed by FinalizeBlockScope in the
|
|
|
|
// meantime.
|
|
|
|
Scope* scope = pair.scope->GetUnremovedScope();
|
2017-09-07 12:05:46 +00:00
|
|
|
BlockState block_state(&scope_, scope);
|
|
|
|
RewriteDestructuringAssignment(to_rewrite);
|
2015-12-04 17:20:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-18 13:53:52 +00:00
|
|
|
Expression* Parser::RewriteExponentiation(Expression* left, Expression* right,
|
|
|
|
int pos) {
|
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone());
|
|
|
|
args->Add(left, zone());
|
|
|
|
args->Add(right, zone());
|
[builtins] Unify most of the remaining Math builtins.
Import fdlibm versions of acos, acosh, asin and asinh, which are more
precise and produce the same result across platforms (we were using
libm versions for asin and acos so far, where both speed and precision
depended on the operating system so far). Introduce appropriate TurboFan
operators for these functions and use them both for inlining and for the
generic builtin.
Also migrate the Math.imul and Math.fround builtins to TurboFan builtins
to ensure that their behavior is always exactly the same as the inlined
TurboFan version (i.e. C++ truncation semantics for double to float
don't necessarily meet the JavaScript semantics).
For completeness, also migrate Math.sign, which can even get some nice
love in TurboFan.
Drive-by-fix: Some alpha-sorting on the Math related functions, and
cleanup the list of Math intrinsics that we have to export via the
native context currently.
BUG=v8:3266,v8:3496,v8:3509,v8:3952,v8:5169,v8:5170,v8:5171,v8:5172
TBR=rossberg@chromium.org
R=franzih@chromium.org
Review-Url: https://codereview.chromium.org/2116753002
Cr-Commit-Position: refs/heads/master@{#37476}
2016-07-01 11:11:33 +00:00
|
|
|
return factory()->NewCallRuntime(Context::MATH_POW_INDEX, args, pos);
|
2016-03-18 13:53:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Expression* Parser::RewriteAssignExponentiation(Expression* left,
|
|
|
|
Expression* right, int pos) {
|
|
|
|
ZoneList<Expression*>* args = new (zone()) ZoneList<Expression*>(2, zone());
|
|
|
|
if (left->IsVariableProxy()) {
|
|
|
|
VariableProxy* lhs = left->AsVariableProxy();
|
|
|
|
|
|
|
|
Expression* result;
|
|
|
|
DCHECK_NOT_NULL(lhs->raw_name());
|
2016-10-25 07:59:05 +00:00
|
|
|
result = ExpressionFromIdentifier(lhs->raw_name(), lhs->position());
|
2016-03-18 13:53:52 +00:00
|
|
|
args->Add(left, zone());
|
|
|
|
args->Add(right, zone());
|
|
|
|
Expression* call =
|
[builtins] Unify most of the remaining Math builtins.
Import fdlibm versions of acos, acosh, asin and asinh, which are more
precise and produce the same result across platforms (we were using
libm versions for asin and acos so far, where both speed and precision
depended on the operating system so far). Introduce appropriate TurboFan
operators for these functions and use them both for inlining and for the
generic builtin.
Also migrate the Math.imul and Math.fround builtins to TurboFan builtins
to ensure that their behavior is always exactly the same as the inlined
TurboFan version (i.e. C++ truncation semantics for double to float
don't necessarily meet the JavaScript semantics).
For completeness, also migrate Math.sign, which can even get some nice
love in TurboFan.
Drive-by-fix: Some alpha-sorting on the Math related functions, and
cleanup the list of Math intrinsics that we have to export via the
native context currently.
BUG=v8:3266,v8:3496,v8:3509,v8:3952,v8:5169,v8:5170,v8:5171,v8:5172
TBR=rossberg@chromium.org
R=franzih@chromium.org
Review-Url: https://codereview.chromium.org/2116753002
Cr-Commit-Position: refs/heads/master@{#37476}
2016-07-01 11:11:33 +00:00
|
|
|
factory()->NewCallRuntime(Context::MATH_POW_INDEX, args, pos);
|
2016-03-18 13:53:52 +00:00
|
|
|
return factory()->NewAssignment(Token::ASSIGN, result, call, pos);
|
|
|
|
} else if (left->IsProperty()) {
|
|
|
|
Property* prop = left->AsProperty();
|
2016-08-09 19:49:25 +00:00
|
|
|
auto temp_obj = NewTemporary(ast_value_factory()->empty_string());
|
|
|
|
auto temp_key = NewTemporary(ast_value_factory()->empty_string());
|
2016-03-18 13:53:52 +00:00
|
|
|
Expression* assign_obj = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(temp_obj), prop->obj(),
|
2016-06-30 09:26:30 +00:00
|
|
|
kNoSourcePosition);
|
2016-03-18 13:53:52 +00:00
|
|
|
Expression* assign_key = factory()->NewAssignment(
|
|
|
|
Token::ASSIGN, factory()->NewVariableProxy(temp_key), prop->key(),
|
2016-06-30 09:26:30 +00:00
|
|
|
kNoSourcePosition);
|
2016-03-18 13:53:52 +00:00
|
|
|
args->Add(factory()->NewProperty(factory()->NewVariableProxy(temp_obj),
|
|
|
|
factory()->NewVariableProxy(temp_key),
|
|
|
|
left->position()),
|
|
|
|
zone());
|
|
|
|
args->Add(right, zone());
|
|
|
|
Expression* call =
|
[builtins] Unify most of the remaining Math builtins.
Import fdlibm versions of acos, acosh, asin and asinh, which are more
precise and produce the same result across platforms (we were using
libm versions for asin and acos so far, where both speed and precision
depended on the operating system so far). Introduce appropriate TurboFan
operators for these functions and use them both for inlining and for the
generic builtin.
Also migrate the Math.imul and Math.fround builtins to TurboFan builtins
to ensure that their behavior is always exactly the same as the inlined
TurboFan version (i.e. C++ truncation semantics for double to float
don't necessarily meet the JavaScript semantics).
For completeness, also migrate Math.sign, which can even get some nice
love in TurboFan.
Drive-by-fix: Some alpha-sorting on the Math related functions, and
cleanup the list of Math intrinsics that we have to export via the
native context currently.
BUG=v8:3266,v8:3496,v8:3509,v8:3952,v8:5169,v8:5170,v8:5171,v8:5172
TBR=rossberg@chromium.org
R=franzih@chromium.org
Review-Url: https://codereview.chromium.org/2116753002
Cr-Commit-Position: refs/heads/master@{#37476}
2016-07-01 11:11:33 +00:00
|
|
|
factory()->NewCallRuntime(Context::MATH_POW_INDEX, args, pos);
|
2016-03-18 13:53:52 +00:00
|
|
|
Expression* target = factory()->NewProperty(
|
|
|
|
factory()->NewVariableProxy(temp_obj),
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewVariableProxy(temp_key), kNoSourcePosition);
|
2016-03-18 13:53:52 +00:00
|
|
|
Expression* assign =
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, target, call, pos);
|
|
|
|
return factory()->NewBinaryOperation(
|
|
|
|
Token::COMMA, assign_obj,
|
|
|
|
factory()->NewBinaryOperation(Token::COMMA, assign_key, assign, pos),
|
|
|
|
pos);
|
|
|
|
}
|
|
|
|
UNREACHABLE();
|
|
|
|
}
|
2015-12-04 17:20:10 +00:00
|
|
|
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
Expression* Parser::RewriteSpreads(ArrayLiteral* lit) {
|
|
|
|
// Array literals containing spreads are rewritten using do expressions, e.g.
|
|
|
|
// [1, 2, 3, ...x, 4, ...y, 5]
|
|
|
|
// is roughly rewritten as:
|
|
|
|
// do {
|
|
|
|
// $R = [1, 2, 3];
|
|
|
|
// for ($i of x) %AppendElement($R, $i);
|
|
|
|
// %AppendElement($R, 4);
|
|
|
|
// for ($j of y) %AppendElement($R, $j);
|
|
|
|
// %AppendElement($R, 5);
|
|
|
|
// $R
|
|
|
|
// }
|
|
|
|
// where $R, $i and $j are fresh temporary variables.
|
|
|
|
ZoneList<Expression*>::iterator s = lit->FirstSpread();
|
|
|
|
if (s == lit->EndValue()) return nullptr; // no spread, no rewriting...
|
2016-08-09 19:49:25 +00:00
|
|
|
Variable* result = NewTemporary(ast_value_factory()->dot_result_string());
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
// NOTE: The value assigned to R is the whole original array literal,
|
|
|
|
// spreads included. This will be fixed before the rewritten AST is returned.
|
|
|
|
// $R = lit
|
2016-06-30 09:26:30 +00:00
|
|
|
Expression* init_result = factory()->NewAssignment(
|
|
|
|
Token::INIT, factory()->NewVariableProxy(result), lit, kNoSourcePosition);
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* do_block = factory()->NewBlock(16, false);
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
do_block->statements()->Add(
|
2016-06-30 09:26:30 +00:00
|
|
|
factory()->NewExpressionStatement(init_result, kNoSourcePosition),
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
zone());
|
|
|
|
// Traverse the array literal starting from the first spread.
|
|
|
|
while (s != lit->EndValue()) {
|
|
|
|
Expression* value = *s++;
|
|
|
|
Spread* spread = value->AsSpread();
|
|
|
|
if (spread == nullptr) {
|
|
|
|
// If the element is not a spread, we're adding a single:
|
|
|
|
// %AppendElement($R, value)
|
2016-09-08 18:50:17 +00:00
|
|
|
// or, in case of a hole,
|
|
|
|
// ++($R.length)
|
|
|
|
if (!value->IsLiteral() ||
|
|
|
|
!value->AsLiteral()->raw_value()->IsTheHole()) {
|
|
|
|
ZoneList<Expression*>* append_element_args = NewExpressionList(2);
|
|
|
|
append_element_args->Add(factory()->NewVariableProxy(result), zone());
|
|
|
|
append_element_args->Add(value, zone());
|
|
|
|
do_block->statements()->Add(
|
|
|
|
factory()->NewExpressionStatement(
|
|
|
|
factory()->NewCallRuntime(Runtime::kAppendElement,
|
|
|
|
append_element_args,
|
|
|
|
kNoSourcePosition),
|
|
|
|
kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
} else {
|
|
|
|
Property* length_property = factory()->NewProperty(
|
|
|
|
factory()->NewVariableProxy(result),
|
|
|
|
factory()->NewStringLiteral(ast_value_factory()->length_string(),
|
|
|
|
kNoSourcePosition),
|
|
|
|
kNoSourcePosition);
|
|
|
|
CountOperation* count_op = factory()->NewCountOperation(
|
|
|
|
Token::INC, true /* prefix */, length_property, kNoSourcePosition);
|
|
|
|
do_block->statements()->Add(
|
|
|
|
factory()->NewExpressionStatement(count_op, kNoSourcePosition),
|
|
|
|
zone());
|
|
|
|
}
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
} else {
|
|
|
|
// If it's a spread, we're adding a for/of loop iterating through it.
|
2016-08-09 19:49:25 +00:00
|
|
|
Variable* each = NewTemporary(ast_value_factory()->dot_for_string());
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
Expression* subject = spread->expression();
|
|
|
|
// %AppendElement($R, each)
|
|
|
|
Statement* append_body;
|
|
|
|
{
|
2016-08-25 08:44:59 +00:00
|
|
|
ZoneList<Expression*>* append_element_args = NewExpressionList(2);
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
append_element_args->Add(factory()->NewVariableProxy(result), zone());
|
|
|
|
append_element_args->Add(factory()->NewVariableProxy(each), zone());
|
|
|
|
append_body = factory()->NewExpressionStatement(
|
|
|
|
factory()->NewCallRuntime(Runtime::kAppendElement,
|
2016-06-30 09:26:30 +00:00
|
|
|
append_element_args, kNoSourcePosition),
|
|
|
|
kNoSourcePosition);
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
}
|
|
|
|
// for (each of spread) %AppendElement($R, each)
|
2017-02-15 19:39:06 +00:00
|
|
|
ForOfStatement* loop =
|
|
|
|
factory()->NewForOfStatement(nullptr, kNoSourcePosition);
|
2016-07-07 08:15:11 +00:00
|
|
|
const bool finalize = false;
|
2017-02-15 19:39:06 +00:00
|
|
|
InitializeForOfStatement(loop, factory()->NewVariableProxy(each), subject,
|
|
|
|
append_body, finalize, IteratorType::kNormal);
|
2016-03-07 19:52:12 +00:00
|
|
|
do_block->statements()->Add(loop, zone());
|
Add spread rewriting
In short, array literals containing spreads, when used as expressions,
are rewritten using do expressions. E.g.
[1, 2, 3, ...x, 4, ...y, 5]
is roughly rewritten as:
do {
$R = [1, 2, 3];
for ($i of x) %AppendElement($R, $i);
%AppendElement($R, 4);
for ($j of y) %AppendElement($R, $j);
%AppendElement($R, 5);
$R
}
where $R, $i and $j are fresh temporary variables.
R=rossberg@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1564083002
Cr-Commit-Position: refs/heads/master@{#33307}
2016-01-14 17:49:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Now, rewind the original array literal to truncate everything from the
|
|
|
|
// first spread (included) until the end. This fixes $R's initialization.
|
|
|
|
lit->RewindSpreads();
|
|
|
|
return factory()->NewDoExpression(do_block, result, lit->position());
|
|
|
|
}
|
|
|
|
|
2016-08-23 16:34:39 +00:00
|
|
|
void Parser::QueueDestructuringAssignmentForRewriting(Expression* expr) {
|
2016-02-19 15:58:57 +00:00
|
|
|
DCHECK(expr->IsRewritableExpression());
|
2016-08-23 16:34:39 +00:00
|
|
|
function_state_->AddDestructuringAssignment(
|
2016-08-25 08:48:45 +00:00
|
|
|
DestructuringAssignment(expr, scope()));
|
2015-12-04 17:20:10 +00:00
|
|
|
}
|
|
|
|
|
2016-08-23 16:34:39 +00:00
|
|
|
void Parser::QueueNonPatternForRewriting(Expression* expr, bool* ok) {
|
2016-02-19 15:58:57 +00:00
|
|
|
DCHECK(expr->IsRewritableExpression());
|
2016-08-23 16:34:39 +00:00
|
|
|
function_state_->AddNonPatternForRewriting(expr, ok);
|
2016-02-19 15:58:57 +00:00
|
|
|
}
|
|
|
|
|
2017-06-19 15:13:45 +00:00
|
|
|
void Parser::SetFunctionNameFromPropertyName(LiteralProperty* property,
|
|
|
|
const AstRawString* name,
|
|
|
|
const AstRawString* prefix) {
|
|
|
|
// Ensure that the function we are going to create has shared name iff
|
|
|
|
// we are not going to set it later.
|
|
|
|
if (property->NeedsSetFunctionName()) {
|
|
|
|
name = nullptr;
|
|
|
|
prefix = nullptr;
|
|
|
|
} else {
|
|
|
|
// If the property value is an anonymous function or an anonymous class or
|
|
|
|
// a concise method or an accessor function which doesn't require the name
|
|
|
|
// to be set then the shared name must be provided.
|
|
|
|
DCHECK_IMPLIES(property->value()->IsAnonymousFunctionDefinition() ||
|
|
|
|
property->value()->IsConciseMethodDefinition() ||
|
|
|
|
property->value()->IsAccessorFunctionDefinition(),
|
|
|
|
name != nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
Expression* value = property->value();
|
|
|
|
SetFunctionName(value, name, prefix);
|
2016-09-06 18:49:04 +00:00
|
|
|
}
|
|
|
|
|
2016-08-25 08:48:45 +00:00
|
|
|
void Parser::SetFunctionNameFromPropertyName(ObjectLiteralProperty* property,
|
2017-06-19 15:13:45 +00:00
|
|
|
const AstRawString* name,
|
|
|
|
const AstRawString* prefix) {
|
2016-01-06 23:38:28 +00:00
|
|
|
// Ignore "__proto__" as a name when it's being used to set the [[Prototype]]
|
|
|
|
// of an object literal.
|
2017-06-19 15:13:45 +00:00
|
|
|
// See ES #sec-__proto__-property-names-in-object-initializers.
|
2017-04-27 14:48:32 +00:00
|
|
|
if (property->IsPrototype()) return;
|
2016-01-06 23:38:28 +00:00
|
|
|
|
2017-06-19 15:13:45 +00:00
|
|
|
DCHECK(!property->value()->IsAnonymousFunctionDefinition() ||
|
2016-09-06 18:49:04 +00:00
|
|
|
property->kind() == ObjectLiteralProperty::COMPUTED);
|
2017-06-19 15:13:45 +00:00
|
|
|
|
|
|
|
SetFunctionNameFromPropertyName(static_cast<LiteralProperty*>(property), name,
|
|
|
|
prefix);
|
2016-09-06 17:43:17 +00:00
|
|
|
}
|
|
|
|
|
2016-08-25 08:48:45 +00:00
|
|
|
void Parser::SetFunctionNameFromIdentifierRef(Expression* value,
|
|
|
|
Expression* identifier) {
|
2016-01-13 23:35:32 +00:00
|
|
|
if (!identifier->IsVariableProxy()) return;
|
2016-08-25 08:48:45 +00:00
|
|
|
SetFunctionName(value, identifier->AsVariableProxy()->raw_name());
|
2016-07-18 07:27:10 +00:00
|
|
|
}
|
2016-01-13 23:35:32 +00:00
|
|
|
|
2017-06-19 15:13:45 +00:00
|
|
|
void Parser::SetFunctionName(Expression* value, const AstRawString* name,
|
|
|
|
const AstRawString* prefix) {
|
|
|
|
if (!value->IsAnonymousFunctionDefinition() &&
|
|
|
|
!value->IsConciseMethodDefinition() &&
|
|
|
|
!value->IsAccessorFunctionDefinition()) {
|
|
|
|
return;
|
|
|
|
}
|
2016-02-01 17:44:23 +00:00
|
|
|
auto function = value->AsFunctionLiteral();
|
2017-05-04 17:00:44 +00:00
|
|
|
if (value->IsClassLiteral()) {
|
|
|
|
function = value->AsClassLiteral()->constructor();
|
|
|
|
}
|
2016-02-01 17:44:23 +00:00
|
|
|
if (function != nullptr) {
|
2017-06-19 15:13:45 +00:00
|
|
|
AstConsString* cons_name = nullptr;
|
|
|
|
if (name != nullptr) {
|
|
|
|
if (prefix != nullptr) {
|
|
|
|
cons_name = ast_value_factory()->NewConsString(prefix, name);
|
|
|
|
} else {
|
|
|
|
cons_name = ast_value_factory()->NewConsString(name);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
DCHECK_NULL(prefix);
|
|
|
|
}
|
|
|
|
function->set_raw_name(cons_name);
|
2016-01-13 23:35:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Statement* Parser::CheckCallable(Variable* var, Expression* error, int pos) {
|
2016-06-30 09:26:30 +00:00
|
|
|
const int nopos = kNoSourcePosition;
|
2016-02-19 19:19:52 +00:00
|
|
|
Statement* validate_var;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* type_of = factory()->NewUnaryOperation(
|
|
|
|
Token::TYPEOF, factory()->NewVariableProxy(var), nopos);
|
|
|
|
Expression* function_literal = factory()->NewStringLiteral(
|
|
|
|
ast_value_factory()->function_string(), nopos);
|
|
|
|
Expression* condition = factory()->NewCompareOperation(
|
2016-02-19 19:19:52 +00:00
|
|
|
Token::EQ_STRICT, type_of, function_literal, nopos);
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Statement* throw_call = factory()->NewExpressionStatement(error, pos);
|
2016-02-19 19:19:52 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
validate_var = factory()->NewIfStatement(
|
|
|
|
condition, factory()->NewEmptyStatement(nopos), throw_call, nopos);
|
2016-02-19 19:19:52 +00:00
|
|
|
}
|
|
|
|
return validate_var;
|
|
|
|
}
|
2016-02-04 14:12:37 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
void Parser::BuildIteratorClose(ZoneList<Statement*>* statements,
|
|
|
|
Variable* iterator, Variable* input,
|
2017-03-22 04:34:36 +00:00
|
|
|
Variable* var_output, IteratorType type) {
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
//
|
|
|
|
// This function adds four statements to [statements], corresponding to the
|
|
|
|
// following code:
|
|
|
|
//
|
|
|
|
// let iteratorReturn = iterator.return;
|
2016-06-02 09:42:34 +00:00
|
|
|
// if (IS_NULL_OR_UNDEFINED(iteratorReturn) {
|
|
|
|
// return {value: input, done: true};
|
|
|
|
// }
|
|
|
|
// output = %_Call(iteratorReturn, iterator, input);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// if (!IS_RECEIVER(output)) %ThrowIterResultNotAnObject(output);
|
|
|
|
//
|
|
|
|
|
2016-06-30 09:26:30 +00:00
|
|
|
const int nopos = kNoSourcePosition;
|
2016-02-04 14:12:37 +00:00
|
|
|
|
|
|
|
// let iteratorReturn = iterator.return;
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
Variable* var_return = var_output; // Reusing the output variable.
|
2016-02-04 14:12:37 +00:00
|
|
|
Statement* get_return;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* iterator_proxy = factory()->NewVariableProxy(iterator);
|
|
|
|
Expression* literal = factory()->NewStringLiteral(
|
|
|
|
ast_value_factory()->return_string(), nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
Expression* property =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewProperty(iterator_proxy, literal, nopos);
|
|
|
|
Expression* return_proxy = factory()->NewVariableProxy(var_return);
|
|
|
|
Expression* assignment =
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, return_proxy, property, nopos);
|
|
|
|
get_return = factory()->NewExpressionStatement(assignment, nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
}
|
|
|
|
|
2016-06-02 09:42:34 +00:00
|
|
|
// if (IS_NULL_OR_UNDEFINED(iteratorReturn) {
|
|
|
|
// return {value: input, done: true};
|
|
|
|
// }
|
2016-02-04 14:12:37 +00:00
|
|
|
Statement* check_return;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* condition = factory()->NewCompareOperation(
|
|
|
|
Token::EQ, factory()->NewVariableProxy(var_return),
|
|
|
|
factory()->NewNullLiteral(nopos), nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* value = factory()->NewVariableProxy(input);
|
2016-03-01 09:38:54 +00:00
|
|
|
|
2017-03-22 04:34:36 +00:00
|
|
|
Statement* return_input = BuildReturnStatement(value, nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
check_return = factory()->NewIfStatement(
|
|
|
|
condition, return_input, factory()->NewEmptyStatement(nopos), nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
}
|
|
|
|
|
2016-06-02 09:42:34 +00:00
|
|
|
// output = %_Call(iteratorReturn, iterator, input);
|
2016-02-04 14:12:37 +00:00
|
|
|
Statement* call_return;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(3, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(var_return), zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(iterator), zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(input), zone());
|
2016-02-04 14:12:37 +00:00
|
|
|
|
|
|
|
Expression* call =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewCallRuntime(Runtime::kInlineCall, args, nopos);
|
2017-03-22 04:34:36 +00:00
|
|
|
if (type == IteratorType::kAsync) {
|
2017-07-14 15:20:23 +00:00
|
|
|
call = factory()->NewAwait(call, nopos);
|
2017-03-22 04:34:36 +00:00
|
|
|
}
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* output_proxy = factory()->NewVariableProxy(var_output);
|
|
|
|
Expression* assignment =
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, output_proxy, call, nopos);
|
|
|
|
call_return = factory()->NewExpressionStatement(assignment, nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
}
|
|
|
|
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// if (!IS_RECEIVER(output)) %ThrowIteratorResultNotAnObject(output);
|
2016-02-04 16:36:11 +00:00
|
|
|
Statement* validate_output;
|
2016-02-04 14:12:37 +00:00
|
|
|
{
|
|
|
|
Expression* is_receiver_call;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(var_output), zone());
|
2016-02-04 14:12:37 +00:00
|
|
|
is_receiver_call =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewCallRuntime(Runtime::kInlineIsJSReceiver, args, nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Statement* throw_call;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(var_output), zone());
|
|
|
|
Expression* call = factory()->NewCallRuntime(
|
2016-02-04 14:12:37 +00:00
|
|
|
Runtime::kThrowIteratorResultNotAnObject, args, nopos);
|
2016-08-19 08:11:04 +00:00
|
|
|
throw_call = factory()->NewExpressionStatement(call, nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
validate_output = factory()->NewIfStatement(
|
|
|
|
is_receiver_call, factory()->NewEmptyStatement(nopos), throw_call,
|
|
|
|
nopos);
|
2016-02-04 14:12:37 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
statements->Add(get_return, zone());
|
|
|
|
statements->Add(check_return, zone());
|
|
|
|
statements->Add(call_return, zone());
|
|
|
|
statements->Add(validate_output, zone());
|
2016-02-04 14:12:37 +00:00
|
|
|
}
|
|
|
|
|
2017-09-07 12:05:46 +00:00
|
|
|
void Parser::FinalizeIteratorUse(Variable* completion, Expression* condition,
|
|
|
|
Variable* iter, Block* iterator_use,
|
|
|
|
Block* target, IteratorType type) {
|
2016-03-10 09:33:29 +00:00
|
|
|
//
|
|
|
|
// This function adds two statements to [target], corresponding to the
|
|
|
|
// following code:
|
|
|
|
//
|
|
|
|
// completion = kNormalCompletion;
|
|
|
|
// try {
|
|
|
|
// try {
|
|
|
|
// iterator_use
|
|
|
|
// } catch(e) {
|
|
|
|
// if (completion === kAbruptCompletion) completion = kThrowCompletion;
|
2016-04-04 08:14:57 +00:00
|
|
|
// %ReThrow(e);
|
2016-03-10 09:33:29 +00:00
|
|
|
// }
|
|
|
|
// } finally {
|
|
|
|
// if (condition) {
|
|
|
|
// #BuildIteratorCloseForCompletion(iter, completion)
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
|
2016-06-30 09:26:30 +00:00
|
|
|
const int nopos = kNoSourcePosition;
|
2016-03-10 09:33:29 +00:00
|
|
|
|
|
|
|
// completion = kNormalCompletion;
|
|
|
|
Statement* initialize_completion;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* proxy = factory()->NewVariableProxy(completion);
|
|
|
|
Expression* assignment = factory()->NewAssignment(
|
2016-03-10 09:33:29 +00:00
|
|
|
Token::ASSIGN, proxy,
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewSmiLiteral(Parser::kNormalCompletion, nopos), nopos);
|
|
|
|
initialize_completion =
|
|
|
|
factory()->NewExpressionStatement(assignment, nopos);
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// if (completion === kAbruptCompletion) completion = kThrowCompletion;
|
|
|
|
Statement* set_completion_throw;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* condition = factory()->NewCompareOperation(
|
|
|
|
Token::EQ_STRICT, factory()->NewVariableProxy(completion),
|
|
|
|
factory()->NewSmiLiteral(Parser::kAbruptCompletion, nopos), nopos);
|
2016-03-10 09:33:29 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* proxy = factory()->NewVariableProxy(completion);
|
|
|
|
Expression* assignment = factory()->NewAssignment(
|
2016-03-10 09:33:29 +00:00
|
|
|
Token::ASSIGN, proxy,
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewSmiLiteral(Parser::kThrowCompletion, nopos), nopos);
|
|
|
|
Statement* statement = factory()->NewExpressionStatement(assignment, nopos);
|
|
|
|
set_completion_throw = factory()->NewIfStatement(
|
|
|
|
condition, statement, factory()->NewEmptyStatement(nopos), nopos);
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// if (condition) {
|
|
|
|
// #BuildIteratorCloseForCompletion(iter, completion)
|
|
|
|
// }
|
|
|
|
Block* maybe_close;
|
|
|
|
{
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* block = factory()->NewBlock(2, true);
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* proxy = factory()->NewVariableProxy(completion);
|
2017-09-07 12:05:46 +00:00
|
|
|
BuildIteratorCloseForCompletion(block->statements(), iter, proxy, type);
|
2016-03-10 09:33:29 +00:00
|
|
|
DCHECK(block->statements()->length() == 2);
|
|
|
|
|
2017-02-27 16:22:25 +00:00
|
|
|
maybe_close = IgnoreCompletion(factory()->NewIfStatement(
|
|
|
|
condition, block, factory()->NewEmptyStatement(nopos), nopos));
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// try { #try_block }
|
|
|
|
// catch(e) {
|
|
|
|
// #set_completion_throw;
|
2016-04-04 08:14:57 +00:00
|
|
|
// %ReThrow(e);
|
2016-03-10 09:33:29 +00:00
|
|
|
// }
|
|
|
|
Statement* try_catch;
|
|
|
|
{
|
2017-09-07 12:05:46 +00:00
|
|
|
Scope* catch_scope = NewHiddenCatchScope();
|
2016-03-10 09:33:29 +00:00
|
|
|
|
|
|
|
Statement* rethrow;
|
2016-04-04 08:14:57 +00:00
|
|
|
// We use %ReThrow rather than the ordinary throw because we want to
|
|
|
|
// preserve the original exception message. This is also why we create a
|
|
|
|
// TryCatchStatementForReThrow below (which does not clear the pending
|
|
|
|
// message), rather than a TryCatchStatement.
|
2016-03-10 09:33:29 +00:00
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(1, zone());
|
2017-03-02 14:14:43 +00:00
|
|
|
args->Add(factory()->NewVariableProxy(catch_scope->catch_variable()),
|
|
|
|
zone());
|
2016-08-19 08:11:04 +00:00
|
|
|
rethrow = factory()->NewExpressionStatement(
|
|
|
|
factory()->NewCallRuntime(Runtime::kReThrow, args, nopos), nopos);
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* catch_block = factory()->NewBlock(2, false);
|
2016-08-19 08:11:04 +00:00
|
|
|
catch_block->statements()->Add(set_completion_throw, zone());
|
|
|
|
catch_block->statements()->Add(rethrow, zone());
|
2016-03-10 09:33:29 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
try_catch = factory()->NewTryCatchStatementForReThrow(
|
2017-03-03 08:28:54 +00:00
|
|
|
iterator_use, catch_scope, catch_block, nopos);
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// try { #try_catch } finally { #maybe_close }
|
|
|
|
Statement* try_finally;
|
|
|
|
{
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* try_block = factory()->NewBlock(1, false);
|
2016-08-19 08:11:04 +00:00
|
|
|
try_block->statements()->Add(try_catch, zone());
|
2016-03-10 09:33:29 +00:00
|
|
|
|
|
|
|
try_finally =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewTryFinallyStatement(try_block, maybe_close, nopos);
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
target->statements()->Add(initialize_completion, zone());
|
|
|
|
target->statements()->Add(try_finally, zone());
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
2017-09-07 12:05:46 +00:00
|
|
|
void Parser::BuildIteratorCloseForCompletion(ZoneList<Statement*>* statements,
|
2016-08-19 08:11:04 +00:00
|
|
|
Variable* iterator,
|
2017-02-15 19:39:06 +00:00
|
|
|
Expression* completion,
|
|
|
|
IteratorType type) {
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
//
|
|
|
|
// This function adds two statements to [statements], corresponding to the
|
|
|
|
// following code:
|
|
|
|
//
|
|
|
|
// let iteratorReturn = iterator.return;
|
|
|
|
// if (!IS_NULL_OR_UNDEFINED(iteratorReturn)) {
|
2016-03-10 09:33:29 +00:00
|
|
|
// if (completion === kThrowCompletion) {
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// if (!IS_CALLABLE(iteratorReturn)) {
|
|
|
|
// throw MakeTypeError(kReturnMethodNotCallable);
|
|
|
|
// }
|
2017-02-15 19:39:06 +00:00
|
|
|
// [if (IteratorType == kAsync)]
|
|
|
|
// try { Await(%_Call(iteratorReturn, iterator) } catch (_) { }
|
|
|
|
// [else]
|
|
|
|
// try { %_Call(iteratorReturn, iterator) } catch (_) { }
|
|
|
|
// [endif]
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// } else {
|
2017-02-15 19:39:06 +00:00
|
|
|
// [if (IteratorType == kAsync)]
|
|
|
|
// let output = Await(%_Call(iteratorReturn, iterator));
|
|
|
|
// [else]
|
|
|
|
// let output = %_Call(iteratorReturn, iterator);
|
|
|
|
// [endif]
|
2016-02-24 18:21:32 +00:00
|
|
|
// if (!IS_RECEIVER(output)) {
|
|
|
|
// %ThrowIterResultNotAnObject(output);
|
|
|
|
// }
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
|
2016-06-30 09:26:30 +00:00
|
|
|
const int nopos = kNoSourcePosition;
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// let iteratorReturn = iterator.return;
|
2016-08-19 08:11:04 +00:00
|
|
|
Variable* var_return = NewTemporary(ast_value_factory()->empty_string());
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
Statement* get_return;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* iterator_proxy = factory()->NewVariableProxy(iterator);
|
|
|
|
Expression* literal = factory()->NewStringLiteral(
|
|
|
|
ast_value_factory()->return_string(), nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
Expression* property =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewProperty(iterator_proxy, literal, nopos);
|
|
|
|
Expression* return_proxy = factory()->NewVariableProxy(var_return);
|
|
|
|
Expression* assignment =
|
|
|
|
factory()->NewAssignment(Token::ASSIGN, return_proxy, property, nopos);
|
|
|
|
get_return = factory()->NewExpressionStatement(assignment, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// if (!IS_CALLABLE(iteratorReturn)) {
|
|
|
|
// throw MakeTypeError(kReturnMethodNotCallable);
|
|
|
|
// }
|
|
|
|
Statement* check_return_callable;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* throw_expr =
|
|
|
|
NewThrowTypeError(MessageTemplate::kReturnMethodNotCallable,
|
|
|
|
ast_value_factory()->empty_string(), nopos);
|
2016-03-18 10:39:09 +00:00
|
|
|
check_return_callable = CheckCallable(var_return, throw_expr, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
2016-02-24 18:21:32 +00:00
|
|
|
// try { %_Call(iteratorReturn, iterator) } catch (_) { }
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
Statement* try_call_return;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(2, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(var_return), zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(iterator), zone());
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
|
|
|
Expression* call =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewCallRuntime(Runtime::kInlineCall, args, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
2017-02-15 19:39:06 +00:00
|
|
|
if (type == IteratorType::kAsync) {
|
2017-07-14 15:20:23 +00:00
|
|
|
call = factory()->NewAwait(call, nopos);
|
2017-02-15 19:39:06 +00:00
|
|
|
}
|
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* try_block = factory()->NewBlock(1, false);
|
2016-08-19 08:11:04 +00:00
|
|
|
try_block->statements()->Add(factory()->NewExpressionStatement(call, nopos),
|
|
|
|
zone());
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* catch_block = factory()->NewBlock(0, false);
|
2017-10-05 08:30:58 +00:00
|
|
|
Scope* catch_scope = NewHiddenCatchScope();
|
|
|
|
try_call_return = factory()->NewTryCatchStatement(try_block, catch_scope,
|
|
|
|
catch_block, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
2016-02-24 18:21:32 +00:00
|
|
|
// let output = %_Call(iteratorReturn, iterator);
|
|
|
|
// if (!IS_RECEIVER(output)) {
|
|
|
|
// %ThrowIteratorResultNotAnObject(output);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// }
|
2016-02-24 18:21:32 +00:00
|
|
|
Block* validate_return;
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Variable* var_output = NewTemporary(ast_value_factory()->empty_string());
|
2016-02-24 18:21:32 +00:00
|
|
|
Statement* call_return;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(2, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(var_return), zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(iterator), zone());
|
2016-02-24 18:21:32 +00:00
|
|
|
Expression* call =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewCallRuntime(Runtime::kInlineCall, args, nopos);
|
2017-02-15 19:39:06 +00:00
|
|
|
if (type == IteratorType::kAsync) {
|
2017-07-14 15:20:23 +00:00
|
|
|
call = factory()->NewAwait(call, nopos);
|
2017-02-15 19:39:06 +00:00
|
|
|
}
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* output_proxy = factory()->NewVariableProxy(var_output);
|
2016-02-24 18:21:32 +00:00
|
|
|
Expression* assignment =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewAssignment(Token::ASSIGN, output_proxy, call, nopos);
|
|
|
|
call_return = factory()->NewExpressionStatement(assignment, nopos);
|
2016-02-24 18:21:32 +00:00
|
|
|
}
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
|
|
|
Expression* is_receiver_call;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(var_output), zone());
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
is_receiver_call =
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewCallRuntime(Runtime::kInlineIsJSReceiver, args, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Statement* throw_call;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
auto args = new (zone()) ZoneList<Expression*>(1, zone());
|
|
|
|
args->Add(factory()->NewVariableProxy(var_output), zone());
|
|
|
|
Expression* call = factory()->NewCallRuntime(
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
Runtime::kThrowIteratorResultNotAnObject, args, nopos);
|
2016-08-19 08:11:04 +00:00
|
|
|
throw_call = factory()->NewExpressionStatement(call, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Statement* check_return = factory()->NewIfStatement(
|
|
|
|
is_receiver_call, factory()->NewEmptyStatement(nopos), throw_call,
|
|
|
|
nopos);
|
2016-02-24 18:21:32 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
validate_return = factory()->NewBlock(2, false);
|
2016-08-19 08:11:04 +00:00
|
|
|
validate_return->statements()->Add(call_return, zone());
|
|
|
|
validate_return->statements()->Add(check_return, zone());
|
2016-02-24 18:21:32 +00:00
|
|
|
}
|
|
|
|
|
2016-03-10 09:33:29 +00:00
|
|
|
// if (completion === kThrowCompletion) {
|
2016-02-24 18:21:32 +00:00
|
|
|
// #check_return_callable;
|
|
|
|
// #try_call_return;
|
|
|
|
// } else {
|
|
|
|
// #validate_return;
|
|
|
|
// }
|
|
|
|
Statement* call_return_carefully;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* condition = factory()->NewCompareOperation(
|
2016-06-28 07:43:38 +00:00
|
|
|
Token::EQ_STRICT, completion,
|
2016-08-19 08:11:04 +00:00
|
|
|
factory()->NewSmiLiteral(Parser::kThrowCompletion, nopos), nopos);
|
2016-02-24 18:21:32 +00:00
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* then_block = factory()->NewBlock(2, false);
|
2016-08-19 08:11:04 +00:00
|
|
|
then_block->statements()->Add(check_return_callable, zone());
|
|
|
|
then_block->statements()->Add(try_call_return, zone());
|
2016-02-24 18:21:32 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
call_return_carefully = factory()->NewIfStatement(condition, then_block,
|
|
|
|
validate_return, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// if (!IS_NULL_OR_UNDEFINED(iteratorReturn)) { ... }
|
|
|
|
Statement* maybe_call_return;
|
|
|
|
{
|
2016-08-19 08:11:04 +00:00
|
|
|
Expression* condition = factory()->NewCompareOperation(
|
|
|
|
Token::EQ, factory()->NewVariableProxy(var_return),
|
|
|
|
factory()->NewNullLiteral(nopos), nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
maybe_call_return = factory()->NewIfStatement(
|
|
|
|
condition, factory()->NewEmptyStatement(nopos), call_return_carefully,
|
|
|
|
nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
statements->Add(get_return, zone());
|
|
|
|
statements->Add(maybe_call_return, zone());
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
2016-08-19 08:11:04 +00:00
|
|
|
Statement* Parser::FinalizeForOfStatement(ForOfStatement* loop,
|
2017-02-15 19:39:06 +00:00
|
|
|
Variable* var_completion,
|
|
|
|
IteratorType type, int pos) {
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
//
|
|
|
|
// This function replaces the loop with the following wrapping:
|
|
|
|
//
|
2016-07-07 08:15:11 +00:00
|
|
|
// completion = kNormalCompletion;
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// try {
|
2016-03-10 09:33:29 +00:00
|
|
|
// try {
|
|
|
|
// #loop;
|
|
|
|
// } catch(e) {
|
|
|
|
// if (completion === kAbruptCompletion) completion = kThrowCompletion;
|
2016-04-04 08:14:57 +00:00
|
|
|
// %ReThrow(e);
|
2016-03-10 09:33:29 +00:00
|
|
|
// }
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// } finally {
|
2016-11-28 15:29:59 +00:00
|
|
|
// if (!(completion === kNormalCompletion)) {
|
2016-02-24 18:21:32 +00:00
|
|
|
// #BuildIteratorCloseForCompletion(#iterator, completion)
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
2016-07-07 08:15:11 +00:00
|
|
|
// Note that the loop's body and its assign_each already contain appropriate
|
|
|
|
// assignments to completion (see InitializeForOfStatement).
|
2016-03-10 09:33:29 +00:00
|
|
|
//
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
2016-06-30 09:26:30 +00:00
|
|
|
const int nopos = kNoSourcePosition;
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
|
2016-11-28 15:29:59 +00:00
|
|
|
// !(completion === kNormalCompletion)
|
2016-03-10 09:33:29 +00:00
|
|
|
Expression* closing_condition;
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
{
|
2016-11-28 15:29:59 +00:00
|
|
|
Expression* cmp = factory()->NewCompareOperation(
|
2016-08-19 08:11:04 +00:00
|
|
|
Token::EQ_STRICT, factory()->NewVariableProxy(var_completion),
|
|
|
|
factory()->NewSmiLiteral(Parser::kNormalCompletion, nopos), nopos);
|
2016-11-28 15:29:59 +00:00
|
|
|
closing_condition = factory()->NewUnaryOperation(Token::NOT, cmp, nopos);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
}
|
|
|
|
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* final_loop = factory()->NewBlock(2, false);
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
{
|
2017-08-29 18:01:54 +00:00
|
|
|
Block* try_block = factory()->NewBlock(1, false);
|
2016-08-19 08:11:04 +00:00
|
|
|
try_block->statements()->Add(loop, zone());
|
2016-03-10 09:33:29 +00:00
|
|
|
|
2017-09-07 12:05:46 +00:00
|
|
|
FinalizeIteratorUse(var_completion, closing_condition, loop->iterator(),
|
|
|
|
try_block, final_loop, type);
|
2016-03-10 09:33:29 +00:00
|
|
|
}
|
2016-02-24 18:52:17 +00:00
|
|
|
|
[es6] Implement for-of iterator finalization
Implements iterator finalisation by desugaring for-of loops with an additional try-finally wrapper. See comment in parser.cc for details.
Also improved some AST printing facilities while there.
@Ross, I had to disable the bytecode generation test for for-of, because it got completely out of hand after this change (the new bytecode has 150+ lines). See the TODO that I assigned to you.
Patch set 1 is WIP patch by Georg (http://crrev.com/1695583003), patch set 2 relative changes.
@Georg, FYI, I changed the following:
- Moved try-finally out of the loop body, for performance, and in order to be able to handle `continue` correctly.
- Fixed scope management in ParseForStatement, which was the cause for the variable allocation failure.
- Fixed pre-existing zone initialisation bug in rewriter, which caused the crashes.
- Enabled all tests, adjusted a few others, added a couple more.
BUG=v8:2214
LOG=Y
Review URL: https://codereview.chromium.org/1695393003
Cr-Commit-Position: refs/heads/master@{#34111}
2016-02-18 10:49:07 +00:00
|
|
|
return final_loop;
|
|
|
|
}
|
|
|
|
|
2016-07-19 08:03:43 +00:00
|
|
|
#undef CHECK_OK
|
2016-07-19 19:45:50 +00:00
|
|
|
#undef CHECK_OK_VOID
|
2016-07-19 08:03:43 +00:00
|
|
|
#undef CHECK_FAILED
|
|
|
|
|
2015-06-01 22:46:54 +00:00
|
|
|
} // namespace internal
|
|
|
|
} // namespace v8
|