Initial support for exception handling

RyanLamansky · Aug 27, 2024 · c1c3f34 · c1c3f34
1 parent df3a7cf
commit c1c3f34
Show file tree

Hide file tree

Showing 38 changed files with 1,452 additions and 74 deletions.
diff --git a/WebAssembly.Tests/AssemblyBuilder.cs b/WebAssembly.Tests/AssemblyBuilder.cs
@@ -9,7 +9,7 @@ namespace WebAssembly;
 /// </summary>
 static class AssemblyBuilder
 {
-    public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType? @return, params Instruction[] code)
+    public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType? @return, Instruction[] code, Action<Module>? configure)
     where TExport : class
     {
         Assert.IsNotNull(name);
@@ -37,6 +37,8 @@ public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType?
             Code = code
         });
 
+        configure?.Invoke(module);
+
         var compiled = module.ToInstance<TExport>();
 
         Assert.IsNotNull(compiled);
@@ -45,7 +47,13 @@ public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType?
         return compiled.Exports;
     }
 
-    public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType? @return, IList<WebAssemblyValueType> parameters, params Instruction[] code)
+    public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType? @return, params Instruction[] code)
+        where TExport : class
+    {
+        return CreateInstance<TExport>(name, @return, code, null);
+    }
+
+    public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType? @return, IList<WebAssemblyValueType> parameters, Instruction[] code, Action<Module>? configure)
     where TExport : class
     {
         Assert.IsNotNull(name);
@@ -75,6 +83,8 @@ public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType?
             Code = code
         });
 
+        configure?.Invoke(module);
+
         var compiled = module.ToInstance<TExport>();
 
         Assert.IsNotNull(compiled);
@@ -83,6 +93,12 @@ public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType?
         return compiled.Exports;
     }
 
