Make linkage-specifications hold on to all of their declarations
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61110 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index cce8246..3faf5ac 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -285,6 +285,21 @@
return new (Mem) OverloadedFunctionDecl(DC, N);
}
+LinkageSpecDecl::LinkageSpecDecl(SourceLocation L, LanguageIDs lang,
+ Decl **InDecls, unsigned InNumDecls)
+ : Decl(LinkageSpec, L), Language(lang), HadBraces(true),
+ Decls(0), NumDecls(InNumDecls) {
+ Decl **NewDecls = new Decl*[NumDecls];
+ for (unsigned I = 0; I < NumDecls; ++I)
+ NewDecls[I] = InDecls[I];
+ Decls = NewDecls;
+}
+
+LinkageSpecDecl::~LinkageSpecDecl() {
+ if (HadBraces)
+ delete [] (Decl**)Decls;
+}
+
LinkageSpecDecl *LinkageSpecDecl::Create(ASTContext &C,
SourceLocation L,
LanguageIDs Lang, Decl *D) {
@@ -292,3 +307,20 @@
return new (Mem) LinkageSpecDecl(L, Lang, D);
}
+LinkageSpecDecl *LinkageSpecDecl::Create(ASTContext &C,
+ SourceLocation L,
+ LanguageIDs Lang,
+ Decl **Decls, unsigned NumDecls) {
+ void *Mem = C.getAllocator().Allocate<LinkageSpecDecl>();
+ return new (Mem) LinkageSpecDecl(L, Lang, Decls, NumDecls);
+}
+
+LinkageSpecDecl::decl_const_iterator LinkageSpecDecl::decls_begin() const {
+ if (hasBraces()) return (Decl**)Decls;
+ else return (Decl**)&Decls;
+}
+
+LinkageSpecDecl::decl_iterator LinkageSpecDecl::decls_end() const {
+ if (hasBraces()) return (Decl**)Decls + NumDecls;
+ else return (Decl**)&Decls + 1;
+}
diff --git a/lib/AST/DeclSerialization.cpp b/lib/AST/DeclSerialization.cpp
index c0ffb0c..c853b1b 100644
--- a/lib/AST/DeclSerialization.cpp
+++ b/lib/AST/DeclSerialization.cpp
@@ -660,13 +660,30 @@
void LinkageSpecDecl::EmitInRec(Serializer& S) const {
Decl::EmitInRec(S);
S.EmitInt(getLanguage());
- S.EmitPtr(D);
+ S.EmitBool(HadBraces);
+ if (HadBraces) {
+ S.EmitInt(NumDecls);
+ for (decl_const_iterator D = decls_begin(), DEnd = decls_end();
+ D != DEnd; ++D)
+ S.EmitPtr(*D);
+ } else {
+ S.EmitPtr((Decl*)Decls);
+ }
}
void LinkageSpecDecl::ReadInRec(Deserializer& D, ASTContext& C) {
Decl::ReadInRec(D, C);
Language = static_cast<LanguageIDs>(D.ReadInt());
- D.ReadPtr(this->D);
+ HadBraces = D.ReadBool();
+ if (HadBraces) {
+ NumDecls = D.ReadInt();
+ Decl **NewDecls = new Decl*[NumDecls];
+ Decls = NewDecls;
+ for (unsigned I = 0; I < NumDecls; ++I)
+ D.ReadPtr(NewDecls[I]);
+ } else {
+ D.ReadPtr(this->Decls);
+ }
}
//===----------------------------------------------------------------------===//
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 3771867..ec2a37a 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -108,24 +108,26 @@
SourceLocation Loc = ConsumeStringToken();
DeclTy *D = 0;
- SourceLocation LBrace, RBrace;
if (Tok.isNot(tok::l_brace)) {
D = ParseDeclarationOrFunctionDefinition();
- } else {
- LBrace = ConsumeBrace();
- while (Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof)) {
- // FIXME capture the decls.
- D = ParseExternalDeclaration();
- }
+ if (D)
+ return Actions.ActOnLinkageSpec(Loc, LangBufPtr, StrSize, D);
- RBrace = MatchRHSPunctuation(tok::r_brace, LBrace);
+ return 0;
+ }
+
+ SourceLocation LBrace = ConsumeBrace();
+ llvm::SmallVector<DeclTy *, 8> InnerDecls;
+ while (Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof)) {
+ D = ParseExternalDeclaration();
+ if (D)
+ InnerDecls.push_back(D);
}
- if (!D)
- return 0;
-
- return Actions.ActOnLinkageSpec(Loc, LBrace, RBrace, LangBufPtr, StrSize, D);
+ SourceLocation RBrace = MatchRHSPunctuation(tok::r_brace, LBrace);
+ return Actions.ActOnLinkageSpec(Loc, LBrace, RBrace, LangBufPtr, StrSize,
+ &InnerDecls.front(), InnerDecls.size());
}
/// ParseClassName - Parse a C++ class-name, which names a class. Note
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 3e42280..89d9ebb 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -288,6 +288,9 @@
virtual DeclTy *ActOnFinishFunctionBody(DeclTy *Decl, StmtArg Body);
virtual DeclTy *ActOnLinkageSpec(SourceLocation Loc, SourceLocation LBrace,
SourceLocation RBrace, const char *Lang,
+ unsigned StrSize,
+ DeclTy **Decls, unsigned NumDecls);
+ virtual DeclTy *ActOnLinkageSpec(SourceLocation Loc, const char *Lang,
unsigned StrSize, DeclTy *D);
virtual DeclTy *ActOnFileScopeAsmDecl(SourceLocation Loc, ExprArg expr);
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 81a4abe..b7c8316 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -3382,11 +3382,34 @@
return FileScopeAsmDecl::Create(Context, Loc, AsmString);
}
+ /// ActOnLinkageSpec - Parsed a C++ linkage-specification that
+ /// contained braces. Lang/StrSize contains the language string that
+ /// was parsed at location Loc. Decls/NumDecls provides the
+ /// declarations parsed inside the linkage specification.
Sema::DeclTy* Sema::ActOnLinkageSpec(SourceLocation Loc,
SourceLocation LBrace,
SourceLocation RBrace,
const char *Lang,
unsigned StrSize,
+ DeclTy **Decls, unsigned NumDecls) {
+ LinkageSpecDecl::LanguageIDs Language;
+ if (strncmp(Lang, "\"C\"", StrSize) == 0)
+ Language = LinkageSpecDecl::lang_c;
+ else if (strncmp(Lang, "\"C++\"", StrSize) == 0)
+ Language = LinkageSpecDecl::lang_cxx;
+ else {
+ Diag(Loc, diag::err_bad_language);
+ return 0;
+ }
+
+ // FIXME: Add all the various semantics of linkage specifications
+
+ return LinkageSpecDecl::Create(Context, Loc, Language,
+ (Decl **)Decls, NumDecls);
+}
+
+Sema::DeclTy* Sema::ActOnLinkageSpec(SourceLocation Loc,
+ const char *Lang, unsigned StrSize,
DeclTy *D) {
LinkageSpecDecl::LanguageIDs Language;
Decl *dcl = static_cast<Decl *>(D);