Author: Markus Böck Date: 2021-11-30T09:13:22+01:00 New Revision: 7ba70d32736aef0c640b9d0e7b9081fc208c81c2
URL: https://github.com/llvm/llvm-project/commit/7ba70d32736aef0c640b9d0e7b9081fc208c81c2 DIFF: https://github.com/llvm/llvm-project/commit/7ba70d32736aef0c640b9d0e7b9081fc208c81c2.diff LOG: [PR52549][clang-cl] Predefine _MSVC_EXECUTION_CHARACTER_SET Since VS 2022 17.1 MSVC predefines _MSVC_EXECUTION_CHARACTER_SET to inform the users of the execution character set defined at compile time. The value the macro expands to is a Windows Code Page Identifier which are documented here: https://docs.microsoft.com/en-us/windows/win32/intl/code-page-identifiers As clang currently only supports UTF-8 it is defined as 65001. If clang-cl were to support a different execution character set in the future we'd have to change the value. Fixes https://bugs.llvm.org/show_bug.cgi?id=52549 Differential Revision: https://reviews.llvm.org/D114576 Added: Modified: clang/lib/Basic/Targets/OSTargets.cpp clang/test/Preprocessor/init.c Removed: ################################################################################ diff --git a/clang/lib/Basic/Targets/OSTargets.cpp b/clang/lib/Basic/Targets/OSTargets.cpp index 7cd4a51901205..4d9a462b51366 100644 --- a/clang/lib/Basic/Targets/OSTargets.cpp +++ b/clang/lib/Basic/Targets/OSTargets.cpp @@ -201,6 +201,14 @@ static void addVisualCDefines(const LangOptions &Opts, MacroBuilder &Builder) { } Builder.defineMacro("_INTEGRAL_MAX_BITS", "64"); + + // Starting with VS 2022 17.1, MSVC predefines the below macro to inform + // users of the execution character set defined at compile time. + // The value given is the Windows Code Page Identifier: + // https://docs.microsoft.com/en-us/windows/win32/intl/code-page-identifiers + // + // Clang currently only supports UTF-8, so we'll use 65001 + Builder.defineMacro("_MSVC_EXECUTION_CHARACTER_SET", "65001"); } void addWindowsDefines(const llvm::Triple &Triple, const LangOptions &Opts, diff --git a/clang/test/Preprocessor/init.c b/clang/test/Preprocessor/init.c index 8bbfe85b9ba74..52c33d9b8b7a5 100644 --- a/clang/test/Preprocessor/init.c +++ b/clang/test/Preprocessor/init.c @@ -194,6 +194,7 @@ // MSEXT:#define _INTEGRAL_MAX_BITS 64 // MSEXT-NOT:#define _NATIVE_WCHAR_T_DEFINED 1 // MSEXT-NOT:#define _WCHAR_T_DEFINED 1 +// MSEXT:#define _MSVC_EXECUTION_CHARACTER_SET 65001 // // // RUN: %clang_cc1 -x c++ -fms-extensions -triple i686-pc-win32 -E -dM < /dev/null | FileCheck -match-full-lines -check-prefix MSEXT-CXX %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits