V8. ASM-2-WASM. Fixes technical debt in asm-types.

src/asmjs/asm-types.h

 // 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.
 
 #ifndef SRC_ASMJS_ASM_TYPES_H_
 #define SRC_ASMJS_ASM_TYPES_H_
 
 #include <string>
 
 #include "src/base/macros.h"
 #include "src/zone-containers.h"
 #include "src/zone.h"
 
 namespace v8 {
 namespace internal {
 namespace wasm {
 
 class AsmType;
 class AsmFFIType;
 class AsmFunctionType;
 class AsmOverloadedFunctionType;
 class AsmFunctionTableType;
 
 // List of V(CamelName, string_name, number, parent_types)
 #define FOR_EACH_ASM_VALUE_TYPE_LIST(V)                                       \
   /* These tags are not types that are expressable in the asm source. They */ \
   /* are used to express semantic information about the types they tag.    */ \
   V(Heap, "[]", 1, 0)                                                         \
-  /*The following are actual types that appear in the asm source. */          \
-  V(Void, "void", 2, 0)                                                       \
-  V(Extern, "extern", 3, 0)                                                   \
-  V(DoubleQ, "double?", 4, 0)                                                 \
-  V(Double, "double", 5, kAsmDoubleQ | kAsmExtern)                            \
-  V(Intish, "intish", 6, 0)                                                   \
-  V(Int, "int", 7, kAsmIntish)                                                \
-  V(Signed, "signed", 8, kAsmInt | kAsmExtern)                                \
-  V(Unsigned, "unsigned", 9, kAsmInt)                                         \
-  V(FixNum, "fixnum", 10, kAsmSigned | kAsmUnsigned)                          \
-  V(Floatish, "floatish", 11, 0)                                              \
-  V(FloatQ, "float?", 12, kAsmFloatish)                                       \
-  V(Float, "float", 13, kAsmFloatQ)                                           \
+  V(FloatishDoubleQ, "floatish|double?", 2, 0)                                \
+  V(FloatQDoubleQ, "float?|double?", 3, 0)                                    \
+  /* The following are actual types that appear in the asm source. */         \
+  V(Void, "void", 4, 0)                                                       \
+  V(Extern, "extern", 5, 0)                                                   \
+  V(DoubleQ, "double?", 6, kAsmFloatishDoubleQ | kAsmFloatQDoubleQ)           \
+  V(Double, "double", 7, kAsmDoubleQ | kAsmExtern)                            \
+  V(Intish, "intish", 8, 0)                                                   \
+  V(Int, "int", 9, kAsmIntish)                                                \
+  V(Signed, "signed", 10, kAsmInt | kAsmExtern)                               \
+  V(Unsigned, "unsigned", 11, kAsmInt)                                        \
+  V(FixNum, "fixnum", 12, kAsmSigned | kAsmUnsigned)                          \
+  V(Floatish, "floatish", 13, kAsmFloatishDoubleQ)                            \
+  V(FloatQ, "float?", 14, kAsmFloatQDoubleQ | kAsmFloatish)                   \
+  V(Float, "float", 15, kAsmFloatQ)                                           \
   /* Types used for expressing the Heap accesses. */                          \
-  V(Uint8Array, "Uint8Array", 14, kAsmHeap)                                   \
-  V(Int8Array, "Int8Array", 15, kAsmHeap)                                     \
-  V(Uint16Array, "Uint16Array", 16, kAsmHeap)                                 \
-  V(Int16Array, "Int16Array", 17, kAsmHeap)                                   \
-  V(Uint32Array, "Uint32Array", 18, kAsmHeap)                                 \
-  V(Int32Array, "Int32Array", 19, kAsmHeap)                                   \
-  V(Float32Array, "Float32Array", 20, kAsmHeap)                               \
-  V(Float64Array, "Float64Array", 21, kAsmHeap)                               \
-  /* Pseudo-types used in representing heap access for fp types.*/            \
-  /* TODO(jpp): FloatishDoubleQ should be a base type.*/                      \
-  V(FloatishDoubleQ, "floatish|double?", 22, kAsmFloatish | kAsmDoubleQ)      \
-  /* TODO(jpp): FloatQDoubleQ should be a base type.*/                        \
-  V(FloatQDoubleQ, "float?|double?", 23, kAsmFloatQ | kAsmDoubleQ)            \
+  V(Uint8Array, "Uint8Array", 16, kAsmHeap)                                   \
+  V(Int8Array, "Int8Array", 17, kAsmHeap)                                     \
+  V(Uint16Array, "Uint16Array", 18, kAsmHeap)                                 \
+  V(Int16Array, "Int16Array", 19, kAsmHeap)                                   \
+  V(Uint32Array, "Uint32Array", 20, kAsmHeap)                                 \
+  V(Int32Array, "Int32Array", 21, kAsmHeap)                                   \
+  V(Float32Array, "Float32Array", 22, kAsmHeap)                               \
+  V(Float64Array, "Float64Array", 23, kAsmHeap)                               \
   /* None is used to represent errors in the type checker. */                 \
   V(None, "<none>", 31, 0)
 
 // List of V(CamelName)
 #define FOR_EACH_ASM_CALLABLE_TYPE_LIST(V) \
   V(FunctionType)                          \
   V(FFIType)                               \
   V(OverloadedFunctionType)                \
   V(FunctionTableType)
 
@@ skipping 34 matching lines @@
         static_cast<uintptr_t>(bits | kAsmValueTypeTag));
   }
 
   // AsmValueTypes can't be created except through AsmValueType::New.
   DISALLOW_IMPLICIT_CONSTRUCTORS(AsmValueType);
 };
 
 class AsmCallableType : public ZoneObject {
  public:
   virtual std::string Name() = 0;
-  virtual AsmType* ValidateCall(AsmType* return_type,
-                                const ZoneVector<AsmType*>& args) = 0;
 
   virtual bool CanBeInvokedWith(AsmType* return_type,
                                 const ZoneVector<AsmType*>& args) = 0;
 
 #define DECLARE_CAST(CamelName) \
   virtual Asm##CamelName* As##CamelName() { return nullptr; }
   FOR_EACH_ASM_CALLABLE_TYPE_LIST(DECLARE_CAST)
 #undef DECLARE_CAST
 
  protected:
   AsmCallableType() = default;
   virtual ~AsmCallableType() = default;
+  virtual bool IsA(AsmType* other);
 
  private:
+  friend class AsmType;
+
   DISALLOW_COPY_AND_ASSIGN(AsmCallableType);
 };
 
