Bug 1091986 (part 1) - Remove an over-zealous assertion in Vector.h.
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 30 Oct 2014 19:48:10 -0700
changeset 214022 b24680cc584c68eefd8dd5f75d177fa8d6464410
parent 214021 1b07e2892e9d6df4608c97ee7ebd6346a77c00bb
child 214023 4be4cf0afc2950232fd5d84e4edcf8a0a429c8dc
push id27771
push userryanvm@gmail.com
push dateWed, 05 Nov 2014 19:04:24 +0000
treeherdermozilla-central@305b4fecce99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1091986
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1091986 (part 1) - Remove an over-zealous assertion in Vector.h.
mfbt/Vector.h
--- a/mfbt/Vector.h
+++ b/mfbt/Vector.h
@@ -719,18 +719,16 @@ VectorBase<T, N, AP, TV>::convertToHeapS
   return true;
 }
 
 template<typename T, size_t N, class AP, class TV>
 MOZ_NEVER_INLINE bool
 VectorBase<T, N, AP, TV>::growStorageBy(size_t aIncr)
 {
   MOZ_ASSERT(mLength + aIncr > mCapacity);
-  MOZ_ASSERT_IF(!usingInlineStorage(),
-                !detail::CapacityHasExcessSpace<T>(mCapacity));
 
   /*
    * When choosing a new capacity, its size should is as close to 2**N bytes
    * as possible.  2**N-sized requests are best because they are unlikely to
    * be rounded up by the allocator.  Asking for a 2**N number of elements
    * isn't as good, because if sizeof(T) is not a power-of-two that would
    * result in a non-2**N request size.
    */