tor-browser

commit d1953268011e0a4393f257ef29ed88b322fd0c1a
parent d9c79633592daa83a75e070b106193924280cdd2
Author: Lando <lando@lando.test>
Date:   Wed, 10 Dec 2025 06:49:36 +0000

Merge mozilla-central to autoland

Diffstat:
M
xpcom/base/nsMaybeWeakPtr.h
 | 
10
----------

1 file changed, 0 insertions(+), 10 deletions(-)
diff --git a/xpcom/base/nsMaybeWeakPtr.h b/xpcom/base/nsMaybeWeakPtr.h
@@ -11,7 +11,6 @@
 #include "nsIWeakReferenceUtils.h"
 #include "nsTArray.h"
 #include "nsCycleCollectionNoteChild.h"
-#include "xpcpublic.h"
 
 // nsMaybeWeakPtr is a helper object to hold a strong-or-weak reference
 // to the template class.  It's pretty minimal, but sufficient.
@@ -82,15 +81,6 @@ class nsMaybeWeakPtrArray : public CopyableTArray<nsMaybeWeakPtr<T>> {
     nsMaybeWeakPtr<T> ref;
     MOZ_TRY(SetMaybeWeakPtr(ref, aElement, aOwnsWeak));
 
-#if (defined(MOZ_DIAGNOSTIC_ASSERT_ENABLED) && !defined(MOZ_THUNDERBIRD))
-    // Checking for duplicates is expensive, so we enforce callers to avoid
-    // this with a diagnostic assertion. See bug 2000788 for Thunderbird.
-    if (MaybeWeakArray::Contains(aElement)) {
-      xpc_DumpJSStack(true, true, false);
-      MOZ_DIAGNOSTIC_ASSERT(false, "Element already in array.");
-    }
-#endif
-
     MaybeWeakArray::AppendElement(ref);
     return NS_OK;
   }