Refactor type collector testing macros.

test/cctest/expression-type-collector-macros.h

 // 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.
 
 #ifndef V8_EXPRESSION_TYPE_COLLECTOR_MACROS_H_
 #define V8_EXPRESSION_TYPE_COLLECTOR_MACROS_H_
 
 #define CHECK_TYPES_BEGIN \
   {                       \
     size_t index = 0;     \
     int depth = 0;
 
 #define CHECK_TYPES_END          \
   CHECK_EQ(index, types.size()); \
   }
 
 #define DEFAULT_TYPE Bounds::Unbounded()

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

Ok, now I can recommend inlining this macro.

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

Done.

-#define INT32_TYPE                            \
-  Bounds(Type::Signed32(handles.main_zone()), \
-         Type::Signed32(handles.main_zone()))
 
-#define CHECK_EXPR(ekind, type)                     \
-  CHECK_LT(index, types.size());                    \
-  CHECK(strcmp(#ekind, types[index].kind) == 0);    \
-  CHECK_EQ(depth, types[index].depth);              \
-  CHECK(type.lower->Is(types[index].bounds.lower)); \
-  CHECK(type.upper->Is(types[index].bounds.upper)); \
+
+#define CHECK_EXPR(ekind, type)                  \
+  CHECK_LT(index, types.size());                 \
+  CHECK(strcmp(#ekind, types[index].kind) == 0); \
+  CHECK_EQ(depth, types[index].depth);           \
+  CHECK(types[index].bounds.Narrows(type));      \
   for (int j = (++depth, ++index, 0); j < 1 ? 1 : (--depth, 0); ++j)
 
 #define CHECK_VAR(vname, type)                                     \
   CHECK_EXPR(VariableProxy, type);                                 \
   CHECK_EQ(#vname, std::string(types[index - 1].name->raw_data(),  \
                                types[index - 1].name->raw_data() + \
                                    types[index - 1].name->byte_length()));
 
+#define CHECK_SKIP()                                             \
+  {                                                              \
+    ++index;                                                     \
+    while (index < types.size() && types[index].depth > depth) { \
+      ++index;                                                   \
+    }                                                            \
+  }
+
 #endif  // V8_EXPRESSION_TYPE_COLLECTOR_MACROS_H_