diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index d2bf232e23f..9382bd4dbb0 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -785,6 +785,14 @@ IncrementalReferenceBarrier(void *ptr)
         JSObject::writeBarrierPre((JSObject *) ptr);
     else if (kind == JSTRACE_STRING)
         JSString::writeBarrierPre((JSString *) ptr);
+    else if (kind == JSTRACE_SCRIPT)
+        JSScript::writeBarrierPre((JSScript *) ptr);
+    else if (kind == JSTRACE_SHAPE)
+        Shape::writeBarrierPre((Shape *) ptr);
+    else if (kind == JSTRACE_BASE_SHAPE)
+        BaseShape::writeBarrierPre((BaseShape *) ptr);
+    else if (kind == JSTRACE_TYPE_OBJECT)
+        types::TypeObject::writeBarrierPre((types::TypeObject *) ptr);
     else
         JS_NOT_REACHED("invalid trace kind");
 }