TokenPositions on more nodes when running from Kernel

runtime/vm/kernel.h

Index: runtime/vm/kernel.h
diff --git a/runtime/vm/kernel.h b/runtime/vm/kernel.h
index ea04b73bed042f4468611cf612614a9a61b88515..de0fb987bf5b8f2abb3146436955205d11d28f65 100644
--- a/runtime/vm/kernel.h
+++ b/runtime/vm/kernel.h
@@ -2003,11 +2003,13 @@ class Block : public Statement {
   virtual void VisitChildren(Visitor* visitor);
 
   List<Statement>& statements() { return statements_; }
+  TokenPosition end_position() { return end_position_; }
 
  private:
-  Block() {}
+  Block() : end_position_(TokenPosition::kNoSource) {}
 
   List<Statement> statements_;
+  TokenPosition end_position_;
 
   DISALLOW_COPY_AND_ASSIGN(Block);
 };
@@ -2169,14 +2171,20 @@ class ForStatement : public Statement {
   Expression* condition() { return condition_; }
   List<Expression>& updates() { return updates_; }
   Statement* body() { return body_; }
+  TokenPosition position() { return position_; }
+  TokenPosition end_position() { return end_position_; }
 
  private:
-  ForStatement() {}
+  ForStatement()
+      : position_(TokenPosition::kNoSource),
+        end_position_(TokenPosition::kNoSource) {}
 
   List<VariableDeclaration> variables_;
   Child<Expression> condition_;
   List<Expression> updates_;
   Child<Statement> body_;
+  TokenPosition position_;
+  TokenPosition end_position_;
 
   DISALLOW_COPY_AND_ASSIGN(ForStatement);
 };
@@ -2198,14 +2206,20 @@ class ForInStatement : public Statement {
   Expression* iterable() { return iterable_; }
   Statement* body() { return body_; }
   bool is_async() { return is_async_; }
+  TokenPosition position() { return position_; }
+  TokenPosition end_position() { return end_position_; }
 
  private:
-  ForInStatement() {}
+  ForInStatement()
+      : position_(TokenPosition::kNoSource),
+        end_position_(TokenPosition::kNoSource) {}
 
   Child<VariableDeclaration> variable_;
   Child<Expression> iterable_;
   Child<Statement> body_;
   bool is_async_;
+  TokenPosition position_;
+  TokenPosition end_position_;
 
   DISALLOW_COPY_AND_ASSIGN(ForInStatement);
 };
@@ -2380,9 +2394,13 @@ class Catch : public TreeNode {
   VariableDeclaration* exception() { return exception_; }
   VariableDeclaration* stack_trace() { return stack_trace_; }
   Statement* body() { return body_; }
+  TokenPosition position() { return position_; }
+  TokenPosition end_position() { return end_position_; }
 
  private:
-  Catch() {}
+  Catch()
+      : position_(TokenPosition::kNoSource),
+        end_position_(TokenPosition::kNoSource) {}
 
   template <typename T>
   friend class List;
@@ -2391,6 +2409,8 @@ class Catch : public TreeNode {
   Child<VariableDeclaration> exception_;
   Child<VariableDeclaration> stack_trace_;
   Child<Statement> body_;
+  TokenPosition position_;
+  TokenPosition end_position_;
 
   DISALLOW_COPY_AND_ASSIGN(Catch);
 };
@@ -2477,9 +2497,10 @@ class VariableDeclaration : public Statement {
   DartType* type() { return type_; }
   InferredValue* inferred_value() { return inferred_value_; }
   Expression* initializer() { return initializer_; }
+  TokenPosition end_position() { return end_position_; }
 
  private:
-  VariableDeclaration() {}
+  VariableDeclaration() : end_position_(TokenPosition::kNoSource) {}
 
   template <typename T>
   friend class List;
@@ -2489,6 +2510,7 @@ class VariableDeclaration : public Statement {
   Child<DartType> type_;
   Child<InferredValue> inferred_value_;
   Child<Expression> initializer_;
+  TokenPosition end_position_;
 
   DISALLOW_COPY_AND_ASSIGN(VariableDeclaration);
 };