Backed out changeset 3b1cf7c28eb7 (bug 1290646) for possibly breaking OS X debug mochitests.

xpcom/glue/nsTArray.h

@@ -43,7 +43,6 @@ namespace layers {
 struct TileClient;
 } // namespace layers
 } // namespace mozilla
-
 //
 // nsTArray is a resizable array class, like std::vector.
 //
@@ -2241,11 +2240,12 @@ private:
     static_assert(MOZ_ALIGNOF(elem_type) <= 8,
                   "can't handle alignments greater than 8, "
                   "see nsTArray_base::UsesAutoArrayBuffer()");
-
-    *base_type::PtrToHdr() = reinterpret_cast<Header*>(&mAutoBuf);
-    base_type::Hdr()->mLength = 0;
-    base_type::Hdr()->mCapacity = N;
-    base_type::Hdr()->mIsAutoArray = 1;
+    // Temporary work around for VS2012 RC compiler crash
+    Header** phdr = base_type::PtrToHdr();
+    *phdr = reinterpret_cast<Header*>(&mAutoBuf);
+    (*phdr)->mLength = 0;
+    (*phdr)->mCapacity = N;
+    (*phdr)->mIsAutoArray = 1;
 
     MOZ_ASSERT(base_type::GetAutoArrayBuffer(MOZ_ALIGNOF(elem_type)) ==
                reinterpret_cast<Header*>(&mAutoBuf),