This is an archive of the discontinued LLVM Phabricator instance.

Differential D114952

[clang-cl] Define _MSVC_LANG for -std=c++2b
ClosedPublic

Authored by thakis on Dec 2 2021, 6:20 AM.

Details

Reviewers
hans
Commits
rG2a2b3a3e3df7: [clang-cl] Define _MSVC_LANG for -std=c++2b
Summary

This matches the value that msvc v19.29 VS16.11 uses for
_MSVC_LANG with /std:c++latest.

Diff Detail

Event Timeline

thakis requested review of this revision.Dec 2 2021, 6:20 AM
thakis created this revision.
thakis added a comment.Dec 2 2021, 6:22 AM

(for reference: https://godbolt.org/z/W6n6jqz4Y)

hans accepted this revision.Dec 2 2021, 6:40 AM

lgtm

This revision is now accepted and ready to land.Dec 2 2021, 6:40 AM
Harbormaster completed remote builds in B137123: Diff 391303.Dec 2 2021, 8:50 AM
Closed by commit rG2a2b3a3e3df7: [clang-cl] Define _MSVC_LANG for -std=c++2b (authored by thakis). · Explain WhyDec 2 2021, 9:09 AM
This revision was automatically updated to reflect the committed changes.
thakis added a commit: rG2a2b3a3e3df7: [clang-cl] Define _MSVC_LANG for -std=c++2b.
Herald added a project: Restricted Project. · View Herald TranscriptDec 2 2021, 9:09 AM

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
4 lines
test/
Preprocessor/
11 lines

Diff 391303

clang/lib/Basic/Targets/OSTargets.cpp

Show First 20 Lines • Show All 175 Lines • ▼ Show 20 Lines if (Opts.MSCompatibilityVersion) {
Builder.defineMacro("_MSC_FULL_VER", Twine(Opts.MSCompatibilityVersion)); Builder.defineMacro("_MSC_FULL_VER", Twine(Opts.MSCompatibilityVersion));
// FIXME We cannot encode the revision information into 32-bits // FIXME We cannot encode the revision information into 32-bits
Builder.defineMacro("_MSC_BUILD", Twine(1)); Builder.defineMacro("_MSC_BUILD", Twine(1));
if (Opts.CPlusPlus11 && Opts.isCompatibleWithMSVC(LangOptions::MSVC2015)) if (Opts.CPlusPlus11 && Opts.isCompatibleWithMSVC(LangOptions::MSVC2015))
Builder.defineMacro("_HAS_CHAR16_T_LANGUAGE_SUPPORT", Twine(1)); Builder.defineMacro("_HAS_CHAR16_T_LANGUAGE_SUPPORT", Twine(1));
if (Opts.isCompatibleWithMSVC(LangOptions::MSVC2015)) { if (Opts.isCompatibleWithMSVC(LangOptions::MSVC2015)) {
if (Opts.CPlusPlus20) if (Opts.CPlusPlus2b)
Builder.defineMacro("_MSVC_LANG", "202004L");
else if (Opts.CPlusPlus20)
Builder.defineMacro("_MSVC_LANG", "202002L"); Builder.defineMacro("_MSVC_LANG", "202002L");
else if (Opts.CPlusPlus17) else if (Opts.CPlusPlus17)
Builder.defineMacro("_MSVC_LANG", "201703L"); Builder.defineMacro("_MSVC_LANG", "201703L");
else if (Opts.CPlusPlus14) else if (Opts.CPlusPlus14)
Builder.defineMacro("_MSVC_LANG", "201402L"); Builder.defineMacro("_MSVC_LANG", "201402L");
} }
} }
Show All 35 Lines

clang/test/Preprocessor/predefined-win-macros.c

Show All 39 Lines
// CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 // CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
// CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 // CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
// CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 // CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
// CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 // CHECK-MS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
// CHECK-MS-NOT: GNU // CHECK-MS-NOT: GNU
// CHECK-MS-NOT: GXX // CHECK-MS-NOT: GXX
// RUN: %clang_cc1 %s -x c++ -E -dM -triple i686-pc-win32 -fms-extensions -fms-compatibility \ // RUN: %clang_cc1 %s -x c++ -E -dM -triple i686-pc-win32 -fms-extensions -fms-compatibility \
// RUN: -fms-compatibility-version=19.00 -std=c++20 -o - | FileCheck -match-full-lines %s --check-prefix=CHECK-MS-CPP2A // RUN: -fms-compatibility-version=19.00 -std=c++20 -o - | FileCheck -match-full-lines %s --check-prefix=CHECK-MS-CPP20
// CHECK-MS-CPP2A: #define _MSC_VER 1900 // CHECK-MS-CPP20: #define _MSC_VER 1900
// CHECK-MS-CPP2A: #define _MSVC_LANG 202002L // CHECK-MS-CPP20: #define _MSVC_LANG 202002L
// RUN: %clang_cc1 %s -x c++ -E -dM -triple i686-pc-win32 -fms-extensions -fms-compatibility \
// RUN: -fms-compatibility-version=19.00 -std=c++2b -o - | FileCheck -match-full-lines %s --check-prefix=CHECK-MS-CPP2B
// CHECK-MS-CPP2B: #define _MSC_VER 1900
// CHECK-MS-CPP2B: #define _MSVC_LANG 202004L
// RUN: %clang_cc1 -triple i386-windows %s -E -dM -o - \ // RUN: %clang_cc1 -triple i386-windows %s -E -dM -o - \
// RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-X86-WIN // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-X86-WIN
// CHECK-X86-WIN-NOT: #define WIN32 1 // CHECK-X86-WIN-NOT: #define WIN32 1
// CHECK-X86-WIN-NOT: #define WIN64 1 // CHECK-X86-WIN-NOT: #define WIN64 1
// CHECK-X86-WIN-NOT: #define WINNT 1 // CHECK-X86-WIN-NOT: #define WINNT 1
// CHECK-X86-WIN: #define _WIN32 1 // CHECK-X86-WIN: #define _WIN32 1
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines