@crossbind/core-embind-jsi 2.0.0-beta.60 → 2.0.0-beta.62

package/cpp/src/emscripten/bind.h

@@ -1183,7 +1183,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_constructor"),
                 1,
                 [destructor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     destructor(t);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1216,7 +1216,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_gter1"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(field, *t2);
                 });
 
@@ -1225,7 +1225,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_ster1"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(field, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1257,8 +1257,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_gter2"),
                 2,
                 [g, getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return g(getter, *t2);
                 });
 
@@ -1267,8 +1267,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_ster2"),
                 3,
                 [s](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Setter* t = reinterpret_cast<Setter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Setter* t = reinterpret_cast<Setter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     s(*t, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1299,8 +1299,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_gter3"),
                 2,
                 [getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(t1, *t2);
                 });
 
@@ -1310,8 +1310,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_ster3"),
                 3,
                 [setter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(t1, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1359,7 +1359,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_constructor"),
                 1,
                 [dtor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     dtor(t);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1392,7 +1392,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter1"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(field, *t2);
                 });
 
@@ -1401,7 +1401,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster1"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(field, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1439,8 +1439,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter1"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(*t1, *t2);
                 });
 
@@ -1449,8 +1449,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster1"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(*t1, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1487,8 +1487,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter2"),
                 2,
                 [g, getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return g(getter, *t2);
                 });
 
@@ -1497,8 +1497,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster2"),
                 3,
                 [s](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Setter* t = reinterpret_cast<Setter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Setter* t = reinterpret_cast<Setter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     s(*t, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1531,8 +1531,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter3"),
                 2,
                 [getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(t1, *t2);
                 });
 
@@ -1541,8 +1541,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster3"),
                 3,
                 [setter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(t1, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -2159,7 +2159,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"__getActualType"),
                 1,
                 [_getActualType](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    auto returnValue = _getActualType(reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt)));
+                    auto returnValue = _getActualType(reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0])));
                     return facebook::jsi::BigInt::fromUint64(rt, reinterpret_cast<uint64_t>(returnValue));
                 });
 
@@ -2168,7 +2168,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_upcast"),
                 1,
                 [upcast](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     BaseSpecifier* a = nullptr;
                     return dsadsa<ClassType, BaseSpecifier>(rt, t, a);
                 });
@@ -2178,7 +2178,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_downcast"),
                 1,
                 [downcast](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     BaseSpecifier* a = nullptr;
                     return downcastHelper<ClassType, BaseSpecifier>(rt, t, a);
                 });
@@ -2188,7 +2188,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_destructor"),
                 1,
                 [destructor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    destructor(reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt)));
+                    destructor(reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0])));
                     return facebook::jsi::Value::undefined();
                 });
 
@@ -2227,7 +2227,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_get"),
                 1,
                 [get](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    uint64_t ptrNumber = args[0].asBigInt(rt).asUint64(rt);
+                    uint64_t ptrNumber = internal::bigIntUint64(rt, args[0]);
                     auto b = *reinterpret_cast<PointerType*>(ptrNumber);
                     auto a = get(b);
                     return facebook::jsi::BigInt::fromUint64(rt, reinterpret_cast<uint64_t>(a));
@@ -2247,10 +2247,10 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_share"),
                 2,
                 [share](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    uint64_t pNumber = args[0].asBigInt(rt).asUint64(rt);
+                    uint64_t pNumber = internal::bigIntUint64(rt, args[0]);
                     auto p = reinterpret_cast<PointeeType*>(pNumber);
                     // uint64_t vNumber = (uint64_t) args[1].getNumber();
-                    uint64_t vNumber = args[1].asBigInt(rt).asUint64(rt);
+                    uint64_t vNumber = internal::bigIntUint64(rt, args[1]);
                     EM_VAL v = reinterpret_cast<EM_VAL>(vNumber);
                     auto a = share(p, v);
                     auto e = facebook::jsi::BigInt::fromUint64(rt, reinterpret_cast<uint64_t>(a));
@@ -2262,7 +2262,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_destructor"),
                 1,
                 [destructor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    uint64_t ptrNumber = args[0].asBigInt(rt).asUint64(rt);
+                    uint64_t ptrNumber = internal::bigIntUint64(rt, args[0]);
                     auto b = reinterpret_cast<PointerType*>(ptrNumber);
                     destructor(b);
                     return facebook::jsi::Value::undefined();
@@ -2403,7 +2403,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_gter"),
                 2,
                 [getter, a](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(a, *t2);
                 });
 
@@ -2441,8 +2441,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_gter"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    FieldType* t = reinterpret_cast<FieldType*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    FieldType* t = reinterpret_cast<FieldType*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(field, *t2);
                 });
 
