hamzasood created this revision.
hamzasood added reviewers: rnk, EricWF, compnerd, smeenai.
Herald added subscribers: cfe-commits, ldionne, mgorny.
The patch fixes a few issues that arise when using libc++ on Windows.
Specifically:
1. The CMake configuration added `-Wall` to the compilation, which actually
means `-Weverything` in MSVC. This led to several thousand warnings per file.
2. The experimental library was enabled by default. It doesn't really work
(yet) on Windows, and in fact the build docs suggest to disable it, so I don't
think that was a sensible default.
3. There were some other errors that caused compilation errors in some of the
tests.
I've identified a few other issues, but I'm not sure how best to fix them:
1. `support/win32/locale_win32.h` includes `xlocinfo.h`, which ends up
including `yvals_core.h`. That MSVC header defines feature test macros, among
other things, that clash with macros defined in libc++. This is causing lots of
test errors.
2. `<new>` includes the ucrt header `new.h` in the hope that it'll declare
`get_new_handler` etc. but `new.h` really just goes back and includes `<new>`.
The end result is that nothing actually gets declared and so we're missing a
few declarations, which causes lots of compilation errors.
Repository:
rCXX libc++
https://reviews.llvm.org/D51868
Files:
CMakeLists.txt
include/filesystem
test/std/strings/c.strings/cuchar.pass.cpp
test/support/test_macros.h
test/support/verbose_assert.h
Index: test/support/verbose_assert.h
===================================================================
--- test/support/verbose_assert.h
+++ test/support/verbose_assert.h
@@ -21,18 +21,18 @@
template <class Tp, int ST = (IsStreamable<decltype(std::cerr), Tp>::value ? 1
: (IsStreamable<decltype(std::wcerr), Tp>::value ? 2 : -1))>
-struct SelectStream {
+struct SelectErrStream {
static_assert(ST == -1, "specialization required for ST != -1");
static void Print(Tp const&) { std::clog << "Value Not Streamable!\n"; }
};
template <class Tp>
-struct SelectStream<Tp, 1> {
+struct SelectErrStream<Tp, 1> {
static void Print(Tp const& val) { std::cerr << val; }
};
template <class Tp>
-struct SelectStream<Tp, 2> {
+struct SelectErrStream<Tp, 2> {
static void Print(Tp const& val) { std::wcerr << val; }
};
@@ -86,14 +86,14 @@
template <class Tp>
friend LogType& operator<<(LogType& log, Tp const& value) {
if (!log.is_disabled) {
- SelectStream<Tp>::Print(value);
+ SelectErrStream<Tp>::Print(value);
}
return log;
}
friend LogType& operator<<(LogType& log, EndLType* m) {
if (!log.is_disabled) {
- SelectStream<EndLType*>::Print(m);
+ std::cerr << m;
}
return log;
}
Index: test/support/test_macros.h
===================================================================
--- test/support/test_macros.h
+++ test/support/test_macros.h
@@ -143,11 +143,6 @@
# define TEST_HAS_C11_FEATURES
# define TEST_HAS_TIMESPEC_GET
# endif
-# elif defined(_WIN32)
-# if defined(_MSC_VER) && !defined(__MINGW32__)
-# define TEST_HAS_C11_FEATURES // Using Microsoft's C Runtime library
-# define TEST_HAS_TIMESPEC_GET
-# endif
# endif
#endif
Index: test/std/strings/c.strings/cuchar.pass.cpp
===================================================================
--- test/std/strings/c.strings/cuchar.pass.cpp
+++ test/std/strings/c.strings/cuchar.pass.cpp
@@ -8,6 +8,9 @@
//===----------------------------------------------------------------------===//
//
// XFAIL: *
+//
+// The MSVC stdlib has cuchar, which causes this test to pass unexpectedly.
+// UNSUPPORTED: windows
// <cuchar>
Index: include/filesystem
===================================================================
--- include/filesystem
+++ include/filesystem
@@ -1393,7 +1393,6 @@
return __storage_->__what_.c_str();
}
- _LIBCPP_FUNC_VIS
void __create_what(int __num_paths);
private:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -67,7 +67,7 @@
option(LIBCXX_ENABLE_ASSERTIONS "Enable assertions independent of build mode." OFF)
option(LIBCXX_ENABLE_SHARED "Build libc++ as a shared library." ON)
option(LIBCXX_ENABLE_STATIC "Build libc++ as a static library." ON)
-option(LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY "Build libc++experimental.a" ON)
+option(LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY "Build libc++experimental.a" $<NOT:WIN32>)
set(ENABLE_FILESYSTEM_DEFAULT ${LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY})
if (WIN32)
set(ENABLE_FILESYSTEM_DEFAULT OFF)
@@ -542,8 +542,13 @@
# Warning flags ===============================================================
add_definitions(-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+if (MSVC)
+ add_compile_flags(/W4)
+else()
+ add_compile_flags_if_supported(-Wall)
+endif()
add_compile_flags_if_supported(
- -Wall -Wextra -W -Wwrite-strings
+ -Wextra -W -Wwrite-strings
-Wno-unused-parameter -Wno-long-long
-Werror=return-type)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
