more

Author: pavelsavara

src/coreclr/vm/wasm/callhelpers.cpp

@@ -785,6 +785,27 @@ extern "C" void SystemJS_ExecuteTimerCallback()
     Call_System_Private_CoreLib_System_Threading_TimerQueue_TimerHandler();
 }
 
+static MethodDesc* MD_System_Runtime_InteropServices_JavaScript_System_Runtime_InteropServices_JavaScript_JavaScriptExports_GetManagedStackTrace_IntPtr_RetVoid = nullptr;
+static void Call_System_Runtime_InteropServices_JavaScript_System_Runtime_InteropServices_JavaScript_JavaScriptExports_GetManagedStackTrace(void* arg0)
+{
+    int64_t args[1] =
+    {
+        (int64_t)arg0
+    };
+
+    // Lazy lookup of MethodDesc for the function export scenario.
+    if (!MD_System_Runtime_InteropServices_JavaScript_System_Runtime_InteropServices_JavaScript_JavaScriptExports_GetManagedStackTrace_IntPtr_RetVoid)
+    {
+        LookupMethodByName("System.Runtime.InteropServices.JavaScript.JavaScriptExports, System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "GetManagedStackTrace", &MD_System_Runtime_InteropServices_JavaScript_System_Runtime_InteropServices_JavaScript_JavaScriptExports_GetManagedStackTrace_IntPtr_RetVoid);
+    }
+    ExecuteInterpretedMethodFromUnmanaged(MD_System_Runtime_InteropServices_JavaScript_System_Runtime_InteropServices_JavaScript_JavaScriptExports_GetManagedStackTrace_IntPtr_RetVoid, (int8_t*)args, sizeof(args), nullptr);
+}
+
+extern "C" void SystemInteropJS_GetManagedStackTrace(void* arg0)
+{
+    Call_System_Runtime_InteropServices_JavaScript_System_Runtime_InteropServices_JavaScript_JavaScriptExports_GetManagedStackTrace(arg0);
+}
+
 extern const ReverseThunkMapEntry g_ReverseThunks[] =
 {
     { 100678287, { &MD_System_Private_CoreLib_System_Threading_ThreadPool_BackgroundJobHandler_Void_RetVoid, (void*)&Call_System_Private_CoreLib_System_Threading_ThreadPool_BackgroundJobHandler } },

src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/JavaScriptExports.cs

@@ -229,6 +229,7 @@ public static void CompleteTask(JSMarshalerArgument* arguments_buffer)
             }
         }
 
