Move exception handing into

GoogleChromeLabs · Sep 7, 2019 · ba6e5df · ba6e5df
1 parent 5ed29e0
commit ba6e5df
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 65 deletions.
diff --git a/src/detectors/bulk-memory/index.js b/src/detectors/bulk-memory/index.js
@@ -19,11 +19,5 @@ import inlineModule from "wat2wasm:--enable-bulk-memory:./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/exceptions/index.js b/src/detectors/exceptions/index.js
@@ -19,11 +19,5 @@ import inlineModule from "wat2wasm:--enable-exceptions:./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/multi-value/index.js b/src/detectors/multi-value/index.js
@@ -19,11 +19,5 @@ import inlineModule from "wat2wasm:--enable-multi-value:./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/mutable-globals/index.js b/src/detectors/mutable-globals/index.js
@@ -18,11 +18,5 @@ import inlineModule from "wat2wasm::./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/reference-types/index.js b/src/detectors/reference-types/index.js
@@ -19,11 +19,5 @@ import inlineModule from "wat2wasm:--enable-reference-types:./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/saturated-float-to-int/index.js b/src/detectors/saturated-float-to-int/index.js
@@ -19,11 +19,5 @@ import inlineModule from "wat2wasm:--enable-saturating-float-to-int:./module.wat
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/sign-extensions/index.js b/src/detectors/sign-extensions/index.js
@@ -19,11 +19,5 @@ import inlineModule from "wat2wasm:--enable-sign-extension:./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/simd/index.js b/src/detectors/simd/index.js
@@ -19,10 +19,5 @@ import inlineModule from "wat2wasm:--enable-simd:./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/tail-call/index.js b/src/detectors/tail-call/index.js
@@ -19,11 +19,5 @@ import inlineModule from "wat2wasm:--enable-tail-call:./module.wat";
 import { testCompile } from "../../helpers.js";
 
 export default async function() {
-  try {
-    // Test for atomics
-    await testCompile(inlineModule);
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return testCompile(inlineModule);
 }
diff --git a/src/detectors/threads/index.js b/src/detectors/threads/index.js
@@ -31,8 +31,7 @@ export default async function() {
       port1.postMessage(sab);
     });
     // Test for atomics
-    await testCompile(inlineModule);
-    return true;
+    return testCompile(inlineModule);
   } catch (e) {
     return false;
   }

diff --git a/src/helpers.js b/src/helpers.js
@@ -15,5 +15,10 @@
 // be called quite often and by having our own function terser can give it
 // a one-letter name.
 export async function testCompile(path) {
-  return WebAssembly.compile(await fetch(path).then(r => r.arrayBuffer()));
+  try {
+    await WebAssembly.compile(await fetch(path).then(r => r.arrayBuffer()));
+    return true;
+  } catch (e) {
+    return false;
+  }
 }