@@ -2451,8 +2451,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_ster"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    FieldType* t = reinterpret_cast<FieldType*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    FieldType* t = reinterpret_cast<FieldType*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(field, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -2487,8 +2487,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName) + "_gter"),
                 2,
                 [gter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return gter(*t, *t2);
                 });
 
@@ -2536,8 +2536,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_gter"),
                 2,
                 [gter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return gter(*t, *t2);
                 });
 
@@ -2546,8 +2546,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_ster"),
                 3,
                 [ster](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Setter* t = reinterpret_cast<Setter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Setter* t = reinterpret_cast<Setter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     ster(*t, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });

package/cpp/src/emscripten/val.h

@@ -17,6 +17,7 @@
 #include <climits>
 #include "./wire.h"
 #include <cstdint> // uintptr_t
+#include <stdexcept>
 #include <vector>
 
 // #include <android/log.h>
@@ -48,15 +49,14 @@ enum {
   _EMVAL_FALSE = 4
 };
 
-typedef struct _EM_DESTRUCTORS* EM_DESTRUCTORS;
 typedef struct _EM_METHOD_CALLER* EM_METHOD_CALLER;
 typedef facebook::jsi::Value EM_GENERIC_WIRE_TYPE;
-typedef const void* EM_VAR_ARGS;
 
 void _emval_incref(EM_VAL value);
 void _emval_decref(EM_VAL value);
 
-void _emval_run_destructors(EM_DESTRUCTORS handle);
+// Runs the destructors the latest _emval_as or _emval_call_method conversion queued.
+void _emval_run_destructors();
 
 EM_VAL _emval_new_array();
 EM_VAL _emval_new_array_from_memory_view(EM_VAL mv);
@@ -65,19 +65,19 @@ EM_VAL _emval_new_cstring(const char*);
 EM_VAL _emval_new_u8string(const char*);
 EM_VAL _emval_new_u16string(const char16_t*);
 
-EM_VAL _emval_take_value(TYPEID type, EM_VAR_ARGS argv);
+EM_VAL _emval_take_value(TYPEID type, const facebook::jsi::Value& value);
 
 EM_VAL _emval_new(
     EM_VAL value,
     unsigned argCount,
     const TYPEID argTypes[],
-    EM_VAR_ARGS argv);
+    facebook::jsi::Value* argv);
 
 EM_VAL _emval_get_global(const char* name);
 EM_VAL _emval_get_module_property(const char* name);
 EM_VAL _emval_get_property(EM_VAL object, EM_VAL key);
 void _emval_set_property(EM_VAL object, EM_VAL key, EM_VAL value);
-EM_GENERIC_WIRE_TYPE _emval_as(EM_VAL value, TYPEID returnType, EM_DESTRUCTORS* destructors);
+EM_GENERIC_WIRE_TYPE _emval_as(EM_VAL value, TYPEID returnType);
 int64_t _emval_as_int64(EM_VAL value, TYPEID returnType);
 uint64_t _emval_as_uint64(EM_VAL value, TYPEID returnType);
 
@@ -91,7 +91,7 @@ EM_VAL _emval_call(
     EM_VAL value,
     unsigned argCount,
     const TYPEID argTypes[],
-    EM_VAR_ARGS argv);
+    facebook::jsi::Value* argv);
 
 // DO NOT call this more than once per signature. It will
 // leak generated function objects!