+        [UnmanagedCallersOnly(EntryPoint = "SystemInteropJS_GetManagedStackTrace")]
         // the marshaled signature is: string GetManagedStackTrace(GCHandle exception)
         public static void GetManagedStackTrace(JSMarshalerArgument* arguments_buffer)
         {

src/native/libs/Common/JavaScript/cross-module/index.ts

@@ -142,6 +142,7 @@ export function dotnetUpdateInternalsSubscriber() {
     // keep in sync with interopJavaScriptExportsToTable()
     function interopJavaScriptExportsFromTable(table: InteropJavaScriptExportsTable, interop: InteropJavaScriptExports): void {
         const interopLocal: InteropJavaScriptExports = {
+            SystemInteropJS_GetManagedStackTrace: table[0],
         };
         Object.assign(interop, interopLocal);
     }

src/native/libs/Common/JavaScript/types/exchange.ts

@@ -75,9 +75,11 @@ export type BrowserHostExportsTable = [
 ]
 
 export type InteropJavaScriptExports = {
+    SystemInteropJS_GetManagedStackTrace: typeof _SystemInteropJS_GetManagedStackTrace,
 }
 
 export type InteropJavaScriptExportsTable = [
+    typeof _SystemInteropJS_GetManagedStackTrace,
 ]
 
 export type NativeBrowserExports = {

src/native/libs/System.Runtime.InteropServices.JavaScript.Native/interop/cancelable-promise.ts

@@ -3,9 +3,10 @@
 
 import { ManagedObject } from "./marshaled-types";
 import { ControllablePromise, GCHandle, MarshalerToCs } from "./types";
-import { completeTask, isRuntimeRunning } from "./utils";
+import { isRuntimeRunning } from "./utils";
 import { lookupJsOwnedObject, teardownManagedProxy } from "./gc-handles";
 import { marshalCsObjectToCs } from "./marshal-to-cs";
+import { completeTask } from "./managed-exports";
 
 const promiseHolderSymbol = Symbol.for("wasm promise_holder");
 

src/native/libs/System.Runtime.InteropServices.JavaScript.Native/interop/gc-handles.ts

@@ -7,11 +7,12 @@ import { dotnetAssert, dotnetLogger } from "./cross-module";
 
 import type { GCHandle, JSHandle, WeakRefInternal } from "./types";
 import { GCHandleNull } from "./types";
-import { assertJsInterop, isRuntimeRunning, releaseJsOwnedObjectByGcHandle } from "./utils";
+import { assertJsInterop, isRuntimeRunning } from "./utils";
 import { useWeakRef, createStrongRef, createWeakRef } from "./weak-ref";
 import { jsImportWrapperByFnHandle } from "./invoke-js";
 import { boundCsFunctionSymbol, importedJsFunctionSymbol, proxyDebugSymbol } from "./marshal";
 import { exportsByAssembly } from "./invoke-cs";
+import { releaseJsOwnedObjectByGcHandle } from "./managed-exports";
 
 const useFinalizationRegistry = typeof globalThis.FinalizationRegistry === "function";
 let jsOwnedObjectRegistry: FinalizationRegistry<any>;

src/native/libs/System.Runtime.InteropServices.JavaScript.Native/interop/invoke-cs.ts

@@ -1,7 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { assertJsInterop, bindAssemblyExports } from "./utils";
+import { bindAssemblyExports } from "./managed-exports";
+import { assertJsInterop } from "./utils";
 
 export const exportsByAssembly: Map<string, any> = new Map();
 

src/native/libs/System.Runtime.InteropServices.JavaScript.Native/interop/invoke-js.ts

@@ -3,7 +3,7 @@
 
 import BuildConfiguration from "consts:configuration";
 
-import { dotnetBrowserUtilsExports, dotnetApi, dotnetAssert, dotnetLogger, VoidPtrNull } from "./cross-module";
+import { dotnetBrowserUtilsExports, dotnetApi, dotnetAssert, dotnetLogger, VoidPtrNull, Module } from "./cross-module";
 
 import type { BindingClosure, BoundMarshalerToJs, JSFnHandle, JSFunctionSignature, JSHandle, JSMarshalerArguments, VoidPtr, WrappedJSFunction } from "./types";
 import { MarshalerType, MeasuredBlock } from "./types";

src/native/libs/System.Runtime.InteropServices.JavaScript.Native/interop/managed-exports.ts

@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+import { dotnetInteropJSExports, Module } from "./cross-module";
+import { allocStackFrame, getArg, setArgType, setGcHandle as setGcHandle } from "./marshal";
+import { marshalStringToJs } from "./marshal-to-js";
+import { MarshalerType, type GCHandle, type MarshalerToCs, type MarshalerToJs } from "./types";
+import { assertRuntimeRunning, isRuntimeRunning } from "./utils";
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function releaseJsOwnedObjectByGcHandle(gcHandle: GCHandle) {
+    // TODO-WASM
+}
+
+export function getManagedStackTrace(exceptionGCHandle: GCHandle): string {
+    assertRuntimeRunning();
+    const sp = Module.stackSave();
+    try {
+        const size = 3;
+        const args = allocStackFrame(size);
+
+        const arg1 = getArg(args, 2);
+        setArgType(arg1, MarshalerType.Exception);
+        setGcHandle(arg1, exceptionGCHandle);
+
+        dotnetInteropJSExports.SystemInteropJS_GetManagedStackTrace(args);
+
+        const res = getArg(args, 1);
+        return marshalStringToJs(res)!;
+    } finally {
+        if (isRuntimeRunning()) Module.stackRestore(sp);
+    }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function callDelegate(callbackGcHandle: GCHandle, arg1Js: any, arg2Js: any, arg3Js: any, resConverter?: MarshalerToJs, arg1Converter?: MarshalerToCs, arg2Converter?: MarshalerToCs, arg3Converter?: MarshalerToCs) {
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function completeTask(holder_gc_handle: GCHandle, error?: any, data?: any, res_converter?: MarshalerToCs) {
+
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function bindAssemblyExports(assemblyName: string): Promise<void> {
+    // TODO-WASM
+    return Promise.resolve();
+}

src/native/libs/System.Runtime.InteropServices.JavaScript.Native/interop/marshal-to-js.ts

@@ -10,8 +10,9 @@ import { GCHandleNull, JavaScriptMarshalerArgSize, MarshalerType } from "./types
 import { arrayElementSize, csToJsMarshalers, getArg, getArgBool, getArgDate, getArgElementType, getArgF32, getArgF64, getArgGcHandle, getArgI16, getArgI32, getArgI52, getArgI64Big, getArgIntptr, getArgJsHandle, getArgLength, getArgType, getArgU16, getArgU8, getSignatureArg1Type, getSignatureArg2Type, getSignatureArg3Type, getSignatureResType, proxyDebugSymbol, setArgType, setJsHandle } from "./marshal";
 import { getMarshalerToCsByType, jsinteropDoc, marshalExceptionToCs } from "./marshal-to-cs";
 import { lookupJsOwnedObject, getJsHandleFromJSObject, getJSObjectFromJSHandle, registerWithJsvHandle, releaseCSOwnedObject, setupManagedProxy, teardownManagedProxy } from "./gc-handles";
-import { assertRuntimeRunning, callDelegate, fixupPointer, isRuntimeRunning } from "./utils";
+import { assertRuntimeRunning, fixupPointer, isRuntimeRunning } from "./utils";
 import { ArraySegment, ManagedError, ManagedObject, MemoryViewType, Span } from "./marshaled-types";
+import { callDelegate } from "./managed-exports";
 
 export function initializeMarshalersToJs(): void {
     if (csToJsMarshalers.size == 0) {