release/20.x: [libcxx] Add a missing include for __bit_iterator (#127015) #131382
Conversation
|
@philnik777 What do you think about merging this PR to the release branch? |
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: None (llvmbot) ChangesBackport 672e385 Requested by: @ian-twilightcoder Full diff: https://github.com/llvm/llvm-project/pull/131382.diff 1 Files Affected:
diff --git a/libcxx/include/__vector/vector_bool.h b/libcxx/include/__vector/vector_bool.h
index 4f1c442ce0be8..feff646a35dc8 100644
--- a/libcxx/include/__vector/vector_bool.h
+++ b/libcxx/include/__vector/vector_bool.h
@@ -17,6 +17,7 @@
#include <__bit_reference>
#include <__config>
#include <__functional/unary_function.h>
+#include <__fwd/bit_reference.h>
#include <__fwd/functional.h>
#include <__fwd/vector.h>
#include <__iterator/distance.h>
|
github-project-automation
bot
moved this from Needs Triage
to Needs Merge
in LLVM Release Status
There was a problem hiding this comment.
LGTM. I opened #131506 for resolving CI failures with Apple Clang 17, perhaps that patch should be backported first.
|
I'd like us to validate that this is the right fix on |
There was a problem hiding this comment.
Now that we have a better understanding that this is a workaround for a real issue, how to reproduce the issue, etc, I am comfortable with cherry-picking this to LLVM 20. I don't think this is necessarily the workaround we'll want to keep forever, but I think this is safe and useful to cherry-pick.
See #127015 (comment) for more details.
|
This still has some failing tests. |
I think they should pass after #131506, re-running |
|
@ian-twilightcoder You'd have to rebase the PR in order for the CI issue to be fixed. I'm not concerned with the failing tests on macOS since that's indeed #131506, IMO this can be merged safely. |
|
@tstellar is that fine with you? I'd rebase the branch but I don't know the slash command to do that (if there even is one). |
This is to fix compile error with explicit Clang modules like
```
../../third_party/libc++/src/include/__vector/vector_bool.h:85:11: error: default argument of '__bit_iterator' must be imported from module 'std.bit_reference_fwd' before it is required
85 | typedef __bit_iterator<vector, false> pointer;
| ^
../../third_party/libc++/src/include/__fwd/bit_reference.h:23:68: note: default argument declared here is not reachable
23 | template <class _Cp, bool _IsConst, typename _Cp::__storage_type = 0>
| ^
```
(cherry picked from commit 672e385)
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
|
@ian-twilightcoder (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Backport 672e385
Requested by: @ian-twilightcoder