@@ -102,13 +102,14 @@ EM_GENERIC_WIRE_TYPE _emval_call_method(
     EM_METHOD_CALLER caller,
     EM_VAL handle,
     const char* methodName,
-    EM_DESTRUCTORS* destructors,
-    EM_VAR_ARGS argv);
+    unsigned argCount,
+    facebook::jsi::Value* argv);
 void _emval_call_void_method(
     EM_METHOD_CALLER caller,
     EM_VAL handle,
     const char* methodName,
-    EM_VAR_ARGS argv);
+    unsigned argCount,
+    facebook::jsi::Value* argv);
 EM_VAL _emval_typeof(EM_VAL value);
 bool _emval_instanceof(EM_VAL object, EM_VAL constructor);
 bool _emval_is_number(EM_VAL object);
@@ -146,20 +147,17 @@ struct Signature {
   }
 };
 
+// Scoped to one conversion: every _emval_as / _emval_call_method that returns queues exactly one
+// destructor list in JS, and this runs it once the C++ side has read the value.
 struct DestructorsRunner {
 public:
-  explicit DestructorsRunner(EM_DESTRUCTORS d)
-      : destructors(d)
-  {}
+  DestructorsRunner() = default;
   ~DestructorsRunner() {
-    _emval_run_destructors(destructors);
+    _emval_run_destructors();
   }
 
   DestructorsRunner(const DestructorsRunner&) = delete;
   void operator=(const DestructorsRunner&) = delete;
-
-private:
-  EM_DESTRUCTORS destructors;
 };
 
 template<typename WireType>
