diff --git a/src/components/servo/dom/bindings/codegen/CodegenRust.py b/src/components/servo/dom/bindings/codegen/CodegenRust.py
index 624018c394ed..0fc99027ab11 100644
--- a/src/components/servo/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/servo/dom/bindings/codegen/CodegenRust.py
@@ -1454,7 +1454,7 @@ def wrapAndSetPtr(wrapCall, failureCode=None):
         """
         if failureCode is None:
             if not haveSuccessCode:
-                return wrapCall + ";\n" + "return if *vp != 0 { 1 } else { 0 };"
+                return wrapCall + ";\n" + "return if (*vp).v != 0 { 1 } else { 0 };"
             failureCode = "return 0;"
         str = ("if !%s {\n" +
                CGIndenter(CGGeneric(failureCode)).define() + "\n" +
diff --git a/src/support/spidermonkey/rust-mozjs b/src/support/spidermonkey/rust-mozjs
index f68fa6237754..dc25b92b3f87 160000
--- a/src/support/spidermonkey/rust-mozjs
+++ b/src/support/spidermonkey/rust-mozjs
@@ -1 +1 @@
-Subproject commit f68fa6237754b9317cea7765de15a54ee832271f
+Subproject commit dc25b92b3f8777b3599455cee190d1a07348b717