From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Thu, 12 Mar 2015 14:28:38 +0000 (+0000)
Subject: Use Sema's PrintingPolicy when diagnosing DeclSpecs.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4812148e13cbde16b24adaa261c42bdad52d80b;p=platform%2Fupstream%2Fllvm.git

Use Sema's PrintingPolicy when diagnosing DeclSpecs.

Sema overrides ASTContext's policy on the first emitted diagnostic
(doesn't matter if it's ignored or not). This means changing the order
of diagnostic emission in Sema suddenly changes the text of diagnostic
emitted from the parser.

In the test case -Wmissing-prototypes (ignored) was the culprit, use
'int main' to suppress that warning so we see when this regresses.
Also move it into Sema/ as it's not testing any C++.

llvm-svn: 232039
---

diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index cea5824..b4a7664 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -2569,7 +2569,8 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
   bool EnteringContext = (DSContext == DSC_class || DSContext == DSC_top_level);
   bool AttrsLastTime = false;
   ParsedAttributesWithRange attrs(AttrFactory);
-  const PrintingPolicy &Policy = Actions.getASTContext().getPrintingPolicy();
+  // We use Sema's policy to get bool macros right.
+  const PrintingPolicy &Policy = Actions.getPrintingPolicy();
   while (1) {
     bool isInvalid = false;
     bool isStorageClass = false;
diff --git a/clang/test/SemaCXX/pr9812.c b/clang/test/Sema/pr9812.c
similarity index 94%
rename from clang/test/SemaCXX/pr9812.c
rename to clang/test/Sema/pr9812.c
index cbbe44b..14bc6c8 100644
--- a/clang/test/SemaCXX/pr9812.c
+++ b/clang/test/Sema/pr9812.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 
 #define bool _Bool
-int test1(int argc, char** argv)
+int main(int argc, char** argv)
 {
     bool signed;  // expected-error {{'bool' cannot be signed or unsigned}} expected-warning {{declaration does not declare anything}}