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

Fixed panic due to GC while parsing

Browse source
This commit is contained in:
Alan Jeffrey 2018-06-07 12:52:57 -05:00
parent 022daccbe1
commit 40ea4c4946
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/script_thread.rs
View file

@ -104,6 +104,7 @@ use servo_atoms::Atom;
use servo_config::opts; use servo_config::opts;
use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl}; use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
use std::cell::Cell; use std::cell::Cell;
use std::cell::RefCell;
use std::collections::{hash_map, HashMap, HashSet}; use std::collections::{hash_map, HashMap, HashSet};
use std::default::Default; use std::default::Default;
use std::ops::Deref; use std::ops::Deref;
@ -387,6 +388,14 @@ impl<'a> Iterator for DocumentsIter<'a> {
} }
} }
// We borrow the incomplete parser contexts mutably during parsing,
// which is fine except that parsing can trigger evaluation,
// which can trigger GC, and so we can end up tracing the script
// thread during parsing. For this reason, we don't trace the
// incomplete parser contexts during GC.
type IncompleteParserContexts = Vec<(PipelineId, ParserContext)>;
unsafe_no_jsmanaged_fields!(RefCell<IncompleteParserContexts>);
#[derive(JSTraceable)] #[derive(JSTraceable)]
// ScriptThread instances are rooted on creation, so this is okay // ScriptThread instances are rooted on creation, so this is okay
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
@ -399,7 +408,7 @@ pub struct ScriptThread {
/// A list of data pertaining to loads that have not yet received a network response /// A list of data pertaining to loads that have not yet received a network response
incomplete_loads: DomRefCell<Vec<InProgressLoad>>, incomplete_loads: DomRefCell<Vec<InProgressLoad>>,
/// A vector containing parser contexts which have not yet been fully processed /// A vector containing parser contexts which have not yet been fully processed
incomplete_parser_contexts: DomRefCell<Vec<(PipelineId, ParserContext)>>, incomplete_parser_contexts: RefCell<IncompleteParserContexts>,
/// A map to store service worker registrations for a given origin /// A map to store service worker registrations for a given origin
registration_map: DomRefCell<HashMap<ServoUrl, Dom<ServiceWorkerRegistration>>>, registration_map: DomRefCell<HashMap<ServoUrl, Dom<ServiceWorkerRegistration>>>,
/// A job queue for Service Workers keyed by their scope url /// A job queue for Service Workers keyed by their scope url
@ -825,7 +834,7 @@ impl ScriptThread {
documents: DomRefCell::new(Documents::new()), documents: DomRefCell::new(Documents::new()),
window_proxies: DomRefCell::new(HashMap::new()), window_proxies: DomRefCell::new(HashMap::new()),
incomplete_loads: DomRefCell::new(vec!()), incomplete_loads: DomRefCell::new(vec!()),
incomplete_parser_contexts: DomRefCell::new(vec!()), incomplete_parser_contexts: RefCell::new(vec!()),
registration_map: DomRefCell::new(HashMap::new()), registration_map: DomRefCell::new(HashMap::new()),
job_queue_map: Rc::new(JobQueue::new()), job_queue_map: Rc::new(JobQueue::new()),