Don't allow calling UnorderdMap::value_at for a set #4639
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
masterleinad
force-pushed
the
disallow_unorderedmap_value_at_set
branch
from
3ff24b4
to
e4be7a0
Compare
dalg24
reviewed
Dec 30, 2021
| @@ -699,7 +725,8 @@ class UnorderedMap { | |||
| /// kernel. | |||
| KOKKOS_FORCEINLINE_FUNCTION | |||
| key_type key_at(size_type i) const { | |||
| return m_keys[i < capacity() ? i : capacity()]; | |||
| KOKKOS_EXPECTS(i < capacity()); | |||
There was a problem hiding this comment.
The precondition check needs to be guarded for deprecated code enabled.
There was a problem hiding this comment.
I would argue that returning the last element if out-of-range was just wrong/buggy. That was more like a drive-by change. If that is debatable I'm happy to just remove it.
There was a problem hiding this comment.
kokkos/containers/src/Kokkos_UnorderedMap.hpp
Line 313 in 01974b7
There was a problem hiding this comment.
Not defending the current design, just pointing out that the behavior is changing
| value_at(size_type i) const { | ||
| return m_values[is_set ? 0 : (i < capacity() ? i : capacity())]; | ||
| KOKKOS_EXPECTS(i < capacity()); |
There was a problem hiding this comment.
Same comment about change of behavior
masterleinad
force-pushed
the
disallow_unorderedmap_value_at_set
branch
from
b058e08
to
586e7af
Compare
crtrott
approved these changes
Jan 5, 2022
|
@Char-Aznable would you please review? |
dalg24
approved these changes
Jan 5, 2022
|
Looks good to me! Thanks for the patch! |
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.
Fixes #4555.