Refactor exception handling tests and assertions

Simplified assertions in exception tests by removing redundant comparisons and using direct boolean checks. Updated type assertions in catch blocks for better type safety. Added eslint-disable comments for returns in finally blocks. Adjusted expected line numbers in .wat test outputs to match code changes.

Author: BlobMaster41

src/compiler.ts

@@ -3022,9 +3022,8 @@ export class Compiler extends DiagnosticEmitter {
 
     // If exception handling feature is enabled, use actual throw instruction
     if (this.options.hasFeature(Feature.ExceptionHandling)) {
-      let value = statement.value;
       // Compile the thrown value - should be Error or subclass
-      let valueExpr = this.compileExpression(value, Type.auto);
+      let valueExpr = this.compileExpression(statement.value, Type.auto);
 
       // Ensure exception tag exists
       let tagName = this.ensureExceptionTag();

tests/compiler/exceptions.debug.wat

@@ -5331,8 +5331,6 @@
   end
   call $exceptions/testFinally
   global.get $exceptions/finallyRan
-  i32.const 1
-  i32.eq
   i32.eqz
   if
    i32.const 0
@@ -5367,8 +5365,6 @@
    unreachable
   end
   global.get $exceptions/returnInCatchFinallyRan
-  i32.const 1
-  i32.eq
   i32.eqz
   if
    i32.const 0
@@ -5392,8 +5388,6 @@
    unreachable
   end
   global.get $exceptions/tryCatchFinallyRan
-  i32.const 1
-  i32.eq
   i32.eqz
   if
    i32.const 0
@@ -5994,7 +5988,7 @@
   if
    i32.const 0
    i32.const 480
-   i32.const 473
+   i32.const 474
    i32.const 1
    call $~lib/builtins/abort
    unreachable
@@ -6006,7 +6000,7 @@
   if
    i32.const 0
    i32.const 480
-   i32.const 485
+   i32.const 487
    i32.const 1
    call $~lib/builtins/abort
    unreachable
@@ -6018,19 +6012,17 @@
   if
    i32.const 0
    i32.const 480
-   i32.const 497
+   i32.const 500
    i32.const 1
    call $~lib/builtins/abort
    unreachable
   end
   global.get $exceptions/finallyReturnSuppressedExceptionRan
-  i32.const 1
-  i32.eq
   i32.eqz
   if
    i32.const 0
    i32.const 480
-   i32.const 498
+   i32.const 501
    i32.const 1
    call $~lib/builtins/abort
    unreachable

tests/compiler/exceptions.release.wat

@@ -3153,8 +3153,7 @@
    unreachable
   end
   global.get $exceptions/tryCatchFinallyRan
-  i32.const 1
-  i32.ne
+  i32.eqz
   if
    i32.const 0
    i32.const 1504
@@ -4334,12 +4333,11 @@
    unreachable
   end
   global.get $exceptions/finallyReturnSuppressedExceptionRan
-  i32.const 1
-  i32.ne
+  i32.eqz
   if
    i32.const 0
    i32.const 1504
-   i32.const 498
+   i32.const 501
    i32.const 1
    call $~lib/builtins/abort
    unreachable

tests/compiler/exceptions.ts

@@ -19,7 +19,7 @@ function testCatchVar(): string {
   try {
     throw new Error("msg");
   } catch (e) {
-    return e.message;
+    return (e as Error).message;
   }
   return "";
 }
@@ -45,7 +45,7 @@ function testFinally(): void {
   }
 }
 testFinally();
-assert(finallyRan == true);
+assert(finallyRan);
 
 // Nested try-catch
 function testNested(): i32 {
@@ -74,7 +74,7 @@ function testReturnInCatchFinally(): i32 {
   }
 }
 assert(testReturnInCatchFinally() == 10);
-assert(returnInCatchFinallyRan == true);
+assert(returnInCatchFinallyRan);
 
 // Try-catch-finally (without return in catch)
 let tryCatchFinallyRan = false;
@@ -90,7 +90,7 @@ function testTryCatchFinally(): void {
 }
 testTryCatchFinally();
 assert(tryCatchFinallyResult == 10);
-assert(tryCatchFinallyRan == true);
+assert(tryCatchFinallyRan);
 
 // Finally with exception propagation
 let finallyWithExceptionRan = false;
@@ -302,7 +302,7 @@ function innerRethrow(): void {
     throw new Error("original");
   } catch (e) {
     rethrowFinallyRan = false;
-    throw new Error("rethrown: " + e.message);
+    throw new Error("rethrown: " + (e as Error).message);
   } finally {
     rethrowFinallyRan = true;
   }
@@ -467,6 +467,7 @@ function testReturnInFinally(): i32 {
   try {
     return 1;  // This return is overridden
   } finally {
+    // eslint-disable-next-line no-unsafe-finally
     return 2;  // This return wins
   }
 }
@@ -479,6 +480,7 @@ function testReturnInFinallyOverridesCatch(): i32 {
   } catch (e) {
     return 1;  // This return is overridden
   } finally {
+    // eslint-disable-next-line no-unsafe-finally
     return 2;  // This return wins
   }
 }
@@ -491,8 +493,9 @@ function testReturnInFinallySuppressesException(): i32 {
     throw new Error("should be suppressed");
   } finally {
     finallyReturnSuppressedExceptionRan = true;
+    // eslint-disable-next-line no-unsafe-finally
     return 42;  // This suppresses the exception
   }
 }
 assert(testReturnInFinallySuppressesException() == 42);
-assert(finallyReturnSuppressedExceptionRan == true);
+assert(finallyReturnSuppressedExceptionRan);