Passing zone to type objects so printing macros work in arm debug mode.

test/cctest/test-asm-validator.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.
 
 // TODO(jochen): Remove this after the setting is turned on globally.
 #define V8_IMMINENT_DEPRECATION_WARNINGS
 
 #include "src/v8.h"
 
 #include "src/ast/ast.h"
 #include "src/ast/ast-expression-visitor.h"
 #include "src/ast/scopes.h"
 #include "src/parsing/parser.h"
 #include "src/parsing/rewriter.h"
 #include "src/type-cache.h"
 #include "src/typing-asm.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/expression-type-collector.h"
 #include "test/cctest/expression-type-collector-macros.h"
 
 // Macros for function types.
-#define FUNC_V_TYPE Bounds(Type::Function(Type::Undefined(), zone))
+#define FUNC_V_TYPE Bounds(Type::Function(Type::Undefined(zone), zone))
 #define FUNC_I_TYPE Bounds(Type::Function(cache.kAsmSigned, zone))
 #define FUNC_F_TYPE Bounds(Type::Function(cache.kAsmFloat, zone))
 #define FUNC_D_TYPE Bounds(Type::Function(cache.kAsmDouble, zone))
 #define FUNC_D2D_TYPE \
   Bounds(Type::Function(cache.kAsmDouble, cache.kAsmDouble, zone))
 #define FUNC_N2F_TYPE \
-  Bounds(Type::Function(cache.kAsmFloat, Type::Number(), zone))
+  Bounds(Type::Function(cache.kAsmFloat, Type::Number(zone), zone))
 #define FUNC_I2I_TYPE \
   Bounds(Type::Function(cache.kAsmSigned, cache.kAsmInt, zone))
 #define FUNC_II2D_TYPE \
   Bounds(Type::Function(cache.kAsmDouble, cache.kAsmInt, cache.kAsmInt, zone))
 #define FUNC_II2I_TYPE \
   Bounds(Type::Function(cache.kAsmSigned, cache.kAsmInt, cache.kAsmInt, zone))
 #define FUNC_DD2D_TYPE                                                        \
   Bounds(Type::Function(cache.kAsmDouble, cache.kAsmDouble, cache.kAsmDouble, \
                         zone))
 #define FUNC_N2N_TYPE \
-  Bounds(Type::Function(Type::Number(), Type::Number(), zone))
+  Bounds(Type::Function(Type::Number(zone), Type::Number(zone), zone))
 
 // Macros for array types.
 #define FLOAT64_ARRAY_TYPE Bounds(Type::Array(cache.kAsmDouble, zone))
 #define FUNC_I2I_ARRAY_TYPE                                                 \
   Bounds(Type::Array(Type::Function(cache.kAsmSigned, cache.kAsmInt, zone), \
                      zone))
 
 using namespace v8::internal;
 
 namespace {
@@ skipping 207 matching lines @@
                   CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
                 }
                 CHECK_EXPR(Literal, Bounds(cache.kAsmDouble));
               }
             }
           }
           CHECK_EXPR(Literal, Bounds(cache.kAsmDouble));
         }
       }
       // "use asm";
