Use RootedTraceableBox for unions.

servo · Feb 16, 2017 · d5f8b35 · d5f8b35
1 parent 0cc6d3e
commit d5f8b35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -722,6 +722,9 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
         if type.nullable():
             declType = CGWrapper(declType, pre="Option<", post=" >")
 
+        if isMember != "Dictionary" and type_needs_tracing(type):
+            declType = CGTemplatedType("RootedTraceableBox", declType)
+
         templateBody = ("match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n"
                         "    Ok(ConversionResult::Success(value)) => value,\n"
                         "    Ok(ConversionResult::Failure(error)) => {\n"
@@ -6190,6 +6193,9 @@ def type_needs_tracing(t):
         if t.isSequence():
             return type_needs_tracing(t.inner)
 
+        if t.isUnion():
+            return any(type_needs_tracing(member) for member in t.flatMemberTypes)
+
         return False
 
     if t.isDictionary():

diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
@@ -435,7 +435,7 @@ impl TestBindingMethods for TestBinding {
     fn PassUnion6(&self, _: UnsignedLongOrBoolean) {}
     fn PassUnion7(&self, _: StringSequenceOrUnsignedLong) {}
     fn PassUnion8(&self, _: ByteStringSequenceOrLong) {}
-    fn PassUnion9(&self, _: UnionTypes::TestDictionaryOrLong) {}
+    fn PassUnion9(&self, _: RootedTraceableBox<UnionTypes::TestDictionaryOrLong>) {}
     fn PassUnionWithTypedef(&self, _: DocumentOrTestTypedef) {}
     fn PassUnionWithTypedef2(&self, _: LongSequenceOrTestTypedef) {}
     #[allow(unsafe_code)]