Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #5166 : JIoJIaJIu/servo/gc, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-03-31 09:24:58 -06:00
commit 52cc63a262
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/bindings/js.rs
View file

@ -57,7 +57,7 @@ use js::jsval::JSVal;
use layout_interface::TrustedNodeAddress; use layout_interface::TrustedNodeAddress;
use script_task::STACK_ROOTS; use script_task::STACK_ROOTS;
use util::smallvec::{SmallVec, SmallVec16}; use util::smallvec::{SmallVec, SmallVec24};
use core::nonzero::NonZero; use core::nonzero::NonZero;
use std::cell::{Cell, UnsafeCell}; use std::cell::{Cell, UnsafeCell};
@ -610,7 +610,7 @@ impl<T: Assignable<U>, U: Reflectable> TemporaryPushable<T> for Vec<JS<U>> {
/// See also [*Exact Stack Rooting - Storing a GCPointer on the CStack*] /// See also [*Exact Stack Rooting - Storing a GCPointer on the CStack*]
/// (https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Internals/GC/Exact_Stack_Rooting). /// (https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Internals/GC/Exact_Stack_Rooting).
pub struct RootCollection { pub struct RootCollection {
roots: UnsafeCell<SmallVec16<*mut JSObject>>, roots: UnsafeCell<SmallVec24<*mut JSObject>>,
} }
/// A pointer to a RootCollection, for use in global variables. /// A pointer to a RootCollection, for use in global variables.
@ -622,7 +622,7 @@ impl RootCollection {
/// Create an empty collection of roots /// Create an empty collection of roots
pub fn new() -> RootCollection { pub fn new() -> RootCollection {
RootCollection { RootCollection {
roots: UnsafeCell::new(SmallVec16::new()), roots: UnsafeCell::new(SmallVec24::new()),
} }
} }
@ -632,6 +632,7 @@ impl RootCollection {
let roots = self.roots.get(); let roots = self.roots.get();
(*roots).push(untracked.js_ptr); (*roots).push(untracked.js_ptr);
debug!(" rooting {:?}", untracked.js_ptr); debug!(" rooting {:?}", untracked.js_ptr);
assert!(!(*roots).spilled());
} }
} }