<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Oct 9, 2015 at 6:29 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><span class="">On Fri, Oct 9, 2015 at 6:03 PM, Manman Ren via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: mren<br>
Date: Fri Oct 9 20:03:55 2015<br>
New Revision: 249926<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249926&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249926&view=rev</a><br>
Log:<br>
Revert r249889 due to bot failure.<br></blockquote><div><br></div></span><div>Can you provide a pointer to the failing bot?</div></div></div></div></blockquote><div><br></div><div>Ah, found it:</div><div><br></div><div><a href="http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_check/7703/testReport/junit/libc++/std_depr_depr_c_headers/wchar_h_pass_cpp/">http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_check/7703/testReport/junit/libc++/std_depr_depr_c_headers/wchar_h_pass_cpp/</a><br></div><div><br></div><div>Unreverted in r249932, with an XFAIL for Darwin. The problem is that the underlying libc provides a bad overload set, and there's nothing that libc++ can do to fix that.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><span style="color:rgb(80,0,80)"> </span></div><div><div class="h5"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Removed:<br>
libcxx/trunk/include/wchar.h<br>
Modified:<br>
libcxx/trunk/include/cwchar<br>
libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp<br>
<br>
Modified: libcxx/trunk/include/cwchar<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cwchar?rev=249926&r1=249925&r2=249926&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cwchar?rev=249926&r1=249925&r2=249926&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/include/cwchar (original)<br>
+++ libcxx/trunk/include/cwchar Fri Oct 9 20:03:55 2015<br>
@@ -106,6 +106,9 @@ size_t wcsrtombs(char* restrict dst, con<br>
#include <__config><br>
#include <cwctype><br>
#include <wchar.h><br>
+#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)<br>
+#include <support/win32/support.h> // pull in *swprintf defines<br>
+#endif // _LIBCPP_MSVCRT<br>
<br>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)<br>
#pragma GCC system_header<br>
@@ -158,13 +161,16 @@ using ::wcscoll;<br>
using ::wcsncmp;<br>
using ::wcsxfrm;<br>
<br>
-#ifdef _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS<br>
+#if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)<br>
+<br>
using ::wcschr;<br>
using ::wcspbrk;<br>
using ::wcsrchr;<br>
using ::wcsstr;<br>
using ::wmemchr;<br>
+<br>
#else<br>
+<br>
inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcschr(const wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}<br>
inline _LIBCPP_INLINE_VISIBILITY wchar_t* wcschr( wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}<br>
<br>
@@ -179,6 +185,7 @@ inline _LIBCPP_INLINE_VISIBILITY w<br>
<br>
inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wmemchr(const wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}<br>
inline _LIBCPP_INLINE_VISIBILITY wchar_t* wmemchr( wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}<br>
+<br>
#endif<br>
<br>
using ::wcscspn;<br>
<br>
Removed: libcxx/trunk/include/wchar.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/wchar.h?rev=249925&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/wchar.h?rev=249925&view=auto</a><br>
==============================================================================<br>
--- libcxx/trunk/include/wchar.h (original)<br>
+++ libcxx/trunk/include/wchar.h (removed)<br>
@@ -1,136 +0,0 @@<br>
-// -*- C++ -*-<br>
-//===--------------------------- wchar.h ----------------------------------===//<br>
-//<br>
-// The LLVM Compiler Infrastructure<br>
-//<br>
-// This file is dual licensed under the MIT and the University of Illinois Open<br>
-// Source Licenses. See LICENSE.TXT for details.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#if defined(__need_wint_t) || defined(__need_mbstate_t)<br>
-<br>
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)<br>
-#pragma GCC system_header<br>
-#endif<br>
-<br>
-#include_next <wchar.h><br>
-<br>
-#elif !defined(_LIBCPP_WCHAR_H)<br>
-#define _LIBCPP_WCHAR_H<br>
-<br>
-/*<br>
- wchar.h synopsis<br>
-<br>
-Macros:<br>
-<br>
- NULL<br>
- WCHAR_MAX<br>
- WCHAR_MIN<br>
- WEOF<br>
-<br>
-Types:<br>
-<br>
- mbstate_t<br>
- size_t<br>
- tm<br>
- wint_t<br>
-<br>
-int fwprintf(FILE* restrict stream, const wchar_t* restrict format, ...);<br>
-int fwscanf(FILE* restrict stream, const wchar_t* restrict format, ...);<br>
-int swprintf(wchar_t* restrict s, size_t n, const wchar_t* restrict format, ...);<br>
-int swscanf(const wchar_t* restrict s, const wchar_t* restrict format, ...);<br>
-int vfwprintf(FILE* restrict stream, const wchar_t* restrict format, va_list arg);<br>
-int vfwscanf(FILE* restrict stream, const wchar_t* restrict format, va_list arg); // C99<br>
-int vswprintf(wchar_t* restrict s, size_t n, const wchar_t* restrict format, va_list arg);<br>
-int vswscanf(const wchar_t* restrict s, const wchar_t* restrict format, va_list arg); // C99<br>
-int vwprintf(const wchar_t* restrict format, va_list arg);<br>
-int vwscanf(const wchar_t* restrict format, va_list arg); // C99<br>
-int wprintf(const wchar_t* restrict format, ...);<br>
-int wscanf(const wchar_t* restrict format, ...);<br>
-wint_t fgetwc(FILE* stream);<br>
-wchar_t* fgetws(wchar_t* restrict s, int n, FILE* restrict stream);<br>
-wint_t fputwc(wchar_t c, FILE* stream);<br>
-int fputws(const wchar_t* restrict s, FILE* restrict stream);<br>
-int fwide(FILE* stream, int mode);<br>
-wint_t getwc(FILE* stream);<br>
-wint_t getwchar();<br>
-wint_t putwc(wchar_t c, FILE* stream);<br>
-wint_t putwchar(wchar_t c);<br>
-wint_t ungetwc(wint_t c, FILE* stream);<br>
-double wcstod(const wchar_t* restrict nptr, wchar_t** restrict endptr);<br>
-float wcstof(const wchar_t* restrict nptr, wchar_t** restrict endptr); // C99<br>
-long double wcstold(const wchar_t* restrict nptr, wchar_t** restrict endptr); // C99<br>
-long wcstol(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);<br>
-long long wcstoll(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base); // C99<br>
-unsigned long wcstoul(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);<br>
-unsigned long long wcstoull(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base); // C99<br>
-wchar_t* wcscpy(wchar_t* restrict s1, const wchar_t* restrict s2);<br>
-wchar_t* wcsncpy(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);<br>
-wchar_t* wcscat(wchar_t* restrict s1, const wchar_t* restrict s2);<br>
-wchar_t* wcsncat(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);<br>
-int wcscmp(const wchar_t* s1, const wchar_t* s2);<br>
-int wcscoll(const wchar_t* s1, const wchar_t* s2);<br>
-int wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t n);<br>
-size_t wcsxfrm(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);<br>
-const wchar_t* wcschr(const wchar_t* s, wchar_t c);<br>
- wchar_t* wcschr( wchar_t* s, wchar_t c);<br>
-size_t wcscspn(const wchar_t* s1, const wchar_t* s2);<br>
-size_t wcslen(const wchar_t* s);<br>
-const wchar_t* wcspbrk(const wchar_t* s1, const wchar_t* s2);<br>
- wchar_t* wcspbrk( wchar_t* s1, const wchar_t* s2);<br>
-const wchar_t* wcsrchr(const wchar_t* s, wchar_t c);<br>
- wchar_t* wcsrchr( wchar_t* s, wchar_t c);<br>
-size_t wcsspn(const wchar_t* s1, const wchar_t* s2);<br>
-const wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2);<br>
- wchar_t* wcsstr( wchar_t* s1, const wchar_t* s2);<br>
-wchar_t* wcstok(wchar_t* restrict s1, const wchar_t* restrict s2, wchar_t** restrict ptr);<br>
-const wchar_t* wmemchr(const wchar_t* s, wchar_t c, size_t n);<br>
- wchar_t* wmemchr( wchar_t* s, wchar_t c, size_t n);<br>
-int wmemcmp(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);<br>
-wchar_t* wmemcpy(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);<br>
-wchar_t* wmemmove(wchar_t* s1, const wchar_t* s2, size_t n);<br>
-wchar_t* wmemset(wchar_t* s, wchar_t c, size_t n);<br>
-size_t wcsftime(wchar_t* restrict s, size_t maxsize, const wchar_t* restrict format,<br>
- const tm* restrict timeptr);<br>
-wint_t btowc(int c);<br>
-int wctob(wint_t c);<br>
-int mbsinit(const mbstate_t* ps);<br>
-size_t mbrlen(const char* restrict s, size_t n, mbstate_t* restrict ps);<br>
-size_t mbrtowc(wchar_t* restrict pwc, const char* restrict s, size_t n, mbstate_t* restrict ps);<br>
-size_t wcrtomb(char* restrict s, wchar_t wc, mbstate_t* restrict ps);<br>
-size_t mbsrtowcs(wchar_t* restrict dst, const char** restrict src, size_t len,<br>
- mbstate_t* restrict ps);<br>
-size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,<br>
- mbstate_t* restrict ps);<br>
-<br>
-*/<br>
-<br>
-#include <__config><br>
-<br>
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)<br>
-#pragma GCC system_header<br>
-#endif<br>
-<br>
-#ifdef __cplusplus<br>
-#define __CORRECT_ISO_CPP_WCHAR_H_PROTO<br>
-#endif<br>
-<br>
-#include_next <wchar.h><br>
-<br>
-// Let <cwchar> know if we have const-correct overloads for wcschr and friends.<br>
-#if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)<br>
-# define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1<br>
-#elif defined(__GLIBC_PREREQ)<br>
-# if __GLIBC_PREREQ(2, 10)<br>
-# define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1<br>
-# endif<br>
-#endif<br>
-<br>
-#if defined(__cplusplus) && (defined(_LIBCPP_MSVCRT) || defined(__MINGW32__))<br>
-extern "C++" {<br>
-#include <support/win32/support.h> // pull in *swprintf defines<br>
-} // extern "C++"<br>
-#endif // __cplusplus && _LIBCPP_MSVCRT<br>
-<br>
-#endif // _LIBCPP_WCHAR_H<br>
<br>
Modified: libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp?rev=249926&r1=249925&r2=249926&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp?rev=249926&r1=249925&r2=249926&view=diff</a><br>
==============================================================================<br>
--- libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp (original)<br>
+++ libcxx/trunk/test/std/depr/depr.c.headers/wchar_h.pass.cpp Fri Oct 9 20:03:55 2015<br>
@@ -28,9 +28,13 @@<br>
#error WEOF not defined<br>
#endif<br>
<br>
+#if defined(__clang__)<br>
+#pragma clang diagnostic ignored "-Wmissing-braces"<br>
+#endif<br>
+<br>
int main()<br>
{<br>
- mbstate_t mb = {0};<br>
+ mbstate_t mb = {};<br>
size_t s = 0;<br>
tm *tm = 0;<br>
wint_t w = 0;<br>
@@ -50,13 +54,19 @@ int main()<br>
static_assert((std::is_same<decltype(vfwscanf(fp, L"", va)), int>::value), "");<br>
static_assert((std::is_same<decltype(vswprintf(ws, s, L"", va)), int>::value), "");<br>
static_assert((std::is_same<decltype(vswscanf(L"", L"", va)), int>::value), "");<br>
+ static_assert((std::is_same<decltype(vwprintf(L"", va)), int>::value), "");<br>
+ static_assert((std::is_same<decltype(vwscanf(L"", va)), int>::value), "");<br>
+ static_assert((std::is_same<decltype(wprintf(L"")), int>::value), "");<br>
+ static_assert((std::is_same<decltype(wscanf(L"")), int>::value), "");<br>
static_assert((std::is_same<decltype(fgetwc(fp)), wint_t>::value), "");<br>
static_assert((std::is_same<decltype(fgetws(ws, 0, fp)), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(fputwc(L' ', fp)), wint_t>::value), "");<br>
static_assert((std::is_same<decltype(fputws(L"", fp)), int>::value), "");<br>
static_assert((std::is_same<decltype(fwide(fp, 0)), int>::value), "");<br>
static_assert((std::is_same<decltype(getwc(fp)), wint_t>::value), "");<br>
+ static_assert((std::is_same<decltype(getwchar()), wint_t>::value), "");<br>
static_assert((std::is_same<decltype(putwc(L' ', fp)), wint_t>::value), "");<br>
+ static_assert((std::is_same<decltype(putwchar(L' ')), wint_t>::value), "");<br>
static_assert((std::is_same<decltype(ungetwc(L' ', fp)), wint_t>::value), "");<br>
static_assert((std::is_same<decltype(wcstod(L"", (wchar_t**)0)), double>::value), "");<br>
static_assert((std::is_same<decltype(wcstof(L"", (wchar_t**)0)), float>::value), "");<br>
@@ -73,19 +83,14 @@ int main()<br>
static_assert((std::is_same<decltype(wcscoll(L"", L"")), int>::value), "");<br>
static_assert((std::is_same<decltype(wcsncmp(L"", L"", s)), int>::value), "");<br>
static_assert((std::is_same<decltype(wcsxfrm(ws, L"", s)), size_t>::value), "");<br>
- static_assert((std::is_same<decltype(wcschr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcschr((wchar_t*)0, L' ')), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcscspn(L"", L"")), size_t>::value), "");<br>
static_assert((std::is_same<decltype(wcslen(L"")), size_t>::value), "");<br>
- static_assert((std::is_same<decltype(wcspbrk((const wchar_t*)0, L"")), const wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcspbrk((wchar_t*)0, L"")), wchar_t*>::value), "");<br>
- static_assert((std::is_same<decltype(wcsrchr((const wchar_t*)0, L' ')), const wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcsrchr((wchar_t*)0, L' ')), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcsspn(L"", L"")), size_t>::value), "");<br>
- static_assert((std::is_same<decltype(wcsstr((const wchar_t*)0, L"")), const wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcsstr((wchar_t*)0, L"")), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wcstok(ws, L"", (wchar_t**)0)), wchar_t*>::value), "");<br>
- static_assert((std::is_same<decltype(wmemchr((const wchar_t*)0, L' ', s)), const wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wmemchr((wchar_t*)0, L' ', s)), wchar_t*>::value), "");<br>
static_assert((std::is_same<decltype(wmemcmp(L"", L"", s)), int>::value), "");<br>
static_assert((std::is_same<decltype(wmemcpy(ws, L"", s)), wchar_t*>::value), "");<br>
@@ -100,16 +105,4 @@ int main()<br>
static_assert((std::is_same<decltype(wcrtomb(ns, L' ', &mb)), size_t>::value), "");<br>
static_assert((std::is_same<decltype(mbsrtowcs(ws, (const char**)0, s, &mb)), size_t>::value), "");<br>
static_assert((std::is_same<decltype(wcsrtombs(ns, (const wchar_t**)0, s, &mb)), size_t>::value), "");<br>
-<br>
-#ifndef _LIBCPP_HAS_NO_STDIN<br>
- static_assert((std::is_same<decltype(getwchar()), wint_t>::value), "");<br>
- static_assert((std::is_same<decltype(vwscanf(L"", va)), int>::value), "");<br>
- static_assert((std::is_same<decltype(wscanf(L"")), int>::value), "");<br>
-#endif<br>
-<br>
-#ifndef _LIBCPP_HAS_NO_STDOUT<br>
- static_assert((std::is_same<decltype(putwchar(L' ')), wint_t>::value), "");<br>
- static_assert((std::is_same<decltype(vwprintf(L"", va)), int>::value), "");<br>
- static_assert((std::is_same<decltype(wprintf(L"")), int>::value), "");<br>
-#endif<br>
}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div></div>