V8. ASM-2-WASM. Another asm-types.h revision.

src/wasm/asm-types.cc

 // Copyright 2016 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/wasm/asm-types.h"
 
 namespace v8 {
 namespace internal {
 namespace wasm {
 
 AsmCallableType* AsmType::AsCallableType() {
+  if (AsValueType() != nullptr) {
+    return nullptr;
+  }
+
   DCHECK(this->AsFunctionType() != nullptr ||
-         this->AsOverloadedFunctionType() != nullptr);
+         this->AsOverloadedFunctionType() != nullptr ||
+         this->AsFFIType() != nullptr ||
+         this->AsFunctionTableType() != nullptr);
   return reinterpret_cast<AsmCallableType*>(this);
 }
 
 std::string AsmType::Name() {
   AsmValueType* avt = this->AsValueType();
   if (avt != nullptr) {
     switch (avt->Bitset()) {
 #define RETURN_TYPE_NAME(CamelName, string_name, number, parent_types) \
   case AsmValueType::kAsm##CamelName:                                  \
     return string_name;
@@ skipping 202 matching lines @@
 };
 }  // namespace
 
 AsmType* AsmType::MinMaxType(Zone* zone, AsmType* dest, AsmType* src) {
   DCHECK(dest->AsValueType() != nullptr);
   DCHECK(src->AsValueType() != nullptr);
   auto* MinMax = new (zone) AsmMinMaxType(zone, dest, src);
   return reinterpret_cast<AsmType*>(MinMax);
 }
 
+AsmType* AsmFFIType::ValidateCall(AsmType* function_type) {
+  auto* callable = function_type->AsFunctionType();
+  if (callable == nullptr) {
+    return nullptr;
+  }
+
+  for (int ii = 0; ii < callable->Arguments().size(); ++ii) {
+    if (!callable->Arguments()[ii]->IsA(AsmType::Extern())) {
+      return AsmType::None();
+    }
+  }
+
+  return callable->ReturnType();
+}
+
 AsmType* AsmFunctionType::ValidateCall(AsmType* function_type) {
   auto* callable = function_type->AsFunctionType();
   if (callable == nullptr) {
     return nullptr;
   }
 
   if (!return_type_->IsExactly(callable->return_type_)) {
     return AsmType::None();
   }
 
@@ skipping 38 matching lines @@
   }
 
   return AsmType::None();
 }
 
 void AsmOverloadedFunctionType::AddOverload(AsmType* overload) {
   DCHECK(overload->AsFunctionType() != nullptr);
   overloads_.push_back(overload);
 }
 
+std::string AsmFunctionTableType::Name() {
+  std::string base_name =
+      signature_ == nullptr ? "[unbound]" : signature_->Name();
+  return base_name + "[" + std::to_string(length_) + "]";
+}
+
+void AsmFunctionTableType::set_signature(AsmType* function_type) {
+  CHECK(function_type->AsFunctionType() != nullptr);
+  signature_ = function_type;
+}
+
+AsmType* AsmFunctionTableType::ValidateCall(AsmType* function_type) {
+  if (signature_ == nullptr) {

[bradnelson, 2016/06/17 23:38:50]

Doesn't this need to check that function_type is a function before adding it in?
(Or are you doing that outside for a better error message, yeah do that).

[John, 2016/06/20 15:09:52]

signature_ is now initialized during the constructor.

+    set_signature(function_type);
+  }
+  return signature_->AsCallableType()->ValidateCall(function_type);
+}
+
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8