Skip to content

OS 18333466 : Recursion in the generator next call. #5519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2018
Merged

OS 18333466 : Recursion in the generator next call. #5519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/Runtime/Language/JavascriptOperators.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ namespace Js
{
Var nextItem = nullptr;
bool shouldCallReturn = false;
JavascriptExceptionObject *exception = nullptr;
try
{
while (JavascriptOperators::IteratorStepAndValue(iterator, scriptContext, &nextItem))
Expand All @@ -73,13 +74,17 @@ namespace Js
}
catch (const JavascriptException& err)
{
JavascriptExceptionObject * exceptionObj = err.GetAndClear();
exception = err.GetAndClear();
}

if (exception != nullptr)
{
if (shouldCallReturn)
{
// Closing the iterator
JavascriptOperators::IteratorClose(iterator, scriptContext);
}
JavascriptExceptionOperators::DoThrow(exceptionObj, scriptContext);
JavascriptExceptionOperators::DoThrowCheckClone(exception, scriptContext);
}
}

Expand Down
14 changes: 10 additions & 4 deletions lib/Runtime/Library/JavascriptGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ namespace Js
Var thunkArgs[] = { this, yieldData };
Arguments arguments(_countof(thunkArgs), thunkArgs);

JavascriptExceptionObject *exception = nullptr;

try
{
BEGIN_SAFE_REENTRANT_CALL(scriptContext->GetThreadContext())
Expand All @@ -137,12 +139,16 @@ namespace Js
}
catch (const JavascriptException& err)
{
Js::JavascriptExceptionObject* exceptionObj = err.GetAndClear();
if (!exceptionObj->IsGeneratorReturnException())
exception = err.GetAndClear();
}

if (exception != nullptr)
{
if (!exception->IsGeneratorReturnException())
{
JavascriptExceptionOperators::DoThrow(exceptionObj, scriptContext);
JavascriptExceptionOperators::DoThrowCheckClone(exception, scriptContext);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DoThrowCheckClone [](start = 50, length = 17)

Why does it need to change from DoThrow to DoThrowCheckClone?

}
result = exceptionObj->GetThrownObject(nullptr);
result = exception->GetThrownObject(nullptr);
}
}

Expand Down
17 changes: 16 additions & 1 deletion test/Bugs/misc_bugs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,22 @@ var tests = [
assert.throws(() => {"use strict"; let p1 = new Proxy({}, { deleteProperty() {return false;}}); delete p1.foo;}, TypeError, "deleteProperty handler is returning false which will throw type error", "Proxy deleteProperty handler returned false");
}
},

{
name: "Generator : testing recursion",
body: function () {
// This will throw out of stack error
assert.throws(() => {
function foo() {
function *f() {
yield foo();
}
f().next();
}
foo();
});
}
},

];

testRunner.runTests(tests, { verbose: WScript.Arguments[0] != "summary" });