Template instantiation for break and continue statements.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71903 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h
index c4af234..1159ef3 100644
--- a/include/clang/AST/Stmt.h
+++ b/include/clang/AST/Stmt.h
@@ -873,6 +873,9 @@
virtual SourceRange getSourceRange() const {
return SourceRange(ContinueLoc);
}
+
+ ContinueStmt* Clone(ASTContext &C) const;
+
static bool classof(const Stmt *T) {
return T->getStmtClass() == ContinueStmtClass;
}
@@ -898,6 +901,8 @@
virtual SourceRange getSourceRange() const { return SourceRange(BreakLoc); }
+ BreakStmt* Clone(ASTContext &C) const;
+
static bool classof(const Stmt *T) {
return T->getStmtClass() == BreakStmtClass;
}
diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp
index f8f6e06..71103b8 100644
--- a/lib/AST/Stmt.cpp
+++ b/lib/AST/Stmt.cpp
@@ -102,6 +102,14 @@
return new (C) NullStmt(SemiLoc);
}
+ContinueStmt* ContinueStmt::Clone(ASTContext &C) const {
+ return new (C) ContinueStmt(ContinueLoc);
+}
+
+BreakStmt* BreakStmt::Clone(ASTContext &C) const {
+ return new (C) BreakStmt(BreakLoc);
+}
+
void CompoundStmt::setStmts(ASTContext &C, Stmt **Stmts, unsigned NumStmts) {
if (this->Body)
C.Deallocate(Body);
diff --git a/lib/Sema/SemaTemplateInstantiateStmt.cpp b/lib/Sema/SemaTemplateInstantiateStmt.cpp
index c768234..d59f859 100644
--- a/lib/Sema/SemaTemplateInstantiateStmt.cpp
+++ b/lib/Sema/SemaTemplateInstantiateStmt.cpp
@@ -46,6 +46,8 @@
OwningStmtResult VisitExpr(Expr *E);
OwningStmtResult VisitLabelStmt(LabelStmt *S);
OwningStmtResult VisitGotoStmt(GotoStmt *S);
+ OwningStmtResult VisitBreakStmt(BreakStmt *S);
+ OwningStmtResult VisitContinueStmt(ContinueStmt *S);
OwningStmtResult VisitReturnStmt(ReturnStmt *S);
// Base case. I'm supposed to ignore this.
@@ -99,6 +101,15 @@
S->getLabel()->getID());
}
+Sema::OwningStmtResult TemplateStmtInstantiator::VisitBreakStmt(BreakStmt *S) {
+ return SemaRef.Owned(S->Clone(SemaRef.Context));
+}
+
+Sema::OwningStmtResult
+TemplateStmtInstantiator::VisitContinueStmt(ContinueStmt *S) {
+ return SemaRef.Owned(S->Clone(SemaRef.Context));
+}
+
Sema::OwningStmtResult
TemplateStmtInstantiator::VisitReturnStmt(ReturnStmt *S) {
Sema::OwningExprResult Result = SemaRef.ExprEmpty();
diff --git a/test/SemaTemplate/instantiate-function-1.cpp b/test/SemaTemplate/instantiate-function-1.cpp
index 5238602..dc48598 100644
--- a/test/SemaTemplate/instantiate-function-1.cpp
+++ b/test/SemaTemplate/instantiate-function-1.cpp
@@ -116,6 +116,10 @@
template<typename T> struct For0 {
void f(T f, T l) {
for (; f != l; ++f) {
+ if (*f)
+ continue;
+ else if (*f == 17)
+ break;
}
}
};