This is an archive of the discontinued LLVM Phabricator instance.

Differential D140731

[libc++][CI] Fixes robust against ADL for C++03.
ClosedPublic

Authored by Mordante on Dec 28 2022, 11:04 AM.

Details

Reviewers
philnik
Group Reviewers
Restricted Project
Commits
rG0c731b0c00f5: [libc++][CI] Fixes robust against ADL for C++03.
Summary

This was disabled in D139545.

Diff Detail

Event Timeline

Mordante created this revision.Dec 28 2022, 11:04 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 28 2022, 11:04 AM
Herald added a subscriber: arichardson. · View Herald Transcript
Mordante requested review of this revision.Dec 28 2022, 11:04 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 28 2022, 11:04 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B205089: Diff 485524.Dec 28 2022, 12:24 PM
philnik added a comment.Dec 30 2022, 5:10 AM

Where does this fire? noexcept(cond) should never be used in C++03.

Mordante added a comment.Jan 1 2023, 8:36 AM
In D140731#4020155, @philnik wrote:

Where does this fire? noexcept(cond) should never be used in C++03.

include/__functional/invoke.h lines 431 and 438 are the only two places

template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, false, _Ret, _Fp, _Args...>
{
    typedef __nothrow_invokable_r_imp _ThisT;
  
    template <class _Tp>
    static void __test_noexcept(_Tp) _NOEXCEPT;
  
    static const bool value = noexcept(_ThisT::__test_noexcept<_Ret>(  // 431
        _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)));
};    
  
template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, true, _Ret, _Fp, _Args...>
{
    static const bool value = noexcept(                                 / 438
        _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)); 
};
philnik added a comment.Jan 1 2023, 9:26 AM
In D140731#4021229, @Mordante wrote:
In D140731#4020155, @philnik wrote:

Where does this fire? noexcept(cond) should never be used in C++03.

include/__functional/invoke.h lines 431 and 438 are the only two places

template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, false, _Ret, _Fp, _Args...>
{
    typedef __nothrow_invokable_r_imp _ThisT;
  
    template <class _Tp>
    static void __test_noexcept(_Tp) _NOEXCEPT;
  
    static const bool value = noexcept(_ThisT::__test_noexcept<_Ret>(  // 431
        _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)));
};    
  
template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, true, _Ret, _Fp, _Args...>
{
    static const bool value = noexcept(                                 / 438
        _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)); 
};

IMO we should fix the code here. In C++03 the values are always false anyways, so we could just make this

template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, false, _Ret, _Fp, _Args...>
{
    typedef __nothrow_invokable_r_imp _ThisT;
  
    template <class _Tp>
    static void __test_noexcept(_Tp) _NOEXCEPT;

#ifdef _LIBCPP_CXX03_LANG
    static const bool value = false;
#else
    static const bool value = noexcept(_ThisT::__test_noexcept<_Ret>(_VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)));
#endif
};    
  
template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, true, _Ret, _Fp, _Args...>
{
#ifdef _LIBCPP_CXX03_LANG
    static const bool value = false;
#else
    static const bool value = noexcept(_VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)); 
#endif
};

or something similar.

Mordante updated this revision to Diff 487169.Jan 8 2023, 5:17 AM

Uses an alternative approach as suggested by philnik.

philnik accepted this revision.Jan 8 2023, 5:20 AM

LGTM with green CI.

This revision is now accepted and ready to land.Jan 8 2023, 5:20 AM
Harbormaster completed remote builds in B206344: Diff 487169.Jan 8 2023, 7:36 AM
This revision was landed with ongoing or failed builds.Jan 8 2023, 7:43 AM
Closed by commit rG0c731b0c00f5: [libc++][CI] Fixes robust against ADL for C++03. (authored by Mordante). · Explain Why
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rG0c731b0c00f5: [libc++][CI] Fixes robust against ADL for C++03..

Revision Contents

PathSize
libcxx/
include/
__functional/
8 lines
utils/
ci/
5 lines

Diff 487187

libcxx/include/__functional/invoke.h

Show First 20 Lines • Show All 422 Lines • ▼ Show 20 Lines
template <class _Ret, class _Fp, class ..._Args> template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, false, _Ret, _Fp, _Args...> struct __nothrow_invokable_r_imp<true, false, _Ret, _Fp, _Args...>
{ {
typedef __nothrow_invokable_r_imp _ThisT; typedef __nothrow_invokable_r_imp _ThisT;
template <class _Tp> template <class _Tp>
static void __test_noexcept(_Tp) _NOEXCEPT; static void __test_noexcept(_Tp) _NOEXCEPT;
#ifdef _LIBCPP_CXX03_LANG
static const bool value = false;
#else
static const bool value = noexcept(_ThisT::__test_noexcept<_Ret>( static const bool value = noexcept(_ThisT::__test_noexcept<_Ret>(
_VSTD::__invoke(declval<_Fp>(), declval<_Args>()...))); _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)));
#endif
}; };
template <class _Ret, class _Fp, class ..._Args> template <class _Ret, class _Fp, class ..._Args>
struct __nothrow_invokable_r_imp<true, true, _Ret, _Fp, _Args...> struct __nothrow_invokable_r_imp<true, true, _Ret, _Fp, _Args...>
{ {
#ifdef _LIBCPP_CXX03_LANG
static const bool value = false;
#else
static const bool value = noexcept( static const bool value = noexcept(
_VSTD::__invoke(declval<_Fp>(), declval<_Args>()...)); _VSTD::__invoke(declval<_Fp>(), declval<_Args>()...));
#endif
}; };
template <class _Ret, class _Fp, class ..._Args> template <class _Ret, class _Fp, class ..._Args>
using __nothrow_invokable_r = using __nothrow_invokable_r =
__nothrow_invokable_r_imp< __nothrow_invokable_r_imp<
__invokable_r<_Ret, _Fp, _Args...>::value, __invokable_r<_Ret, _Fp, _Args...>::value,
is_void<_Ret>::value, is_void<_Ret>::value,
_Ret, _Fp, _Args... _Ret, _Fp, _Args...
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines

libcxx/utils/ci/run-buildbot

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Linescheck-generated-output)
# Reject code with trailing whitespace # Reject code with trailing whitespace
! grep -rn '[[:blank:]]$' libcxx/include libcxx/src libcxx/test libcxx/benchmarks || false ! grep -rn '[[:blank:]]$' libcxx/include libcxx/src libcxx/test libcxx/benchmarks || false
;; ;;
# #
# Various Standard modes # Various Standard modes
# #
generic-cxx03) generic-cxx03)
clean clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx03.cmake" generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx03.cmake" \
#generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx03.cmake" \ -DLIBCXX_ENABLE_CLANG_TIDY=ON
# -DLIBCXX_ENABLE_CLANG_TIDY=ON
check-runtimes check-runtimes
check-abi-list check-abi-list
;; ;;
generic-cxx11) generic-cxx11)
clean clean
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx11.cmake" \ generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx11.cmake" \
-DLIBCXX_ENABLE_CLANG_TIDY=ON -DLIBCXX_ENABLE_CLANG_TIDY=ON
check-runtimes check-runtimes
▲ Show 20 Lines • Show All 433 Lines • Show Last 20 Lines