Version 3.0.2.

src/ast.h

Index: src/ast.h
diff --git a/src/ast.h b/src/ast.h
index c33838e011823b6784c4908a273ad99855447194..cdf456f67b6e5e2b66cdee56b3a9c19b50a3deed 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -435,6 +435,7 @@ class IterationStatement: public BreakableStatement {
   virtual IterationStatement* AsIterationStatement() { return this; }
 
   Statement* body() const { return body_; }
+  void set_body(Statement* stmt) { body_ = stmt; }
 
   // Bailout support.
   int OsrEntryId() const { return osr_entry_id_; }
@@ -531,8 +532,11 @@ class ForStatement: public IterationStatement {
   }
 
   Statement* init() const { return init_; }
+  void set_init(Statement* stmt) { init_ = stmt; }
   Expression* cond() const { return cond_; }
+  void set_cond(Expression* expr) { cond_ = expr; }
   Statement* next() const { return next_; }
+  void set_next(Statement* stmt) { next_ = stmt; }
 
   bool may_have_function_literal() const {
     return may_have_function_literal_;
@@ -575,13 +579,11 @@ class ForInStatement: public IterationStatement {
   Expression* enumerable() const { return enumerable_; }
 
   // Bailout support.
-  int AssignmentId() const { return assignment_id_; }
   virtual int ContinueId() const { return EntryId(); }
 
  private:
   Expression* each_;
   Expression* enumerable_;
-  int assignment_id_;
 };
 
 
@@ -746,7 +748,9 @@ class IfStatement: public Statement {
 
   Expression* condition() const { return condition_; }
   Statement* then_statement() const { return then_statement_; }
+  void set_then_statement(Statement* stmt) { then_statement_ = stmt; }
   Statement* else_statement() const { return else_statement_; }
+  void set_else_statement(Statement* stmt) { else_statement_ = stmt; }
 
  private:
   Expression* condition_;
@@ -1428,9 +1432,7 @@ class IncrementOperation: public Expression {
 class CountOperation: public Expression {
  public:
   CountOperation(bool is_prefix, IncrementOperation* increment, int pos)
-      : is_prefix_(is_prefix), increment_(increment), pos_(pos),
-        assignment_id_(GetNextId()) {
-  }
+      : is_prefix_(is_prefix), increment_(increment), pos_(pos) { }
 
   DECLARE_NODE_TYPE(CountOperation)
 
@@ -1450,14 +1452,10 @@ class CountOperation: public Expression {
 
   virtual bool IsInlineable() const;
 
-  // Bailout support.
-  int AssignmentId() const { return assignment_id_; }
-
  private:
   bool is_prefix_;
   IncrementOperation* increment_;
   int pos_;
-  int assignment_id_;
 };
 
 
@@ -1587,8 +1585,7 @@ class Assignment: public Expression {
   }
 
   // Bailout support.
-  int CompoundLoadId() const { return compound_load_id_; }
-  int AssignmentId() const { return assignment_id_; }
+  int compound_bailout_id() const { return compound_bailout_id_; }
 
  private:
   Token::Value op_;
@@ -1596,8 +1593,7 @@ class Assignment: public Expression {
   Expression* value_;
   int pos_;
   BinaryOperation* binary_operation_;
-  int compound_load_id_;
-  int assignment_id_;
+  int compound_bailout_id_;
 
   bool block_start_;
   bool block_end_;