@@ -178,115 +176,27 @@ struct GenericWireTypeConverter<Pointee*> {
 
 template<typename T>
 T fromGenericWireType(facebook::jsi::Value& g) {
-    if constexpr (std::is_same<T, std::string>::value) {
-        return g.getString(*jsRuntime).utf8(*jsRuntime);
-    }
-  typedef typename BindingType<T>::WireType WireType;
-  WireType wt = GenericWireTypeConverter<WireType>::from(g);
-  return BindingType<T>::fromWireType(wt);
-}
-
-template<typename... Args>
-struct PackSize;
-
-template<>
-struct PackSize<> {
-  static constexpr size_t value = 0;
-};
-
-template<typename Arg, typename... Args>
-struct PackSize<Arg, Args...> {
-  static constexpr size_t value = (sizeof(typename BindingType<Arg>::WireType) + 7) / 8 + PackSize<Args...>::value;
-};
-
-union GenericWireType {
-  union {
-    unsigned u;
-    float f;
-    // Use uint32_t for pointer values.  This limits us, for now, to 32-bit
-    // address ranges even on wasm64.  This is enforced by assertions below.
-    // TODO(sbc): Allow full 64-bit address range here under wasm64, most
-    // likely by increasing the size of GenericWireType on wasm64.
-    uint32_t p;
-  } w[2];
-    double d;
-    uint64_t u;
-};
-static_assert(sizeof(GenericWireType) == 8, "GenericWireType must be 8 bytes");
-static_assert(alignof(GenericWireType) == 8, "GenericWireType must be 8-byte-aligned");
-
-inline void writeGenericWireType(GenericWireType*& cursor, float wt) {
-  cursor->w[0].f = wt;
-  ++cursor;
-}
-
-inline void writeGenericWireType(GenericWireType*& cursor, double wt) {
-  cursor->d = wt;
-  ++cursor;
-}
-
-inline void writeGenericWireType(GenericWireType*& cursor, int64_t wt) {
-  cursor->u = wt;
-  ++cursor;
-}
-
-inline void writeGenericWireType(GenericWireType*& cursor, uint64_t wt) {
-  cursor->u = wt;
-  ++cursor;
-}
-
-template<typename T>
-void writeGenericWireType(GenericWireType*& cursor, T* wt) {
-  uint64_t short_ptr = reinterpret_cast<uint64_t>(wt);
-  // assert(short_ptr <= UINT32_MAX);
-  cursor->u = short_ptr;
-  ++cursor;
-}
-
-template<typename ElementType>
-inline void writeGenericWireType(GenericWireType*& cursor, const memory_view<ElementType>& wt) {
-  uintptr_t short_ptr = reinterpret_cast<uintptr_t>(wt.data);
-  // This wire slot stores the data pointer in 32 bits (upstream wasm32 layout). On 64-bit
-  // native a pointer above 4 GiB cannot fit; abort loudly rather than silently truncating to
-  // a bogus address (release builds compile out the assert). Full 64-bit memory_view support
-  // needs a wider wire encoding on both the writer and the reader.
-  assert(short_ptr <= UINT32_MAX);
-  if (short_ptr > UINT32_MAX) {
-    abort();
-  }
-  cursor->w[0].u = wt.size;
-  cursor->w[1].p = static_cast<uint32_t>(short_ptr);
-  ++cursor;
-}
-
-template<typename T>
-void writeGenericWireType(GenericWireType*& cursor, T wt) {
-  cursor->w[0].u = static_cast<unsigned>(wt);
-  ++cursor;
-}
-
-inline void writeGenericWireTypes(GenericWireType*&) {
-}
-
-template<typename First, typename... Rest>
-EMSCRIPTEN_ALWAYS_INLINE void writeGenericWireTypes(GenericWireType*& cursor, First&& first, Rest&&... rest) {
-  writeGenericWireType(cursor, BindingType<First>::toWireType(std::forward<First>(first)));
-  writeGenericWireTypes(cursor, std::forward<Rest>(rest)...);
+  if constexpr (std::is_same<T, std::string>::value) {
+    return g.asString(*jsRuntime).utf8(*jsRuntime);
+  } else if constexpr (std::is_same<T, facebook::jsi::Value>::value) {
+    return std::move(g);
+  } else {
+    typedef typename BindingType<T>::WireType WireType;
+    WireType wt = GenericWireTypeConverter<WireType>::from(g);
+    return BindingType<T>::fromWireType(wt);
+  }
 }
 
+// Arguments cross as the values embind's JS types accept (toWireType2), the same way bound
+// functions return them, never as bytes JS would have to read out of native memory.
+// jsi::Value has no copy constructor: each toWireType2 prvalue initializes its element directly,
+// so routing one through a named const Value first would stop this from compiling.
 template<typename... Args>
-struct WireTypePack {
-  WireTypePack(Args&&... args) {
-    GenericWireType* cursor = elements.data();
-    writeGenericWireTypes(cursor, std::forward<Args>(args)...);
-  }
+struct WireValues {
+  explicit WireValues(Args&&... args)
+      : values{{BindingType<Args>::toWireType2(*jsRuntime, std::forward<Args>(args))...}} {}
 
-  operator EM_VAR_ARGS() const {
-    return elements.data();
-  }
-
-private:
-  std::array<GenericWireType, PackSize<Args...>::value> elements;
+  std::array<facebook::jsi::Value, sizeof...(Args)> values;
 };
 
 template<typename ReturnType, typename... Args>
@@ -294,15 +204,14 @@ struct MethodCaller {
   static ReturnType call(EM_VAL handle, const char* methodName, Args&&... args) {
     auto caller = Signature<ReturnType, Args...>::get_method_caller();
 
-    WireTypePack<Args...> argv(std::forward<Args>(args)...);
-    EM_DESTRUCTORS destructors;
+    WireValues<Args...> argv(std::forward<Args>(args)...);
     EM_GENERIC_WIRE_TYPE result = _emval_call_method(
       caller,
       handle,
       methodName,
-      &destructors,
-      argv);
-    DestructorsRunner rd(destructors);
+      sizeof...(Args),
+      argv.values.data());
+    DestructorsRunner rd;
     return fromGenericWireType<ReturnType>(result);
   }
 };
@@ -312,12 +221,13 @@ struct MethodCaller<void, Args...> {
   static void call(EM_VAL handle, const char* methodName, Args&&... args) {
     auto caller = Signature<void, Args...>::get_method_caller();
 
-    WireTypePack<Args...> argv(std::forward<Args>(args)...);
+    WireValues<Args...> argv(std::forward<Args>(args)...);
     _emval_call_void_method(
       caller,
       handle,
       methodName,
-      argv);
+      sizeof...(Args),
+      argv.values.data());
   }
 };
 
