[cfe-commits] r145372 - in /cfe/trunk: include/clang/Basic/DiagnosticParseKinds.td lib/Parse/ParseDecl.cpp lib/Parse/ParseTemplate.cpp test/FixIt/fixit-cxx0x.cpp test/FixIt/fixit.c test/FixIt/fixit.cpp test/SemaCXX/typedef-redecl.cpp
Richard Smith
richard-llvm at metafoo.co.uk
Mon Nov 28 21:27:40 PST 2011
Author: rsmith
Date: Mon Nov 28 23:27:40 2011
New Revision: 145372
URL: http://llvm.org/viewvc/llvm-project?rev=145372&view=rev
Log:
PR10101: Recover better from a common copy-paste error: if a function
declaration at namespace scope is followed by a semicolon and an open-brace
(or in C++, a 'try', ':' or '='), then the error is probably a function
definition with a spurious ';', rather than a mysterious '{'.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
cfe/trunk/lib/Parse/ParseDecl.cpp
cfe/trunk/lib/Parse/ParseTemplate.cpp
cfe/trunk/test/FixIt/fixit-cxx0x.cpp
cfe/trunk/test/FixIt/fixit.c
cfe/trunk/test/FixIt/fixit.cpp
cfe/trunk/test/SemaCXX/typedef-redecl.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=145372&r1=145371&r2=145372&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Mon Nov 28 23:27:40 2011
@@ -138,6 +138,8 @@
"expected ';' at end of declaration list">;
def err_expected_member_name_or_semi : Error<
"expected member name or ';' after declaration specifiers">;
+def err_stray_semi_function_definition : Error<
+ "stray ';' in function definition">;
def err_function_declared_typedef : Error<
"function definition declared 'typedef'">;
def err_iboutletcollection_builtintype : Error<
Modified: cfe/trunk/lib/Parse/ParseDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=145372&r1=145371&r2=145372&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseDecl.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDecl.cpp Mon Nov 28 23:27:40 2011
@@ -1041,13 +1041,28 @@
return DeclGroupPtrTy();
}
+ // Do we have a stray semicolon in the middle of a function definition?
+ if (AllowFunctionDefinitions && D.isFunctionDeclarator() &&
+ Tok.is(tok::semi) && Context == Declarator::FileContext) {
+ const Token &Next = NextToken();
+ if (Next.is(tok::l_brace) || Next.is(tok::kw_try) ||
+ (getLang().CPlusPlus &&
+ (Next.is(tok::colon) || Next.is(tok::equal)))) {
+ // Pretend we didn't see the semicolon.
+ SourceLocation SemiLoc = ConsumeToken();
+ Diag(SemiLoc, diag::err_stray_semi_function_definition)
+ << FixItHint::CreateRemoval(SemiLoc);
+ assert(isStartOfFunctionDefinition(D) && "expected a function defn");
+ }
+ }
+
// Check to see if we have a function *definition* which must have a body.
if (AllowFunctionDefinitions && D.isFunctionDeclarator() &&
// Look at the next token to make sure that this isn't a function
// declaration. We have to check this because __attribute__ might be the
// start of a function definition in GCC-extended K&R C.
!isDeclarationAfterDeclarator()) {
-
+
if (isStartOfFunctionDefinition(D)) {
if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) {
Diag(Tok, diag::err_function_declared_typedef);
Modified: cfe/trunk/lib/Parse/ParseTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseTemplate.cpp?rev=145372&r1=145371&r2=145372&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseTemplate.cpp (original)
+++ cfe/trunk/lib/Parse/ParseTemplate.cpp Mon Nov 28 23:27:40 2011
@@ -240,6 +240,20 @@
return 0;
}
+ // Check for a stray semicolon in a function definition.
+ if (DeclaratorInfo.isFunctionDeclarator() && Tok.is(tok::semi) &&
+ Context == Declarator::FileContext) {
+ const Token &Next = NextToken();
+ if (Next.is(tok::l_brace) || Next.is(tok::kw_try) ||
+ Next.is(tok::equal) || Next.is(tok::colon)) {
+ SourceLocation SemiLoc = ConsumeToken();
+ Diag(SemiLoc, diag::err_stray_semi_function_definition)
+ << FixItHint::CreateRemoval(SemiLoc);
+ assert(!isDeclarationAfterDeclarator() &&
+ isStartOfFunctionDefinition(DeclaratorInfo));
+ }
+ }
+
// If we have a declaration or declarator list, handle it.
if (isDeclarationAfterDeclarator()) {
// Parse this declaration.
@@ -264,16 +278,8 @@
if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) {
Diag(Tok, diag::err_function_declared_typedef);
- if (Tok.is(tok::l_brace)) {
- // This recovery skips the entire function body. It would be nice
- // to simply call ParseFunctionDefinition() below, however Sema
- // assumes the declarator represents a function, not a typedef.
- ConsumeBrace();
- SkipUntil(tok::r_brace, true);
- } else {
- SkipUntil(tok::semi);
- }
- return 0;
+ // Recover by ignoring the 'typedef'.
+ DS.ClearStorageClassSpecs();
}
return ParseFunctionDefinition(DeclaratorInfo, TemplateInfo);
}
Modified: cfe/trunk/test/FixIt/fixit-cxx0x.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-cxx0x.cpp?rev=145372&r1=145371&r2=145372&view=diff
==============================================================================
--- cfe/trunk/test/FixIt/fixit-cxx0x.cpp (original)
+++ cfe/trunk/test/FixIt/fixit-cxx0x.cpp Mon Nov 28 23:27:40 2011
@@ -58,3 +58,26 @@
n [[]], // expected-error {{expected ';' at end of declaration}}
int o;
}
+
+int extraSemi(); // expected-error {{stray ';' in function definition}}
+ = delete;
+
+class ExtraSemi {
+public:
+ ExtraSemi();
+ ExtraSemi(const ExtraSemi &);
+ int n;
+};
+ExtraSemi::ExtraSemi(); // expected-error {{stray ';'}}
+ : n(0) {
+}
+ExtraSemi::ExtraSemi(const ExtraSemi &); // expected-error {{stray ';'}}
+ = default;
+
+template<typename T> T extraSemi(T t);
+
+template<typename T> T extraSemi(T t); // expected-error {{stray ';'}}
+{
+ return t;
+}
+template int extraSemi(int);
Modified: cfe/trunk/test/FixIt/fixit.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.c?rev=145372&r1=145371&r2=145372&view=diff
==============================================================================
--- cfe/trunk/test/FixIt/fixit.c (original)
+++ cfe/trunk/test/FixIt/fixit.c Mon Nov 28 23:27:40 2011
@@ -77,3 +77,11 @@
static int b[] = { 3, 4, 5 },
&a == &b ? oopsMoreCommas() : removeUnusedLabels(a[0]);
}
+
+void extraSemicolon();
+{
+ void extraSemicolon();
+ {
+ return;
+ }
+}
Modified: cfe/trunk/test/FixIt/fixit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.cpp?rev=145372&r1=145371&r2=145372&view=diff
==============================================================================
--- cfe/trunk/test/FixIt/fixit.cpp (original)
+++ cfe/trunk/test/FixIt/fixit.cpp Mon Nov 28 23:27:40 2011
@@ -125,3 +125,13 @@
AD ad, // expected-error {{expected ';' at end of declaration}}
return ad;
}
+
+int extraSemi1(); // expected-error {{stray ';' in function definition}}
+{
+ return 0;
+}
+
+int extraSemi2(); // expected-error {{stray ';' in function definition}}
+try {
+} catch (...) {
+}
Modified: cfe/trunk/test/SemaCXX/typedef-redecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/typedef-redecl.cpp?rev=145372&r1=145371&r2=145372&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/typedef-redecl.cpp (original)
+++ cfe/trunk/test/SemaCXX/typedef-redecl.cpp Mon Nov 28 23:27:40 2011
@@ -54,3 +54,8 @@
typedef int operator! (A); // expected-error{{typedef name must be an identifier}}
int i = !A(); // expected-error{{invalid argument type}}
}
+
+template<typename T>
+typedef T f(T t) { return t; } // expected-error {{function definition declared 'typedef'}}
+int k = f(0);
+int k2 = k;
More information about the cfe-commits
mailing list