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

Bump mozjs and clean up pointer handling

Browse source 
Co-authored-by: atbrakhi <atbrakhi@igalia.com>
Signed-off-by: Delan Azabani <dazabani@igalia.com>
This commit is contained in:
Delan Azabani 2025-07-25 15:44:28 +08:00
parent 1f6c9fa028
commit c6f599b2bd
3 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -5202,7 +5202,7 @@ dependencies = [
[[package]] [[package]]
name = "mozjs" name = "mozjs"
version = "0.14.1" version = "0.14.1"
source = "git+https://github.com/servo/mozjs?rev=94fb7eb92b7f027fa102c69c7eac55526f1ce124#94fb7eb92b7f027fa102c69c7eac55526f1ce124" source = "git+https://github.com/servo/mozjs?rev=ccc1423c5dedd86c34c74b7eda7d62be1b26b7ee#ccc1423c5dedd86c34c74b7eda7d62be1b26b7ee"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",
@ -5214,7 +5214,7 @@ dependencies = [
[[package]] [[package]]
name = "mozjs_sys" name = "mozjs_sys"
version = "0.128.13-1" version = "0.128.13-1"
source = "git+https://github.com/servo/mozjs?rev=94fb7eb92b7f027fa102c69c7eac55526f1ce124#94fb7eb92b7f027fa102c69c7eac55526f1ce124" source = "git+https://github.com/servo/mozjs?rev=ccc1423c5dedd86c34c74b7eda7d62be1b26b7ee#ccc1423c5dedd86c34c74b7eda7d62be1b26b7ee"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",

2
Cargo.toml
View file

@ -85,7 +85,7 @@ imsz = "0.2"
indexmap = { version = "2.10.0", features = ["std"] } indexmap = { version = "2.10.0", features = ["std"] }
ipc-channel = "0.20" ipc-channel = "0.20"
itertools = "0.14" itertools = "0.14"
js = { package = "mozjs", git = "https://github.com/servo/mozjs", rev = "94fb7eb92b7f027fa102c69c7eac55526f1ce124" } # branch = for_debugger js = { package = "mozjs", git = "https://github.com/servo/mozjs", rev = "ccc1423c5dedd86c34c74b7eda7d62be1b26b7ee" } # branch = for_debugger
keyboard-types = "0.7" keyboard-types = "0.7"
kurbo = "0.11" kurbo = "0.11"
libc = "0.2" libc = "0.2"

51
components/script/script_runtime.rs
View file

@ -90,6 +90,7 @@ static JOB_QUEUE_TRAPS: JobQueueTraps = JobQueueTraps {
empty: Some(empty), empty: Some(empty),
pushNewInterruptQueue: Some(push_new_interrupt_queue), pushNewInterruptQueue: Some(push_new_interrupt_queue),
popInterruptQueue: Some(pop_interrupt_queue), popInterruptQueue: Some(pop_interrupt_queue),
dropInterruptQueues: Some(drop_interrupt_queues),
}; };
static SECURITY_CALLBACKS: JSSecurityCallbacks = JSSecurityCallbacks { static SECURITY_CALLBACKS: JSSecurityCallbacks = JSSecurityCallbacks {
@ -251,34 +252,40 @@ unsafe extern "C" fn empty(extra: *const c_void) -> bool {
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe extern "C" fn push_new_interrupt_queue(interrupt_queues: *mut c_void) -> *mut c_void { unsafe extern "C" fn push_new_interrupt_queue(interrupt_queues: *mut c_void) -> *const c_void {
let mut result = std::ptr::null_mut(); let mut result = std::ptr::null();
wrap_panic(&mut || { wrap_panic(&mut || {
let interrupt_queues = &mut *(interrupt_queues as *mut Vec<Rc<MicrotaskQueue>>); let mut interrupt_queues = Box::from_raw(interrupt_queues as *mut Vec<Rc<MicrotaskQueue>>);
let mut new_queue = Rc::new(MicrotaskQueue::default()); let mut new_queue = Rc::new(MicrotaskQueue::default());
// TODO: SAFETY: is this ok? It subverts the Rc::get_mut() check result = Rc::as_ptr(&new_queue) as *const c_void;
result = Rc::get_mut(&mut new_queue).expect("Guaranteed by usage of `new_queue`") as *mut _
as *mut c_void;
interrupt_queues.push(new_queue.clone()); interrupt_queues.push(new_queue.clone());
std::mem::forget(interrupt_queues);
}); });
result result
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe extern "C" fn pop_interrupt_queue(interrupt_queues: *mut c_void) -> *mut c_void { unsafe extern "C" fn pop_interrupt_queue(interrupt_queues: *mut c_void) -> *const c_void {
let mut result = std::ptr::null_mut(); let mut result = std::ptr::null();
wrap_panic(&mut || { wrap_panic(&mut || {
let interrupt_queues = &mut *(interrupt_queues as *mut Vec<Rc<MicrotaskQueue>>); let mut interrupt_queues = Box::from_raw(interrupt_queues as *mut Vec<Rc<MicrotaskQueue>>);
let mut popped_queue: Rc<MicrotaskQueue> = let mut popped_queue: Rc<MicrotaskQueue> =
interrupt_queues.pop().expect("Guaranteed by SpiderMonkey?"); interrupt_queues.pop().expect("Guaranteed by SpiderMonkey?");
// Dangling, but jsglue.cpp will only use this for pointer comparison. // Dangling, but jsglue.cpp will only use this for pointer comparison.
// TODO: SAFETY: is this ok? It subverts the Rc::get_mut() check result = Rc::as_ptr(&popped_queue) as *const c_void;
result = Rc::get_mut(&mut popped_queue).expect("Guaranteed by usage of `popped_queue`") std::mem::forget(interrupt_queues);
as *mut _ as *mut c_void;
}); });
result result
} }
#[allow(unsafe_code)]
unsafe extern "C" fn drop_interrupt_queues(interrupt_queues: *mut c_void) {
wrap_panic(&mut || {
let interrupt_queues = Box::from_raw(interrupt_queues as *mut Vec<Rc<MicrotaskQueue>>);
drop(interrupt_queues);
});
}
/// SM callback for promise job resolution. Adds a promise callback to the current /// SM callback for promise job resolution. Adds a promise callback to the current
/// global's microtask queue. /// global's microtask queue.
#[allow(unsafe_code)] #[allow(unsafe_code)]
@ -507,8 +514,6 @@ pub(crate) struct Runtime {
rt: RustRuntime, rt: RustRuntime,
/// Our actual microtask queue, which is preserved and untouched by the debugger when running debugger scripts. /// Our actual microtask queue, which is preserved and untouched by the debugger when running debugger scripts.
pub(crate) microtask_queue: Rc<MicrotaskQueue>, pub(crate) microtask_queue: Rc<MicrotaskQueue>,
/// Extra microtask queues created for debugger scripts via AutoDebuggerJobQueueInterruption and saveJobQueue().
interrupt_microtask_queues: Rc<Vec<Rc<MicrotaskQueue>>>,
job_queue: *mut JobQueue, job_queue: *mut JobQueue,
networking_task_src: Option<Box<SendableTaskSource>>, networking_task_src: Option<Box<SendableTaskSource>>,
} }
@ -615,15 +620,16 @@ impl Runtime {
InitConsumeStreamCallback(cx, Some(consume_stream), Some(report_stream_error)); InitConsumeStreamCallback(cx, Some(consume_stream), Some(report_stream_error));
let microtask_queue = Rc::new(MicrotaskQueue::default()); let microtask_queue = Rc::new(MicrotaskQueue::default());
let mut interrupt_microtask_queues: Rc<Vec<Rc<MicrotaskQueue>>> = Rc::new(vec![]);
// TODO: SAFETY: is this ok? It subverts the Rc::get_mut() check // Extra queues for debugger scripts (“interrupts”) via AutoDebuggerJobQueueInterruption and saveJobQueue().
let interrupt_queues_raw = Rc::get_mut(&mut interrupt_microtask_queues) // Moved indefinitely to mozjs via CreateJobQueue(), borrowed from mozjs via JobQueueTraps, and moved back from
.expect("Guaranteed by usage of `new_queue`") // mozjs for dropping via DeleteJobQueue().
as *mut _ as *mut c_void; let mut interrupt_queues: Box<Vec<Rc<MicrotaskQueue>>> = Box::new(vec![]);
let job_queue = CreateJobQueue( let job_queue = CreateJobQueue(
&JOB_QUEUE_TRAPS, &JOB_QUEUE_TRAPS,
&*microtask_queue as *const _ as *const c_void, &*microtask_queue as *const _ as *const c_void,
interrupt_queues_raw, Box::into_raw(interrupt_queues) as *mut c_void,
); );
SetJobQueue(cx, job_queue); SetJobQueue(cx, job_queue);
SetPromiseRejectionTrackerCallback(cx, Some(promise_rejection_tracker), ptr::null_mut()); SetPromiseRejectionTrackerCallback(cx, Some(promise_rejection_tracker), ptr::null_mut());
@ -768,7 +774,6 @@ impl Runtime {
Runtime { Runtime {
rt: runtime, rt: runtime,
microtask_queue, microtask_queue,
interrupt_microtask_queues,
job_queue, job_queue,
networking_task_src: (!networking_task_src_ptr.is_null()) networking_task_src: (!networking_task_src_ptr.is_null())
.then(|| Box::from_raw(networking_task_src_ptr)), .then(|| Box::from_raw(networking_task_src_ptr)),
@ -783,10 +788,10 @@ impl Runtime {
impl Drop for Runtime { impl Drop for Runtime {
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn drop(&mut self) { fn drop(&mut self) {
// Clear our microtask_queue, but do not touch any interrupt_microtask_queues. // Clear our main microtask_queue.
// Those are under SpiderMonkey’s control, even though we are responsible for their lifetimes.
self.microtask_queue.clear(); self.microtask_queue.clear();
// Delete the RustJobQueue in mozjs, which will destroy our interrupt queues.
unsafe { unsafe {
DeleteJobQueue(self.job_queue); DeleteJobQueue(self.job_queue);
} }