diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-11 16:14:56 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-11 16:14:56 +0000 |
| commit | 7c142fcc06850c7cee3cdb07e98cc57f04ee5e8b (patch) | |
| tree | 91fc657ab4f9df17c22b8d4c2c6199bb4cb5f2a5 /libcxx/include/__hash_table | |
| parent | b971b59709075a28fa64e31564cf7d6f0bc9fecf (diff) | |
| download | bcm5719-llvm-7c142fcc06850c7cee3cdb07e98cc57f04ee5e8b.tar.gz bcm5719-llvm-7c142fcc06850c7cee3cdb07e98cc57f04ee5e8b.zip | |
[libc++] Make sure we don't eagerly diagnose non-const comparators for containers of incomplete types
Summary:
In r348529, I improved the library-defined diagnostic for using containers
with a non-const comparator/hasher. However, the check is now performed
too early, which leads to the diagnostic being emitted in cases where it
shouldn't. See PR41360 for details.
This patch moves the diagnostic to the destructor of the containers, which
means that the diagnostic will only be emitted when the container is instantiated
at a point where the comparator and the key/value are required to be complete.
We still retain better diagnostics than before r348529, because the diagnostics
are performed in the containers themselves instead of __tree and __hash_table.
As a drive-by fix, I improved the diagnostic to mention that we can't find
a _viable_ const call operator, as suggested by EricWF in PR41360.
Reviewers: EricWF, mclow.lists
Subscribers: christof, jkorous, dexonsmith, libcxx-commits, zoecarver
Tags: #libc
Differential Revision: https://reviews.llvm.org/D60540
llvm-svn: 358189
Diffstat (limited to 'libcxx/include/__hash_table')
| -rw-r--r-- | libcxx/include/__hash_table | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table index c5a9db1dc41..4b04dd62dbb 100644 --- a/libcxx/include/__hash_table +++ b/libcxx/include/__hash_table @@ -875,9 +875,9 @@ struct __enforce_unordered_container_requirements { template <class _Key, class _Hash, class _Equal> #ifndef _LIBCPP_CXX03_LANG _LIBCPP_DIAGNOSE_WARNING(!__invokable<_Equal const&, _Key const&, _Key const&>::value, - "the specified comparator type does not provide a const call operator") + "the specified comparator type does not provide a viable const call operator") _LIBCPP_DIAGNOSE_WARNING(!__invokable<_Hash const&, _Key const&>::value, - "the specified hash functor does not provide a const call operator") + "the specified hash functor does not provide a viable const call operator") #endif typename __enforce_unordered_container_requirements<_Key, _Hash, _Equal>::type __diagnose_unordered_container_requirements(int); |
