Revision: 22906
Author: [email protected]
Date: Wed Aug 6 09:06:57 2014 UTC
Log: Rewind additional parser state when reinterpreting arrow arguments
The new ParserCheckpoint mechanism resets some state, notably the
bailout ID counter but also some statement counters (only applicable
once we get "do" expressions) when we decide to reinterpret a comma
expression as arrow function arguments.
[email protected], [email protected]
BUG=v8:3475
LOG=N
Review URL: https://codereview.chromium.org/437393004
http://code.google.com/p/v8/source/detail?r=22906
Modified:
/branches/bleeding_edge/src/parser.h
/branches/bleeding_edge/src/preparser.h
=======================================
--- /branches/bleeding_edge/src/parser.h Tue Aug 5 13:17:49 2014 UTC
+++ /branches/bleeding_edge/src/parser.h Wed Aug 6 09:06:57 2014 UTC
@@ -339,6 +339,23 @@
//
----------------------------------------------------------------------------
// JAVASCRIPT PARSING
+
+class ParserCheckpoint BASE_EMBEDDED {
+ public:
+ template <typename Parser>
+ explicit ParserCheckpoint(Parser* parser) {
+ isolate_ = parser->zone()->isolate();
+ saved_ast_node_id_ = isolate_->ast_node_id();
+ }
+
+ void Restore() { isolate_->set_ast_node_id(saved_ast_node_id_); }
+
+ private:
+ Isolate* isolate_;
+ int saved_ast_node_id_;
+};
+
+
class Parser;
class SingletonLogger;
@@ -354,6 +371,7 @@
typedef v8::internal::Scope* ScopePtr;
typedef Variable GeneratorVariable;
typedef v8::internal::Zone Zone;
+ typedef ParserCheckpoint Checkpoint;
typedef v8::internal::AstProperties AstProperties;
typedef Vector<VariableProxy*> ParameterIdentifierVector;
=======================================
--- /branches/bleeding_edge/src/preparser.h Tue Aug 5 15:23:07 2014 UTC
+++ /branches/bleeding_edge/src/preparser.h Wed Aug 6 09:06:57 2014 UTC
@@ -114,6 +114,8 @@
}
protected:
+ friend class Traits::Type::Checkpoint;
+
enum AllowEvalOrArgumentsAsIdentifier {
kAllowEvalOrArguments,
kDontAllowEvalOrArguments
@@ -124,6 +126,8 @@
PARSE_EAGERLY
};
+ class ParserCheckpoint;
+
//
---------------------------------------------------------------------------
// FunctionState and BlockState together implement the parser's scope
stack.
// The parser's current scope is in scope_. BlockState and FunctionState
@@ -219,6 +223,38 @@
typename Traits::Type::Factory factory_;
friend class ParserTraits;
+ friend class ParserCheckpoint;
+ };
+
+ // Annoyingly, arrow functions first parse as comma expressions, then
when we
+ // see the => we have to go back and reinterpret the arguments as being
formal
+ // parameters. To do so we need to reset some of the parser state back
to
+ // what it was before the arguments were first seen.
+ class ParserCheckpoint : public Traits::Type::Checkpoint {
+ public:
+ template <typename Parser>
+ explicit ParserCheckpoint(Parser* parser)
+ : Traits::Type::Checkpoint(parser) {
+ function_state_ = parser->function_state_;
+ next_materialized_literal_index_ =
+ function_state_->next_materialized_literal_index_;
+ next_handler_index_ = function_state_->next_handler_index_;
+ expected_property_count_ = function_state_->expected_property_count_;
+ }
+
+ void Restore() {
+ Traits::Type::Checkpoint::Restore();
+ function_state_->next_materialized_literal_index_ =
+ next_materialized_literal_index_;
+ function_state_->next_handler_index_ = next_handler_index_;
+ function_state_->expected_property_count_ = expected_property_count_;
+ }
+
+ private:
+ FunctionState* function_state_;
+ int next_materialized_literal_index_;
+ int next_handler_index_;
+ int expected_property_count_;
};
class ParsingModeScope BASE_EMBEDDED {
@@ -1021,6 +1057,14 @@
};
+class PreParserCheckpoint BASE_EMBEDDED {
+ public:
+ template <typename Parser>
+ explicit PreParserCheckpoint(Parser* parser) {}
+ void Restore() {}
+};
+
+
class PreParser;
class PreParserTraits {
@@ -1033,6 +1077,7 @@
// Used by FunctionState and BlockState.
typedef PreParserScope Scope;
typedef PreParserScope ScopePtr;
+ typedef PreParserCheckpoint Checkpoint;
// PreParser doesn't need to store generator variables.
typedef void GeneratorVariable;
@@ -2006,10 +2051,12 @@
}
if (fni_ != NULL) fni_->Enter();
+ ParserCheckpoint checkpoint(this);
ExpressionT expression =
this->ParseConditionalExpression(accept_IN, CHECK_OK);
if (allow_arrow_functions() && peek() == Token::ARROW) {
+ checkpoint.Restore();
expression = this->ParseArrowFunctionLiteral(lhs_location.beg_pos,
expression, CHECK_OK);
return expression;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
