[MERGE #5849 @boingoing] Fix async function and generator when await/yield is used inside a catch statement with no argument binding

Merge pull request #5849 from boingoing:fix_async_catch_no_binding

Author: boingoing

lib/Runtime/ByteCode/ByteCodeEmitter.cpp

@@ -11749,17 +11749,20 @@ void Emit(ParseNode *pnode, ByteCodeGenerator *byteCodeGenerator, FuncInfo *func
             EmitAssignment(nullptr, pnode1, location, byteCodeGenerator, funcInfo);
             byteCodeGenerator->EndStatement(pnodeCatch);
         }
-        else if (pnodeCatch->HasParam())
+        else
         {
-            Symbol *sym = pnodeCatch->GetParam()->AsParseNodeName()->sym;
-            ParamTrackAndInitialization(sym, true /*initializeParam*/, location);
-            if (scope->GetMustInstantiate())
+            if (pnodeCatch->HasParam())
             {
-                sym->SetIsGlobalCatch(true);
+                Symbol *sym = pnodeCatch->GetParam()->AsParseNodeName()->sym;
+                ParamTrackAndInitialization(sym, true /*initializeParam*/, location);
+                if (scope->GetMustInstantiate())
+                {
+                    sym->SetIsGlobalCatch(true);
+                }
+                byteCodeGenerator->Writer()->RecordCrossFrameEntryExitRecord(true);
             }
-            byteCodeGenerator->Writer()->RecordCrossFrameEntryExitRecord(true);
 
-            // Allow a debugger to stop on the 'catch (e)'
+            // Allow a debugger to stop on the 'catch'
             byteCodeGenerator->StartStatement(pnodeCatch);
             byteCodeGenerator->Writer()->Empty(Js::OpCode::Nop);
             byteCodeGenerator->EndStatement(pnodeCatch);

test/EH/optional-catch-binding.js

@@ -106,6 +106,24 @@ var tests = [
       assert.areEqual(f()(), 2);
     },
   },
+  {
+    name: "Async function with catch block with no binding",
+    body: function() {
+        async function foo() {
+            try { throw "anything" } catch { await 5;}
+        }
+        assert.isTrue(foo() instanceof Promise, "await returns a promise");
+    }
+  },
+  {
+    name: "Async function with catch block with no binding",
+    body: function() {
+        function* foo() {
+            try { throw "anything" } catch { yield 5;}
+        }
+        assert.areEqual(5, foo().next().value, "generator returns an object with yielded value");
+    }
+  },
 ];
 
 testRunner.runTests(tests, { verbose: WScript.Arguments[0] != "summary" });