Auto merge of #18549 - nnethercote:fix-enclosing-crash, r=heycam

Fix a panic in Stylo memory reporting.

`MallocSizeOfOps::enclosing_size_of_op` is an `Option<>` type, and the panic in
question is caused by not providing a value in a case where it's needed for
measuring a HashSet.

HashMaps and HashSets are common enough that it makes sense to make
`enclosing_size_of_op` non-optional, which this patch does.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because tests are on the Gecko side.

<!-- 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. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18549)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-17 23:19:54 -05:00 committed by GitHub
commit bb998dbdf3
3 changed files with 20 additions and 11 deletions

View file

@ -1898,7 +1898,10 @@ extern "C" {
pub fn Servo_Element_ClearData(node: RawGeckoElementBorrowed);
}
extern "C" {
pub fn Servo_Element_SizeOfExcludingThisAndCVs(arg1: MallocSizeOf,
pub fn Servo_Element_SizeOfExcludingThisAndCVs(malloc_size_of:
MallocSizeOf,
malloc_enclosing_size_of:
MallocSizeOf,
seen_ptrs: *mut SeenPtrs,
node:
RawGeckoElementBorrowed)
@ -1964,6 +1967,8 @@ extern "C" {
}
extern "C" {
pub fn Servo_StyleSheet_SizeOfIncludingThis(malloc_size_of: MallocSizeOf,
malloc_enclosing_size_of:
MallocSizeOf,
sheet:
RawServoStyleSheetContentsBorrowed)
-> usize;