-      CHECK_EXPR(Literal, Bounds(Type::String()));
+      CHECK_EXPR(Literal, Bounds(Type::String(zone)));
       // var exp = stdlib.Math.exp;
       CHECK_EXPR(Assignment, FUNC_D2D_TYPE) {
         CHECK_VAR(exp, FUNC_D2D_TYPE);
         CHECK_EXPR(Property, FUNC_D2D_TYPE) {
           CHECK_EXPR(Property, Bounds::Unbounded()) {
             CHECK_VAR(stdlib, Bounds::Unbounded());
             CHECK_EXPR(Literal, Bounds::Unbounded());
           }
           CHECK_EXPR(Literal, Bounds::Unbounded());
         }
@@ skipping 177 matching lines @@
   v8::V8::Initialize();                                \
   HandleAndZoneScope handles;                          \
   Zone* zone = handles.main_zone();                    \
   ZoneVector<ExpressionTypeEntry> types(zone);         \
   CHECK_EQ("", Validate(zone, test_function, &types)); \
   TypeCache cache;                                     \
                                                        \
   CHECK_TYPES_BEGIN {                                  \
     /* Module. */                                      \
     CHECK_EXPR(FunctionLiteral, Bounds::Unbounded()) {
-#define CHECK_FUNC_TYPES_END_1()               \
-  /* "use asm"; */                             \
-  CHECK_EXPR(Literal, Bounds(Type::String())); \
-  /* stdlib shortcuts. */                      \
+#define CHECK_FUNC_TYPES_END_1()                   \
+  /* "use asm"; */                                 \
+  CHECK_EXPR(Literal, Bounds(Type::String(zone))); \
+  /* stdlib shortcuts. */                          \
   CheckStdlibShortcuts(zone, types, index, depth, cache);
 
 
 #define CHECK_FUNC_TYPES_END_2()                   \
   /* return { foo: foo }; */                       \
   CHECK_EXPR(ObjectLiteral, Bounds::Unbounded()) { \
     CHECK_VAR(foo, FUNC_V_TYPE);                   \
   }                                                \
   }                                                \
   }                                                \
@@ skipping 23 matching lines @@
   CHECK_FUNC_TYPES_END
 }
 
 
 TEST(ReturnVoid) {
   CHECK_FUNC_TYPES_BEGIN(
       "function bar() { return; }\n"
       "function foo() { bar(); }") {
     CHECK_EXPR(FunctionLiteral, FUNC_V_TYPE) {
       // return undefined;
-      CHECK_EXPR(Literal, Bounds(Type::Undefined()));
+      CHECK_EXPR(Literal, Bounds(Type::Undefined(zone)));
     }
     CHECK_EXPR(FunctionLiteral, FUNC_V_TYPE) {
-      CHECK_EXPR(Call, Bounds(Type::Undefined())) {
+      CHECK_EXPR(Call, Bounds(Type::Undefined(zone))) {
         CHECK_VAR(bar, FUNC_V_TYPE);
       }
     }
   }
   CHECK_FUNC_TYPES_END
 }
 
 
 TEST(EmptyBody) {
   CHECK_FUNC_TYPES_BEGIN(
       "function bar() { }\n"
       "function foo() { bar(); }") {
     CHECK_EXPR(FunctionLiteral, FUNC_V_TYPE);
     CHECK_EXPR(FunctionLiteral, FUNC_V_TYPE) {
-      CHECK_EXPR(Call, Bounds(Type::Undefined())) {
+      CHECK_EXPR(Call, Bounds(Type::Undefined(zone))) {
         CHECK_VAR(bar, FUNC_V_TYPE);
       }
     }
   }
   CHECK_FUNC_TYPES_END
 }
 
 
 TEST(DoesNothing) {
   CHECK_FUNC_TYPES_BEGIN(
       "function bar() { var x = 1.0; }\n"
       "function foo() { bar(); }") {
     CHECK_EXPR(FunctionLiteral, FUNC_V_TYPE) {
       CHECK_EXPR(Assignment, Bounds(cache.kAsmDouble)) {
         CHECK_VAR(x, Bounds(cache.kAsmDouble));
         CHECK_EXPR(Literal, Bounds(cache.kAsmDouble));
       }
     }
     CHECK_EXPR(FunctionLiteral, FUNC_V_TYPE) {
-      CHECK_EXPR(Call, Bounds(Type::Undefined())) {
+      CHECK_EXPR(Call, Bounds(Type::Undefined(zone))) {
         CHECK_VAR(bar, FUNC_V_TYPE);
       }
     }
   }
   CHECK_FUNC_TYPES_END
 }
 
 
 TEST(ReturnInt32Literal) {
   CHECK_FUNC_TYPES_BEGIN(
@@ skipping 443 matching lines @@
     CHECK_EXPR(FunctionLiteral, FUNC_I_TYPE) {
       CHECK_EXPR(Assignment, Bounds(cache.kAsmInt)) {
         CHECK_VAR(x, Bounds(cache.kAsmInt));
         CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
       }
       CHECK_EXPR(Assignment, Bounds(cache.kAsmInt)) {
         CHECK_VAR(y, Bounds(cache.kAsmInt));
         CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
       }
       CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmSigned)) {
-        CHECK_EXPR(BinaryOperation, Bounds(Type::None(), Type::Any())) {
+        CHECK_EXPR(BinaryOperation, Bounds(Type::None(zone), Type::Any(zone))) {
           CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmUnsigned)) {
             CHECK_VAR(x, Bounds(cache.kAsmInt));
             CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
           }
           CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmUnsigned)) {
             CHECK_VAR(y, Bounds(cache.kAsmInt));
             CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
           }
         }
         CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
@@ skipping 638 matching lines @@
 
 
 TEST(ForeignFunction) {
   CHECK_FUNC_TYPES_BEGIN(
       "var baz = foreign.baz;\n"
       "function bar() { return baz(1, 2)|0; }\n"
       "function foo() { bar(); }") {
     CHECK_EXPR(FunctionLiteral, FUNC_I_TYPE) {
       CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmSigned)) {
         CHECK_EXPR(Call, Bounds(Type::Number(zone))) {
-          CHECK_VAR(baz, Bounds(Type::Any()));
+          CHECK_VAR(baz, Bounds(Type::Any(zone)));
           CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
           CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
         }
         CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
       }
     }
     CHECK_EXPR(FunctionLiteral, FUNC_V_TYPE) {
       CHECK_EXPR(Call, Bounds(cache.kAsmSigned)) {
         CHECK_VAR(bar, FUNC_I_TYPE);
       }
     }
   }
   CHECK_FUNC_TYPES_END_1()
-  CHECK_EXPR(Assignment, Bounds(Type::Any())) {
-    CHECK_VAR(baz, Bounds(Type::Any()));
-    CHECK_EXPR(Property, Bounds(Type::Any())) {
+  CHECK_EXPR(Assignment, Bounds(Type::Any(zone))) {
+    CHECK_VAR(baz, Bounds(Type::Any(zone)));
+    CHECK_EXPR(Property, Bounds(Type::Any(zone))) {
       CHECK_VAR(foreign, Bounds::Unbounded());
       CHECK_EXPR(Literal, Bounds::Unbounded());
     }
   }
   CHECK_FUNC_TYPES_END_2()
 }
 
 
 TEST(BadExports) {
   HARNESS_PREAMBLE()
@@ skipping 117 matching lines @@
   CHECK(!cache.kAsmFloat->Is(cache.kAsmFixnum));
   CHECK(!cache.kAsmFloat->Is(cache.kAsmDouble));
 
   CHECK(cache.kAsmDouble->Is(cache.kAsmDouble));
   CHECK(!cache.kAsmDouble->Is(cache.kAsmInt));
   CHECK(!cache.kAsmDouble->Is(cache.kAsmUnsigned));
   CHECK(!cache.kAsmDouble->Is(cache.kAsmSigned));
   CHECK(!cache.kAsmDouble->Is(cache.kAsmFixnum));
   CHECK(!cache.kAsmDouble->Is(cache.kAsmFloat));
 }