[vm] Boilerplate for wasm types.

liamappelbe · commit-bot@chromium.org · commit 7505b3a5f07c · 2019-09-17T16:38:19.000Z
Follow up to https://dart-review.googlesource.com/c/sdk/+/117210, which was a quick fix to get the bots green. Since I've cut the FFI dependency for the native type markers, wasm.cc needs to switch to using these new classes, and we need boilerplate to associate them with some CIDs. Bug: #37882 Change-Id: Ic64de8fd08b8a84476aeaacae3f57af3f278b8c9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/117292 Reviewed-by: Alexander Markov <alexmarkov@google.com> Commit-Queue: Liam Appelbe <liama@google.com>
diff --git a/runtime/lib/wasm.cc b/runtime/lib/wasm.cc
@@ -46,22 +46,22 @@ static bool ToWasmValue(const Number& value,
                         classid_t type,
                         wasmer_value_t* out) {
   switch (type) {
-    case kFfiInt32Cid:
+    case kWasmInt32Cid:
       if (!value.IsInteger()) return false;
       out->tag = wasmer_value_tag::WASM_I32;
       out->value.I32 = Integer::Cast(value).AsInt64Value();
       return true;
-    case kFfiInt64Cid:
+    case kWasmInt64Cid:
       if (!value.IsInteger()) return false;
       out->tag = wasmer_value_tag::WASM_I64;
       out->value.I64 = Integer::Cast(value).AsInt64Value();
       return true;
-    case kFfiFloatCid:
+    case kWasmFloatCid:
       if (!value.IsDouble()) return false;
       out->tag = wasmer_value_tag::WASM_F32;
       out->value.F32 = Double::Cast(value).value();
       return true;
-    case kFfiDoubleCid:
+    case kWasmDoubleCid:
       if (!value.IsDouble()) return false;
       out->tag = wasmer_value_tag::WASM_F64;
       out->value.F64 = Double::Cast(value).value();
@@ -137,7 +137,7 @@ class WasmMemory {
 
 class WasmImports {
  public:
-  WasmImports(std::unique_ptr<char[]> module_name)
+  explicit WasmImports(std::unique_ptr<char[]> module_name)
       : _module_name(std::move(module_name)) {}
 
   ~WasmImports() {
@@ -195,7 +195,7 @@ class WasmFunction {
                classid_t ret,
                const wasmer_export_func_t* fn)
       : _args(std::move(args)), _ret(ret), _fn(fn) {}
-  bool IsVoid() const { return _ret == kFfiVoidCid; }
+  bool IsVoid() const { return _ret == kWasmVoidCid; }
   const MallocGrowableArray<classid_t>& args() const { return _args; }
 
   bool SignatureMatches(const MallocGrowableArray<classid_t>& dart_args,
@@ -219,11 +219,11 @@ class WasmFunction {
   }
 
   void Print(std::ostream& o, const char* name) const {
-    PrintFfiType(o, _ret);
+    PrintDartType(o, _ret);
     o << ' ' << name << '(';
     for (intptr_t i = 0; i < _args.length(); ++i) {
       if (i > 0) o << ", ";
-      PrintFfiType(o, _args[i]);
+      PrintDartType(o, _args[i]);
     }
     o << ')';
   }
@@ -233,21 +233,21 @@ class WasmFunction {
   const classid_t _ret;
   const wasmer_export_func_t* _fn;
 
-  static void PrintFfiType(std::ostream& o, classid_t type) {
+  static void PrintDartType(std::ostream& o, classid_t type) {
     switch (type) {
-      case kFfiInt32Cid:
+      case kWasmInt32Cid:
         o << "i32";
         break;
-      case kFfiInt64Cid:
+      case kWasmInt64Cid:
         o << "i64";
         break;
-      case kFfiFloatCid:
+      case kWasmFloatCid:
         o << "f32";
         break;
-      case kFfiDoubleCid:
+      case kWasmDoubleCid:
         o << "f64";
         break;
-      case kFfiVoidCid:
+      case kWasmVoidCid:
         o << "void";
         break;
     }
@@ -317,16 +317,16 @@ class WasmInstance {
   wasmer_exports_t* _exports;
   MallocDirectChainedHashMap<CStringKeyValueTrait<WasmFunction*>> _functions;
 
-  static classid_t ToFfiType(wasmer_value_tag wasm_type) {
+  static classid_t ToDartType(wasmer_value_tag wasm_type) {
     switch (wasm_type) {
       case wasmer_value_tag::WASM_I32:
-        return kFfiInt32Cid;
+        return kWasmInt32Cid;
       case wasmer_value_tag::WASM_I64:
-        return kFfiInt64Cid;
+        return kWasmInt64Cid;
       case wasmer_value_tag::WASM_F32:
-        return kFfiFloatCid;
+        return kWasmFloatCid;
       case wasmer_value_tag::WASM_F64:
-        return kFfiDoubleCid;
+        return kWasmDoubleCid;
     }
     FATAL("Unknown WASM type");
     return 0;
@@ -340,7 +340,7 @@ class WasmInstance {
     ASSERT(num_rets <= 1);
     wasmer_value_tag wasm_ret;
     ThrowIfFailed(wasmer_export_func_returns(fn, &wasm_ret, num_rets));
-    classid_t ret = num_rets == 0 ? kFfiVoidCid : ToFfiType(wasm_ret);
+    classid_t ret = num_rets == 0 ? kWasmVoidCid : ToDartType(wasm_ret);
 
     uint32_t num_args;
     ThrowIfFailed(wasmer_export_func_params_arity(fn, &num_args));
@@ -349,7 +349,7 @@ class WasmInstance {
     ThrowIfFailed(wasmer_export_func_params(fn, wasm_args.get(), num_args));
     MallocGrowableArray<classid_t> args;
     for (intptr_t i = 0; i < num_args; ++i) {
-      args.Add(ToFfiType(wasm_args[i]));
+      args.Add(ToDartType(wasm_args[i]));
     }
 
     wasmer_byte_array name_bytes = wasmer_export_name(exp);
diff --git a/runtime/lib/wasm_patch.dart b/runtime/lib/wasm_patch.dart
@@ -6,6 +6,26 @@ import 'dart:_internal' show patch;
 import "dart:nativewrappers" show NativeFieldWrapperClass1;
 import 'dart:typed_data';
 
+@patch
+@pragma("vm:entry-point")
+class Int32 {}
+
+@patch
+@pragma("vm:entry-point")
+class Int64 {}
+
+@patch
+@pragma("vm:entry-point")
+class Float {}
+
+@patch
+@pragma("vm:entry-point")
+class Double {}
+
+@patch
+@pragma("vm:entry-point")
+class Void {}
+
 @patch
 class WasmModule {
   @patch
diff --git a/runtime/vm/class_id.h b/runtime/vm/class_id.h
@@ -131,6 +131,13 @@ namespace dart {
   V(DynamicLibrary)                                                            \
   V(Struct)
 
+#define CLASS_LIST_WASM(V)                                                     \
+  V(WasmInt32)                                                                 \
+  V(WasmInt64)                                                                 \
+  V(WasmFloat)                                                                 \
+  V(WasmDouble)                                                                \
+  V(WasmVoid)
+
 #define DART_CLASS_LIST_TYPED_DATA(V)                                          \
   V(Int8)                                                                      \
   V(Uint8)                                                                     \
@@ -182,6 +189,10 @@ enum ClassId {
   CLASS_LIST_FFI(DEFINE_OBJECT_KIND)
 #undef DEFINE_OBJECT_KIND
 
+#define DEFINE_OBJECT_KIND(clazz) k##clazz##Cid,
+  CLASS_LIST_WASM(DEFINE_OBJECT_KIND)
+#undef DEFINE_OBJECT_KIND
+
 #define DEFINE_OBJECT_KIND(clazz)                                              \
   kTypedData##clazz##Cid,                                                      \
   kTypedData##clazz##ViewCid,                                                  \
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
@@ -1931,6 +1931,15 @@ RawError* Object::Init(Isolate* isolate,
     }
     object_store->set_bootstrap_library(ObjectStore::kWasm, lib);
 
+#define REGISTER_WASM_TYPE(clazz)                                              \
+  cls = Class::New<Instance>(k##clazz##Cid, isolate);                          \
+  cls.set_num_type_arguments(0);                                               \
+  cls.set_is_prefinalized();                                                   \
+  pending_classes.Add(cls);                                                    \
+  RegisterClass(cls, Symbols::clazz(), lib);
+    CLASS_LIST_WASM(REGISTER_WASM_TYPE);
+#undef REGISTER_WASM_TYPE
+
     // Finish the initialization by compiling the bootstrap scripts containing
     // the base interfaces and the implementation of the internal classes.
     const Error& error = Error::Handle(
@@ -2025,6 +2034,11 @@ RawError* Object::Init(Isolate* isolate,
     CLASS_LIST_FFI_TYPE_MARKER(REGISTER_FFI_CLASS);
 #undef REGISTER_FFI_CLASS
 
+#define REGISTER_WASM_CLASS(clazz)                                             \
+  cls = Class::New<Instance>(k##clazz##Cid, isolate);
+    CLASS_LIST_WASM(REGISTER_WASM_CLASS);
+#undef REGISTER_WASM_CLASS
+
     cls = Class::New<Instance>(kFfiNativeFunctionCid, isolate);
 
     cls = Class::NewPointerClass(kFfiPointerCid, isolate);
diff --git a/runtime/vm/raw_object.cc b/runtime/vm/raw_object.cc
@@ -319,6 +319,13 @@ intptr_t RawObject::VisitPointersPredefined(ObjectPointerVisitor* visitor,
         size = HeapSize();
         break;
       }
+#undef RAW_VISITPOINTERS
+#define RAW_VISITPOINTERS(clazz) case k##clazz##Cid:
+      CLASS_LIST_WASM(RAW_VISITPOINTERS) {
+        // These wasm types do not have any fields or type arguments.
+        size = HeapSize();
+        break;
+      }
 #undef RAW_VISITPOINTERS
     case kFreeListElement: {
       uword addr = RawObject::ToAddr(this);
diff --git a/runtime/vm/symbols.h b/runtime/vm/symbols.h
@@ -284,6 +284,11 @@ class ObjectPointerVisitor;
   V(UnwindError, "UnwindError")                                                \
   V(Value, "value")                                                            \
   V(Values, "values")                                                          \
+  V(WasmInt32, "Int32")                                                        \
+  V(WasmInt64, "Int64")                                                        \
+  V(WasmFloat, "Float")                                                        \
+  V(WasmDouble, "Double")                                                      \
+  V(WasmVoid, "Void")                                                          \
   V(YieldKw, "yield")                                                          \
   V(_AsyncAwaitCompleter, "_AsyncAwaitCompleter")                              \
   V(_AsyncAwaitCompleterConstructor, "_AsyncAwaitCompleter.")                  \
