diff options
| author | Douglas Gregor <dgregor@apple.com> | 2013-01-04 18:58:28 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2013-01-04 18:58:28 +0000 |
| commit | 8f1f3331dc00833ea74359ec39cc46c31de5f166 (patch) | |
| tree | b14c353b8a89cea1692c3be9823d6f1d96a162df | |
| parent | f6e6655f372b16bd72b886f2d9a3520fcbb57582 (diff) | |
| download | bcm5719-llvm-8f1f3331dc00833ea74359ec39cc46c31de5f166.tar.gz bcm5719-llvm-8f1f3331dc00833ea74359ec39cc46c31de5f166.zip | |
Add the module name to the 'incomplete umbrella header' warning.
llvm-svn: 171497
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticLexKinds.td | 3 | ||||
| -rw-r--r-- | clang/lib/Lex/PPLexerChange.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Modules/build-fail-notes.m | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticLexKinds.td b/clang/include/clang/Basic/DiagnosticLexKinds.td index c6c50ab37b8..dbb5b4e58f9 100644 --- a/clang/include/clang/Basic/DiagnosticLexKinds.td +++ b/clang/include/clang/Basic/DiagnosticLexKinds.td @@ -521,7 +521,8 @@ def warn_auto_module_import : Warning< "treating #%select{include|import|include_next|__include_macros}0 as an " "import of module '%1'">, InGroup<AutoImport>, DefaultIgnore; def warn_uncovered_module_header : Warning< - "umbrella header does not include header '%0'">, InGroup<IncompleteUmbrella>; + "umbrella header for module '%0' does not include header '%1'">, + InGroup<IncompleteUmbrella>; def err_expected_id_building_module : Error< "expected a module name in '__building_module' expression">; diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp index 0ce67dce7e6..be4defe7864 100644 --- a/clang/lib/Lex/PPLexerChange.cpp +++ b/clang/lib/Lex/PPLexerChange.cpp @@ -395,7 +395,7 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) { SmallString<128> RelativePath; computeRelativePath(FileMgr, Dir, Header, RelativePath); Diag(StartLoc, diag::warn_uncovered_module_header) - << RelativePath; + << Mod->getFullModuleName() << RelativePath; } } } diff --git a/clang/test/Modules/build-fail-notes.m b/clang/test/Modules/build-fail-notes.m index 93809daca35..63428ec1929 100644 --- a/clang/test/Modules/build-fail-notes.m +++ b/clang/test/Modules/build-fail-notes.m @@ -25,7 +25,7 @@ extern int Module; // CHECK-SDIAG: build-fail-notes.m:4:9: note: while building module 'DependsOnModule' imported from // CHECK-SDIAG: DependsOnModule.h:1:10: note: while building module 'Module' imported from // CHECK-SDIAG: note: expanded from here -// CHECK-SDIAG: warning: umbrella header does not include header 'NotInModule.h' [-Wincomplete-umbrella] +// CHECK-SDIAG: warning: umbrella header for module 'Module' does not include header 'NotInModule.h' [-Wincomplete-umbrella] // CHECK-SDIAG: DependsOnModule.h:1:10: fatal: could not build module 'Module' // CHECK-SDIAG: build-fail-notes.m:4:9: note: while building module 'DependsOnModule' imported from |
