diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-04 11:03:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-04 11:03:35 -0700 |
commit | 80cb0cf8214fd52d2884724614c40cb278ee7575 (patch) | |
tree | d5d98004a84375aea65a74d594dead5a27fc2392 /components/script/script_thread.rs | |
parent | 36974f0746261b971c93ed7dfb9bd726675ccf69 (diff) | |
parent | b79a7d468e99f335dce49cc48342f0cd447eb855 (diff) | |
download | servo-80cb0cf8214fd52d2884724614c40cb278ee7575.tar.gz servo-80cb0cf8214fd52d2884724614c40cb278ee7575.zip |
Auto merge of #11872 - eddyb:back-to-roots, r=Ms2ger
Replace return_address usage for rooting with stack guards and convenience macros.
The existing `Rooted` and `RootedVec` users were migrated the the following two macros:
```rust
let x = Rooted::new(cx, value);
// Was changed to:
rooted!(in(cx) let x = value);
// Which expands to:
let mut __root = Rooted::new_unrooted(value);
let x = RootedGuard::new(cx, &mut __root);
```
```rust
let mut v = RootedVec::new();
v.extend(iterator);
// Was changed to:
rooted_vec!(let v <- iterator);
// Which expands to:
let mut __root = RootableVec::new();
let v = RootedVec::new(&mut __root, iterator);
```
The `rooted!` macro depends on servo/rust-mozjs#272.
These APIs based on two types, a container to be rooted and a rooting guard, allow implementing both `Rooted`-style rooting and `Traceable`-based rooting in stable Rust, without abusing `return_address`.
Such macros may have been tried before, but in 1.9 their hygiene is broken, they work only since 1.10.
Sadly, `Rooted` is a FFI type and completely exposed, so I cannot prevent anyone from creating their own, although all fields but the value get overwritten by `RootedGuard::new` anyway.
`RootableVec` OTOH is *guaranteed* to be empty when not rooted, which makes it harmless AFAICT.
By fixing rust-lang/rust#34227, this PR enables Servo to build with `-Zorbit`.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix rust-lang/rust#34227
- [x] These changes do not require tests because they are not functional changes
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11872)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r-- | components/script/script_thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 96555524c5d..7a23867fc8b 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -58,7 +58,7 @@ use hyper::mime::{Mime, SubLevel, TopLevel}; use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::router::ROUTER; use js::glue::GetWindowProxyClass; -use js::jsapi::{DOMProxyShadowsResult, HandleId, HandleObject, RootedValue}; +use js::jsapi::{DOMProxyShadowsResult, HandleId, HandleObject}; use js::jsapi::{JSAutoCompartment, JSContext, JS_SetWrapObjectCallbacks}; use js::jsapi::{JSTracer, SetWindowProxyClass}; use js::jsval::UndefinedValue; @@ -1747,7 +1747,7 @@ impl ScriptThread { // Script source is ready to be evaluated (11.) unsafe { let _ac = JSAutoCompartment::new(self.get_cx(), window.reflector().get_jsobject().get()); - let mut jsval = RootedValue::new(self.get_cx(), UndefinedValue()); + rooted!(in(self.get_cx()) let mut jsval = UndefinedValue()); window.evaluate_js_on_global_with_result(&script_source, jsval.handle_mut()); let strval = DOMString::from_jsval(self.get_cx(), jsval.handle(), |