# HG changeset patch
# User Miyagi Mitsuki <e135756@ie.u-ryukyu.ac.jp>
# Date 1453959156 -32400
# Node ID 76d4b0e4470975d19a74ee992fc34183096420ea
# Parent  57be027de0f49405de465f62353e0ece88c916e7
LLVM 3.9

diff -r 57be027de0f4 -r 76d4b0e44709 tools/clang/lib/Parse/ParseCbC.cpp
--- a/tools/clang/lib/Parse/ParseCbC.cpp	Tue Jan 26 23:17:11 2016 +0900
+++ b/tools/clang/lib/Parse/ParseCbC.cpp	Thu Jan 28 14:32:36 2016 +0900
@@ -3,7 +3,6 @@
 #include "clang/Parse/Parser.h"
 #include "RAIIObjectsForParser.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/PrettyStackTrace.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Sema/DeclSpec.h"
@@ -12,6 +11,7 @@
 #include "clang/Sema/Lookup.h"
 #include "clang/Lex/LiteralSupport.h"
 #include "clang/AST/ASTConsumer.h"
+#include "clang/Sema/SemaDiagnostic.h"
 
 #include <sstream>
 #include <string>
@@ -280,7 +280,7 @@
     D.setGroupingParens(true);
     D.SetRangeEnd(Loc);
     DeclSpec FDS(AttrFactory);
-    DS.Finish(Diags, PP, Policy);
+    DS.Finish(Actions, Policy);
     
     D.AddTypeInfo(DeclaratorChunk::getPointer(FDS.getTypeQualifiers(), Loc, FDS.getConstSpecLoc(), FDS.getVolatileSpecLoc(),
                                               FDS.getRestrictSpecLoc(), DS.getAtomicSpecLoc()), FDS.getAttributes(), SourceLocation());
@@ -545,7 +545,7 @@
   DeclaratorInfo.D.setCommaLoc(CommaLoc);
   DeclaratorInfo.D.SetRangeEnd(Loc);
   DeclSpec DS(AttrFactory);
-  DS.Finish(Diags, PP, Policy);
+  DS.Finish(Actions, Policy);
   DeclaratorInfo.D.SetIdentifier(CreateIdentifierInfo(Name, Loc),Loc);
 
   DeclaratorInfo.D.AddTypeInfo(DeclaratorChunk::getPointer(DS.getTypeQualifiers(), Loc,DS.getConstSpecLoc(),
@@ -679,7 +679,7 @@
   Declarator envDInfo(envDS, Declarator::TypeNameContext);
   envDInfo.SetRangeEnd(Loc);
   DeclSpec starDS(AttrFactory);
-  starDS.Finish(Diags, PP, Policy);
+  starDS.Finish(Actions, Policy);
   envDInfo.SetIdentifier(0,Loc);
   envDInfo.AddTypeInfo(DeclaratorChunk::getPointer(starDS.getTypeQualifiers(), Loc,
                                                    starDS.getConstSpecLoc(),
@@ -723,7 +723,7 @@
   Declarator ljD(ljDS, Declarator::TypeNameContext);
   ljD.SetRangeEnd(Loc);
   DeclSpec starDS2(AttrFactory);
-  starDS2.Finish(Diags, PP, Policy);
+  starDS2.Finish(Actions, Policy);
   ljD.ExtendWithDeclSpec(starDS2);
   ljD.SetIdentifier(0, Loc);
   ljD.AddTypeInfo(DeclaratorChunk::getPointer(ljDS.getTypeQualifiers(), Loc,
@@ -806,7 +806,7 @@
   ParamDeclarator.SetIdentifier(II, Loc);
   for(int i = 0;i<pointerNum; i++){
     DeclSpec pointerDS(AttrFactory);
-    pointerDS.Finish(Diags, PP, Policy);
+    pointerDS.Finish(Actions, Policy);
     ParamDeclarator.AddTypeInfo(DeclaratorChunk::getPointer(pointerDS.getTypeQualifiers(), Loc,
                                                             pointerDS.getConstSpecLoc(),
                                                             pointerDS.getVolatileSpecLoc(),
@@ -865,7 +865,7 @@
   else
     isInvalid = DS->SetTypeSpecType(T, Loc, PrevSpec, DiagID, Policy);
   
-  DS->Finish(Diags, PP, Policy);
+  DS->Finish(Actions, Policy);
   if (isInvalid) {
     assert(PrevSpec && "Method did not return previous specifier!");
     assert(DiagID);
@@ -907,7 +907,7 @@
   Token TokAfterGoto = Tok;
   Stmtsp = &Stmts;
   
-  gotoRes = ParseStatementOrDeclaration(Stmts, false);
+  gotoRes = ParseStatementOrDeclaration(Stmts, ACK_Any);
 
   if (gotoRes.get() == NULL)
     return StmtError();