From 089db3ebdb5670e35cceac71696201ab5f880d1a Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Fri, 3 Jul 2020 16:57:00 +0000
Subject: [PATCH] Bug 1650245 Part 3 - Remove CLANG_CRASH_BUG define in
 CSSOrderAwareFrameIterator.h. r=dholbert

Our minimum version requirements for clang is 5.0 per
https://groups.google.com/forum/#!msg/mozilla.dev.platform/ygj-1MDVB4M/CLxE_7OcBAAJ

Differential Revision: https://phabricator.services.mozilla.com/D82119
---
 layout/generic/CSSOrderAwareFrameIterator.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/layout/generic/CSSOrderAwareFrameIterator.h b/layout/generic/CSSOrderAwareFrameIterator.h
index 851e8879edf7..ed8af9c31d26 100644
--- a/layout/generic/CSSOrderAwareFrameIterator.h
+++ b/layout/generic/CSSOrderAwareFrameIterator.h
@@ -15,10 +15,6 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/Assertions.h"
 
-#if defined(__clang__) && __clang_major__ == 3 && __clang_minor__ <= 9
-#  define CLANG_CRASH_BUG 1
-#endif
-
 namespace mozilla {
 
 /**
@@ -146,10 +142,8 @@ class CSSOrderAwareFrameIteratorT {
   }
 
   void SetItemCount(size_t aItemCount) {
-#ifndef CLANG_CRASH_BUG
     MOZ_ASSERT(mIter.isSome() || aItemCount <= mArray->Length(),
                "item count mismatch");
-#endif
     mItemCount.emplace(aItemCount);
     // Note: it's OK if mItemIndex underflows -- ItemIndex()
     // will not be called unless there is at least one item.
@@ -178,10 +172,7 @@ class CSSOrderAwareFrameIteratorT {
   }
 
   bool AtEnd() const {
-#ifndef CLANG_CRASH_BUG
-    // Clang 3.6.2 crashes when compiling this assertion:
     MOZ_ASSERT(mIter.isSome() || mArrayIndex <= mArray->Length());
-#endif
     return mIter ? (*mIter == *mIterEnd) : mArrayIndex >= mArray->Length();
   }