Bug 1207696 Part 5l - Don't trace refcounts while recording or replaying, r=froydnj.

--HG--
extra : rebase_source : 7e410db1606f7b0fedd6a4483da908e6244ec6b5

xpcom/base/nsTraceRefcnt.cpp

@@ -198,6 +198,10 @@ static const char kStaticCtorDtorWarning[] =
 static void
 AssertActivityIsLegal()
 {
+  if (recordreplay::IsRecordingOrReplaying()) {
+    // Avoid recorded events in the TLS accesses below.
+    return;
+  }
   if (gActivityTLS == BAD_TLS_INDEX || PR_GetThreadPrivate(gActivityTLS)) {
     if (PR_GetEnv("MOZ_FATAL_STATIC_XPCOM_CTORS_DTORS")) {
       MOZ_CRASH_UNSAFE_OOL(kStaticCtorDtorWarning);
@@ -638,6 +642,12 @@ InitTraceLog()
   }
   gInitialized = true;
 
+  // Don't trace refcounts while recording or replaying, these are not
+  // required to match up between the two executions.
+  if (mozilla::recordreplay::IsRecordingOrReplaying()) {
+    return;
+  }
+
   bool defined = InitLog(ENVVAR("XPCOM_MEM_BLOAT_LOG"), "bloat/leaks", &gBloatLog);
   if (!defined) {
     gLogLeaksOnly = InitLog(ENVVAR("XPCOM_MEM_LEAK_LOG"), "leaks", &gBloatLog);