Remove finally block from callMain. NFC (#17486)

sbc100 · web-flow · commit d947b5061499 · 2022-07-20T09:58:22.000-07:00
As of #17478 this finally block, and the try block itself, is not needed under certain circumstances.
diff --git a/src/postamble.js b/src/postamble.js
@@ -149,7 +149,9 @@ function callMain(args) {
   var argv = 0;
 #endif // MAIN_READS_PARAMS
 
+#if ABORT_ON_WASM_EXCEPTIONS || !PROXY_TO_PTHREAD
   try {
+#endif
 #if BENCHMARK
     var start = Date.now();
 #endif
@@ -185,13 +187,14 @@ function callMain(args) {
   }
   catch (e) {
     return handleException(e);
+  }
 #endif // !PROXY_TO_PTHREAD
-  } finally {
 #if ABORT_ON_WASM_EXCEPTIONS
+  finally {
     // See abortWrapperDepth in preamble.js!
     abortWrapperDepth -= 2;
-#endif
   }
+#endif
 }
 #endif // HAS_MAIN
 
diff --git a/tests/other/metadce/test_metadce_cxx_ctors1.jssize b/tests/other/metadce/test_metadce_cxx_ctors1.jssize
@@ -1 +1 @@
-26119
+26110
diff --git a/tests/other/metadce/test_metadce_cxx_ctors2.jssize b/tests/other/metadce/test_metadce_cxx_ctors2.jssize
@@ -1 +1 @@
-26083
+26074
diff --git a/tests/other/metadce/test_metadce_cxx_except.jssize b/tests/other/metadce/test_metadce_cxx_except.jssize
@@ -1 +1 @@
-31513
+31504
diff --git a/tests/other/metadce/test_metadce_cxx_except_wasm.jssize b/tests/other/metadce/test_metadce_cxx_except_wasm.jssize
@@ -1 +1 @@
-26273
+26264
diff --git a/tests/other/metadce/test_metadce_cxx_mangle.jssize b/tests/other/metadce/test_metadce_cxx_mangle.jssize
@@ -1 +1 @@
-31613
+31604
diff --git a/tests/other/metadce/test_metadce_cxx_noexcept.jssize b/tests/other/metadce/test_metadce_cxx_noexcept.jssize
@@ -1 +1 @@
-26119
+26110
diff --git a/tests/other/metadce/test_metadce_hello_O0.jssize b/tests/other/metadce/test_metadce_hello_O0.jssize
@@ -1 +1 @@
-27528
+27514
diff --git a/tests/other/metadce/test_metadce_hello_O1.jssize b/tests/other/metadce/test_metadce_hello_O1.jssize
@@ -1 +1 @@
-9245
+9225
diff --git a/tests/other/metadce/test_metadce_hello_O2.jssize b/tests/other/metadce/test_metadce_hello_O2.jssize
@@ -1 +1 @@
-6641
+6632
diff --git a/tests/other/metadce/test_metadce_hello_O3.jssize b/tests/other/metadce/test_metadce_hello_O3.jssize
@@ -1 +1 @@
-6001
+5992
diff --git a/tests/other/metadce/test_metadce_hello_Os.jssize b/tests/other/metadce/test_metadce_hello_Os.jssize
@@ -1 +1 @@
-6001
+5992
diff --git a/tests/other/metadce/test_metadce_hello_Oz.jssize b/tests/other/metadce/test_metadce_hello_Oz.jssize
@@ -1 +1 @@
-5960
+5951
diff --git a/tests/other/metadce/test_metadce_libcxxabi_message_O3.jssize b/tests/other/metadce/test_metadce_libcxxabi_message_O3.jssize
@@ -1 +1 @@
-5271
+5262
diff --git a/tests/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize b/tests/other/metadce/test_metadce_libcxxabi_message_O3_standalone.jssize
@@ -1 +1 @@
-5270
+5261
diff --git a/tests/other/metadce/test_metadce_mem_O3.jssize b/tests/other/metadce/test_metadce_mem_O3.jssize
@@ -1 +1 @@
-6162
+6153
diff --git a/tests/other/metadce/test_metadce_mem_O3_grow.jssize b/tests/other/metadce/test_metadce_mem_O3_grow.jssize
@@ -1 +1 @@
-6493
+6484
diff --git a/tests/other/metadce/test_metadce_mem_O3_grow_standalone.jssize b/tests/other/metadce/test_metadce_mem_O3_grow_standalone.jssize
@@ -1 +1 @@
-5766
+5757
diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone.jssize
@@ -1 +1 @@
-5690
+5681
diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone_lib.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone_lib.jssize
@@ -1 +1 @@
-5272
+5263
diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone_narg.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone_narg.jssize
@@ -1 +1 @@
-5270
+5261
diff --git a/tests/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize b/tests/other/metadce/test_metadce_mem_O3_standalone_narg_flto.jssize
@@ -1 +1 @@
-5270
+5261
diff --git a/tests/other/test_unoptimized_code_size.js.size b/tests/other/test_unoptimized_code_size.js.size
@@ -1 +1 @@
-84076
+84062
diff --git a/tests/other/test_unoptimized_code_size_no_asserts.js.size b/tests/other/test_unoptimized_code_size_no_asserts.js.size
@@ -1 +1 @@
-56618
+56604
diff --git a/tests/other/test_unoptimized_code_size_strict.js.size b/tests/other/test_unoptimized_code_size_strict.js.size
@@ -1 +1 @@
-66141
+66127
