maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix ms-layout_version declspec test and add missing new test 

Now that MSVC compatibility versions are stored as a four digit number
(1912) instead of a two digit number (19), we need to adjust how we
handle this attribute.

Also add a new test that was intended to be part of r349414.

llvm-svn: 349415
This commit is contained in:
Reid Kleckner 2018-12-17 23:16:43 +00:00
parent d2f98772d0
commit 1a94d877bf
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Sema/SemaDeclAttr.cpp
View File

@ -5694,18 +5694,18 @@ static void handleLayoutVersion(Sema &S, Decl *D, const ParsedAttr &AL) {
if (!checkUInt32Argument(S, AL, AL.getArgAsExpr(0), Version))
return;
// The attribute expects a "major" version number like 19, but new versions of
// MSVC have moved to updating the "minor", or less significant numbers, so we
// have to multiply by 100 now.
Version *= 100;
// TODO: Investigate what happens with the next major version of MSVC.
if (Version != LangOptions::MSVC2015) {
if (Version != LangOptions::MSVC2015 / 100) {
S.Diag(AL.getLoc(), diag::err_attribute_argument_out_of_bounds)
<< AL << Version << VersionExpr->getSourceRange();
return;
}
// The attribute expects a "major" version number like 19, but new versions of
// MSVC have moved to updating the "minor", or less significant numbers, so we
// have to multiply by 100 now.
Version *= 100;
D->addAttr(::new (S.Context)
LayoutVersionAttr(AL.getRange(), S.Context, Version,
AL.getAttributeSpellingListIndex()));

42
clang/test/CodeGenCXX/mangle-ms-exception-spec.cpp Normal file
View File

@ -0,0 +1,42 @@
// RUN: %clang_cc1 -std=c++11 -fms-extensions -emit-llvm %s -o - -triple=x86_64-pc-win32 -Wno-noexcept-type -fms-compatibility-version=19.12 | FileCheck %s --check-prefix=CHECK --check-prefix=CXX11
// RUN: %clang_cc1 -std=c++17 -fms-extensions -emit-llvm %s -o - -triple=x86_64-pc-win32 | FileCheck %s --check-prefix=CHECK --check-prefix=NOCOMPAT
// RUN: %clang_cc1 -std=c++17 -fms-extensions -emit-llvm %s -o - -triple=x86_64-pc-win32 -fms-compatibility-version=19.12 | FileCheck %s --check-prefix=CHECK --check-prefix=CXX17
// Prove that mangling only changed for noexcept types under /std:C++17, not all noexcept functions
// CHECK-DAG: @"?nochange@@YAXXZ"
void nochange() noexcept {}
// CXX11-DAG: @"?a@@YAXP6AHXZ@Z"
// NOCOMPAT-DAG: @"?a@@YAXP6AHXZ@Z"
// CXX17-DAG: @"?a@@YAXP6AHX_E@Z"
void a(int() noexcept) {}
// CHECK-DAG: @"?b@@YAXP6AHXZ@Z"
void b(int() noexcept(false)) {}
// CXX11-DAG: @"?c@@YAXP6AHXZ@Z"
// NOCOMPAT-DAG: @"?c@@YAXP6AHXZ@Z"
// CXX17-DAG: @"?c@@YAXP6AHX_E@Z"
void c(int() noexcept(true)) {}
// CHECK-DAG: @"?d@@YAXP6AHXZ@Z"
void d(int()) {}
template <typename T>
class e;
template <typename T, typename... U>
class e<T(U...) noexcept> {
// CXX11-DAG: @"?ee@?$e@$$A6AXXZ@@EEAAXXZ"
// NOCOMPAT-DAG: @"?ee@?$e@$$A6AXXZ@@EEAAXXZ"
// CXX17-DAG: @"?ee@?$e@$$A6AXX_E@@EEAAXXZ"
virtual T ee(U &&...) noexcept {};
};
e<void() noexcept> e1;
template <typename T>
class f;
template <typename T, typename... U>
class f<T(U...)> {
// CHECK-DAG: @"?ff@?$f@$$A6AXXZ@@EEAAXXZ"
virtual T ff(U &&...) noexcept {};
};
f<void()> f1;