diff options
author | Jordan Rose <jordan_rose@apple.com> | 2012-06-06 17:25:21 +0000 |
---|---|---|
committer | Jordan Rose <jordan_rose@apple.com> | 2012-06-06 17:25:21 +0000 |
commit | d73ef135ba029db59c0b5649e6117845d9e39600 (patch) | |
tree | 4e353271c446576ebfa70b18525f90ad68fa372c /lib/Parse/ParseAST.cpp | |
parent | a08e7bc74b5635995fc50009f240dd3feb1999e2 (diff) |
Add pedantic warning -Wempty-translation-unit (C11 6.9p1).
In standard C since C89, a 'translation-unit' is syntactically defined to have
at least one "external-declaration", which is either a decl or a function
definition. In Clang the latter gives us a declaration as well.
The tricky bit about this warning is that our predefines can contain external
declarations (__builtin_va_list and the 128-bit integer types). Therefore our
AST parser now makes sure we have at least one declaration that doesn't come
from the predefines buffer.
Also, remove bogus warning about empty source files. This doesn't catch source
files that only contain comments, and never fired anyway because of our
predefines.
PR12665 and <rdar://problem/9165548>
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158085 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseAST.cpp')
-rw-r--r-- | lib/Parse/ParseAST.cpp | 54 |
1 files changed, 39 insertions, 15 deletions
diff --git a/lib/Parse/ParseAST.cpp b/lib/Parse/ParseAST.cpp index d1c2624f8c..3f86c4d2c8 100644 --- a/lib/Parse/ParseAST.cpp +++ b/lib/Parse/ParseAST.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "clang/Parse/ParseAST.h" +#include "clang/Parse/ParseDiagnostic.h" #include "clang/Sema/Sema.h" #include "clang/Sema/CodeCompleteConsumer.h" #include "clang/Sema/SemaConsumer.h" @@ -77,27 +78,50 @@ void clang::ParseAST(Sema &S, bool PrintStats, bool SkipFunctionBodies) { S.getPreprocessor().EnterMainSourceFile(); P.Initialize(); S.Initialize(); - - if (ExternalASTSource *External = S.getASTContext().getExternalSource()) + + // C11 6.9p1 says translation units must have at least one top-level + // declaration. C++ doesn't have this restriction. We also don't want to + // complain if we have a precompiled header, although technically if the PCH + // is empty we should still emit the (pedantic) diagnostic. + bool WarnForEmptyTU = !S.getLangOpts().CPlusPlus; + if (ExternalASTSource *External = S.getASTContext().getExternalSource()) { External->StartTranslationUnit(Consumer); - - bool Abort = false; + WarnForEmptyTU = false; + } + + // Clang's predefines contain top-level declarations for things like va_list, + // making it hard to tell if the /user's/ translation unit has at least one + // top-level declaration. So we parse cautiously, looking for a declaration + // that doesn't come from our predefines. + // Note that ParseTopLevelDecl returns 'true' at EOF. + SourceManager &SM = S.getSourceManager(); Parser::DeclGroupPtrTy ADecl; - - while (!P.ParseTopLevelDecl(ADecl)) { // Not end of file. - // If we got a null return and something *was* parsed, ignore it. This - // is due to a top-level semicolon, an action override, or a parse error - // skipping something. + while (WarnForEmptyTU && !P.ParseTopLevelDecl(ADecl)) { if (ADecl) { - if (!Consumer->HandleTopLevelDecl(ADecl.get())) { - Abort = true; - break; + if (!Consumer->HandleTopLevelDecl(ADecl.get())) + return; + if (DeclGroupRef::iterator FirstDecl = ADecl.get().begin()) { + SourceLocation DeclLoc = (*FirstDecl)->getLocation(); + WarnForEmptyTU = SM.isFromPredefines(DeclLoc); } } - }; + } - if (Abort) - return; + // If we ended up seeing EOF before any top-level declarations, emit our + // diagnostic. Otherwise, parse the rest of the file normally. + if (WarnForEmptyTU) { + P.Diag(diag::ext_empty_translation_unit); + } else { + while (!P.ParseTopLevelDecl(ADecl)) { // Not end of file. + // If we got a null return and something *was* parsed, ignore it. This + // is due to a top-level semicolon, an action override, or a parse error + // skipping something. + if (ADecl) { + if (!Consumer->HandleTopLevelDecl(ADecl.get())) + return; + } + }; + } // Process any TopLevelDecls generated by #pragma weak. for (SmallVector<Decl*,2>::iterator |