@@ -410,9 +320,9 @@ public:
   explicit val(T&& value) {
     using namespace internal;
 
-    typedef internal::BindingType<T> BT;
-    WireTypePack<T> argv(std::forward<T>(value));
-    handle = _emval_take_value(internal::TypeID<T>::get(), argv);
+    handle = _emval_take_value(
+        internal::TypeID<T>::get(),
+        BindingType<T>::toWireType2(*jsRuntime, std::forward<T>(value)));
   }
 
   val() : handle(EM_VAL(internal::_EMVAL_UNDEFINED)) {}
@@ -555,15 +465,10 @@ public:
   T as(Policies...) const {
     using namespace internal;
 
-    typedef BindingType<T> BT;
     typename WithPolicies<Policies...>::template ArgTypeList<T> targetType;
 
-    EM_DESTRUCTORS destructors;
-    EM_GENERIC_WIRE_TYPE result = _emval_as(
-        handle,
-        targetType.getTypes()[0],
-        &destructors);
-    DestructorsRunner dr(destructors);
+    EM_GENERIC_WIRE_TYPE result = _emval_as(handle, targetType.getTypes()[0]);
+    DestructorsRunner dr;
     return fromGenericWireType<T>(result);
   }
 
@@ -629,8 +534,8 @@ private:
     using namespace internal;
 
     WithPolicies<>::ArgTypeList<Args...> argList;
-    WireTypePack<Args...> argv(std::forward<Args>(args)...);
-    return val(impl(handle, argList.getCount(), argList.getTypes(), argv));
+    WireValues<Args...> argv(std::forward<Args>(args)...);
+    return val(impl(handle, argList.getCount(), argList.getTypes(), argv.values.data()));
   }
 
   template<typename T>
@@ -669,7 +574,7 @@ struct BindingType<val> {
     static val fromWireType2(facebook::jsi::Runtime& rt, WireType2& v) {
       // return val::undefined();
         // return val::take_ownership(reinterpret_cast<EM_VAL>((int) v.getNumber()));
-        return val::take_ownership(reinterpret_cast<EM_VAL>(v.asBigInt(rt).asUint64(rt)));
+        return val::take_ownership(reinterpret_cast<EM_VAL>(bigIntUint64(rt, v)));
     }
 };
 
@@ -690,17 +595,23 @@ std::vector<T> vecFromJSArray(const val& v, Policies... policies) {
 
 template <typename T>
 std::vector<T> convertJSArrayToNumberVector(const val& v) {
-  const size_t l = v["length"].as<size_t>();
+  // size_t is not a registered embind type on every 64-bit ABI; the length is a Number anyway.
+  const double l = v["length"].as<double>();
+  if (!(l >= 0 && l <= static_cast<double>(std::vector<T>().max_size()))) {
+    throw std::length_error("crossbind: the array length is not a valid size");
+  }
 
   std::vector<T> rv;
-  rv.resize(l);
+  rv.resize(static_cast<size_t>(l));
 
   // Copy the array into our vector through the use of typed arrays.
   // It will try to convert each element through Number().
   // See https://www.ecma-international.org/ecma-262/6.0/#sec-%typedarray%.prototype.set-array-offset
   // and https://www.ecma-international.org/ecma-262/6.0/#sec-tonumber
-  val memoryView{ typed_memory_view(l, rv.data()) };
-  memoryView.call<void>("set", v);
+  // The typed array is JS-owned and copied out: one aliasing rv would need external memory.
+  val typedArray = val::global(internal::typedArrayNameOf<T>()).new_(l);
+  typedArray.call<void>("set", v);
+  internal::copyFromTypedArray(*jsRuntime, typedArray.as<facebook::jsi::Value>(), rv.data(), rv.size() * sizeof(T));
 
   return rv;
 }