Ensure that GeneratorReturnExceptions are not handled by InterpreterStackFrame::DebugProcess

Author: paolosevMSFT

lib/Runtime/Language/InterpreterStackFrame.cpp

@@ -2353,8 +2353,9 @@ namespace Js
             if (exception)
             {
                 bool skipException = false;
-                if (exception != scriptContext->GetThreadContext()->GetPendingSOErrorObject()
-                    && exception != scriptContext->GetThreadContext()->GetPendingOOMErrorObject())
+                if (!exception->IsGeneratorReturnException() &&
+                    exception != scriptContext->GetThreadContext()->GetPendingSOErrorObject() &&
+                    exception != scriptContext->GetThreadContext()->GetPendingOOMErrorObject())
                 {
                     skipException = exception->IsDebuggerSkip();
                 }

test/es6/generators-functionality.js

@@ -949,6 +949,11 @@ var tests = [
             assert.areEqual({ value: 2, done: false }, g.return(100), "Return causes the finally block to execute");
             assert.throws(function () { g.next(); }, ExpectedException, "Second next call should throw from finally block");
             assert.areEqual({ value: undefined, done: true }, g.next(), "Method execution has finished");
+
+            gf = function* () { try { throw new ExpectedException(); } catch (e) { throw e; } }
+            g = gf();
+            assert.throws(function () { g.next() }, ExpectedException, "First next call should rethrow exception");
+            assert.areEqual({ value: 2, done: true }, g.return(2), "Return statement completes the function from try block");
         }
     },
     {

test/es6/rlexe.xml

@@ -868,6 +868,13 @@
       <tags>exclude_arm</tags>
     </default>
   </test>
+  <test>
+    <default>
+      <files>generators-functionality.js</files>
+      <compile-flags>-ES6Generators -ES6Classes -ES6DefaultArgs -debuglaunch -args summary -endargs</compile-flags>
+      <tags>exclude_arm</tags>
+    </default>
+  </test>
   <test>
     <default>
       <files>generators-deferred.js</files>

test/es7/rlexe.xml

@@ -19,6 +19,13 @@
       <baseline>asyncawait-functionality.baseline</baseline>
     </default>
   </test>
+  <test>
+    <default>
+      <files>asyncawait-functionality.js</files>
+      <compile-flags>-es6experimental -nodeferparse -debuglaunch -args summary -endargs</compile-flags>
+      <baseline>asyncawait-functionality.baseline</baseline>
+    </default>
+  </test>
   <test>
     <default>
       <files>asyncawait-functionality.js</files>