Fix thrust::optional<T&>::emplace() #1707
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
miscco
reviewed
May 6, 2024
thrust/thrust/optional.h
Outdated
Comment on lines
2777
to
2780
| _CCCL_HOST_DEVICE T& emplace(Args&&... args) noexcept | ||
| { | ||
| static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args"); | ||
| static_assert(sizeof...(Args) == 1, "Args must be a single lvalue"); | ||
| static_assert(std::is_lvalue_reference<Args...>::value, "Args must be a single lvalue"); |
There was a problem hiding this comment.
I would rather change the function signature to just take a _Arg& instead of variadics
There was a problem hiding this comment.
That was my initial preference, but I didn't want to change the interface. I guess functionally the change would still be the same as changing the interface anyway, so it wouldn't matter technically.
Snektron
force-pushed
the
fix-optional-emplace
branch
from
6fd9c5e
to
758148b
Compare
|
pre-commit.ci autofix |
|
/ok to test |
Where optional<T> inherits optional<T>::construct via a series of classes, optional<T&> does not. This means that optional<T&>::emplace() was broken and called into a member function that did not exist. This replaces the functionality to make optional<T&>::emplace() change the stored reference to the new one. Note that it does _not_ emplace the referee, as this would lead to questionable behavior when the optional holds nullopt. This was revealed by a change in LLVM, see llvm/llvm-project#90152 and ROCm/rocThrust#404.
Snektron
force-pushed
the
fix-optional-emplace
branch
from
758148b
to
5864eed
Compare
|
@miscco Is the regressions directory the right place to put the test? I've noticed that they are disabled currently. I'm fine with moving, I wasn't sure what the proper place was otherwise. |
|
I just realized, that there are no tests against thrust optional at all 🤦♂️ |
|
/ok to test |
🟩 CI Results [ Failed: 0 | Passed: 198 | Total: 198 ]
|
| # | Runner |
|---|---|
| 154 | linux-amd64-cpu16 |
| 16 | linux-arm64-cpu16 |
| 16 | linux-amd64-gpu-v100-latest-1 |
| 12 | windows-amd64-cpu16 |
👃 Inspect Changes
Modifications in project?
| Project | |
|---|---|
| CCCL Infrastructure | |
| libcu++ | |
| CUB | |
| +/- | Thrust |
Modifications in project or dependencies?
| Project | |
|---|---|
| CCCL Infrastructure | |
| libcu++ | |
| +/- | CUB |
| +/- | Thrust |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
closes #1706
Where optional inherits optional::construct via a series of classes, optional<T&> does not. This means that optional<T&>::emplace() was broken and called into a member function that did not exist.
This replaces the functionality to make optional<T&>::emplace() change the stored reference to the new one. Note that it does not emplace the referee, as this would lead to questionable behavior when the optional holds nullopt.
This was revealed by a change in LLVM, see
llvm/llvm-project#90152 and ROCm/rocThrust#404.
Checklist