Bug 1316098 - Optimize out result object allocation for await/return in async function.

Tag #1287

1 files changed, 2 insertions, 97 deletions

diff --git a/js/src/jit-test/tests/debug/onExceptionUnwind-resumption-async.js b/js/src/jit-test/tests/debug/onExceptionUnwind-resumption-async.js
index d4e7e8576..0b2ee766b 100644
--- a/js/src/jit-test/tests/debug/onExceptionUnwind-resumption-async.js
+++ b/js/src/jit-test/tests/debug/onExceptionUnwind-resumption-async.js
@@ -9,28 +9,6 @@ async function f() {
 }
 `);
 
-// To continue testing after uncaught exception, remember the exception and
-// return normal completeion.
-var currentFrame;
-var uncaughtException;
-dbg.uncaughtExceptionHook = function(e) {
-    uncaughtException = e;
-    return {
-        return: currentFrame.eval("({ done: true, value: 'uncaught' })").return
-    };
-};
-function testUncaughtException() {
-    uncaughtException = undefined;
-    var val = g.eval(`
-var val;
-f().then(v => { val = v });
-drainJobQueue();
-val;
-`);
-    assertEq(val, "uncaught");
-    assertEq(uncaughtException instanceof TypeError, true);
-}
-
 // Just continue
 dbg.onExceptionUnwind = function(frame) {
     return undefined;
@@ -42,83 +20,10 @@ drainJobQueue();
 assertEq(exc instanceof ReferenceError, true);
 `);
 
-// Should return object.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: "foo"
-    };
-};
-testUncaughtException();
-
-// The object should have `done` property and `value` property.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: frame.eval("({})").return
-    };
-};
-testUncaughtException();
-
-// The object should have `done` property.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: frame.eval("({ value: 10 })").return
-    };
-};
-testUncaughtException();
-
-// The object should have `value` property.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: frame.eval("({ done: true })").return
-    };
-};
-testUncaughtException();
-
-// `done` property should be a boolean value.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: frame.eval("({ done: 10, value: 10 })").return
-    };
-};
-testUncaughtException();
-
-// `done` property shouldn't be an accessor.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: frame.eval("({ get done() { return true; }, value: 10 })").return
-    };
-};
-testUncaughtException();
-
-// `value` property shouldn't be an accessor.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: frame.eval("({ done: true, get value() { return 10; } })").return
-    };
-};
-testUncaughtException();
-
-// The object shouldn't be a Proxy.
-dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
-    return {
-        return: frame.eval("new Proxy({ done: true, value: 10 }, {})").return
-    };
-};
-testUncaughtException();
-
-// Correct resumption value.
+// Return with resumption value.
 dbg.onExceptionUnwind = function(frame) {
-    currentFrame = frame;
     return {
-        return: frame.eval("({ done: true, value: 10 })").return
+        return: 10
     };
 };
 var val = g.eval(`