ae3ff6be00
> Here it is. > > ~~There's two major things that are unfinished here:~~ > - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done. > - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done. > > I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location. > > Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later. > > Generational GC works. SM doesn't work without it. > > The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`. > > Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it. > > `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`. > > `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case. > > This has been tested with the following zeal settings: > > GC after every allocation > JS_GC_ZEAL=2,1 > > GC after every 100 allocations (important for catching use-after-free bugs) > JS_GC_ZEAL=2,100 > > Verify pre barriers > JS_GC_ZEAL=4,1 > > Verify post barriers > JS_GC_ZEAL=11,1 Source-Repo: https://github.com/servo/servo Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
56 lines
2.6 KiB
Rust
56 lines
2.6 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use syntax::ext::base::{Annotatable, ExtCtxt};
|
|
use syntax::codemap::Span;
|
|
use syntax::ast::MetaItem;
|
|
use syntax::ast;
|
|
use utils::match_ty_unwrap;
|
|
|
|
|
|
pub fn expand_reflector(cx: &mut ExtCtxt, span: Span, _: &MetaItem, annotatable: &Annotatable,
|
|
push: &mut FnMut(Annotatable)) {
|
|
if let &Annotatable::Item(ref item) = annotatable {
|
|
if let ast::ItemStruct(ref def, _) = item.node {
|
|
let struct_name = item.ident;
|
|
// This path has to be hardcoded, unfortunately, since we can't resolve paths at expansion time
|
|
match def.fields.iter().find(
|
|
|f| match_ty_unwrap(&*f.node.ty, &["dom", "bindings", "utils", "Reflector"]).is_some()) {
|
|
// If it has a field that is a Reflector, use that
|
|
Some(f) => {
|
|
let field_name = f.node.ident();
|
|
let impl_item = quote_item!(cx,
|
|
impl ::dom::bindings::utils::Reflectable for $struct_name {
|
|
fn reflector<'a>(&'a self) -> &'a ::dom::bindings::utils::Reflector {
|
|
&self.$field_name
|
|
}
|
|
fn init_reflector(&mut self, obj: *mut ::js::jsapi::JSObject) {
|
|
self.$field_name.set_jsobject(obj);
|
|
}
|
|
}
|
|
);
|
|
impl_item.map(|it| push(Annotatable::Item(it)))
|
|
},
|
|
// Or just call it on the first field (supertype).
|
|
None => {
|
|
let field_name = def.fields[0].node.ident();
|
|
let impl_item = quote_item!(cx,
|
|
impl ::dom::bindings::utils::Reflectable for $struct_name {
|
|
fn reflector<'a>(&'a self) -> &'a ::dom::bindings::utils::Reflector {
|
|
self.$field_name.reflector()
|
|
}
|
|
fn init_reflector(&mut self, obj: *mut ::js::jsapi::JSObject) {
|
|
self.$field_name.init_reflector(obj);
|
|
}
|
|
}
|
|
);
|
|
impl_item.map(|it| push(Annotatable::Item(it)))
|
|
}
|
|
};
|
|
} else {
|
|
cx.span_err(span, "#[dom_struct] seems to have been applied to a non-struct");
|
|
}
|
|
}
|
|
}
|