-class AsmFunctionType : public AsmCallableType {
+class AsmFunctionType final : public AsmCallableType {
  public:
   AsmFunctionType* AsFunctionType() final { return this; }
 
   void AddArgument(AsmType* type) { args_.push_back(type); }
   const ZoneVector<AsmType*> Arguments() const { return args_; }
   AsmType* ReturnType() const { return return_type_; }
 
-  virtual bool IsMinMaxType() const { return false; }
-  virtual bool IsFroundType() const { return false; }
-
-  AsmType* ValidateCall(AsmType* return_type,
-                        const ZoneVector<AsmType*>& args) override;
   bool CanBeInvokedWith(AsmType* return_type,
                         const ZoneVector<AsmType*>& args) override;
 
  protected:
   AsmFunctionType(Zone* zone, AsmType* return_type)
       : return_type_(return_type), args_(zone) {}
 
  private:
   friend AsmType;
 
   std::string Name() override;
+  bool IsA(AsmType* other) override;
 
   AsmType* return_type_;
   ZoneVector<AsmType*> args_;
 
   DISALLOW_COPY_AND_ASSIGN(AsmFunctionType);
 };
 
 class AsmOverloadedFunctionType final : public AsmCallableType {
  public:
   AsmOverloadedFunctionType* AsOverloadedFunctionType() override {
     return this;
   }
 
   void AddOverload(AsmType* overload);
 
  private:
   friend AsmType;
 
   explicit AsmOverloadedFunctionType(Zone* zone) : overloads_(zone) {}
 
   std::string Name() override;
-  AsmType* ValidateCall(AsmType* return_type,
-                        const ZoneVector<AsmType*>& args) override;
   bool CanBeInvokedWith(AsmType* return_type,
                         const ZoneVector<AsmType*>& args) override;
 
   ZoneVector<AsmType*> overloads_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AsmOverloadedFunctionType);
 };
 
 class AsmFFIType final : public AsmCallableType {
  public:
   AsmFFIType* AsFFIType() override { return this; }
 
   std::string Name() override { return "Function"; }
-  AsmType* ValidateCall(AsmType* return_type,
-                        const ZoneVector<AsmType*>& args) override;
   bool CanBeInvokedWith(AsmType* return_type,
                         const ZoneVector<AsmType*>& args) override;
 
  private:
   friend AsmType;
 
   AsmFFIType() = default;
 
   DISALLOW_COPY_AND_ASSIGN(AsmFFIType);
 };
 
 class AsmFunctionTableType : public AsmCallableType {
  public:
   AsmFunctionTableType* AsFunctionTableType() override { return this; }
 
   std::string Name() override;
 
-  AsmType* ValidateCall(AsmType* return_type,
-                        const ZoneVector<AsmType*>& args) override;
   bool CanBeInvokedWith(AsmType* return_type,
                         const ZoneVector<AsmType*>& args) override;
 
   size_t length() const { return length_; }
   AsmType* signature() { return signature_; }
 
  private:
   friend class AsmType;
 
   AsmFunctionTableType(size_t length, AsmType* signature);
@@ skipping 130 matching lines @@
   // Returns the store type if this is a heap type. AsmType::None is returned if
   // this is not a heap type.
   AsmType* StoreType();
 };
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // SRC_ASMJS_ASM_TYPES_H_