RESOLVED FIXED Bug 214774
Fixed exception check handling below ScheduledAction::executeFunctionInContext()
https://bugs.webkit.org/show_bug.cgi?id=214774
Summary Fixed exception check handling below ScheduledAction::executeFunctionInContext()
Michael Saboff
Reported 2020-07-24 18:08:55 PDT
The simulated exception code found some issues in ScheduledAction::executeFunctionInContext() causing us not not properly account for exceptions thrown and caught there. <rdar://problem/65925857>
Attachments
Patch (3.90 KB, patch)
2020-07-24 18:15 PDT, Michael Saboff
mark.lam: review+
Patch for Landing (3.97 KB, patch)
2020-07-24 18:55 PDT, Michael Saboff
mark.lam: review+
Michael Saboff
Comment 1 2020-07-24 18:15:23 PDT
Mark Lam
Comment 2 2020-07-24 18:25:21 PDT
Comment on attachment 405209 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405209&action=review r=me with fixes. > Source/WebCore/bindings/js/ScheduledAction.cpp:122 > + EXCEPTION_ASSERT(catchScope.exception() == exception); This should be `EXCEPTION_ASSERT(!catchScope.exception());` because by the time profiledCall() returns, it should have cleared the exception and return it via the NakedPtr. > LayoutTests/js/dom/scheduled-action-exception-checks.html:1 > +<script> Take a look at LayoutTests/js/dom/missing-exception-check-below-queueMicrotask.html and due the same with the stuff surrounding the script: they pass the needed JSC option and also make the test output cleaner. Please rebase the expected results after you do that.
Michael Saboff
Comment 3 2020-07-24 18:55:47 PDT
Created attachment 405215 [details] Patch for Landing (In reply to Mark Lam from comment #2) > Comment on attachment 405209 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=405209&action=review > > r=me with fixes. > > > Source/WebCore/bindings/js/ScheduledAction.cpp:122 > > + EXCEPTION_ASSERT(catchScope.exception() == exception); > > This should be `EXCEPTION_ASSERT(!catchScope.exception());` because by the > time profiledCall() returns, it should have cleared the exception and return > it via the NakedPtr. > > > LayoutTests/js/dom/scheduled-action-exception-checks.html:1 > > +<script> > > Take a look at > LayoutTests/js/dom/missing-exception-check-below-queueMicrotask.html and due > the same with the stuff surrounding the script: they pass the needed JSC > option and also make the test output cleaner. Please rebase the expected > results after you do that. Done.
Michael Saboff
Comment 4 2020-07-24 19:09:21 PDT
Note You need to log in before you can comment on or make changes to this bug.