commit c0b07286cf9d303958d2d21c0548403086c87e36
author Douglas Gregor <dgregor@apple.com> Tue Sep 27 22:38:19 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Tue Sep 27 22:38:19 2011 +0000
tree f7620d339f3b00c699e65fd82972cfde71c93b13
parent ac8dbf0fc70ca56fa6c7bda4e9b76323102ba65a

When 'bool' is not a built-in type but is defined as a macro, print
'bool' rather than '_Bool' within types, to make things a bit more
readable. Fixes <rdar://problem/10063263>.

llvm-svn: 140650

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index fa0ebc8..9a9c95a 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -231,11 +231,11 @@
     BlockDescriptorExtendedType(0), cudaConfigureCallDecl(0),
     NullTypeSourceInfo(QualType()),
     SourceMgr(SM), LangOpts(LOpts), 
-    AddrSpaceMap(0), Target(t),
+    AddrSpaceMap(0), Target(t), PrintingPolicy(LOpts),
     Idents(idents), Selectors(sels),
     BuiltinInfo(builtins),
     DeclarationNames(*this),
-    ExternalSource(0), Listener(0), PrintingPolicy(LOpts),
+    ExternalSource(0), Listener(0),
     LastSDM(0, 0),
     UniqueBlockByRefTypeID(0) 
 {
@@ -4385,7 +4385,7 @@
           = TemplateSpecializationType::PrintTemplateArgumentList(
                                             TemplateArgs.data(),
                                             TemplateArgs.size(),
-                                            (*this).PrintingPolicy);
+                                            (*this).getPrintingPolicy());
 
         S += TemplateArgsStr;
       }
@@ -6475,6 +6475,12 @@
 
 CXXABI::~CXXABI() {}
 
+PrintingPolicy ASTContext::getPrintingPolicy() const {
+  PrintingPolicy.Bool 
+    = LangOpts.Bool || Idents.get("bool").hasMacroDefinition();
+  return PrintingPolicy;
+}
+
 size_t ASTContext::getSideTableAllocatedMemory() const {
   return ASTRecordLayouts.getMemorySize()
     + llvm::capacity_in_bytes(ObjCLayouts)