Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release/18.x: Extend GCC workaround to GCC < 8.4 for llvm::iterator_range ctor (#82643) #82688

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

llvmbot
Copy link
Collaborator

@llvmbot llvmbot commented Feb 22, 2024

Backport 7f71fa9

Requested by: @RoboTux

…m#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 7f71fa9)
@llvmbot llvmbot added this to the LLVM 18.X Release milestone Feb 22, 2024
@llvmbot
Copy link
Collaborator Author

llvmbot commented Feb 22, 2024

@MaskRay What do you think about merging this PR to the release branch?

@llvmbot
Copy link
Collaborator Author

llvmbot commented Feb 22, 2024

@llvm/pr-subscribers-llvm-adt

Author: None (llvmbot)

Changes

Backport 7f71fa9

Requested by: @RoboTux


Full diff: https://github.com/llvm/llvm-project/pull/82688.diff

1 Files Affected:

  • (modified) llvm/include/llvm/ADT/iterator_range.h (+2-2)
diff --git a/llvm/include/llvm/ADT/iterator_range.h b/llvm/include/llvm/ADT/iterator_range.h
index 2dc227935984b1..7d288ea4506ba5 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

@tstellar tstellar merged commit b9029ed into llvm:release/18.x Feb 23, 2024
10 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants