Fix multiple return statements in typing-asm, cleanup.

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.h"
@@ skipping 1401 matching lines @@
 
 
 TEST(BadLiteral) {
   CHECK_FUNC_ERROR(
       "function bar() { return true | 0; }\n"
       "function foo() { bar(); }",
       "asm: line 39: illegal literal\n");
 }
 
 
+TEST(MismatchedReturnTypeLiteral) {
+  CHECK_FUNC_ERROR(
+      "function bar() { if(1) { return 1; } return 1.0; }\n"
+      "function foo() { bar(); }",
+      "asm: line 39: return type does not match function signature\n");
+}
+
+
+TEST(MismatchedReturnTypeExpression) {
+  CHECK_FUNC_ERROR(
+      "function bar() {\n"
+      "  var x = 1; var y = 1.0; if(1) { return x; } return +y; }\n"
+      "function foo() { bar(); }",
+      "asm: line 40: return type does not match function signature\n");
+}
+
+
 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_EXPR(Literal, Bounds(cache.kAsmFixnum));
@@ skipping 30 matching lines @@
   HandleAndZoneScope handles;
   Zone* zone = handles.main_zone();
   ZoneVector<ExpressionTypeEntry> types(zone);
   CHECK_EQ("asm: line 40: non-function in function table\n",
            Validate(zone, test_function, &types));
 }
 
 
 TEST(TypeConsistency) {
   v8::V8::Initialize();
-  //  HandleAndZoneScope handles;
-  //  Zone* zone = handles.main_zone();
   TypeCache cache;
+  // Check the consistency of each of the main Asm.js types.
+  CHECK(cache.kAsmFixnum->Is(cache.kAsmFixnum));
+  CHECK(cache.kAsmFixnum->Is(cache.kAsmSigned));
+  CHECK(cache.kAsmFixnum->Is(cache.kAsmUnsigned));
+  CHECK(cache.kAsmFixnum->Is(cache.kAsmInt));
+  CHECK(!cache.kAsmFixnum->Is(cache.kAsmFloat));
+  CHECK(!cache.kAsmFixnum->Is(cache.kAsmDouble));
 
+  CHECK(cache.kAsmSigned->Is(cache.kAsmSigned));
+  CHECK(cache.kAsmSigned->Is(cache.kAsmInt));
+  CHECK(!cache.kAsmSigned->Is(cache.kAsmFixnum));
+  CHECK(!cache.kAsmSigned->Is(cache.kAsmUnsigned));
+  CHECK(!cache.kAsmSigned->Is(cache.kAsmFloat));
+  CHECK(!cache.kAsmSigned->Is(cache.kAsmDouble));
 
-  CHECK(!cache.kAsmSigned->Is(cache.kAsmDouble));
-  CHECK(!cache.kAsmSigned->Is(cache.kAsmFloat));
-  CHECK(!cache.kAsmSigned->Is(cache.kAsmUnsigned));
+  CHECK(cache.kAsmUnsigned->Is(cache.kAsmUnsigned));
+  CHECK(cache.kAsmUnsigned->Is(cache.kAsmInt));
+  CHECK(!cache.kAsmUnsigned->Is(cache.kAsmSigned));
+  CHECK(!cache.kAsmUnsigned->Is(cache.kAsmFixnum));
+  CHECK(!cache.kAsmUnsigned->Is(cache.kAsmFloat));
+  CHECK(!cache.kAsmUnsigned->Is(cache.kAsmDouble));
+
+  CHECK(cache.kAsmInt->Is(cache.kAsmInt));
+  CHECK(!cache.kAsmInt->Is(cache.kAsmUnsigned));
+  CHECK(!cache.kAsmInt->Is(cache.kAsmSigned));
+  CHECK(!cache.kAsmInt->Is(cache.kAsmFixnum));
+  CHECK(!cache.kAsmInt->Is(cache.kAsmFloat));
+  CHECK(!cache.kAsmInt->Is(cache.kAsmDouble));
+
+  CHECK(cache.kAsmFloat->Is(cache.kAsmFloat));
+  CHECK(!cache.kAsmFloat->Is(cache.kAsmInt));
+  CHECK(!cache.kAsmFloat->Is(cache.kAsmUnsigned));
+  CHECK(!cache.kAsmFloat->Is(cache.kAsmSigned));
+  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.kAsmSigned->Is(cache.kAsmInt));
-  CHECK(!cache.kAsmSigned->Is(cache.kAsmDouble));
+  CHECK(!cache.kAsmDouble->Is(cache.kAsmFixnum));
+  CHECK(!cache.kAsmDouble->Is(cache.kAsmFloat));
 }