Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upPrevent panic on layout send in finish-load #24818
Conversation
highfive
commented
Nov 21, 2019
|
Heads up! This PR modifies the following files:
|
highfive
commented
Nov 21, 2019
7295a41
to
bc9c4d8
|
@bors-servo try=wpt @jdm I think this one might actually fix #22955 (and hopefully not break other things) |
Prevent panic on layout send in finish-load <!-- Please describe your changes on the following line: --> Do not run the finish load steps if the pipeline has been discarded by the time the parser finishes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #22955 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
|
I think a more robust fix would be calling ServoParser::abort on Document::current_parser (if it exists) when we know a pipeline is being closed. |
bc9c4d8
to
3ba3f37
|
@jdm Thanks, I have changed the fix accordingly. |
|
@bors-servo try=wpt |
3ba3f37
to
1fab241
Prevent panic on layout send in finish-load <!-- Please describe your changes on the following line: --> Do not run the finish load steps if the pipeline has been discarded by the time the parser finishes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #22955 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
|
|
|
@bors-servo retry |
|
@bors-servo try=wpt |
Prevent panic on layout send in finish-load <!-- Please describe your changes on the following line: --> Do not run the finish load steps if the pipeline has been discarded by the time the parser finishes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #22955 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
|
|
Looks like aborting the parser when the pipeline exits results in other crashes. |
|
The async parser doesn't get used unless |
|
In particular, because aborting the parser can cause additional parser activity, I think we need to do that before we shut down the layout thread. |
|
@bors-servo try=wpt Ok, trying before shutting down layout... |
Prevent panic on layout send in finish-load <!-- Please describe your changes on the following line: --> Do not run the finish load steps if the pipeline has been discarded by the time the parser finishes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #22955 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
|
|
|
@bors-servo r+ |
|
|
Prevent panic on layout send in finish-load <!-- Please describe your changes on the following line: --> Do not run the finish load steps if the pipeline has been discarded by the time the parser finishes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #22955 (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
|
|
gterzian commentedNov 21, 2019
Do not run the finish load steps if the pipeline has been discarded by the time the parser finishes.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errors