1 files changed, 30 insertions, 15 deletions

diff --git a/src/embind/emval.js b/src/embind/emval.js
index 77270597..039f1d61 100644
--- a/src/embind/emval.js
+++ b/src/embind/emval.js
@@ -3,7 +3,8 @@
 /*global new_*/
 /*global createNamedFunction*/
 /*global readLatin1String, writeStringToMemory*/
-/*global requireRegisteredType, throwBindingError*/
+/*global requireRegisteredType, throwBindingError, runDestructors*/
+/*jslint sub:true*/ /* The symbols 'fromWireType' and 'toWireType' must be accessed via array notation to be closure-safe since craftInvokerFunction crafts functions as strings that can't be closured. */
 
 var Module = Module || {};
 
@@ -78,6 +79,12 @@ function __emval_decref(handle) {
     }
 }
 
+function __emval_run_destructors(handle) {
+    var destructors = _emval_handle_array[handle].value;
+    runDestructors(destructors);
+    __emval_decref(handle);
+}
+
 function __emval_new_array() {
     return __emval_register([]);
 }
@@ -100,7 +107,7 @@ function __emval_new_cstring(v) {
 
 function __emval_take_value(type, v) {
     type = requireRegisteredType(type, '_emval_take_value');
-    v = type.fromWireType(v);
+    v = type['fromWireType'](v);
     return __emval_register(v);
 }
 
@@ -198,12 +205,13 @@ function __emval_set_property(handle, key, value) {
     _emval_handle_array[handle].value[_emval_handle_array[key].value] = _emval_handle_array[value].value;
 }
 
-function __emval_as(handle, returnType) {
+function __emval_as(handle, returnType, destructorsRef) {
     requireHandle(handle);
     returnType = requireRegisteredType(returnType, 'emval::as');
     var destructors = [];
-    // caller owns destructing
-    return returnType.toWireType(destructors, _emval_handle_array[handle].value);
+    var rd = __emval_register(destructors);
+    HEAP32[destructorsRef >> 2] = rd;
+    return returnType['toWireType'](destructors, _emval_handle_array[handle].value);
 }
 
 function parseParameters(argCount, argTypes, argWireTypes) {
@@ -212,7 +220,7 @@ function parseParameters(argCount, argTypes, argWireTypes) {
         var argType = requireRegisteredType(
             HEAP32[(argTypes >> 2) + i],
             "parameter " + i);
-        a[i] = argType.fromWireType(argWireTypes[i]);
+        a[i] = argType['fromWireType'](argWireTypes[i]);
     }
     return a;
 }
@@ -223,7 +231,7 @@ function __emval_call(handle, argCount, argTypes) {
 
     var args = new Array(argCount);
     for (var i = 0; i < argCount; ++i) {
-        args[i] = types[i].fromWireType(arguments[3 + i]);
+        args[i] = types[i]['fromWireType'](arguments[3 + i]);
     }
 
     var fn = _emval_handle_array[handle].value;
@@ -241,14 +249,20 @@ function lookupTypes(argCount, argTypes, argWireTypes) {
     return a;
 }
 
+function allocateDestructors(destructorsRef) {
+    var destructors = [];
+    HEAP32[destructorsRef >> 2] = __emval_register(destructors);
+    return destructors;
+}
+
 function __emval_get_method_caller(argCount, argTypes) {
     var types = lookupTypes(argCount, argTypes);
 
     var retType = types[0];
     var signatureName = retType.name + "_$" + types.slice(1).map(function (t) { return t.name; }).join("_") + "$";
 
-    var args1 = ["Runtime", "createNamedFunction", "requireHandle", "getStringOrSymbol", "_emval_handle_array", "retType"];
-    var args2 = [Runtime, createNamedFunction, requireHandle, getStringOrSymbol, _emval_handle_array, retType];
+    var args1 = ["addFunction", "createNamedFunction", "requireHandle", "getStringOrSymbol", "_emval_handle_array", "retType", "allocateDestructors"];
+    var args2 = [Runtime.addFunction, createNamedFunction, requireHandle, getStringOrSymbol, _emval_handle_array, retType, allocateDestructors];
 
     var argsList = ""; // 'arg0, arg1, arg2, ... , argN'
     var argsListWired = ""; // 'arg0Wired, ..., argNWired'
@@ -260,16 +274,17 @@ function __emval_get_method_caller(argCount, argTypes) {
     }
 
     var invokerFnBody =
-        "return Runtime.addFunction(createNamedFunction('" + signatureName + "', function (handle, name" + argsListWired + ") {\n" +
-        "requireHandle(handle);\n" +
-        "name = getStringOrSymbol(name);\n";
+        "return addFunction(createNamedFunction('" + signatureName + "', function (handle, name, destructorsRef" + argsListWired + ") {\n" +
+        "    requireHandle(handle);\n" +
+        "    name = getStringOrSymbol(name);\n";
 
     for (var i = 0; i < argCount - 1; ++i) {
-        invokerFnBody += "var arg" + i + " = argType" + i + ".fromWireType(arg" + i + "Wired);\n";
+        invokerFnBody += "    var arg" + i + " = argType" + i + ".fromWireType(arg" + i + "Wired);\n";
     }
     invokerFnBody +=
-        "var obj = _emval_handle_array[handle].value;\n" +
-        "return retType.toWireType(null, obj[name](" + argsList + "));\n" + 
+        "    var obj = _emval_handle_array[handle].value;\n" +
+        "    var rv = obj[name](" + argsList + ");\n" +
+        "    return retType.toWireType(allocateDestructors(destructorsRef), rv);\n" +
         "}));\n";
 
     args1.push(invokerFnBody);