Switch to using Function(Any) for foreign functions, label declarations.

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.
 
 #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_BARE_TYPE Bounds(Type::Function())
+#define FUNC_FOREIGN_TYPE Bounds(Type::Function(Type::Any(), zone))
 #define FUNC_V_TYPE Bounds(Type::Function(Type::Undefined(), 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))
 #define FUNC_I2I_TYPE \
   Bounds(Type::Function(cache.kAsmSigned, cache.kAsmInt, zone))
@@ skipping 1689 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(cache.kAsmSigned)) {
-          CHECK_VAR(baz, FUNC_BARE_TYPE);
+          CHECK_VAR(baz, FUNC_FOREIGN_TYPE);
           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(FUNC_FOREIGN_TYPE)) {
+    CHECK_VAR(baz, Bounds(FUNC_FOREIGN_TYPE));
+    CHECK_EXPR(Property, Bounds(FUNC_FOREIGN_TYPE)) {
       CHECK_VAR(foreign, Bounds::Unbounded());
       CHECK_EXPR(Literal, Bounds::Unbounded());
     }
   }
   CHECK_FUNC_TYPES_END_2()
 }
 
 
 TEST(BadExports) {
   HARNESS_PREAMBLE()
@@ skipping 364 matching lines @@
   CHECK_EQ("", Validate(zone, test_function, &types));
   TypeCache cache;
 
   CHECK_TYPES_BEGIN {
     // Module.
     CHECK_EXPR(FunctionLiteral, Bounds::Unbounded()) {
       // function test1
       CHECK_EXPR(FunctionLiteral, FUNC_I_TYPE) {
         CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmSigned)) {
           CHECK_EXPR(Call, Bounds(cache.kAsmSigned)) {
-            CHECK_VAR(ffunc, FUNC_BARE_TYPE);
+            CHECK_VAR(ffunc, FUNC_FOREIGN_TYPE);
             CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmSigned)) {
               CHECK_VAR(fint, Bounds(cache.kAsmInt));
               CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
             }
             CHECK_VAR(fdouble, Bounds(cache.kAsmDouble));
           }
           CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
         }
       }
       // function test2
       CHECK_EXPR(FunctionLiteral, FUNC_D_TYPE) {
         CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmDouble)) {
           CHECK_EXPR(Call, Bounds(cache.kAsmDouble)) {
-            CHECK_VAR(ffunc, FUNC_BARE_TYPE);
+            CHECK_VAR(ffunc, FUNC_FOREIGN_TYPE);
             CHECK_VAR(fdouble, Bounds(cache.kAsmDouble));
             CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmSigned)) {
               CHECK_VAR(fint, Bounds(cache.kAsmInt));
               CHECK_EXPR(Literal, Bounds(cache.kAsmFixnum));
             }
           }
           CHECK_EXPR(Literal, Bounds(cache.kAsmDouble));
         }
       }
       // "use asm";
       CHECK_EXPR(Literal, Bounds(Type::String()));
       // var func = foreign.foo;
-      CHECK_EXPR(Assignment, Bounds(Type::Any())) {
-        CHECK_VAR(ffunc, Bounds(Type::Any()));
-        CHECK_EXPR(Property, Bounds(Type::Any())) {
+      CHECK_EXPR(Assignment, Bounds(FUNC_FOREIGN_TYPE)) {
+        CHECK_VAR(ffunc, Bounds(FUNC_FOREIGN_TYPE));
+        CHECK_EXPR(Property, Bounds(FUNC_FOREIGN_TYPE)) {
           CHECK_VAR(foreign, Bounds::Unbounded());
           CHECK_EXPR(Literal, Bounds::Unbounded());
         }
       }
       // var fint = foreign.bar | 0;
       CHECK_EXPR(Assignment, Bounds(cache.kAsmInt)) {
         CHECK_VAR(fint, Bounds(cache.kAsmInt));
         CHECK_EXPR(BinaryOperation, Bounds(cache.kAsmSigned)) {
           CHECK_EXPR(Property, Bounds(Type::Number())) {
             CHECK_VAR(foreign, Bounds::Unbounded());
@@ skipping 15 matching lines @@
       }
       // return { testFunc1: test1, testFunc2: test2 };
       CHECK_EXPR(ObjectLiteral, Bounds::Unbounded()) {
         CHECK_VAR(test1, FUNC_I_TYPE);
         CHECK_VAR(test2, FUNC_D_TYPE);
       }
     }
   }
   CHECK_TYPES_END
 }