This is an archive of the discontinued LLVM Phabricator instance.

Differential D126073

[libc++] Assume that push_macro and pop_macro are available
ClosedPublic

Authored by philnik on May 20 2022, 8:14 AM.

Details

Reviewers
ldionne
Mordante
var-const
Group Reviewers
Restricted Project
Commits
rG570390580567: [libc++] Assume that push_macro and pop_macro are available
Summary

All compilers that libc++ supports support push_macro and pop_macro. So let's remove it.

Diff Detail

Event Timeline

philnik created this revision.May 20 2022, 8:14 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 20 2022, 8:14 AM
Herald added a subscriber: mgorny. · View Herald Transcript
philnik requested review of this revision.May 20 2022, 8:14 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 20 2022, 8:14 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B165532: Diff 430980.May 20 2022, 10:16 AM
ldionne accepted this revision.May 23 2022, 10:21 AM
This revision is now accepted and ready to land.May 23 2022, 10:21 AM
This revision was landed with ongoing or failed builds.May 23 2022, 11:48 AM
Closed by commit rG570390580567: [libc++] Assume that push_macro and pop_macro are available (authored by philnik). · Explain Why
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rG570390580567: [libc++] Assume that push_macro and pop_macro are available.

Revision Contents

PathSize
libcxx/
3 lines
include/
31 lines
21 lines

Diff 431442

libcxx/CMakeLists.txt

Show First 20 Lines • Show All 628 Lines • ▼ Show 20 Linesfunction(cxx_add_warning_flags target)
else() else()
# TODO(EricWF) Remove this. We shouldn't be suppressing errors when -Werror is # TODO(EricWF) Remove this. We shouldn't be suppressing errors when -Werror is
# added elsewhere. # added elsewhere.
target_add_compile_flags_if_supported(${target} PRIVATE -Wno-error) target_add_compile_flags_if_supported(${target} PRIVATE -Wno-error)
endif() endif()
if (LIBCXX_ENABLE_PEDANTIC) if (LIBCXX_ENABLE_PEDANTIC)
target_add_compile_flags_if_supported(${target} PRIVATE -pedantic) target_add_compile_flags_if_supported(${target} PRIVATE -pedantic)
endif() endif()
if (LIBCXX_DISABLE_MACRO_CONFLICT_WARNINGS)
target_compile_definitions(${target} PRIVATE -D_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS)
endif()
endfunction() endfunction()
# Exception flags ============================================================= # Exception flags =============================================================
function(cxx_add_exception_flags target) function(cxx_add_exception_flags target)
if (LIBCXX_ENABLE_EXCEPTIONS) if (LIBCXX_ENABLE_EXCEPTIONS)
# Catches C++ exceptions only and tells the compiler to assume that extern C # Catches C++ exceptions only and tells the compiler to assume that extern C
# functions never throw a C++ exception. # functions never throw a C++ exception.
target_add_compile_flags_if_supported(${target} PUBLIC -EHsc) target_add_compile_flags_if_supported(${target} PUBLIC -EHsc)
▲ Show 20 Lines • Show All 305 Lines • Show Last 20 Lines

libcxx/include/__config

Show First 20 Lines • Show All 1,229 Lines • ▼ Show 20 Lines
#define _LIBCPP_ENABLE_CXX20_REMOVED_RAW_STORAGE_ITERATOR #define _LIBCPP_ENABLE_CXX20_REMOVED_RAW_STORAGE_ITERATOR
#define _LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS #define _LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS
#endif // _LIBCPP_ENABLE_CXX20_REMOVED_FEATURES #endif // _LIBCPP_ENABLE_CXX20_REMOVED_FEATURES
#if !defined(__cpp_impl_coroutine) || __cpp_impl_coroutine < 201902L #if !defined(__cpp_impl_coroutine) || __cpp_impl_coroutine < 201902L
#define _LIBCPP_HAS_NO_CXX20_COROUTINES #define _LIBCPP_HAS_NO_CXX20_COROUTINES
#endif #endif
#if defined(_LIBCPP_COMPILER_IBM) # define _LIBCPP_PUSH_MACROS _Pragma("push_macro(\"min\")") _Pragma("push_macro(\"max\")")
#define _LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO # define _LIBCPP_POP_MACROS _Pragma("pop_macro(\"min\")") _Pragma("pop_macro(\"max\")")
#endif
#if defined(_LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO)
# define _LIBCPP_PUSH_MACROS
# define _LIBCPP_POP_MACROS
#else
// Don't warn about macro conflicts when we can restore them at the
// end of the header.
# ifndef _LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS
# define _LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS
# endif
# if defined(_LIBCPP_COMPILER_MSVC)
# define _LIBCPP_PUSH_MACROS \
__pragma(push_macro("min")) \
__pragma(push_macro("max"))
# define _LIBCPP_POP_MACROS \
__pragma(pop_macro("min")) \
__pragma(pop_macro("max"))
# else
# define _LIBCPP_PUSH_MACROS \
_Pragma("push_macro(\"min\")") \
_Pragma("push_macro(\"max\")")
# define _LIBCPP_POP_MACROS \
_Pragma("pop_macro(\"min\")") \
_Pragma("pop_macro(\"max\")")
# endif
#endif // defined(_LIBCPP_HAS_NO_PRAGMA_PUSH_POP_MACRO)
#ifndef _LIBCPP_NO_AUTO_LINK #ifndef _LIBCPP_NO_AUTO_LINK
# if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY) # if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) # if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
# pragma comment(lib, "c++.lib") # pragma comment(lib, "c++.lib")
# else # else
# pragma comment(lib, "libc++.lib") # pragma comment(lib, "libc++.lib")
# endif # endif
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

libcxx/include/__undef_macros

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifdef min #ifdef min
#if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS)
#if defined(_LIBCPP_WARNING)
_LIBCPP_WARNING("macro min is incompatible with C++. Try #define NOMINMAX "
"before any Windows header. #undefing min")
#else
#warning: macro min is incompatible with C++. #undefing min
#endif
#endif
#undef min # undef min
#endif #endif
#ifdef max #ifdef max
#if !defined(_LIBCPP_DISABLE_MACRO_CONFLICT_WARNINGS)
#if defined(_LIBCPP_WARNING)
_LIBCPP_WARNING("macro max is incompatible with C++. Try #define NOMINMAX "
"before any Windows header. #undefing max")
#else
#warning: macro max is incompatible with C++. #undefing max
#endif
#endif
#undef max # undef max
#endif #endif