This is an archive of the discontinued LLVM Phabricator instance.

Differential D73855

Protect <span> against mim/max macro
ClosedPublic

Authored by cor3ntin on Feb 2 2020, 1:21 PM.

Details

Reviewers
ldionne
mclow.lists
Commits
rG1ac44d9fd1d9: [libc++] Protect <span> against min/max macro
Summary

While working on something else, I noticed <span> doesn't protect itself against max which was failing one of my tests
Now it does

Diff Detail

Event Timeline

cor3ntin created this revision.Feb 2 2020, 1:21 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 2 2020, 1:21 PM
Herald added subscribers: libcxx-commits, dexonsmith, christof. · View Herald Transcript
ldionne accepted this revision.Feb 10 2020, 4:37 AM
This revision is now accepted and ready to land.Feb 10 2020, 4:37 AM
Herald added a reviewer: mclow.lists. · View Herald TranscriptFeb 10 2020, 4:37 AM
Closed by commit rG1ac44d9fd1d9: [libc++] Protect <span> against min/max macro (authored by ldionne). · Explain WhyFeb 10 2020, 4:44 AM
This revision was automatically updated to reflect the committed changes.
ldionne added a comment.Feb 10 2020, 4:53 AM

Thanks for the patch!

Revision Contents

PathSize
libcxx/
include/
2 lines
test/
libcxx/
2 lines

Diff 243512

libcxx/include/span

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
inline constexpr size_t dynamic_extent = numeric_limits<size_t>::max(); inline constexpr size_t dynamic_extent = (numeric_limits<size_t>::max)();
template <typename _Tp, size_t _Extent = dynamic_extent> class span; template <typename _Tp, size_t _Extent = dynamic_extent> class span;
template <class _Tp> template <class _Tp>
struct __is_span_impl : public false_type {}; struct __is_span_impl : public false_type {};
template <class _Tp, size_t _Extent> template <class _Tp, size_t _Extent>
struct __is_span_impl<span<_Tp, _Extent>> : public true_type {}; struct __is_span_impl<span<_Tp, _Extent>> : public true_type {};
▲ Show 20 Lines • Show All 437 Lines • Show Last 20 Lines

libcxx/test/libcxx/min_max_macros.sh.cpp

Show First 20 Lines • Show All 171 Lines • ▼ Show 20 Lines
#include <set> #include <set>
TEST_MACROS(); TEST_MACROS();
#include <setjmp.h> #include <setjmp.h>
TEST_MACROS(); TEST_MACROS();
#ifndef _LIBCPP_HAS_NO_THREADS #ifndef _LIBCPP_HAS_NO_THREADS
#include <shared_mutex> #include <shared_mutex>
TEST_MACROS(); TEST_MACROS();
#endif #endif
#include <span>
TEST_MACROS();
#include <sstream> #include <sstream>
TEST_MACROS(); TEST_MACROS();
#include <stack> #include <stack>
TEST_MACROS(); TEST_MACROS();
#include <stdbool.h> #include <stdbool.h>
TEST_MACROS(); TEST_MACROS();
#include <stddef.h> #include <stddef.h>
TEST_MACROS(); TEST_MACROS();
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines