Assign yield ids in ast-numbering rather than in bytecode-generator.

src/ast/ast.h

Index: src/ast/ast.h
diff --git a/src/ast/ast.h b/src/ast/ast.h
index 4d97fc249b3499267b25229a1dd8c0b1beaef773..9ecad9e727f7e2c49c78a84beb956c959e5e4a97 100644
--- a/src/ast/ast.h
+++ b/src/ast/ast.h
@@ -647,8 +647,12 @@ class IterationStatement : public BreakableStatement {
   Statement* body() const { return body_; }
   void set_body(Statement* s) { body_ = s; }
 
-  int yield_count() { return yield_count_; }
+  int yield_count() const { return yield_count_; }
+  int first_yield_id() const { return first_yield_id_; }
   void set_yield_count(int yield_count) { yield_count_ = yield_count; }
+  void set_first_yield_id(int first_yield_id) {
+    first_yield_id_ = first_yield_id;
+  }
 
   static int num_ids() { return parent_num_ids() + 1; }
   BailoutId OsrEntryId() const { return BailoutId(local_id(0)); }
@@ -662,7 +666,8 @@ class IterationStatement : public BreakableStatement {
   IterationStatement(Zone* zone, ZoneList<const AstRawString*>* labels, int pos)
       : BreakableStatement(zone, labels, TARGET_FOR_ANONYMOUS, pos),
         body_(NULL),
-        yield_count_(0) {}
+        yield_count_(0),
+        first_yield_id_(0) {}
   static int parent_num_ids() { return BreakableStatement::num_ids(); }
   void Initialize(Statement* body) { body_ = body; }
 
@@ -672,6 +677,7 @@ class IterationStatement : public BreakableStatement {
   Statement* body_;
   Label continue_target_;
   int yield_count_;
+  int first_yield_id_;
 };
 
 
@@ -2531,20 +2537,24 @@ class Yield final : public Expression {
 
   Expression* generator_object() const { return generator_object_; }
   Expression* expression() const { return expression_; }
+  int id() const { return id_; }

[Jarin, 2016/04/28 16:31:18]

I believe the Expression class already has an id() method for bailouts. Please,
do not overload it. (I am actually a bit surprised that the compiler does not
warn about this.)

[neis, 2016/04/29 07:52:24]

Oh indeed. Done.

 
   void set_generator_object(Expression* e) { generator_object_ = e; }
   void set_expression(Expression* e) { expression_ = e; }
+  void set_id(int id) { id_ = id; }
 
  protected:
   Yield(Zone* zone, Expression* generator_object, Expression* expression,
         int pos)
       : Expression(zone, pos),
         generator_object_(generator_object),
-        expression_(expression) {}
+        expression_(expression),
+        id_(-1) {}
 
  private:
   Expression* generator_object_;
   Expression* expression_;
+  int id_;
 };