From 55a9637969260ca7eb66011732094b33f049c52a Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Thu, 3 Mar 2011 16:52:29 +0000 Subject: [PATCH] Removed left brace location from LinkageSpecDecl. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126945 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/DeclCXX.h | 9 ++------- lib/AST/DeclCXX.cpp | 3 +-- lib/Sema/SemaDeclCXX.cpp | 3 +-- lib/Serialization/ASTReaderDecl.cpp | 3 +-- lib/Serialization/ASTWriterDecl.cpp | 1 - 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h index 499f3c822c..302aac739f 100644 --- a/include/clang/AST/DeclCXX.h +++ b/include/clang/AST/DeclCXX.h @@ -1711,20 +1711,17 @@ private: /// Language - The language for this linkage specification. LanguageIDs Language; - /// LBraceLoc - The source location for the left brace (if valid). - SourceLocation LBraceLoc; /// RBraceLoc - The source location for the right brace (if valid). SourceLocation RBraceLoc; LinkageSpecDecl(DeclContext *DC, SourceLocation L, LanguageIDs lang, - SourceLocation LBLoc, SourceLocation RBLoc) + SourceLocation RBLoc) : Decl(LinkageSpec, DC, L), DeclContext(LinkageSpec), - Language(lang), LBraceLoc(LBLoc), RBraceLoc(RBLoc) { } + Language(lang), RBraceLoc(RBLoc) { } public: static LinkageSpecDecl *Create(ASTContext &C, DeclContext *DC, SourceLocation L, LanguageIDs Lang, - SourceLocation LBraceLoc, SourceLocation RBraceLoc = SourceLocation()); /// \brief Return the language specified by this linkage specification. @@ -1736,9 +1733,7 @@ public: /// \brief Determines whether this linkage specification had braces in /// its syntactic form. bool hasBraces() const { return RBraceLoc.isValid(); } - SourceLocation getLBraceLoc() const { return LBraceLoc; } SourceLocation getRBraceLoc() const { return RBraceLoc; } - void setLBraceLoc(SourceLocation L) { LBraceLoc = L; } void setRBraceLoc(SourceLocation L) { RBraceLoc = L; } SourceLocation getLocEnd() const { diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index 8bd0ae7611..b6cba0a04c 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -1271,9 +1271,8 @@ LinkageSpecDecl *LinkageSpecDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L, LanguageIDs Lang, - SourceLocation LBraceLoc, SourceLocation RBraceLoc) { - return new (C) LinkageSpecDecl(DC, L, Lang, LBraceLoc, RBraceLoc); + return new (C) LinkageSpecDecl(DC, L, Lang, RBraceLoc); } UsingDirectiveDecl *UsingDirectiveDecl::Create(ASTContext &C, DeclContext *DC, diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 82cf031c69..45105a14ec 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -6575,8 +6575,7 @@ Decl *Sema::ActOnStartLinkageSpecification(Scope *S, SourceLocation ExternLoc, // FIXME: Add all the various semantics of linkage specifications LinkageSpecDecl *D = LinkageSpecDecl::Create(Context, CurContext, - LangLoc, Language, - LBraceLoc); + LangLoc, Language); CurContext->addDecl(D); PushDeclContext(S, D); return D; diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp index 8f1d9a5395..2b690310fe 100644 --- a/lib/Serialization/ASTReaderDecl.cpp +++ b/lib/Serialization/ASTReaderDecl.cpp @@ -721,7 +721,6 @@ void ASTDeclReader::VisitBlockDecl(BlockDecl *BD) { void ASTDeclReader::VisitLinkageSpecDecl(LinkageSpecDecl *D) { VisitDecl(D); D->setLanguage((LinkageSpecDecl::LanguageIDs)Record[Idx++]); - D->setLBraceLoc(ReadSourceLocation(Record, Idx)); D->setRBraceLoc(ReadSourceLocation(Record, Idx)); } @@ -1419,7 +1418,7 @@ Decl *ASTReader::ReadDeclRecord(unsigned Index, DeclID ID) { case DECL_LINKAGE_SPEC: D = LinkageSpecDecl::Create(*Context, 0, SourceLocation(), (LinkageSpecDecl::LanguageIDs)0, - SourceLocation(), SourceLocation()); + SourceLocation()); break; case DECL_LABEL: D = LabelDecl::Create(*Context, 0, SourceLocation(), 0); diff --git a/lib/Serialization/ASTWriterDecl.cpp b/lib/Serialization/ASTWriterDecl.cpp index bfd343a7d4..7c0c15cb00 100644 --- a/lib/Serialization/ASTWriterDecl.cpp +++ b/lib/Serialization/ASTWriterDecl.cpp @@ -647,7 +647,6 @@ void ASTDeclWriter::VisitBlockDecl(BlockDecl *D) { void ASTDeclWriter::VisitLinkageSpecDecl(LinkageSpecDecl *D) { VisitDecl(D); Record.push_back(D->getLanguage()); - Writer.AddSourceLocation(D->getLBraceLoc(), Record); Writer.AddSourceLocation(D->getRBraceLoc(), Record); Code = serialization::DECL_LINKAGE_SPEC; } -- 2.40.0