aboutsummaryrefslogtreecommitdiff
path: root/llvm
diff options
context:
space:
mode:
authorThomas Preud'homme <thomas.preudhomme@arm.com>2024-02-22 21:01:05 +0000
committerllvmbot <llvmbot@llvm.org>2024-02-22 21:08:58 +0000
commitb9029ed0053b93d94e0f133e6a44250f82bf0dc2 (patch)
treece64841b11c25bdb181c6aec61755391fa37b740 /llvm
parent6c90f8dd546334b01c9a86387950e8c72d459f1e (diff)
downloadllvm-b9029ed0053b93d94e0f133e6a44250f82bf0dc2.zip
llvm-b9029ed0053b93d94e0f133e6a44250f82bf0dc2.tar.gz
llvm-b9029ed0053b93d94e0f133e6a44250f82bf0dc2.tar.bz2
Extend GCC workaround to GCC < 8.4 for llvm::iterator_range ctor (#82643)
GCC SFINAE error with decltype was fixed in commit ac5e28911abdfb8d9bf6bea980223e199bbcf28d which made it into GCC 8.4. Therefore adjust GCC version test accordingly. (cherry picked from commit 7f71fa909a10be182b82b9dfaf0fade6eb84796c)
Diffstat (limited to 'llvm')
-rw-r--r--llvm/include/llvm/ADT/iterator_range.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/include/llvm/ADT/iterator_range.h b/llvm/include/llvm/ADT/iterator_range.h
index 2dc2279..7d288ea 100644
--- a/llvm/include/llvm/ADT/iterator_range.h
+++ b/llvm/include/llvm/ADT/iterator_range.h
@@ -43,8 +43,8 @@ class iterator_range {
IteratorT begin_iterator, end_iterator;
public:
-#if __GNUC__ == 7
- // Be careful no to break gcc-7 on the mlir target.
+#if __GNUC__ == 7 || (__GNUC__ == 8 && __GNUC_MINOR__ < 4)
+ // Be careful no to break gcc-7 and gcc-8 < 8.4 on the mlir target.
// See https://github.com/llvm/llvm-project/issues/63843
template <typename Container>
#else