Refactor type collector testing macros.

test/cctest/test-ast-expression-visitor.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdlib.h>
 
 #include "src/v8.h"
 
 #include "src/ast.h"
 #include "src/ast-expression-visitor.h"
@@ skipping 33 matching lines @@
       info.scope()->declarations()->at(0)->AsFunctionDeclaration()->fun());
 
   ExpressionTypeCollector(&compilation_info, dst).Run();
 }
 }
 
 
 TEST(VisitExpressions) {
   v8::V8::Initialize();
   HandleAndZoneScope handles;
-  ZoneVector<ExpressionTypeEntry> types(handles.main_zone());
+  Zone* zone = handles.main_zone();
+  ZoneVector<ExpressionTypeEntry> types(zone);

[titzer, 2015/08/31 18:08:53]

You can put this subexpression back in now. (and below).

[bradn, 2015/08/31 18:34:59]

Done.

   const char test_function[] =
       "function GeometricMean(stdlib, foreign, buffer) {\n"
       "  \"use asm\";\n"
       "\n"
       "  var exp = stdlib.Math.exp;\n"
       "  var log = stdlib.Math.log;\n"
       "  var values = new stdlib.Float64Array(buffer);\n"
       "\n"
       "  function logSum(start, end) {\n"
       "    start = start|0;\n"
@@ skipping 201 matching lines @@
       }
     }
   }
   CHECK_TYPES_END
 }
 
 
 TEST(VisitEmptyForStatment) {
   v8::V8::Initialize();
   HandleAndZoneScope handles;
-  ZoneVector<ExpressionTypeEntry> types(handles.main_zone());
+  Zone* zone = handles.main_zone();
+  ZoneVector<ExpressionTypeEntry> types(zone);
   // Check that traversing an empty for statement works.
   const char test_function[] =
       "function foo() {\n"
       "  for (;;) {}\n"
       "}\n";
   CollectTypes(&handles, test_function, &types);
   CHECK_TYPES_BEGIN {
     CHECK_EXPR(FunctionLiteral, DEFAULT_TYPE) {}
   }
   CHECK_TYPES_END
 }
 
 
 TEST(VisitSwitchStatment) {
   v8::V8::Initialize();
   HandleAndZoneScope handles;
-  ZoneVector<ExpressionTypeEntry> types(handles.main_zone());
+  Zone* zone = handles.main_zone();
+  ZoneVector<ExpressionTypeEntry> types(zone);
   // Check that traversing a switch with a default works.
   const char test_function[] =
       "function foo() {\n"
       "  switch (0) { case 1: break; default: break; }\n"
       "}\n";
   CollectTypes(&handles, test_function, &types);
   CHECK_TYPES_BEGIN {
     CHECK_EXPR(FunctionLiteral, DEFAULT_TYPE) {
       CHECK_EXPR(Assignment, DEFAULT_TYPE) {
         CHECK_VAR(.switch_tag, DEFAULT_TYPE);
         CHECK_EXPR(Literal, DEFAULT_TYPE);
       }
       CHECK_EXPR(Literal, DEFAULT_TYPE);
       CHECK_VAR(.switch_tag, DEFAULT_TYPE);
       CHECK_EXPR(Literal, DEFAULT_TYPE);
     }
   }
   CHECK_TYPES_END
 }
 
 
 TEST(VisitThrow) {
   v8::V8::Initialize();
   HandleAndZoneScope handles;
-  ZoneVector<ExpressionTypeEntry> types(handles.main_zone());
+  Zone* zone = handles.main_zone();
+  ZoneVector<ExpressionTypeEntry> types(zone);
   // Check that traversing an empty for statement works.
   const char test_function[] =
       "function foo() {\n"
       "  throw 123;\n"
       "}\n";
   CollectTypes(&handles, test_function, &types);
   CHECK_TYPES_BEGIN {
     CHECK_EXPR(FunctionLiteral, DEFAULT_TYPE) {
       CHECK_EXPR(Throw, DEFAULT_TYPE) { CHECK_EXPR(Literal, DEFAULT_TYPE); }
     }
   }
   CHECK_TYPES_END
 }
 
 
 TEST(VisitYield) {
   v8::V8::Initialize();
   HandleAndZoneScope handles;
-  ZoneVector<ExpressionTypeEntry> types(handles.main_zone());
+  Zone* zone = handles.main_zone();
+  ZoneVector<ExpressionTypeEntry> types(zone);
   // Check that traversing an empty for statement works.
   const char test_function[] =
       "function* foo() {\n"
       "  yield 123;\n"
       "}\n";
   CollectTypes(&handles, test_function, &types);
   CHECK_TYPES_BEGIN {
     CHECK_EXPR(FunctionLiteral, DEFAULT_TYPE) {
       // Generator function yields generator on entry.
       CHECK_EXPR(Yield, DEFAULT_TYPE) {
@@ skipping 10 matching lines @@
       }
       // Then yields 123.
       CHECK_EXPR(Yield, DEFAULT_TYPE) {
         CHECK_VAR(.generator_object, DEFAULT_TYPE);
         CHECK_EXPR(Literal, DEFAULT_TYPE);
       }
     }
   }
   CHECK_TYPES_END
 }
+
+
+TEST(VisitSkipping) {
+  v8::V8::Initialize();
+  HandleAndZoneScope handles;
+  Zone* zone = handles.main_zone();
+  ZoneVector<ExpressionTypeEntry> types(zone);
+  // Check that traversing an empty for statement works.
+  const char test_function[] =
+      "function foo(x) {\n"
+      "  return (x + x) + 1;\n"
+      "}\n";
+  CollectTypes(&handles, test_function, &types);
+  CHECK_TYPES_BEGIN {
+    CHECK_EXPR(FunctionLiteral, DEFAULT_TYPE) {
+      CHECK_EXPR(BinaryOperation, DEFAULT_TYPE) {
+        // Skip x + x
+        CHECK_SKIP();
+        CHECK_EXPR(Literal, DEFAULT_TYPE);
+      }
+    }
+  }
+  CHECK_TYPES_END
+}