Author: dgregor
Date: Fri Jan 4 12:58:28 2013
New Revision: 171497
URL: http://llvm.org/viewvc/llvm-project?rev=171497&view=rev
Log:
Add the module name to the 'incomplete umbrella header' warning.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
cfe/trunk/lib/Lex/PPLexerChange.cpp
cfe/trunk/test/Modules/build-fail-notes.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td?rev=171497&r1=171496&r2=171497&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td Fri Jan 4 12:58:28 2013
@@ -521,7 +521,8 @@
"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">;
Modified: cfe/trunk/lib/Lex/PPLexerChange.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPLexerChange.cpp?rev=171497&r1=171496&r2=171497&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPLexerChange.cpp (original)
+++ cfe/trunk/lib/Lex/PPLexerChange.cpp Fri Jan 4 12:58:28 2013
@@ -395,7 +395,7 @@
SmallString<128> RelativePath;
computeRelativePath(FileMgr, Dir, Header, RelativePath);
Diag(StartLoc, diag::warn_uncovered_module_header)
- << RelativePath;
+ << Mod->getFullModuleName() << RelativePath;
}
}
}
Modified: cfe/trunk/test/Modules/build-fail-notes.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/build-fail-notes.m?rev=171497&r1=171496&r2=171497&view=diff
==============================================================================
--- cfe/trunk/test/Modules/build-fail-notes.m (original)
+++ cfe/trunk/test/Modules/build-fail-notes.m Fri Jan 4 12:58:28 2013
@@ -25,7 +25,7 @@
// 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
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
