Refactor type collector testing macros.

test/cctest/test-typing-reset.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"
 #include "src/parser.h"
 #include "src/rewriter.h"
 #include "src/scopes.h"
 #include "src/typing-reset.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/function-tester.h"
 #include "test/cctest/expression-type-collector.h"
 #include "test/cctest/expression-type-collector-macros.h"
 
+#define INT32_TYPE Bounds(Type::Signed32(), Type::Signed32())
+
 using namespace v8::internal;
 
 namespace {
 
 class TypeSetter : public AstExpressionVisitor {
  public:
   explicit TypeSetter(CompilationInfo* info) : AstExpressionVisitor(info) {}
 
  protected:
   void VisitExpression(Expression* expression) {
-    expression->set_bounds(Bounds(Type::Integral32()));
+    expression->set_bounds(INT32_TYPE);
   }
 };
 
 
 void CheckAllSame(ZoneVector<ExpressionTypeEntry>& types,
                   Bounds expected_type) {
-  HandleAndZoneScope handles;
   CHECK_TYPES_BEGIN {
     // function logSum
     CHECK_EXPR(FunctionLiteral, expected_type) {
       CHECK_EXPR(FunctionLiteral, expected_type) {
         CHECK_EXPR(Assignment, expected_type) {
           CHECK_VAR(start, expected_type);
           CHECK_EXPR(BinaryOperation, expected_type) {
             CHECK_VAR(start, expected_type);
             CHECK_EXPR(Literal, expected_type);
           }
@@ skipping 201 matching lines @@
       "    end = end|0;\n"
       "\n"
       "    return +exp(+logSum(start, end) / +((end - start)|0));\n"
       "  }\n"
       "\n"
       "  return { geometricMean: geometricMean };\n"
       "}\n";
 
   v8::V8::Initialize();
   HandleAndZoneScope handles;
+  Zone* zone = handles.main_zone();
 
   i::Isolate* isolate = CcTest::i_isolate();
   i::Factory* factory = isolate->factory();
 
   i::Handle<i::String> source_code =
       factory->NewStringFromUtf8(i::CStrVector(test_function))
           .ToHandleChecked();
 
   i::Handle<i::Script> script = factory->NewScript(source_code);
 
-  i::ParseInfo info(handles.main_zone(), script);
+  i::ParseInfo info(zone, script);
   i::Parser parser(&info);
   parser.set_allow_harmony_arrow_functions(true);
   parser.set_allow_harmony_sloppy(true);
   info.set_global();
   info.set_lazy(false);
   info.set_allow_lazy_parsing(false);
   info.set_toplevel(true);
 
   i::CompilationInfo compilation_info(&info);
   CHECK(i::Compiler::ParseAndAnalyze(&info));
   info.set_literal(
       info.scope()->declarations()->at(0)->AsFunctionDeclaration()->fun());
 
   // Core of the test.
-  ZoneVector<ExpressionTypeEntry> types(handles.main_zone());
+  ZoneVector<ExpressionTypeEntry> types(zone);
   ExpressionTypeCollector(&compilation_info, &types).Run();
   CheckAllSame(types, DEFAULT_TYPE);
 
   TypeSetter(&compilation_info).Run();
 
   ExpressionTypeCollector(&compilation_info, &types).Run();
   CheckAllSame(types, INT32_TYPE);
 
   TypingReseter(&compilation_info).Run();
 
   ExpressionTypeCollector(&compilation_info, &types).Run();
   CheckAllSame(types, DEFAULT_TYPE);
 }