nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Downgrade bogus ExtWarn on duplicate 'friend' specifier to a Warning, and add a

Browse Source 
Warning for a duplicate 'constexpr' specifier.

llvm-svn: 198956
This commit is contained in:
Richard Smith
2014-01-10 21:27:55 +00:00
parent 78dcc03c37
commit c0a5d5bc4f
3 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/Sema/DeclSpec.cpp
View File

@@ -827,7 +827,12 @@ bool DeclSpec::SetFriendSpec(SourceLocation Loc, const char *&PrevSpec,
unsigned &DiagID) {
if (Friend_specified) {
PrevSpec = "friend";
DiagID = diag::ext_duplicate_declspec;
// Keep the later location, so that we can later diagnose ill-formed
// declarations like 'friend class X friend;'. Per [class.friend]p3,
// 'friend' must be the first token in a friend declaration that is
// not a function declaration.
FriendLoc = Loc;
DiagID = diag::warn_duplicate_declspec;
return true;
}
@@ -850,7 +855,13 @@ bool DeclSpec::setModulePrivateSpec(SourceLocation Loc, const char *&PrevSpec,
bool DeclSpec::SetConstexprSpec(SourceLocation Loc, const char *&PrevSpec,
unsigned &DiagID) {
// 'constexpr constexpr' is ok.
// 'constexpr constexpr' is ok, but warn as this is likely not what the user
// intended.
if (Constexpr_specified) {
DiagID = diag::warn_duplicate_declspec;
PrevSpec = "constexpr";
return true;
}
Constexpr_specified = true;
ConstexprLoc = Loc;
return false;