Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19644 - Xanewok:root-seq-any, r=jdm

Browse source 
Root sequence<any> params using CustomAutoRooter

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

Attempt at https://github.com/servo/servo/issues/16678. At the moment this pulls an external [remove-handle-conv](https://github.com/Xanewok/rust-mozjs/tree/remove-handle-conv) branch for rust-mozjs (removing `FromJSValConvertible` implementation for `HandleValue` and adding one for `*mut JSObject`)

In short, this roots the `sequence<any>` and `sequence<object>` function arguments using `CustomAutoRooter` (introduced in https://github.com/servo/rust-mozjs/pull/382).

As per https://github.com/servo/servo/issues/16678#issuecomment-302224110 the underlying vector contains raw gc thing pointers instead of handles. To do that, this introduces new possible `isMember = "AutoRoot"` value in CodegenRust.py.
The rooted argument is passed to a function wrapped in a `CustomAutoRooterGuard` [RAII root guard](ed5e37a288/src/rust.rs (L586-L588)) (e.g. as `CustomAutoRooterGuard<Vec<JSVal>>`)

I felt quite out of my depth when trying to adapt CodegenRust.py code, so I'd appreciate any help with how can be done better/in a more clean manner.
Also the name `CustomAutoRooterGuard` is quite lengthy, so I'm also open to changing it (`AutoRoot`? `AutoRootGuard`?)

---
<!-- 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
- [x] These changes fix #16678  (github issue number if applicable).

<!-- Either: -->
- [X] 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. -->

<!-- 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/19644)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-01-05 14:02:53 -06:00 • committed by GitHub
commit 989d2fd532
8 changed files with 91 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -32867,6 +32867,12 @@
{}
]
],
"mozilla/custom_auto_rooter.html": [
[
"/_mozilla/mozilla/custom_auto_rooter.html",
{}
]
],
"mozilla/deep_serialization_succeeds.html": [
[
"/_mozilla/mozilla/deep_serialization_succeeds.html",
@ -66058,6 +66064,10 @@
"67d8cdd3e3a1656ba315fcbf6dae7236680bac16",
"reftest"
],
"mozilla/custom_auto_rooter.html": [
"3466095fb0846b848c948dd1596764fff456fa9b",
"testharness"
],
"mozilla/deep_serialization_succeeds.html": [
"cb3d201d577c17d19babf1f6c04ba882fa42048e",
"testharness"

3
tests/wpt/mozilla/meta/mozilla/custom_auto_rooter.html.ini Normal file
View file

@ -0,0 +1,3 @@
[custom_auto_rooter.html]
type: testharness
prefs: [dom.testbinding.enabled:true]

23
tests/wpt/mozilla/tests/mozilla/custom_auto_rooter.html Normal file
View file

@ -0,0 +1,23 @@
<!doctype html>
<html>
<meta charset="utf-8">
<title>Types using Custom Auto Rooter work correctly</title>
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<script>
test(function() {
var t = new TestBinding;
var seq = [5, "str", { key: "val" }, undefined];
assert_array_equals(seq, t.anySequencePassthrough(seq), "Returned simple array is the same");
var seq = new Array(null, {'inner': 1, 'a': 'as'}, {'inner': 2}, null, undefined);
assert_array_equals(seq, t.anySequencePassthrough(seq), "Returned array using new Array is the same");
var seq = new Array(null, {'inner': 1, 'a': 'as', 'toString': function() { seq = null; return Object.prototype.toString(this); }}, {'inner': 2}, null, undefined);
assert_array_equals(seq, t.anySequencePassthrough(seq), "Returned array with closure member is the same");
}, "sequence<any> conversion did not lose any values");
</script>
</html>