зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
bd9d7f8048
Коммит
089db3ebdb
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче