From 5b5d21ea1aac8ca59905be31e76ccf9b912a8d5c Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Wed, 12 Mar 2014 23:36:42 +0000
Subject: 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
---
 clang/lib/Lex/ModuleMap.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'clang/lib/Lex/ModuleMap.cpp')

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);
       }
-- 
cgit v1.2.3