diff options
| -rw-r--r-- | lib/Sema/Sema.h | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 11 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateExpr.cpp | 23 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiate-function-1.cpp | 3 |
4 files changed, 37 insertions, 2 deletions
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 87c01075a8..9947d3ef4f 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -1978,7 +1978,7 @@ public: /// \brief The kind of template instantiation we are performing enum { /// We are instantiating a template declaration. The entity is - /// the declaration we're instantiation (e.g., a CXXRecordDecl). + /// the declaration we're instantiating (e.g., a CXXRecordDecl). TemplateInstantiation, /// We are instantiating a default argument for a template diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index eb006dc3f3..113003fd44 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -107,7 +107,7 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) { if (T.isNull()) return 0; - // Build the instantiataed declaration + // Build the instantiated declaration VarDecl *Var = VarDecl::Create(SemaRef.Context, Owner, D->getLocation(), D->getIdentifier(), T, D->getStorageClass(), @@ -585,6 +585,8 @@ void Sema::InstantiateFunctionDefinition(FunctionDecl *Function) { if (!Pattern) return; + // FIXME: add to the instantiation stack. + // Introduce a new scope where local variable instantiations will be // recorded. LocalInstantiationScope Scope(*this); @@ -595,6 +597,11 @@ void Sema::InstantiateFunctionDefinition(FunctionDecl *Function) { Scope.InstantiatedLocal(PatternDecl->getParamDecl(I), Function->getParamDecl(I)); + // Enter the scope of this instantiation. We don't use + // PushDeclContext because we don't have a scope. + DeclContext *PreviousContext = CurContext; + CurContext = Function; + // Instantiate the function body. OwningStmtResult Body = InstantiateStmt(Pattern, getTemplateInstantiationArgs(Function)); @@ -602,6 +609,8 @@ void Sema::InstantiateFunctionDefinition(FunctionDecl *Function) { Function->setInvalidDecl(true); else Function->setBody(Body.takeAs<Stmt>()); + + CurContext = PreviousContext; } /// \brief Instantiate the definition of the given variable from its diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp index 52daa5d6a0..2dca993f74 100644 --- a/lib/Sema/SemaTemplateInstantiateExpr.cpp +++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp @@ -441,6 +441,7 @@ namespace { // FIXME: Once we get closer to completion, replace these // manually-written declarations with automatically-generated ones // from clang/AST/StmtNodes.def. + OwningStmtResult VisitDeclStmt(DeclStmt *S); OwningStmtResult VisitNullStmt(NullStmt *S); OwningStmtResult VisitCompoundStmt(CompoundStmt *S); OwningStmtResult VisitExpr(Expr *E); @@ -454,6 +455,28 @@ namespace { }; } +Sema::OwningStmtResult TemplateStmtInstantiator::VisitDeclStmt(DeclStmt *S) { + llvm::SmallVector<Decl *, 8> Decls; + for (DeclStmt::decl_iterator D = S->decl_begin(), DEnd = S->decl_end(); + D != DEnd; ++D) { + Decl *Instantiated = SemaRef.InstantiateDecl(*D, SemaRef.CurContext, + TemplateArgs); + if (!Instantiated) + return SemaRef.StmtError(); + + Decls.push_back(Instantiated); + SemaRef.CurrentInstantiationScope->InstantiatedLocal(cast<VarDecl>(*D), + cast<VarDecl>(Instantiated)); + } + + return SemaRef.Owned(new (SemaRef.Context) DeclStmt( + DeclGroupRef::Create(SemaRef.Context, + &Decls[0], + Decls.size()), + S->getStartLoc(), + S->getEndLoc())); +} + Sema::OwningStmtResult TemplateStmtInstantiator::VisitNullStmt(NullStmt *S) { return SemaRef.Owned(new (SemaRef.Context) NullStmt(S->getSemiLoc())); } diff --git a/test/SemaTemplate/instantiate-function-1.cpp b/test/SemaTemplate/instantiate-function-1.cpp index 9cf2ca5129..6b755c8ea9 100644 --- a/test/SemaTemplate/instantiate-function-1.cpp +++ b/test/SemaTemplate/instantiate-function-1.cpp @@ -18,8 +18,11 @@ struct X2 { void f(T); T g(T x, T y) { + /* DeclStmt */; + T *xp = &x, &yr = y; // expected-error{{pointer to a reference}} /* NullStmt */; } }; template struct X2<int>; +template struct X2<int&>; // expected-note{{instantiation of}} |