[coverage] Block coverage with support for IfStatements

src/ast/ast.h

Index: src/ast/ast.h
diff --git a/src/ast/ast.h b/src/ast/ast.h
index a1fea5bc8007e54884e596c6dd288297b1d8ac01..b1e54622538c5bd4628911701db79653d3e75be5 100644
--- a/src/ast/ast.h
+++ b/src/ast/ast.h
@@ -182,6 +182,10 @@ class AstProperties final BASE_EMBEDDED {
 
 DEFINE_OPERATORS_FOR_FLAGS(AstProperties::Flags)
 
+struct SourceRange {
+  SourceRange() : from(kNoSourcePosition), to(kNoSourcePosition) {}
+  int32_t from, to;

[marja, 2017/05/18 11:30:17]

In Scope, FunctionLiteral etc. there's already start_position and end_position,
I think it makes sense to have consistent naming there. I.e., these should be
start_position and end_position instead of from and to.

[jgruber, 2017/05/22 09:43:32]

No very strong feelings on this from my side, but if possible I'd prefer keeping
the names short. What about {start, end}?

Maybe we could also change Scope, FunctionLiteral etc. to contain a SourceRange
at some point.

[marja, 2017/05/22 12:55:37]

start + end sgtm

+};
 
 class AstNode: public ZoneObject {
  public:
@@ -1015,6 +1019,9 @@ class IfStatement final : public Statement {
   Statement* then_statement() const { return then_statement_; }
   Statement* else_statement() const { return else_statement_; }
 
+  SourceRange then_range() const { return then_range_; }
+  SourceRange else_range() const { return else_range_; }
+
   void set_condition(Expression* e) { condition_ = e; }
   void set_then_statement(Statement* s) { then_statement_ = s; }
   void set_else_statement(Statement* s) { else_statement_ = s; }
@@ -1034,12 +1041,15 @@ class IfStatement final : public Statement {
   friend class AstNodeFactory;
 
   IfStatement(Expression* condition, Statement* then_statement,
-              Statement* else_statement, int pos)
+              Statement* else_statement, int pos, SourceRange then_range,
+              SourceRange else_range)
       : Statement(pos, kIfStatement),
         base_id_(BailoutId::None().ToInt()),
         condition_(condition),
         then_statement_(then_statement),
-        else_statement_(else_statement) {}
+        else_statement_(else_statement),
+        then_range_(then_range),
+        else_range_(else_range) {}
 
   static int parent_num_ids() { return 0; }
   int base_id() const {
@@ -1052,6 +1062,8 @@ class IfStatement final : public Statement {
   Expression* condition_;
   Statement* then_statement_;
   Statement* else_statement_;
+  SourceRange then_range_;
+  SourceRange else_range_;
 };
 
 
@@ -3342,12 +3354,12 @@ class AstNodeFactory final BASE_EMBEDDED {
     return new (zone_) WithStatement(scope, expression, statement, pos);
   }
 
-  IfStatement* NewIfStatement(Expression* condition,
-                              Statement* then_statement,
-                              Statement* else_statement,
-                              int pos) {
-    return new (zone_)
-        IfStatement(condition, then_statement, else_statement, pos);
+  IfStatement* NewIfStatement(Expression* condition, Statement* then_statement,
+                              Statement* else_statement, int pos,
+                              SourceRange then_range = {},
+                              SourceRange else_range = {}) {
+    return new (zone_) IfStatement(condition, then_statement, else_statement,
+                                   pos, then_range, else_range);
   }
 
   TryCatchStatement* NewTryCatchStatement(Block* try_block, Scope* scope,