replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing a typo, updating the diagnostic wording and logic based on post-commit review feedback. Amends r206186. 

llvm-svn: 206229
This commit is contained in:
Aaron Ballman 2014-04-15 00:36:39 +00:00
parent f9b61e6afd
commit ef5d94caf0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/DiagnosticParseKinds.td
View File

@ -527,8 +527,8 @@ def warn_cxx98_compat_attribute : Warning<
InGroup<CXX98Compat>, DefaultIgnore;
def err_cxx11_attribute_forbids_arguments : Error<
"attribute %0 cannot have an argument list">;
def err_attribute_requires_arguements : Error<
"attribute %0 requires a nonempty argument list">;
def err_attribute_requires_arguments : Error<
"parentheses must be omitted if %0 attribute's argument list is empty">;
def err_cxx11_attribute_forbids_ellipsis : Error<
"attribute '%0' cannot be used as an attribute pack">;
def err_cxx11_attribute_repeated : Error<

2
clang/lib/Parse/ParseDecl.cpp
View File

@ -517,7 +517,7 @@ bool Parser::ParseMicrosoftDeclSpecArgs(IdentifierInfo *AttrName,
// arguments but none were provided, emit a diagnostic.
const AttributeList *Attr = Attrs.getList();
if (Attr && Attr->getMaxArgs() && !NumArgs) {
Diag(OpenParenLoc, diag::err_attribute_requires_arguements) << AttrName;
Diag(OpenParenLoc, diag::err_attribute_requires_arguments) << AttrName;
return false;
}
return true;

10
clang/lib/Parse/ParseDeclCXX.cpp
View File

@ -3254,12 +3254,12 @@ bool Parser::ParseCXX11AttributeArgs(IdentifierInfo *AttrName,
// parsing an argument list, we need to determine whether this attribute
// was allowed to have an argument list (such as [[deprecated]]), and how
// many arguments were parsed (so we can diagnose on [[deprecated()]]).
if (Attr->getMaxArgs() && !NumArgs) {
// The attribute was allowed to have arguments, but none were provided
// even though the attribute parsed successfully. This is an error.
Diag(LParenLoc, diag::err_attribute_requires_arguements) << AttrName;
if (!NumArgs) {
// Diagnose an empty argument list when parenthesis are present.
// FIXME: This is a good place for a fixit which removes the parens.
Diag(LParenLoc, diag::err_attribute_requires_arguments) << AttrName;
return false;
} else if (!Attr->getMaxArgs()) {
} else if (NumArgs && !Attr->getMaxArgs()) {
// The attribute parsed successfully, but was not allowed to have any
// arguments. It doesn't matter whether any were provided -- the
// presence of the argument list (even if empty) is diagnosed.

2
clang/test/Parser/MicrosoftExtensions.c
View File

@ -104,7 +104,7 @@ struct __declspec("testing") S3 {}; /* expected-warning {{__declspec attribute '
/* declspecs with arguments cannot have an empty argument list, even if the
arguments are optional. */
__declspec(deprecated()) void dep_func_test(void); /* expected-error {{attribute 'deprecated' requires a nonempty argument list}} */
__declspec(deprecated()) void dep_func_test(void); /* expected-error {{parentheses must be omitted if 'deprecated' attribute's argument list is empty}} */
__declspec(deprecated) void dep_func_test2(void);
__declspec(deprecated("")) void dep_func_test3(void);

2
clang/test/Parser/cxx0x-attributes.cpp
View File

@ -326,6 +326,6 @@ namespace GccASan {
namespace {
[[deprecated]] void bar();
[[deprecated("hello")]] void baz();
[[deprecated()]] void foo(); // expected-error {{attribute 'deprecated' requires a nonempty argument list}}
[[deprecated()]] void foo(); // expected-error {{parentheses must be omitted if 'deprecated' attribute's argument list is empty}}
[[gnu::deprecated()]] void quux();
}