From 1feeb23514118926098f6fab219f38fc22e8f9d7 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 2 Jun 2020 15:34:50 -0400 Subject: [PATCH] dom: Extract non-generic code from Root::new. --- components/script/dom/bindings/root.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs index 59f9b964564..36bc2296ee5 100644 --- a/components/script/dom/bindings/root.rs +++ b/components/script/dom/bindings/root.rs @@ -63,12 +63,17 @@ where /// out references which cannot outlive this new `Root`. #[allow(unrooted_must_root)] pub unsafe fn new(value: T) -> Self { - debug_assert!(thread_state::get().is_script()); - STACK_ROOTS.with(|ref root_list| { - let root_list = &*root_list.get().unwrap(); - root_list.root(value.stable_trace_object()); - Root { value, root_list } - }) + unsafe fn add_to_root_list(object: *const dyn JSTraceable) -> *const RootCollection { + debug_assert!(thread_state::get().is_script()); + STACK_ROOTS.with(|ref root_list| { + let root_list = &*root_list.get().unwrap(); + root_list.root(object); + root_list + }) + } + + let root_list = add_to_root_list(value.stable_trace_object()); + Root { value, root_list } } }