Fix multiple return statements in typing-asm, cleanup.

src/typing-asm.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/typing-asm.h"
 
 #include "src/ast.h"
 #include "src/codegen.h"
@@ skipping 294 matching lines @@
     FAIL(stmt, "continue statement inside module body");
   }
 }
 
 
 void AsmTyper::VisitReturnStatement(ReturnStatement* stmt) {
   // Handle module return statement in VisitAsmModule.
   if (!in_function_) {
     return;
   }
-  // Returning literals handled in annotations.
-  if (stmt->expression()->IsLiteral()) {
-    return;
+  Literal* literal = stmt->expression()->AsLiteral();
+  if (literal) {
+    VisitLiteral(literal, true);
+  } else {
+    RECURSE(
+        VisitWithExpectation(stmt->expression(), Type::Any(),
+                             "return expression expected to have return type"));
   }
-  RECURSE(
-      VisitWithExpectation(stmt->expression(), return_type_,
-                           "return expression expected to have return type"));
+  if (!computed_type_->Is(return_type_) || !return_type_->Is(computed_type_)) {
+    FAIL(stmt->expression(), "return type does not match function signature");
+  }
 }
 
 
 void AsmTyper::VisitWithStatement(WithStatement* stmt) {
   FAIL(stmt, "bad with statement");
 }
 
 
 void AsmTyper::VisitSwitchStatement(SwitchStatement* stmt) {
   if (!in_function_) {
@@ skipping 870 matching lines @@
     computed_type_->Print();
     PrintF("Expected type: ");
     expected_type_->Print();
 #endif
     FAIL(expr, msg);
   }
   expected_type_ = save;
 }
 }  // namespace internal
 }  // namespace v8