summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex/ModuleMap.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2014-03-12 23:36:42 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2014-03-12 23:36:42 +0000
commit5b5d21ea1aac8ca59905be31e76ccf9b912a8d5c (patch)
tree87b04152250e9251f4bbc97dcbe1622b783f74dd /clang/lib/Lex/ModuleMap.cpp
parent34ac9be1d7c60410cec282f0a26f63c2afae19ff (diff)
downloadbcm5719-llvm-5b5d21ea1aac8ca59905be31e76ccf9b912a8d5c.tar.gz
bcm5719-llvm-5b5d21ea1aac8ca59905be31e76ccf9b912a8d5c.zip
Only allow streaming exactly type 'bool' to a DiagnosticBuilder, not anything
that implicitly converts to 'bool' (such as pointers, and the first operand of ?:). Clean up issues found by this. Patch by Stephan Tolksdorf! llvm-svn: 203735
Diffstat (limited to 'clang/lib/Lex/ModuleMap.cpp')
-rw-r--r--clang/lib/Lex/ModuleMap.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index beb0bcbbd3f..d5e8af95fe6 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -1282,7 +1282,8 @@ void ModuleMapParser::parseModuleDecl() {
if (ActiveModule) {
Diags.Report(Id[I].second, diag::err_mmap_missing_module_qualified)
- << Id[I].first << ActiveModule->getTopLevelModule();
+ << Id[I].first
+ << ActiveModule->getTopLevelModule()->getFullModuleName();
} else {
Diags.Report(Id[I].second, diag::err_mmap_expected_module_name);
}
OpenPOWER on IntegriCloud