Parse extern templates, pass that information all the way to Sema,
then drop it on the floor. llvm-svn: 80989
This commit is contained in:
parent
119b0c7185
commit
43e75176ec
|
@ -1749,6 +1749,9 @@ public:
|
||||||
///
|
///
|
||||||
/// \param S the current scope
|
/// \param S the current scope
|
||||||
///
|
///
|
||||||
|
/// \param ExternLoc the location of the 'extern' keyword that specifies that
|
||||||
|
/// this is an extern template (if any).
|
||||||
|
///
|
||||||
/// \param TemplateLoc the location of the 'template' keyword that
|
/// \param TemplateLoc the location of the 'template' keyword that
|
||||||
/// specifies that this is an explicit instantiation.
|
/// specifies that this is an explicit instantiation.
|
||||||
///
|
///
|
||||||
|
@ -1774,7 +1777,9 @@ public:
|
||||||
///
|
///
|
||||||
/// \param Attr attributes that apply to this instantiation.
|
/// \param Attr attributes that apply to this instantiation.
|
||||||
virtual DeclResult
|
virtual DeclResult
|
||||||
ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
ActOnExplicitInstantiation(Scope *S,
|
||||||
|
SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
unsigned TagSpec,
|
unsigned TagSpec,
|
||||||
SourceLocation KWLoc,
|
SourceLocation KWLoc,
|
||||||
const CXXScopeSpec &SS,
|
const CXXScopeSpec &SS,
|
||||||
|
@ -1804,6 +1809,9 @@ public:
|
||||||
///
|
///
|
||||||
/// \param S the current scope
|
/// \param S the current scope
|
||||||
///
|
///
|
||||||
|
/// \param ExternLoc the location of the 'extern' keyword that specifies that
|
||||||
|
/// this is an extern template (if any).
|
||||||
|
///
|
||||||
/// \param TemplateLoc the location of the 'template' keyword that
|
/// \param TemplateLoc the location of the 'template' keyword that
|
||||||
/// specifies that this is an explicit instantiation.
|
/// specifies that this is an explicit instantiation.
|
||||||
///
|
///
|
||||||
|
@ -1829,7 +1837,9 @@ public:
|
||||||
///
|
///
|
||||||
/// \param Attr attributes that apply to this instantiation.
|
/// \param Attr attributes that apply to this instantiation.
|
||||||
virtual DeclResult
|
virtual DeclResult
|
||||||
ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
ActOnExplicitInstantiation(Scope *S,
|
||||||
|
SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
unsigned TagSpec,
|
unsigned TagSpec,
|
||||||
SourceLocation KWLoc,
|
SourceLocation KWLoc,
|
||||||
const CXXScopeSpec &SS,
|
const CXXScopeSpec &SS,
|
||||||
|
|
|
@ -607,9 +607,10 @@ private:
|
||||||
: Kind(isSpecialization? ExplicitSpecialization : Template),
|
: Kind(isSpecialization? ExplicitSpecialization : Template),
|
||||||
TemplateParams(TemplateParams) { }
|
TemplateParams(TemplateParams) { }
|
||||||
|
|
||||||
explicit ParsedTemplateInfo(SourceLocation TemplateLoc)
|
explicit ParsedTemplateInfo(SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc)
|
||||||
: Kind(ExplicitInstantiation), TemplateParams(0),
|
: Kind(ExplicitInstantiation), TemplateParams(0),
|
||||||
TemplateLoc(TemplateLoc) { }
|
ExternLoc(ExternLoc), TemplateLoc(TemplateLoc) { }
|
||||||
|
|
||||||
/// \brief The kind of template we are parsing.
|
/// \brief The kind of template we are parsing.
|
||||||
enum {
|
enum {
|
||||||
|
@ -627,6 +628,10 @@ private:
|
||||||
/// and explicit specializations.
|
/// and explicit specializations.
|
||||||
TemplateParameterLists *TemplateParams;
|
TemplateParameterLists *TemplateParams;
|
||||||
|
|
||||||
|
/// \brief The location of the 'extern' keyword, if any, for an explicit
|
||||||
|
/// instantiation
|
||||||
|
SourceLocation ExternLoc;
|
||||||
|
|
||||||
/// \brief The location of the 'template' keyword, for an explicit
|
/// \brief The location of the 'template' keyword, for an explicit
|
||||||
/// instantiation.
|
/// instantiation.
|
||||||
SourceLocation TemplateLoc;
|
SourceLocation TemplateLoc;
|
||||||
|
@ -1241,7 +1246,8 @@ private:
|
||||||
TemplateArgIsTypeList &TemplateArgIsType,
|
TemplateArgIsTypeList &TemplateArgIsType,
|
||||||
TemplateArgLocationList &TemplateArgLocations);
|
TemplateArgLocationList &TemplateArgLocations);
|
||||||
void *ParseTemplateArgument(bool &ArgIsType);
|
void *ParseTemplateArgument(bool &ArgIsType);
|
||||||
DeclPtrTy ParseExplicitInstantiation(SourceLocation TemplateLoc,
|
DeclPtrTy ParseExplicitInstantiation(SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
SourceLocation &DeclEnd);
|
SourceLocation &DeclEnd);
|
||||||
|
|
||||||
//===--------------------------------------------------------------------===//
|
//===--------------------------------------------------------------------===//
|
||||||
|
|
|
@ -638,6 +638,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind,
|
||||||
// This is an explicit instantiation of a class template.
|
// This is an explicit instantiation of a class template.
|
||||||
TagOrTempResult
|
TagOrTempResult
|
||||||
= Actions.ActOnExplicitInstantiation(CurScope,
|
= Actions.ActOnExplicitInstantiation(CurScope,
|
||||||
|
TemplateInfo.ExternLoc,
|
||||||
TemplateInfo.TemplateLoc,
|
TemplateInfo.TemplateLoc,
|
||||||
TagType,
|
TagType,
|
||||||
StartLoc,
|
StartLoc,
|
||||||
|
@ -734,6 +735,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind,
|
||||||
//
|
//
|
||||||
TagOrTempResult
|
TagOrTempResult
|
||||||
= Actions.ActOnExplicitInstantiation(CurScope,
|
= Actions.ActOnExplicitInstantiation(CurScope,
|
||||||
|
TemplateInfo.ExternLoc,
|
||||||
TemplateInfo.TemplateLoc,
|
TemplateInfo.TemplateLoc,
|
||||||
TagType, StartLoc, SS, Name,
|
TagType, StartLoc, SS, Name,
|
||||||
NameLoc, Attr);
|
NameLoc, Attr);
|
||||||
|
|
|
@ -25,7 +25,8 @@ Parser::ParseDeclarationStartingWithTemplate(unsigned Context,
|
||||||
SourceLocation &DeclEnd,
|
SourceLocation &DeclEnd,
|
||||||
AccessSpecifier AS) {
|
AccessSpecifier AS) {
|
||||||
if (Tok.is(tok::kw_template) && NextToken().isNot(tok::less))
|
if (Tok.is(tok::kw_template) && NextToken().isNot(tok::less))
|
||||||
return ParseExplicitInstantiation(ConsumeToken(), DeclEnd);
|
return ParseExplicitInstantiation(SourceLocation(), ConsumeToken(),
|
||||||
|
DeclEnd);
|
||||||
|
|
||||||
return ParseTemplateDeclarationOrSpecialization(Context, DeclEnd, AS);
|
return ParseTemplateDeclarationOrSpecialization(Context, DeclEnd, AS);
|
||||||
}
|
}
|
||||||
|
@ -186,7 +187,6 @@ Parser::ParseSingleDeclarationAfterTemplate(
|
||||||
|
|
||||||
// Parse the declaration specifiers.
|
// Parse the declaration specifiers.
|
||||||
DeclSpec DS;
|
DeclSpec DS;
|
||||||
// FIXME: Pass TemplateLoc through for explicit template instantiations
|
|
||||||
ParseDeclarationSpecifiers(DS, TemplateInfo, AS);
|
ParseDeclarationSpecifiers(DS, TemplateInfo, AS);
|
||||||
|
|
||||||
if (Tok.is(tok::semi)) {
|
if (Tok.is(tok::semi)) {
|
||||||
|
@ -871,11 +871,15 @@ Parser::ParseTemplateArgumentList(TemplateArgList &TemplateArgs,
|
||||||
/// (C++ [temp.explicit]).
|
/// (C++ [temp.explicit]).
|
||||||
///
|
///
|
||||||
/// explicit-instantiation:
|
/// explicit-instantiation:
|
||||||
/// 'template' declaration
|
/// 'extern' [opt] 'template' declaration
|
||||||
|
///
|
||||||
|
/// Note that the 'extern' is a GNU extension and C++0x feature.
|
||||||
Parser::DeclPtrTy
|
Parser::DeclPtrTy
|
||||||
Parser::ParseExplicitInstantiation(SourceLocation TemplateLoc,
|
Parser::ParseExplicitInstantiation(SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
SourceLocation &DeclEnd) {
|
SourceLocation &DeclEnd) {
|
||||||
return ParseSingleDeclarationAfterTemplate(Declarator::FileContext,
|
return ParseSingleDeclarationAfterTemplate(Declarator::FileContext,
|
||||||
ParsedTemplateInfo(TemplateLoc),
|
ParsedTemplateInfo(ExternLoc,
|
||||||
|
TemplateLoc),
|
||||||
DeclEnd, AS_none);
|
DeclEnd, AS_none);
|
||||||
}
|
}
|
||||||
|
|
|
@ -391,6 +391,7 @@ void Parser::ParseTranslationUnit() {
|
||||||
/// [C++0x] empty-declaration:
|
/// [C++0x] empty-declaration:
|
||||||
/// ';'
|
/// ';'
|
||||||
///
|
///
|
||||||
|
/// [C++0x/GNU] 'extern' 'template' declaration
|
||||||
Parser::DeclGroupPtrTy Parser::ParseExternalDeclaration() {
|
Parser::DeclGroupPtrTy Parser::ParseExternalDeclaration() {
|
||||||
DeclPtrTy SingleDecl;
|
DeclPtrTy SingleDecl;
|
||||||
switch (Tok.getKind()) {
|
switch (Tok.getKind()) {
|
||||||
|
@ -452,6 +453,20 @@ Parser::DeclGroupPtrTy Parser::ParseExternalDeclaration() {
|
||||||
SourceLocation DeclEnd;
|
SourceLocation DeclEnd;
|
||||||
return ParseDeclaration(Declarator::FileContext, DeclEnd);
|
return ParseDeclaration(Declarator::FileContext, DeclEnd);
|
||||||
}
|
}
|
||||||
|
case tok::kw_extern:
|
||||||
|
if (getLang().CPlusPlus && NextToken().is(tok::kw_template)) {
|
||||||
|
// Extern templates
|
||||||
|
SourceLocation ExternLoc = ConsumeToken();
|
||||||
|
SourceLocation TemplateLoc = ConsumeToken();
|
||||||
|
SourceLocation DeclEnd;
|
||||||
|
return Actions.ConvertDeclToDeclGroup(
|
||||||
|
ParseExplicitInstantiation(ExternLoc, TemplateLoc, DeclEnd));
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: Detect C++ linkage specifications here?
|
||||||
|
|
||||||
|
// Fall through to handle other declarations or function definitions.
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// We can't tell whether this is a function-definition or declaration yet.
|
// We can't tell whether this is a function-definition or declaration yet.
|
||||||
return ParseDeclarationOrFunctionDefinition();
|
return ParseDeclarationOrFunctionDefinition();
|
||||||
|
|
|
@ -2454,7 +2454,9 @@ public:
|
||||||
Declarator &D);
|
Declarator &D);
|
||||||
|
|
||||||
virtual DeclResult
|
virtual DeclResult
|
||||||
ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
ActOnExplicitInstantiation(Scope *S,
|
||||||
|
SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
unsigned TagSpec,
|
unsigned TagSpec,
|
||||||
SourceLocation KWLoc,
|
SourceLocation KWLoc,
|
||||||
const CXXScopeSpec &SS,
|
const CXXScopeSpec &SS,
|
||||||
|
@ -2467,7 +2469,9 @@ public:
|
||||||
AttributeList *Attr);
|
AttributeList *Attr);
|
||||||
|
|
||||||
virtual DeclResult
|
virtual DeclResult
|
||||||
ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
ActOnExplicitInstantiation(Scope *S,
|
||||||
|
SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
unsigned TagSpec,
|
unsigned TagSpec,
|
||||||
SourceLocation KWLoc,
|
SourceLocation KWLoc,
|
||||||
const CXXScopeSpec &SS,
|
const CXXScopeSpec &SS,
|
||||||
|
|
|
@ -2849,8 +2849,11 @@ Sema::ActOnStartOfFunctionTemplateDef(Scope *FnBodyScope,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Explicit instantiation of a class template specialization
|
// Explicit instantiation of a class template specialization
|
||||||
|
// FIXME: Implement extern template semantics
|
||||||
Sema::DeclResult
|
Sema::DeclResult
|
||||||
Sema::ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
Sema::ActOnExplicitInstantiation(Scope *S,
|
||||||
|
SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
unsigned TagSpec,
|
unsigned TagSpec,
|
||||||
SourceLocation KWLoc,
|
SourceLocation KWLoc,
|
||||||
const CXXScopeSpec &SS,
|
const CXXScopeSpec &SS,
|
||||||
|
@ -3034,8 +3037,11 @@ Sema::ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Explicit instantiation of a member class of a class template.
|
// Explicit instantiation of a member class of a class template.
|
||||||
|
// FIXME: Implement extern template semantics.
|
||||||
Sema::DeclResult
|
Sema::DeclResult
|
||||||
Sema::ActOnExplicitInstantiation(Scope *S, SourceLocation TemplateLoc,
|
Sema::ActOnExplicitInstantiation(Scope *S,
|
||||||
|
SourceLocation ExternLoc,
|
||||||
|
SourceLocation TemplateLoc,
|
||||||
unsigned TagSpec,
|
unsigned TagSpec,
|
||||||
SourceLocation KWLoc,
|
SourceLocation KWLoc,
|
||||||
const CXXScopeSpec &SS,
|
const CXXScopeSpec &SS,
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
// RUN: clang-cc -fsyntax-only %s
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
class X0 {
|
||||||
|
public:
|
||||||
|
void f(T t);
|
||||||
|
};
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
void X0<T>::f(T t) {
|
||||||
|
t = 17;
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: Later, we'll want to write an explicit template
|
||||||
|
// declaration (extern template) for X0<int*>, then try to
|
||||||
|
// call X0<int*>::f. The translation unit should succeed,
|
||||||
|
// because we're not allowed to instantiate the out-of-line
|
||||||
|
// definition of X0<T>::f. For now, this is just a parsing
|
||||||
|
// test.
|
||||||
|
extern template class X0<int>;
|
Loading…
Reference in New Issue