This is an archive of the discontinued LLVM Phabricator instance.

Differential D103541

[libc++][nfc] Add more nasty macros.
ClosedPublic

Authored by Mordante on Jun 2 2021, 11:00 AM.

Details

Reviewers
cjdb
curdeius
mstorsjo
• Quuxplusone
ldionne
Group Reviewers
Restricted Project
Commits
rGfd3a5260852a: [libc++][nfc] Add more nasty macros.
Summary

D101613 added some macros used by Microsofts SAL. D103425 uses __pre
and __post. They are also used by SAL and cause issues when used on
Windows. Add them to the blacklist making it easier to figure out what
the issue is.

Diff Detail

Unit TestsFailed

TimeTest
590 mslibcxx CI GCC-next/C++20 > libc++.std/atomics/atomics_types_operations/atomics_types_operations_req::atomic_is_lock_free.pass.cpp
1,680 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_advance::advance.pass.cpp
1,260 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_next::iterator_count.pass.cpp
1,230 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_next::iterator_count_sentinel.pass.cpp
1,500 mslibcxx CI GCC-next/C++20 > libc++.std/iterators/iterator_primitives/range_iter_ops/range_iter_ops_next::iterator_sentinel.pass.cpp
View Full Test Results (12 Failed)

Event Timeline

Mordante requested review of this revision.Jun 2 2021, 11:00 AM
Mordante created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2021, 11:00 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
• Quuxplusone accepted this revision as: • Quuxplusone.Jun 2 2021, 11:10 AM
• Quuxplusone added inline comments.
libcxx/test/support/nasty_macros.h
66–67

Alphabetize plz. Otherwise LGTM, ship it!

Mordante added inline comments.Jun 2 2021, 11:31 AM
libcxx/test/support/nasty_macros.h
66–67

Good catch, thanks. I had it sorted but a typo in __post, but forgot to resort after fixing it.

cjdb accepted this revision.Jun 2 2021, 12:54 PM
ldionne accepted this revision.Jun 2 2021, 2:53 PM
This revision is now accepted and ready to land.Jun 2 2021, 2:53 PM
Harbormaster completed remote builds in B107286: Diff 349328.Jun 2 2021, 2:55 PM
Mordante mentioned this in D103425: [libc++][format] Adds string formatter..Jun 2 2021, 11:25 PM
Closed by commit rGfd3a5260852a: [libc++][nfc] Add more nasty macros. (authored by Mordante). · Explain WhyJun 3 2021, 9:23 AM
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rGfd3a5260852a: [libc++][nfc] Add more nasty macros..

Revision Contents

PathSize
libcxx/
test/
support/
2 lines

Diff 349328

libcxx/test/support/nasty_macros.h

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Lines
#define __deallocate NASTY_MACRO #define __deallocate NASTY_MACRO
#define __deref NASTY_MACRO #define __deref NASTY_MACRO
#define __full NASTY_MACRO #define __full NASTY_MACRO
#define __in NASTY_MACRO #define __in NASTY_MACRO
#define __inout NASTY_MACRO #define __inout NASTY_MACRO
#define __nz NASTY_MACRO #define __nz NASTY_MACRO
#define __out NASTY_MACRO #define __out NASTY_MACRO
#define __part NASTY_MACRO #define __part NASTY_MACRO
#define __pre NASTY_MACRO
#define __post NASTY_MACRO
QuuxplusoneUnsubmitted
Not Done
ReplyInline Actions

Alphabetize plz. Otherwise LGTM, ship it!

Quuxplusone: Alphabetize plz. Otherwise LGTM, ship it!
MordanteAuthorUnsubmitted
Done
ReplyInline Actions

Good catch, thanks. I had it sorted but a typo in __post, but forgot to resort after fixing it.

Mordante: Good catch, thanks. I had it sorted but a typo in `__post`, but forgot to resort after fixing…
#endif #endif
#define __output NASTY_MACRO #define __output NASTY_MACRO
#define __input NASTY_MACRO #define __input NASTY_MACRO
#define __acquire NASTY_MACRO #define __acquire NASTY_MACRO
#define __release NASTY_MACRO #define __release NASTY_MACRO
#endif // SUPPORT_NASTY_MACROS_H #endif // SUPPORT_NASTY_MACROS_H