Ticket #4053: fixtrace.patch

source/scriptinterface/third_party/ObjectToIDMap.h

@@ -38 +38 @@
 
 public:
     ObjectIdCache(shared_ptr<ScriptRuntime> rt)
         : table_(nullptr), m_rt(rt)
     {
-        JS_AddExtraGCRootsTracer(m_rt->m_rt, ObjectIdCache::Trace, this);
     }
 
     ~ObjectIdCache()
     {
         if (table_) {
             m_rt->AddDeferredFinalizationObject(std::shared_ptr<void>((void*)table_, DeleteObjectIDTable));
             table_ = nullptr;
+            JS_RemoveExtraGCRootsTracer(m_rt->m_rt, ObjectIdCache::Trace, this);
         }
-
-        JS_RemoveExtraGCRootsTracer(m_rt->m_rt, ObjectIdCache::Trace, this);
     }
 
     bool init()
     {
         MOZ_ASSERT(!table_);
         table_ = new ObjectIdTable(js::SystemAllocPolicy());
+        JS_AddExtraGCRootsTracer(m_rt->m_rt, ObjectIdCache::Trace, this);
         return table_ && table_->init(32);
     }
 
     void trace(JSTracer *trc)
     {