2010-12-16 01:38:57 +08:00
|
|
|
//===------- SemaTemplateVariadic.cpp - C++ Variadic Templates ------------===/
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//===----------------------------------------------------------------------===/
|
|
|
|
//
|
|
|
|
// This file implements semantic analysis for C++0x variadic templates.
|
|
|
|
//===----------------------------------------------------------------------===/
|
|
|
|
|
|
|
|
#include "clang/Sema/Sema.h"
|
2011-01-05 01:33:58 +08:00
|
|
|
#include "clang/Sema/Lookup.h"
|
2010-12-20 10:24:11 +08:00
|
|
|
#include "clang/Sema/ParsedTemplate.h"
|
2010-12-16 01:38:57 +08:00
|
|
|
#include "clang/Sema/SemaInternal.h"
|
2010-12-21 06:05:00 +08:00
|
|
|
#include "clang/Sema/Template.h"
|
2010-12-16 01:38:57 +08:00
|
|
|
#include "clang/AST/Expr.h"
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
#include "clang/AST/RecursiveASTVisitor.h"
|
2010-12-16 01:38:57 +08:00
|
|
|
#include "clang/AST/TypeLoc.h"
|
|
|
|
|
|
|
|
using namespace clang;
|
|
|
|
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
// Visitor that collects unexpanded parameter packs
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
/// \brief A class that collects unexpanded parameter packs.
|
|
|
|
class CollectUnexpandedParameterPacksVisitor :
|
|
|
|
public RecursiveASTVisitor<CollectUnexpandedParameterPacksVisitor>
|
|
|
|
{
|
|
|
|
typedef RecursiveASTVisitor<CollectUnexpandedParameterPacksVisitor>
|
|
|
|
inherited;
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded;
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
|
|
|
|
public:
|
|
|
|
explicit CollectUnexpandedParameterPacksVisitor(
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded)
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
: Unexpanded(Unexpanded) { }
|
|
|
|
|
2010-12-21 07:07:20 +08:00
|
|
|
bool shouldWalkTypesOfTypeLocs() const { return false; }
|
|
|
|
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Recording occurrences of (unexpanded) parameter packs.
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
|
|
|
|
/// \brief Record occurrences of template type parameter packs.
|
|
|
|
bool VisitTemplateTypeParmTypeLoc(TemplateTypeParmTypeLoc TL) {
|
|
|
|
if (TL.getTypePtr()->isParameterPack())
|
|
|
|
Unexpanded.push_back(std::make_pair(TL.getTypePtr(), TL.getNameLoc()));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// \brief Record occurrences of template type parameter packs
|
|
|
|
/// when we don't have proper source-location information for
|
|
|
|
/// them.
|
|
|
|
///
|
|
|
|
/// Ideally, this routine would never be used.
|
|
|
|
bool VisitTemplateTypeParmType(TemplateTypeParmType *T) {
|
|
|
|
if (T->isParameterPack())
|
|
|
|
Unexpanded.push_back(std::make_pair(T, SourceLocation()));
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-01-20 05:32:01 +08:00
|
|
|
/// \brief Record occurrences of function and non-type template
|
2010-12-24 07:51:58 +08:00
|
|
|
/// parameter packs in an expression.
|
|
|
|
bool VisitDeclRefExpr(DeclRefExpr *E) {
|
Implement substitution of a function parameter pack for its set of
instantiated function parameters, enabling instantiation of arbitrary
pack expansions involving function parameter packs. At this point, we
can now correctly compile a simple, variadic print() example:
#include <iostream>
#include <string>
void print() {}
template<typename Head, typename ...Tail>
void print(const Head &head, const Tail &...tail) {
std::cout << head;
print(tail...);
}
int main() {
std::string hello = "Hello";
print(hello, ", world!", " ", 2011, '\n');
}
llvm-svn: 123000
2011-01-08 00:43:16 +08:00
|
|
|
if (E->getDecl()->isParameterPack())
|
|
|
|
Unexpanded.push_back(std::make_pair(E->getDecl(), E->getLocation()));
|
2010-12-24 07:51:58 +08:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-01-05 23:48:55 +08:00
|
|
|
/// \brief Record occurrences of template template parameter packs.
|
|
|
|
bool TraverseTemplateName(TemplateName Template) {
|
|
|
|
if (TemplateTemplateParmDecl *TTP
|
|
|
|
= dyn_cast_or_null<TemplateTemplateParmDecl>(
|
|
|
|
Template.getAsTemplateDecl()))
|
|
|
|
if (TTP->isParameterPack())
|
|
|
|
Unexpanded.push_back(std::make_pair(TTP, SourceLocation()));
|
|
|
|
|
|
|
|
return inherited::TraverseTemplateName(Template);
|
|
|
|
}
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
|
2012-03-07 04:05:56 +08:00
|
|
|
/// \brief Suppress traversal into Objective-C container literal
|
|
|
|
/// elements that are pack expansions.
|
|
|
|
bool TraverseObjCDictionaryLiteral(ObjCDictionaryLiteral *E) {
|
|
|
|
if (!E->containsUnexpandedParameterPack())
|
|
|
|
return true;
|
|
|
|
|
|
|
|
for (unsigned I = 0, N = E->getNumElements(); I != N; ++I) {
|
|
|
|
ObjCDictionaryElement Element = E->getKeyValueElement(I);
|
|
|
|
if (Element.isPackExpansion())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
TraverseStmt(Element.Key);
|
|
|
|
TraverseStmt(Element.Value);
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Pruning the search for unexpanded parameter packs.
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
|
|
|
|
/// \brief Suppress traversal into statements and expressions that
|
|
|
|
/// do not contain unexpanded parameter packs.
|
|
|
|
bool TraverseStmt(Stmt *S) {
|
|
|
|
if (Expr *E = dyn_cast_or_null<Expr>(S))
|
|
|
|
if (E->containsUnexpandedParameterPack())
|
|
|
|
return inherited::TraverseStmt(E);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// \brief Suppress traversal into types that do not contain
|
|
|
|
/// unexpanded parameter packs.
|
|
|
|
bool TraverseType(QualType T) {
|
|
|
|
if (!T.isNull() && T->containsUnexpandedParameterPack())
|
|
|
|
return inherited::TraverseType(T);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// \brief Suppress traversel into types with location information
|
|
|
|
/// that do not contain unexpanded parameter packs.
|
|
|
|
bool TraverseTypeLoc(TypeLoc TL) {
|
2010-12-24 07:51:58 +08:00
|
|
|
if (!TL.getType().isNull() &&
|
|
|
|
TL.getType()->containsUnexpandedParameterPack())
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
return inherited::TraverseTypeLoc(TL);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2010-12-16 05:57:59 +08:00
|
|
|
/// \brief Suppress traversal of non-parameter declarations, since
|
|
|
|
/// they cannot contain unexpanded parameter packs.
|
|
|
|
bool TraverseDecl(Decl *D) {
|
|
|
|
if (D && isa<ParmVarDecl>(D))
|
|
|
|
return inherited::TraverseDecl(D);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2011-01-06 01:40:24 +08:00
|
|
|
|
|
|
|
/// \brief Suppress traversal of template argument pack expansions.
|
|
|
|
bool TraverseTemplateArgument(const TemplateArgument &Arg) {
|
|
|
|
if (Arg.isPackExpansion())
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return inherited::TraverseTemplateArgument(Arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// \brief Suppress traversal of template argument pack expansions.
|
|
|
|
bool TraverseTemplateArgumentLoc(const TemplateArgumentLoc &ArgLoc) {
|
|
|
|
if (ArgLoc.getArgument().isPackExpansion())
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return inherited::TraverseTemplateArgumentLoc(ArgLoc);
|
|
|
|
}
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
/// \brief Diagnose all of the unexpanded parameter packs in the given
|
|
|
|
/// vector.
|
2011-10-25 11:44:56 +08:00
|
|
|
void
|
|
|
|
Sema::DiagnoseUnexpandedParameterPacks(SourceLocation Loc,
|
|
|
|
UnexpandedParameterPackContext UPPC,
|
2012-02-22 17:38:11 +08:00
|
|
|
ArrayRef<UnexpandedParameterPack> Unexpanded) {
|
2011-10-25 11:44:56 +08:00
|
|
|
if (Unexpanded.empty())
|
|
|
|
return;
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<SourceLocation, 4> Locations;
|
|
|
|
SmallVector<IdentifierInfo *, 4> Names;
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
llvm::SmallPtrSet<IdentifierInfo *, 4> NamesKnown;
|
|
|
|
|
|
|
|
for (unsigned I = 0, N = Unexpanded.size(); I != N; ++I) {
|
|
|
|
IdentifierInfo *Name = 0;
|
|
|
|
if (const TemplateTypeParmType *TTP
|
|
|
|
= Unexpanded[I].first.dyn_cast<const TemplateTypeParmType *>())
|
2011-05-01 09:05:51 +08:00
|
|
|
Name = TTP->getIdentifier();
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
else
|
|
|
|
Name = Unexpanded[I].first.get<NamedDecl *>()->getIdentifier();
|
|
|
|
|
|
|
|
if (Name && NamesKnown.insert(Name))
|
|
|
|
Names.push_back(Name);
|
|
|
|
|
|
|
|
if (Unexpanded[I].second.isValid())
|
|
|
|
Locations.push_back(Unexpanded[I].second);
|
|
|
|
}
|
|
|
|
|
|
|
|
DiagnosticBuilder DB
|
2011-10-25 11:44:56 +08:00
|
|
|
= Names.size() == 0? Diag(Loc, diag::err_unexpanded_parameter_pack_0)
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
<< (int)UPPC
|
2011-10-25 11:44:56 +08:00
|
|
|
: Names.size() == 1? Diag(Loc, diag::err_unexpanded_parameter_pack_1)
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
<< (int)UPPC << Names[0]
|
2011-10-25 11:44:56 +08:00
|
|
|
: Names.size() == 2? Diag(Loc, diag::err_unexpanded_parameter_pack_2)
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
<< (int)UPPC << Names[0] << Names[1]
|
2011-10-25 11:44:56 +08:00
|
|
|
: Diag(Loc, diag::err_unexpanded_parameter_pack_3_or_more)
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
<< (int)UPPC << Names[0] << Names[1];
|
|
|
|
|
|
|
|
for (unsigned I = 0, N = Locations.size(); I != N; ++I)
|
|
|
|
DB << SourceRange(Locations[I]);
|
|
|
|
}
|
|
|
|
|
2010-12-16 01:38:57 +08:00
|
|
|
bool Sema::DiagnoseUnexpandedParameterPack(SourceLocation Loc,
|
|
|
|
TypeSourceInfo *T,
|
|
|
|
UnexpandedParameterPackContext UPPC) {
|
|
|
|
// C++0x [temp.variadic]p5:
|
|
|
|
// An appearance of a name of a parameter pack that is not expanded is
|
|
|
|
// ill-formed.
|
|
|
|
if (!T->getType()->containsUnexpandedParameterPack())
|
|
|
|
return false;
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<UnexpandedParameterPack, 2> Unexpanded;
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded).TraverseTypeLoc(
|
|
|
|
T->getTypeLoc());
|
|
|
|
assert(!Unexpanded.empty() && "Unable to find unexpanded parameter packs");
|
2011-10-25 11:44:56 +08:00
|
|
|
DiagnoseUnexpandedParameterPacks(Loc, UPPC, Unexpanded);
|
2010-12-16 01:38:57 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Sema::DiagnoseUnexpandedParameterPack(Expr *E,
|
2010-12-16 08:46:58 +08:00
|
|
|
UnexpandedParameterPackContext UPPC) {
|
2010-12-16 01:38:57 +08:00
|
|
|
// C++0x [temp.variadic]p5:
|
|
|
|
// An appearance of a name of a parameter pack that is not expanded is
|
|
|
|
// ill-formed.
|
|
|
|
if (!E->containsUnexpandedParameterPack())
|
|
|
|
return false;
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<UnexpandedParameterPack, 2> Unexpanded;
|
Introduce a RecursiveASTVisitor subclass that finds all unexpanded
parameter packs within a statement, type, etc. Use this visitor to
provide improved diagnostics for the presence of unexpanded parameter
packs in a full expression, base type, declaration type, etc., by
highlighting the unexpanded parameter packs and providing their names,
e.g.,
test/CXX/temp/temp.decls/temp.variadic/p5.cpp:28:85: error: declaration type
contains unexpanded parameter packs 'VeryInnerTypes',
'OuterTypes', ...
...VeryInnerTypes, OuterTypes>, pair<InnerTypes, OuterTypes> > types;
~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ^
llvm-svn: 121883
2010-12-16 03:43:21 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded).TraverseStmt(E);
|
|
|
|
assert(!Unexpanded.empty() && "Unable to find unexpanded parameter packs");
|
2011-10-25 11:44:56 +08:00
|
|
|
DiagnoseUnexpandedParameterPacks(E->getLocStart(), UPPC, Unexpanded);
|
2010-12-16 01:38:57 +08:00
|
|
|
return true;
|
|
|
|
}
|
2010-12-16 08:46:58 +08:00
|
|
|
|
|
|
|
bool Sema::DiagnoseUnexpandedParameterPack(const CXXScopeSpec &SS,
|
|
|
|
UnexpandedParameterPackContext UPPC) {
|
|
|
|
// C++0x [temp.variadic]p5:
|
|
|
|
// An appearance of a name of a parameter pack that is not expanded is
|
|
|
|
// ill-formed.
|
|
|
|
if (!SS.getScopeRep() ||
|
|
|
|
!SS.getScopeRep()->containsUnexpandedParameterPack())
|
|
|
|
return false;
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<UnexpandedParameterPack, 2> Unexpanded;
|
2010-12-16 08:46:58 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
|
|
|
.TraverseNestedNameSpecifier(SS.getScopeRep());
|
|
|
|
assert(!Unexpanded.empty() && "Unable to find unexpanded parameter packs");
|
2011-10-25 11:44:56 +08:00
|
|
|
DiagnoseUnexpandedParameterPacks(SS.getRange().getBegin(),
|
2010-12-16 08:46:58 +08:00
|
|
|
UPPC, Unexpanded);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Sema::DiagnoseUnexpandedParameterPack(const DeclarationNameInfo &NameInfo,
|
|
|
|
UnexpandedParameterPackContext UPPC) {
|
|
|
|
// C++0x [temp.variadic]p5:
|
|
|
|
// An appearance of a name of a parameter pack that is not expanded is
|
|
|
|
// ill-formed.
|
|
|
|
switch (NameInfo.getName().getNameKind()) {
|
|
|
|
case DeclarationName::Identifier:
|
|
|
|
case DeclarationName::ObjCZeroArgSelector:
|
|
|
|
case DeclarationName::ObjCOneArgSelector:
|
|
|
|
case DeclarationName::ObjCMultiArgSelector:
|
|
|
|
case DeclarationName::CXXOperatorName:
|
|
|
|
case DeclarationName::CXXLiteralOperatorName:
|
|
|
|
case DeclarationName::CXXUsingDirective:
|
|
|
|
return false;
|
|
|
|
|
|
|
|
case DeclarationName::CXXConstructorName:
|
|
|
|
case DeclarationName::CXXDestructorName:
|
|
|
|
case DeclarationName::CXXConversionFunctionName:
|
2010-12-17 01:19:19 +08:00
|
|
|
// FIXME: We shouldn't need this null check!
|
2010-12-16 09:40:04 +08:00
|
|
|
if (TypeSourceInfo *TSInfo = NameInfo.getNamedTypeInfo())
|
|
|
|
return DiagnoseUnexpandedParameterPack(NameInfo.getLoc(), TSInfo, UPPC);
|
|
|
|
|
|
|
|
if (!NameInfo.getName().getCXXNameType()->containsUnexpandedParameterPack())
|
2010-12-16 08:46:58 +08:00
|
|
|
return false;
|
2010-12-16 09:40:04 +08:00
|
|
|
|
2010-12-16 08:46:58 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<UnexpandedParameterPack, 2> Unexpanded;
|
2010-12-16 08:46:58 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
2010-12-16 09:40:04 +08:00
|
|
|
.TraverseType(NameInfo.getName().getCXXNameType());
|
2010-12-16 08:46:58 +08:00
|
|
|
assert(!Unexpanded.empty() && "Unable to find unexpanded parameter packs");
|
2011-10-25 11:44:56 +08:00
|
|
|
DiagnoseUnexpandedParameterPacks(NameInfo.getLoc(), UPPC, Unexpanded);
|
2010-12-16 08:46:58 +08:00
|
|
|
return true;
|
|
|
|
}
|
2010-12-16 16:48:57 +08:00
|
|
|
|
|
|
|
bool Sema::DiagnoseUnexpandedParameterPack(SourceLocation Loc,
|
|
|
|
TemplateName Template,
|
|
|
|
UnexpandedParameterPackContext UPPC) {
|
|
|
|
|
|
|
|
if (Template.isNull() || !Template.containsUnexpandedParameterPack())
|
|
|
|
return false;
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<UnexpandedParameterPack, 2> Unexpanded;
|
2010-12-16 16:48:57 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
|
|
|
.TraverseTemplateName(Template);
|
|
|
|
assert(!Unexpanded.empty() && "Unable to find unexpanded parameter packs");
|
2011-10-25 11:44:56 +08:00
|
|
|
DiagnoseUnexpandedParameterPacks(Loc, UPPC, Unexpanded);
|
2010-12-16 16:48:57 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2011-01-04 04:35:03 +08:00
|
|
|
bool Sema::DiagnoseUnexpandedParameterPack(TemplateArgumentLoc Arg,
|
|
|
|
UnexpandedParameterPackContext UPPC) {
|
|
|
|
if (Arg.getArgument().isNull() ||
|
|
|
|
!Arg.getArgument().containsUnexpandedParameterPack())
|
|
|
|
return false;
|
|
|
|
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<UnexpandedParameterPack, 2> Unexpanded;
|
2011-01-04 04:35:03 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
|
|
|
.TraverseTemplateArgumentLoc(Arg);
|
|
|
|
assert(!Unexpanded.empty() && "Unable to find unexpanded parameter packs");
|
2011-10-25 11:44:56 +08:00
|
|
|
DiagnoseUnexpandedParameterPacks(Arg.getLocation(), UPPC, Unexpanded);
|
2011-01-04 04:35:03 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2010-12-23 05:19:48 +08:00
|
|
|
void Sema::collectUnexpandedParameterPacks(TemplateArgument Arg,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded) {
|
2010-12-23 05:19:48 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
|
|
|
.TraverseTemplateArgument(Arg);
|
|
|
|
}
|
|
|
|
|
2010-12-21 06:05:00 +08:00
|
|
|
void Sema::collectUnexpandedParameterPacks(TemplateArgumentLoc Arg,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded) {
|
2010-12-21 06:05:00 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
|
|
|
.TraverseTemplateArgumentLoc(Arg);
|
|
|
|
}
|
|
|
|
|
2010-12-21 08:52:54 +08:00
|
|
|
void Sema::collectUnexpandedParameterPacks(QualType T,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded) {
|
2010-12-21 08:52:54 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded).TraverseType(T);
|
|
|
|
}
|
|
|
|
|
2011-01-04 06:36:02 +08:00
|
|
|
void Sema::collectUnexpandedParameterPacks(TypeLoc TL,
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded) {
|
2011-01-04 06:36:02 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded).TraverseTypeLoc(TL);
|
|
|
|
}
|
|
|
|
|
2011-10-25 11:44:56 +08:00
|
|
|
void Sema::collectUnexpandedParameterPacks(CXXScopeSpec &SS,
|
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded) {
|
|
|
|
NestedNameSpecifier *Qualifier = SS.getScopeRep();
|
|
|
|
if (!Qualifier)
|
|
|
|
return;
|
|
|
|
|
|
|
|
NestedNameSpecifierLoc QualifierLoc(Qualifier, SS.location_data());
|
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
|
|
|
.TraverseNestedNameSpecifierLoc(QualifierLoc);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Sema::collectUnexpandedParameterPacks(const DeclarationNameInfo &NameInfo,
|
|
|
|
SmallVectorImpl<UnexpandedParameterPack> &Unexpanded) {
|
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded)
|
|
|
|
.TraverseDeclarationNameInfo(NameInfo);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-12-20 10:24:11 +08:00
|
|
|
ParsedTemplateArgument
|
|
|
|
Sema::ActOnPackExpansion(const ParsedTemplateArgument &Arg,
|
|
|
|
SourceLocation EllipsisLoc) {
|
|
|
|
if (Arg.isInvalid())
|
|
|
|
return Arg;
|
|
|
|
|
|
|
|
switch (Arg.getKind()) {
|
|
|
|
case ParsedTemplateArgument::Type: {
|
|
|
|
TypeResult Result = ActOnPackExpansion(Arg.getAsType(), EllipsisLoc);
|
|
|
|
if (Result.isInvalid())
|
|
|
|
return ParsedTemplateArgument();
|
|
|
|
|
|
|
|
return ParsedTemplateArgument(Arg.getKind(), Result.get().getAsOpaquePtr(),
|
|
|
|
Arg.getLocation());
|
|
|
|
}
|
|
|
|
|
2011-01-04 01:17:50 +08:00
|
|
|
case ParsedTemplateArgument::NonType: {
|
|
|
|
ExprResult Result = ActOnPackExpansion(Arg.getAsExpr(), EllipsisLoc);
|
|
|
|
if (Result.isInvalid())
|
|
|
|
return ParsedTemplateArgument();
|
|
|
|
|
|
|
|
return ParsedTemplateArgument(Arg.getKind(), Result.get(),
|
|
|
|
Arg.getLocation());
|
|
|
|
}
|
|
|
|
|
2010-12-20 10:24:11 +08:00
|
|
|
case ParsedTemplateArgument::Template:
|
2011-01-06 01:40:24 +08:00
|
|
|
if (!Arg.getAsTemplate().get().containsUnexpandedParameterPack()) {
|
|
|
|
SourceRange R(Arg.getLocation());
|
|
|
|
if (Arg.getScopeSpec().isValid())
|
|
|
|
R.setBegin(Arg.getScopeSpec().getBeginLoc());
|
|
|
|
Diag(EllipsisLoc, diag::err_pack_expansion_without_parameter_packs)
|
|
|
|
<< R;
|
|
|
|
return ParsedTemplateArgument();
|
|
|
|
}
|
|
|
|
|
|
|
|
return Arg.getTemplatePackExpansion(EllipsisLoc);
|
2010-12-20 10:24:11 +08:00
|
|
|
}
|
|
|
|
llvm_unreachable("Unhandled template argument kind?");
|
|
|
|
}
|
|
|
|
|
|
|
|
TypeResult Sema::ActOnPackExpansion(ParsedType Type,
|
|
|
|
SourceLocation EllipsisLoc) {
|
|
|
|
TypeSourceInfo *TSInfo;
|
|
|
|
GetTypeFromParser(Type, &TSInfo);
|
|
|
|
if (!TSInfo)
|
|
|
|
return true;
|
|
|
|
|
2011-01-15 01:04:44 +08:00
|
|
|
TypeSourceInfo *TSResult = CheckPackExpansion(TSInfo, EllipsisLoc,
|
|
|
|
llvm::Optional<unsigned>());
|
2010-12-21 06:05:00 +08:00
|
|
|
if (!TSResult)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return CreateParsedType(TSResult->getType(), TSResult);
|
|
|
|
}
|
|
|
|
|
|
|
|
TypeSourceInfo *Sema::CheckPackExpansion(TypeSourceInfo *Pattern,
|
2011-01-15 01:04:44 +08:00
|
|
|
SourceLocation EllipsisLoc,
|
|
|
|
llvm::Optional<unsigned> NumExpansions) {
|
2011-01-13 01:07:58 +08:00
|
|
|
// Create the pack expansion type and source-location information.
|
|
|
|
QualType Result = CheckPackExpansion(Pattern->getType(),
|
|
|
|
Pattern->getTypeLoc().getSourceRange(),
|
2011-01-15 01:04:44 +08:00
|
|
|
EllipsisLoc, NumExpansions);
|
2011-01-13 01:07:58 +08:00
|
|
|
if (Result.isNull())
|
2010-12-21 06:05:00 +08:00
|
|
|
return 0;
|
|
|
|
|
2010-12-20 10:24:11 +08:00
|
|
|
TypeSourceInfo *TSResult = Context.CreateTypeSourceInfo(Result);
|
|
|
|
PackExpansionTypeLoc TL = cast<PackExpansionTypeLoc>(TSResult->getTypeLoc());
|
|
|
|
TL.setEllipsisLoc(EllipsisLoc);
|
2010-12-21 06:05:00 +08:00
|
|
|
|
2010-12-20 10:24:11 +08:00
|
|
|
// Copy over the source-location information from the type.
|
|
|
|
memcpy(TL.getNextTypeLoc().getOpaqueData(),
|
2010-12-21 06:05:00 +08:00
|
|
|
Pattern->getTypeLoc().getOpaqueData(),
|
|
|
|
Pattern->getTypeLoc().getFullDataSize());
|
|
|
|
return TSResult;
|
2010-12-20 10:24:11 +08:00
|
|
|
}
|
2010-12-21 08:52:54 +08:00
|
|
|
|
2011-01-13 01:07:58 +08:00
|
|
|
QualType Sema::CheckPackExpansion(QualType Pattern,
|
|
|
|
SourceRange PatternRange,
|
2011-01-15 01:04:44 +08:00
|
|
|
SourceLocation EllipsisLoc,
|
|
|
|
llvm::Optional<unsigned> NumExpansions) {
|
2011-01-13 01:07:58 +08:00
|
|
|
// C++0x [temp.variadic]p5:
|
|
|
|
// The pattern of a pack expansion shall name one or more
|
|
|
|
// parameter packs that are not expanded by a nested pack
|
|
|
|
// expansion.
|
|
|
|
if (!Pattern->containsUnexpandedParameterPack()) {
|
|
|
|
Diag(EllipsisLoc, diag::err_pack_expansion_without_parameter_packs)
|
|
|
|
<< PatternRange;
|
|
|
|
return QualType();
|
|
|
|
}
|
|
|
|
|
2011-01-15 01:04:44 +08:00
|
|
|
return Context.getPackExpansionType(Pattern, NumExpansions);
|
2011-01-13 01:07:58 +08:00
|
|
|
}
|
|
|
|
|
2011-01-04 01:17:50 +08:00
|
|
|
ExprResult Sema::ActOnPackExpansion(Expr *Pattern, SourceLocation EllipsisLoc) {
|
2011-01-15 05:20:45 +08:00
|
|
|
return CheckPackExpansion(Pattern, EllipsisLoc, llvm::Optional<unsigned>());
|
|
|
|
}
|
|
|
|
|
|
|
|
ExprResult Sema::CheckPackExpansion(Expr *Pattern, SourceLocation EllipsisLoc,
|
|
|
|
llvm::Optional<unsigned> NumExpansions) {
|
2011-01-04 01:17:50 +08:00
|
|
|
if (!Pattern)
|
|
|
|
return ExprError();
|
|
|
|
|
|
|
|
// C++0x [temp.variadic]p5:
|
|
|
|
// The pattern of a pack expansion shall name one or more
|
|
|
|
// parameter packs that are not expanded by a nested pack
|
|
|
|
// expansion.
|
|
|
|
if (!Pattern->containsUnexpandedParameterPack()) {
|
|
|
|
Diag(EllipsisLoc, diag::err_pack_expansion_without_parameter_packs)
|
|
|
|
<< Pattern->getSourceRange();
|
|
|
|
return ExprError();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create the pack expansion expression and source-location information.
|
|
|
|
return Owned(new (Context) PackExpansionExpr(Context.DependentTy, Pattern,
|
2011-01-15 05:20:45 +08:00
|
|
|
EllipsisLoc, NumExpansions));
|
2011-01-04 01:17:50 +08:00
|
|
|
}
|
2010-12-21 08:52:54 +08:00
|
|
|
|
Work-in-progress implementation of C++0x [temp.arg.explicit]p9, which
allows an argument pack determines via explicit specification of
function template arguments to be extended by further, deduced
arguments. For example:
template<class ... Types> void f(Types ... values);
void g() {
f<int*, float*>(0, 0, 0); // Types is deduced to the sequence int*, float*, int
}
There are a number of FIXMEs in here that indicate places where we
need to implement + test retained expansions, plus a number of other
places in deduction where we need to correctly cope with the
explicitly-specified arguments when deducing an argument
pack. Furthermore, it appears that the RecursiveASTVisitor needs to be
auditied; it's missing some traversals (especially w.r.t. template
arguments) that cause it not to find unexpanded parameter packs when
it should.
The good news, however, is that the tr1::tuple implementation now
works fully, and the tr1::bind example (both from N2080) is actually
working now.
llvm-svn: 123163
2011-01-10 15:32:04 +08:00
|
|
|
/// \brief Retrieve the depth and index of a parameter pack.
|
|
|
|
static std::pair<unsigned, unsigned>
|
|
|
|
getDepthAndIndex(NamedDecl *ND) {
|
|
|
|
if (TemplateTypeParmDecl *TTP = dyn_cast<TemplateTypeParmDecl>(ND))
|
|
|
|
return std::make_pair(TTP->getDepth(), TTP->getIndex());
|
|
|
|
|
|
|
|
if (NonTypeTemplateParmDecl *NTTP = dyn_cast<NonTypeTemplateParmDecl>(ND))
|
|
|
|
return std::make_pair(NTTP->getDepth(), NTTP->getIndex());
|
|
|
|
|
|
|
|
TemplateTemplateParmDecl *TTP = cast<TemplateTemplateParmDecl>(ND);
|
|
|
|
return std::make_pair(TTP->getDepth(), TTP->getIndex());
|
|
|
|
}
|
|
|
|
|
2010-12-21 08:52:54 +08:00
|
|
|
bool Sema::CheckParameterPacksForExpansion(SourceLocation EllipsisLoc,
|
|
|
|
SourceRange PatternRange,
|
2011-09-22 10:34:54 +08:00
|
|
|
ArrayRef<UnexpandedParameterPack> Unexpanded,
|
2010-12-21 08:52:54 +08:00
|
|
|
const MultiLevelTemplateArgumentList &TemplateArgs,
|
|
|
|
bool &ShouldExpand,
|
Work-in-progress implementation of C++0x [temp.arg.explicit]p9, which
allows an argument pack determines via explicit specification of
function template arguments to be extended by further, deduced
arguments. For example:
template<class ... Types> void f(Types ... values);
void g() {
f<int*, float*>(0, 0, 0); // Types is deduced to the sequence int*, float*, int
}
There are a number of FIXMEs in here that indicate places where we
need to implement + test retained expansions, plus a number of other
places in deduction where we need to correctly cope with the
explicitly-specified arguments when deducing an argument
pack. Furthermore, it appears that the RecursiveASTVisitor needs to be
auditied; it's missing some traversals (especially w.r.t. template
arguments) that cause it not to find unexpanded parameter packs when
it should.
The good news, however, is that the tr1::tuple implementation now
works fully, and the tr1::bind example (both from N2080) is actually
working now.
llvm-svn: 123163
2011-01-10 15:32:04 +08:00
|
|
|
bool &RetainExpansion,
|
2011-01-15 01:04:44 +08:00
|
|
|
llvm::Optional<unsigned> &NumExpansions) {
|
2010-12-21 08:52:54 +08:00
|
|
|
ShouldExpand = true;
|
Work-in-progress implementation of C++0x [temp.arg.explicit]p9, which
allows an argument pack determines via explicit specification of
function template arguments to be extended by further, deduced
arguments. For example:
template<class ... Types> void f(Types ... values);
void g() {
f<int*, float*>(0, 0, 0); // Types is deduced to the sequence int*, float*, int
}
There are a number of FIXMEs in here that indicate places where we
need to implement + test retained expansions, plus a number of other
places in deduction where we need to correctly cope with the
explicitly-specified arguments when deducing an argument
pack. Furthermore, it appears that the RecursiveASTVisitor needs to be
auditied; it's missing some traversals (especially w.r.t. template
arguments) that cause it not to find unexpanded parameter packs when
it should.
The good news, however, is that the tr1::tuple implementation now
works fully, and the tr1::bind example (both from N2080) is actually
working now.
llvm-svn: 123163
2011-01-10 15:32:04 +08:00
|
|
|
RetainExpansion = false;
|
2010-12-21 08:52:54 +08:00
|
|
|
std::pair<IdentifierInfo *, SourceLocation> FirstPack;
|
|
|
|
bool HaveFirstPack = false;
|
|
|
|
|
2011-09-22 10:34:54 +08:00
|
|
|
for (ArrayRef<UnexpandedParameterPack>::iterator i = Unexpanded.begin(),
|
|
|
|
end = Unexpanded.end();
|
|
|
|
i != end; ++i) {
|
2010-12-21 08:52:54 +08:00
|
|
|
// Compute the depth and index for this parameter pack.
|
2011-01-24 01:04:59 +08:00
|
|
|
unsigned Depth = 0, Index = 0;
|
2010-12-21 08:52:54 +08:00
|
|
|
IdentifierInfo *Name;
|
Implement substitution of a function parameter pack for its set of
instantiated function parameters, enabling instantiation of arbitrary
pack expansions involving function parameter packs. At this point, we
can now correctly compile a simple, variadic print() example:
#include <iostream>
#include <string>
void print() {}
template<typename Head, typename ...Tail>
void print(const Head &head, const Tail &...tail) {
std::cout << head;
print(tail...);
}
int main() {
std::string hello = "Hello";
print(hello, ", world!", " ", 2011, '\n');
}
llvm-svn: 123000
2011-01-08 00:43:16 +08:00
|
|
|
bool IsFunctionParameterPack = false;
|
2010-12-21 08:52:54 +08:00
|
|
|
|
|
|
|
if (const TemplateTypeParmType *TTP
|
2011-09-22 10:34:54 +08:00
|
|
|
= i->first.dyn_cast<const TemplateTypeParmType *>()) {
|
2010-12-21 08:52:54 +08:00
|
|
|
Depth = TTP->getDepth();
|
|
|
|
Index = TTP->getIndex();
|
2011-05-01 09:05:51 +08:00
|
|
|
Name = TTP->getIdentifier();
|
2010-12-21 08:52:54 +08:00
|
|
|
} else {
|
2011-09-22 10:34:54 +08:00
|
|
|
NamedDecl *ND = i->first.get<NamedDecl *>();
|
Work-in-progress implementation of C++0x [temp.arg.explicit]p9, which
allows an argument pack determines via explicit specification of
function template arguments to be extended by further, deduced
arguments. For example:
template<class ... Types> void f(Types ... values);
void g() {
f<int*, float*>(0, 0, 0); // Types is deduced to the sequence int*, float*, int
}
There are a number of FIXMEs in here that indicate places where we
need to implement + test retained expansions, plus a number of other
places in deduction where we need to correctly cope with the
explicitly-specified arguments when deducing an argument
pack. Furthermore, it appears that the RecursiveASTVisitor needs to be
auditied; it's missing some traversals (especially w.r.t. template
arguments) that cause it not to find unexpanded parameter packs when
it should.
The good news, however, is that the tr1::tuple implementation now
works fully, and the tr1::bind example (both from N2080) is actually
working now.
llvm-svn: 123163
2011-01-10 15:32:04 +08:00
|
|
|
if (isa<ParmVarDecl>(ND))
|
Implement substitution of a function parameter pack for its set of
instantiated function parameters, enabling instantiation of arbitrary
pack expansions involving function parameter packs. At this point, we
can now correctly compile a simple, variadic print() example:
#include <iostream>
#include <string>
void print() {}
template<typename Head, typename ...Tail>
void print(const Head &head, const Tail &...tail) {
std::cout << head;
print(tail...);
}
int main() {
std::string hello = "Hello";
print(hello, ", world!", " ", 2011, '\n');
}
llvm-svn: 123000
2011-01-08 00:43:16 +08:00
|
|
|
IsFunctionParameterPack = true;
|
Work-in-progress implementation of C++0x [temp.arg.explicit]p9, which
allows an argument pack determines via explicit specification of
function template arguments to be extended by further, deduced
arguments. For example:
template<class ... Types> void f(Types ... values);
void g() {
f<int*, float*>(0, 0, 0); // Types is deduced to the sequence int*, float*, int
}
There are a number of FIXMEs in here that indicate places where we
need to implement + test retained expansions, plus a number of other
places in deduction where we need to correctly cope with the
explicitly-specified arguments when deducing an argument
pack. Furthermore, it appears that the RecursiveASTVisitor needs to be
auditied; it's missing some traversals (especially w.r.t. template
arguments) that cause it not to find unexpanded parameter packs when
it should.
The good news, however, is that the tr1::tuple implementation now
works fully, and the tr1::bind example (both from N2080) is actually
working now.
llvm-svn: 123163
2011-01-10 15:32:04 +08:00
|
|
|
else
|
|
|
|
llvm::tie(Depth, Index) = getDepthAndIndex(ND);
|
|
|
|
|
2010-12-21 08:52:54 +08:00
|
|
|
Name = ND->getIdentifier();
|
|
|
|
}
|
|
|
|
|
Implement substitution of a function parameter pack for its set of
instantiated function parameters, enabling instantiation of arbitrary
pack expansions involving function parameter packs. At this point, we
can now correctly compile a simple, variadic print() example:
#include <iostream>
#include <string>
void print() {}
template<typename Head, typename ...Tail>
void print(const Head &head, const Tail &...tail) {
std::cout << head;
print(tail...);
}
int main() {
std::string hello = "Hello";
print(hello, ", world!", " ", 2011, '\n');
}
llvm-svn: 123000
2011-01-08 00:43:16 +08:00
|
|
|
// Determine the size of this argument pack.
|
|
|
|
unsigned NewPackSize;
|
|
|
|
if (IsFunctionParameterPack) {
|
|
|
|
// Figure out whether we're instantiating to an argument pack or not.
|
|
|
|
typedef LocalInstantiationScope::DeclArgumentPack DeclArgumentPack;
|
|
|
|
|
|
|
|
llvm::PointerUnion<Decl *, DeclArgumentPack *> *Instantiation
|
|
|
|
= CurrentInstantiationScope->findInstantiationOf(
|
2011-09-22 10:34:54 +08:00
|
|
|
i->first.get<NamedDecl *>());
|
2011-02-18 03:38:27 +08:00
|
|
|
if (Instantiation->is<DeclArgumentPack *>()) {
|
Implement substitution of a function parameter pack for its set of
instantiated function parameters, enabling instantiation of arbitrary
pack expansions involving function parameter packs. At this point, we
can now correctly compile a simple, variadic print() example:
#include <iostream>
#include <string>
void print() {}
template<typename Head, typename ...Tail>
void print(const Head &head, const Tail &...tail) {
std::cout << head;
print(tail...);
}
int main() {
std::string hello = "Hello";
print(hello, ", world!", " ", 2011, '\n');
}
llvm-svn: 123000
2011-01-08 00:43:16 +08:00
|
|
|
// We could expand this function parameter pack.
|
|
|
|
NewPackSize = Instantiation->get<DeclArgumentPack *>()->size();
|
|
|
|
} else {
|
|
|
|
// We can't expand this function parameter pack, so we can't expand
|
|
|
|
// the pack expansion.
|
|
|
|
ShouldExpand = false;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// If we don't have a template argument at this depth/index, then we
|
|
|
|
// cannot expand the pack expansion. Make a note of this, but we still
|
|
|
|
// want to check any parameter packs we *do* have arguments for.
|
|
|
|
if (Depth >= TemplateArgs.getNumLevels() ||
|
|
|
|
!TemplateArgs.hasTemplateArgument(Depth, Index)) {
|
|
|
|
ShouldExpand = false;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Determine the size of the argument pack.
|
|
|
|
NewPackSize = TemplateArgs(Depth, Index).pack_size();
|
2010-12-21 08:52:54 +08:00
|
|
|
}
|
|
|
|
|
Work-in-progress implementation of C++0x [temp.arg.explicit]p9, which
allows an argument pack determines via explicit specification of
function template arguments to be extended by further, deduced
arguments. For example:
template<class ... Types> void f(Types ... values);
void g() {
f<int*, float*>(0, 0, 0); // Types is deduced to the sequence int*, float*, int
}
There are a number of FIXMEs in here that indicate places where we
need to implement + test retained expansions, plus a number of other
places in deduction where we need to correctly cope with the
explicitly-specified arguments when deducing an argument
pack. Furthermore, it appears that the RecursiveASTVisitor needs to be
auditied; it's missing some traversals (especially w.r.t. template
arguments) that cause it not to find unexpanded parameter packs when
it should.
The good news, however, is that the tr1::tuple implementation now
works fully, and the tr1::bind example (both from N2080) is actually
working now.
llvm-svn: 123163
2011-01-10 15:32:04 +08:00
|
|
|
// C++0x [temp.arg.explicit]p9:
|
|
|
|
// Template argument deduction can extend the sequence of template
|
|
|
|
// arguments corresponding to a template parameter pack, even when the
|
|
|
|
// sequence contains explicitly specified template arguments.
|
2011-01-21 07:15:49 +08:00
|
|
|
if (!IsFunctionParameterPack) {
|
|
|
|
if (NamedDecl *PartialPack
|
|
|
|
= CurrentInstantiationScope->getPartiallySubstitutedPack()){
|
|
|
|
unsigned PartialDepth, PartialIndex;
|
|
|
|
llvm::tie(PartialDepth, PartialIndex) = getDepthAndIndex(PartialPack);
|
|
|
|
if (PartialDepth == Depth && PartialIndex == Index)
|
|
|
|
RetainExpansion = true;
|
|
|
|
}
|
Work-in-progress implementation of C++0x [temp.arg.explicit]p9, which
allows an argument pack determines via explicit specification of
function template arguments to be extended by further, deduced
arguments. For example:
template<class ... Types> void f(Types ... values);
void g() {
f<int*, float*>(0, 0, 0); // Types is deduced to the sequence int*, float*, int
}
There are a number of FIXMEs in here that indicate places where we
need to implement + test retained expansions, plus a number of other
places in deduction where we need to correctly cope with the
explicitly-specified arguments when deducing an argument
pack. Furthermore, it appears that the RecursiveASTVisitor needs to be
auditied; it's missing some traversals (especially w.r.t. template
arguments) that cause it not to find unexpanded parameter packs when
it should.
The good news, however, is that the tr1::tuple implementation now
works fully, and the tr1::bind example (both from N2080) is actually
working now.
llvm-svn: 123163
2011-01-10 15:32:04 +08:00
|
|
|
}
|
2011-01-21 07:15:49 +08:00
|
|
|
|
2011-01-15 01:04:44 +08:00
|
|
|
if (!NumExpansions) {
|
2010-12-21 08:52:54 +08:00
|
|
|
// The is the first pack we've seen for which we have an argument.
|
|
|
|
// Record it.
|
|
|
|
NumExpansions = NewPackSize;
|
|
|
|
FirstPack.first = Name;
|
2011-09-22 10:34:54 +08:00
|
|
|
FirstPack.second = i->second;
|
2010-12-21 08:52:54 +08:00
|
|
|
HaveFirstPack = true;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2011-01-15 01:04:44 +08:00
|
|
|
if (NewPackSize != *NumExpansions) {
|
2010-12-21 08:52:54 +08:00
|
|
|
// C++0x [temp.variadic]p5:
|
|
|
|
// All of the parameter packs expanded by a pack expansion shall have
|
|
|
|
// the same number of arguments specified.
|
2011-01-15 01:04:44 +08:00
|
|
|
if (HaveFirstPack)
|
|
|
|
Diag(EllipsisLoc, diag::err_pack_expansion_length_conflict)
|
|
|
|
<< FirstPack.first << Name << *NumExpansions << NewPackSize
|
2011-09-22 10:34:54 +08:00
|
|
|
<< SourceRange(FirstPack.second) << SourceRange(i->second);
|
2011-01-15 01:04:44 +08:00
|
|
|
else
|
|
|
|
Diag(EllipsisLoc, diag::err_pack_expansion_length_conflict_multilevel)
|
|
|
|
<< Name << *NumExpansions << NewPackSize
|
2011-09-22 10:34:54 +08:00
|
|
|
<< SourceRange(i->second);
|
2010-12-21 08:52:54 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2010-12-24 06:44:42 +08:00
|
|
|
|
2011-01-11 11:14:20 +08:00
|
|
|
unsigned Sema::getNumArgumentsInExpansion(QualType T,
|
|
|
|
const MultiLevelTemplateArgumentList &TemplateArgs) {
|
|
|
|
QualType Pattern = cast<PackExpansionType>(T)->getPattern();
|
2011-07-23 18:55:15 +08:00
|
|
|
SmallVector<UnexpandedParameterPack, 2> Unexpanded;
|
2011-01-11 11:14:20 +08:00
|
|
|
CollectUnexpandedParameterPacksVisitor(Unexpanded).TraverseType(Pattern);
|
|
|
|
|
|
|
|
for (unsigned I = 0, N = Unexpanded.size(); I != N; ++I) {
|
|
|
|
// Compute the depth and index for this parameter pack.
|
|
|
|
unsigned Depth;
|
|
|
|
unsigned Index;
|
|
|
|
|
|
|
|
if (const TemplateTypeParmType *TTP
|
|
|
|
= Unexpanded[I].first.dyn_cast<const TemplateTypeParmType *>()) {
|
|
|
|
Depth = TTP->getDepth();
|
|
|
|
Index = TTP->getIndex();
|
|
|
|
} else {
|
|
|
|
NamedDecl *ND = Unexpanded[I].first.get<NamedDecl *>();
|
|
|
|
if (isa<ParmVarDecl>(ND)) {
|
|
|
|
// Function parameter pack.
|
|
|
|
typedef LocalInstantiationScope::DeclArgumentPack DeclArgumentPack;
|
|
|
|
|
|
|
|
llvm::PointerUnion<Decl *, DeclArgumentPack *> *Instantiation
|
|
|
|
= CurrentInstantiationScope->findInstantiationOf(
|
|
|
|
Unexpanded[I].first.get<NamedDecl *>());
|
2011-02-18 03:38:27 +08:00
|
|
|
if (Instantiation->is<DeclArgumentPack *>())
|
2011-01-11 11:14:20 +08:00
|
|
|
return Instantiation->get<DeclArgumentPack *>()->size();
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
llvm::tie(Depth, Index) = getDepthAndIndex(ND);
|
|
|
|
}
|
|
|
|
if (Depth >= TemplateArgs.getNumLevels() ||
|
|
|
|
!TemplateArgs.hasTemplateArgument(Depth, Index))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// Determine the size of the argument pack.
|
|
|
|
return TemplateArgs(Depth, Index).pack_size();
|
|
|
|
}
|
|
|
|
|
|
|
|
llvm_unreachable("No unexpanded parameter packs in type expansion.");
|
|
|
|
}
|
|
|
|
|
2010-12-24 06:44:42 +08:00
|
|
|
bool Sema::containsUnexpandedParameterPacks(Declarator &D) {
|
|
|
|
const DeclSpec &DS = D.getDeclSpec();
|
|
|
|
switch (DS.getTypeSpecType()) {
|
|
|
|
case TST_typename:
|
2011-05-19 13:37:45 +08:00
|
|
|
case TST_typeofType:
|
2011-10-07 07:00:33 +08:00
|
|
|
case TST_underlyingType:
|
|
|
|
case TST_atomic: {
|
2010-12-24 06:44:42 +08:00
|
|
|
QualType T = DS.getRepAsType().get();
|
|
|
|
if (!T.isNull() && T->containsUnexpandedParameterPack())
|
|
|
|
return true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case TST_typeofExpr:
|
|
|
|
case TST_decltype:
|
|
|
|
if (DS.getRepAsExpr() &&
|
|
|
|
DS.getRepAsExpr()->containsUnexpandedParameterPack())
|
|
|
|
return true;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TST_unspecified:
|
|
|
|
case TST_void:
|
|
|
|
case TST_char:
|
|
|
|
case TST_wchar:
|
|
|
|
case TST_char16:
|
|
|
|
case TST_char32:
|
|
|
|
case TST_int:
|
2011-10-15 07:23:15 +08:00
|
|
|
case TST_half:
|
2010-12-24 06:44:42 +08:00
|
|
|
case TST_float:
|
|
|
|
case TST_double:
|
|
|
|
case TST_bool:
|
|
|
|
case TST_decimal32:
|
|
|
|
case TST_decimal64:
|
|
|
|
case TST_decimal128:
|
|
|
|
case TST_enum:
|
|
|
|
case TST_union:
|
|
|
|
case TST_struct:
|
|
|
|
case TST_class:
|
|
|
|
case TST_auto:
|
2011-04-10 06:50:59 +08:00
|
|
|
case TST_unknown_anytype:
|
2010-12-24 06:44:42 +08:00
|
|
|
case TST_error:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned I = 0, N = D.getNumTypeObjects(); I != N; ++I) {
|
|
|
|
const DeclaratorChunk &Chunk = D.getTypeObject(I);
|
|
|
|
switch (Chunk.Kind) {
|
|
|
|
case DeclaratorChunk::Pointer:
|
|
|
|
case DeclaratorChunk::Reference:
|
|
|
|
case DeclaratorChunk::Paren:
|
|
|
|
// These declarator chunks cannot contain any parameter packs.
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DeclaratorChunk::Array:
|
|
|
|
case DeclaratorChunk::Function:
|
|
|
|
case DeclaratorChunk::BlockPointer:
|
|
|
|
// Syntactically, these kinds of declarator chunks all come after the
|
|
|
|
// declarator-id (conceptually), so the parser should not invoke this
|
|
|
|
// routine at this time.
|
|
|
|
llvm_unreachable("Could not have seen this kind of declarator chunk");
|
|
|
|
|
|
|
|
case DeclaratorChunk::MemberPointer:
|
|
|
|
if (Chunk.Mem.Scope().getScopeRep() &&
|
|
|
|
Chunk.Mem.Scope().getScopeRep()->containsUnexpandedParameterPack())
|
|
|
|
return true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2011-01-05 01:33:58 +08:00
|
|
|
|
2012-01-14 07:10:36 +08:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
// Callback to only accept typo corrections that refer to parameter packs.
|
|
|
|
class ParameterPackValidatorCCC : public CorrectionCandidateCallback {
|
|
|
|
public:
|
|
|
|
virtual bool ValidateCandidate(const TypoCorrection &candidate) {
|
|
|
|
NamedDecl *ND = candidate.getCorrectionDecl();
|
|
|
|
return ND && ND->isParameterPack();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2011-01-05 01:33:58 +08:00
|
|
|
/// \brief Called when an expression computing the size of a parameter pack
|
|
|
|
/// is parsed.
|
|
|
|
///
|
|
|
|
/// \code
|
|
|
|
/// template<typename ...Types> struct count {
|
|
|
|
/// static const unsigned value = sizeof...(Types);
|
|
|
|
/// };
|
|
|
|
/// \endcode
|
|
|
|
///
|
|
|
|
//
|
|
|
|
/// \param OpLoc The location of the "sizeof" keyword.
|
|
|
|
/// \param Name The name of the parameter pack whose size will be determined.
|
|
|
|
/// \param NameLoc The source location of the name of the parameter pack.
|
|
|
|
/// \param RParenLoc The location of the closing parentheses.
|
|
|
|
ExprResult Sema::ActOnSizeofParameterPackExpr(Scope *S,
|
|
|
|
SourceLocation OpLoc,
|
|
|
|
IdentifierInfo &Name,
|
|
|
|
SourceLocation NameLoc,
|
|
|
|
SourceLocation RParenLoc) {
|
|
|
|
// C++0x [expr.sizeof]p5:
|
|
|
|
// The identifier in a sizeof... expression shall name a parameter pack.
|
|
|
|
LookupResult R(*this, &Name, NameLoc, LookupOrdinaryName);
|
|
|
|
LookupName(R, S);
|
|
|
|
|
|
|
|
NamedDecl *ParameterPack = 0;
|
2012-01-14 07:10:36 +08:00
|
|
|
ParameterPackValidatorCCC Validator;
|
2011-01-05 01:33:58 +08:00
|
|
|
switch (R.getResultKind()) {
|
|
|
|
case LookupResult::Found:
|
|
|
|
ParameterPack = R.getFoundDecl();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case LookupResult::NotFound:
|
|
|
|
case LookupResult::NotFoundInCurrentInstantiation:
|
2011-06-29 00:20:02 +08:00
|
|
|
if (TypoCorrection Corrected = CorrectTypo(R.getLookupNameInfo(),
|
2012-01-14 07:10:36 +08:00
|
|
|
R.getLookupKind(), S, 0,
|
2012-02-01 07:49:25 +08:00
|
|
|
Validator)) {
|
2012-03-11 15:00:24 +08:00
|
|
|
std::string CorrectedQuotedStr(Corrected.getQuoted(getLangOpts()));
|
2012-01-14 07:10:36 +08:00
|
|
|
ParameterPack = Corrected.getCorrectionDecl();
|
|
|
|
Diag(NameLoc, diag::err_sizeof_pack_no_pack_name_suggest)
|
|
|
|
<< &Name << CorrectedQuotedStr
|
|
|
|
<< FixItHint::CreateReplacement(
|
2012-03-11 15:00:24 +08:00
|
|
|
NameLoc, Corrected.getAsString(getLangOpts()));
|
2012-01-14 07:10:36 +08:00
|
|
|
Diag(ParameterPack->getLocation(), diag::note_parameter_pack_here)
|
|
|
|
<< CorrectedQuotedStr;
|
2011-01-05 01:33:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
case LookupResult::FoundOverloaded:
|
|
|
|
case LookupResult::FoundUnresolvedValue:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case LookupResult::Ambiguous:
|
|
|
|
DiagnoseAmbiguousLookup(R);
|
|
|
|
return ExprError();
|
|
|
|
}
|
|
|
|
|
2011-01-06 05:11:38 +08:00
|
|
|
if (!ParameterPack || !ParameterPack->isParameterPack()) {
|
2011-01-05 01:33:58 +08:00
|
|
|
Diag(NameLoc, diag::err_sizeof_pack_no_pack_name)
|
|
|
|
<< &Name;
|
|
|
|
return ExprError();
|
|
|
|
}
|
|
|
|
|
2012-03-02 05:32:56 +08:00
|
|
|
MarkAnyDeclReferenced(OpLoc, ParameterPack);
|
|
|
|
|
2011-01-05 01:33:58 +08:00
|
|
|
return new (Context) SizeOfPackExpr(Context.getSizeType(), OpLoc,
|
|
|
|
ParameterPack, NameLoc, RParenLoc);
|
|
|
|
}
|