This is an archive of the discontinued LLVM Phabricator instance.

Differential D124026

[Headers][MSVC] Define wchar_t in stddef.h like MSVC if not using the builtin type
ClosedPublic

Authored by steplong on Apr 19 2022, 11:11 AM.

Details

Reviewers
rnk
efriedma
Commits
rG7f9837cfa636: [Headers][MSVC] Define wchar_t in stddef.h like MSVC if not using the builtin…
Summary

MSVC expects wchar_t to be defined in stddef.h if /Zc:wchar_t- is specified

Diff Detail

Event Timeline

steplong created this revision.Apr 19 2022, 11:11 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 19 2022, 11:11 AM
steplong requested review of this revision.Apr 19 2022, 11:11 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 19 2022, 11:11 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B160283: Diff 423678.Apr 19 2022, 11:42 AM
efriedma accepted this revision.Apr 25 2022, 10:04 AM

LGTM

This revision is now accepted and ready to land.Apr 25 2022, 10:04 AM
Closed by commit rG7f9837cfa636: [Headers][MSVC] Define wchar_t in stddef.h like MSVC if not using the builtin… (authored by steplong). · Explain WhyMay 12 2022, 9:38 AM
This revision was automatically updated to reflect the committed changes.
steplong added a commit: rG7f9837cfa636: [Headers][MSVC] Define wchar_t in stddef.h like MSVC if not using the builtin….

Revision Contents

PathSize
clang/
lib/
Headers/
2 lines
test/
Headers/
6 lines

Diff 428976

clang/lib/Headers/stddef.h

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
#if !__has_feature(modules) #if !__has_feature(modules)
#define _RSIZE_T #define _RSIZE_T
#endif #endif
typedef __SIZE_TYPE__ rsize_t; typedef __SIZE_TYPE__ rsize_t;
#endif #endif
#endif /* defined(__need_STDDEF_H_misc) */ #endif /* defined(__need_STDDEF_H_misc) */
#if defined(__need_wchar_t) #if defined(__need_wchar_t)
#ifndef __cplusplus #if !defined(__cplusplus) || (defined(_MSC_VER) && !_NATIVE_WCHAR_T_DEFINED)
/* Always define wchar_t when modules are available. */ /* Always define wchar_t when modules are available. */
#if !defined(_WCHAR_T) || __has_feature(modules) #if !defined(_WCHAR_T) || __has_feature(modules)
#if !__has_feature(modules) #if !__has_feature(modules)
#define _WCHAR_T #define _WCHAR_T
#if defined(_MSC_EXTENSIONS) #if defined(_MSC_EXTENSIONS)
#define _WCHAR_T_DEFINED #define _WCHAR_T_DEFINED
#endif #endif
#endif #endif
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

clang/test/Headers/ms-no-wchar.cpp

  • This file was added.
// RUN: %clang_cc1 -fsyntax-only -triple x86_64-pc-windows-msvc -fms-compatibility-version=17.00 -fno-wchar %s
// MSVC defines wchar_t instead of using the builtin if /Zc:wchar_t- is passed
#include <stddef.h>
wchar_t c;