+    public static TExport CreateInstance<TExport>(string name, WebAssemblyValueType? @return, IList<WebAssemblyValueType> parameters, params Instruction[] code)
+        where TExport : class
+    {
+        return CreateInstance<TExport>(name, @return, parameters, code, null);
+    }
+
     private static readonly Dictionary<System.Type, WebAssemblyValueType> map = new(4)
     {
         { typeof(int), WebAssemblyValueType.Int32 },

diff --git a/WebAssembly.Tests/Instructions/CatchAllTests.cs b/WebAssembly.Tests/Instructions/CatchAllTests.cs
@@ -0,0 +1,50 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace WebAssembly.Instructions;
+
+/// <summary>
+/// Tests the <see cref="Try"/> instruction.
+/// </summary>
+[TestClass]
+public class CatchAllTests
+{
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="CatchAll"/> instruction when there are no exceptions.
+    /// </summary>
+    [TestMethod]
+    public void CatchAll_NoException()
+    {
+        Assert.AreEqual<int>(0, AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+            new Try(),
+            new Int32Constant(0),
+            new Return(),
+            new CatchAll(),
+            new Int32Constant(1),
+            new Return(),
+            new End(),
+
+            new Int32Constant(2),
+            new End()
+        ).Test());
+    }
+
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="CatchAll"/> instruction when there is an exception.
+    /// </summary>
+    [TestMethod]
+    public void CatchAll_Catch()
+    {
+        Assert.AreEqual<int>(0, AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+            new Try(),
+            new Int32Constant(0),
+            new Return(),
+            new CatchAll(),
+            new Int32Constant(1),
+            new Return(),
+            new End(),
+
+            new Int32Constant(2),
+            new End()
+        ).Test());
+    }
+}
diff --git a/WebAssembly.Tests/Instructions/CatchTests.cs b/WebAssembly.Tests/Instructions/CatchTests.cs
@@ -0,0 +1,181 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace WebAssembly.Instructions;
+
+/// <summary>
+/// Tests the <see cref="Catch"/> instruction.
+/// </summary>
+[TestClass]
+public class CatchTests
+{
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="Catch"/> instruction when there are no exceptions.
+    /// </summary>
+    [TestMethod]
+    public void Catch_NoException()
+    {
+        Assert.AreEqual<int>(0, AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+            new Instruction[]
+            {
+                new Try(),
+                new Int32Constant(0),
+                new Return(),
+                new Catch(0),
+                new Int32Constant(1),
+                new Return(),
+                new End(),
+
+                new Int32Constant(2),
+                new End()
+            },
+            module =>
+            {
+                module.Types.Add(new WebAssemblyType
+                {
+                    Parameters = new[]
+                    {
+                        WebAssemblyValueType.Int32
+                    },
+                });
+
+                module.Tags.Add(new WebAssemblyTag
+                {
+                    TypeIndex = 1
+                });
+            }
+        ).Test());
+    }
+
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="Catch"/> instruction when there is an exception.
+    /// </summary>
+    [TestMethod]
+    public void Catch_Exception()
+    {
+        Assert.AreEqual<int>(1, AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+            new Instruction[]
+            {
+                new Try(),
+                new Int32Constant(0),
+                new Throw(0),
+                new Catch(0),
+                new Int32Constant(1),
+                new Return(),
+                new End(),
+
+                new Int32Constant(2),
+                new End()
+            },
+            module =>
+            {
+                module.Types.Add(new WebAssemblyType
+                {
+                    Parameters = new[]
+                    {
+                        WebAssemblyValueType.Int32
+                    },
+                });
+
+                module.Tags.Add(new WebAssemblyTag
+                {
+                    TypeIndex = 1
+                });
+            }
+        ).Test());
+    }
+
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="Catch"/> instruction when there is an exception of the wrong type.
+    /// </summary>
+    [TestMethod]
+    public void Catch_MultipleExceptionTags()
+    {
+        Assert.AreEqual<int>(2, AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+            new Instruction[]
+            {
+                new Try(),
+                new Int32Constant(0),
+                new Throw(1),
+                new Catch(0),
+                new Int32Constant(1),
+                new Return(),
+                new Catch(1),
+                new Int32Constant(2),
+                new Return(),
+                new End(),
+
+                new Int32Constant(3),
+                new End()
+            },
+            module =>
+            {
+                module.Types.Add(new WebAssemblyType
+                {
+                    Parameters = new[]
+                    {
+                        WebAssemblyValueType.Int32
+                    },
+                });
+
+                module.Tags.Add(new WebAssemblyTag
+                {
+                    TypeIndex = 1
+                });
+
+                module.Tags.Add(new WebAssemblyTag
+                {
+                    TypeIndex = 1
+                });
+            }
+        ).Test());
+    }
+
+
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="Rethrow"/> instruction.
+    /// </summary>
+    [TestMethod]
+    public void Catch_TryInCatch()
+    {
+        Assert.AreEqual(1, AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+            new Instruction[]
+            {
+                new Try(),
+
+                    new Throw(0),
+
+                new Catch(0),
+
+                    new Try(),
+                        new Throw(1),
+                    new Catch(1),
+                        new Int32Constant(1),
+                        new Return(),
+                    new End(),
+
+                new End(),
+
+                new Int32Constant(0),
+                new End()
+            },
+            module =>
+            {
+                module.Types.Add(new WebAssemblyType
+                {
+                    Parameters = Array.Empty<WebAssemblyValueType>()
+                });
+
+                module.Tags.Add(new WebAssemblyTag
+                {
+                    TypeIndex = 1
+                });
+
+                module.Tags.Add(new WebAssemblyTag
+                {
+                    TypeIndex = 1
+                });
+            }
+        ).Test());
+    }
+}
diff --git a/WebAssembly.Tests/Instructions/RethrowTests.cs b/WebAssembly.Tests/Instructions/RethrowTests.cs
@@ -0,0 +1,48 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using WebAssembly.Runtime;
+
+namespace WebAssembly.Instructions;
+
+/// <summary>
+/// Tests the <see cref="Rethrow"/> instruction.
+/// </summary>
+[TestClass]
+public class RethrowTests
+{
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="Rethrow"/> instruction.
+    /// </summary>
+    [TestMethod]
+    public void Rethrow_Exception()
+    {
+        Assert.ThrowsException<WebAssemblyException>(() =>
+        {
+            AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+                new Instruction[]
+                {
+                    new Try(),
+                    new Throw(0),
+                    new Catch(0),
+                    new Rethrow(0),
+                    new End(),
+
+                    new Int32Constant(0),
+                    new End()
+                },
+                module =>
+                {
+                    module.Types.Add(new WebAssemblyType
+                    {
+                        Parameters = Array.Empty<WebAssemblyValueType>()
+                    });
+
+                    module.Tags.Add(new WebAssemblyTag
+                    {
+                        TypeIndex = 1
+                    });
+                }
+            ).Test();
+        });
+    }
+}
diff --git a/WebAssembly.Tests/Instructions/ThrowTests.cs b/WebAssembly.Tests/Instructions/ThrowTests.cs
@@ -0,0 +1,43 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using WebAssembly.Runtime;
+
+namespace WebAssembly.Instructions;
+
+/// <summary>
+/// Tests the <see cref="Throw"/> instruction.
+/// </summary>
+[TestClass]
+public class ThrowTests
+{
+    /// <summary>
+    /// Tests compilation and execution of the <see cref="Throw"/> instruction.
+    /// </summary>
+    [TestMethod]
+    public void Throw_Exception()
+    {
+        Assert.ThrowsException<WebAssemblyException>(() =>
+        {
+            AssemblyBuilder.CreateInstance<dynamic>("Test", WebAssemblyValueType.Int32,
+                new Instruction[]
+                {
+                    new Throw(0),
+
+                    new End()
+                },
+                module =>
+                {
+                    module.Types.Add(new WebAssemblyType
+                    {
+                        Parameters = Array.Empty<WebAssemblyValueType>()
+                    });
+
+                    module.Tags.Add(new WebAssemblyTag
+                    {
+                        TypeIndex = 1
+                    });
+                }
+            ).Test();
+        });
+    }
+}