[cfe-commits] r71903 - in /cfe/trunk: include/clang/AST/Stmt.h lib/AST/Stmt.cpp lib/Sema/SemaTemplateInstantiateStmt.cpp test/SemaTemplate/instantiate-function-1.cpp

[Douglas Gregor]

Author: dgregor
Date: Fri May 15 17:32:39 2009
New Revision: 71903

URL: http://llvm.org/viewvc/llvm-project?rev=71903&view=rev
Log:
Template instantiation for break and continue statements.

Modified:
    cfe/trunk/include/clang/AST/Stmt.h
    cfe/trunk/lib/AST/Stmt.cpp
    cfe/trunk/lib/Sema/SemaTemplateInstantiateStmt.cpp
    cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp

Modified: cfe/trunk/include/clang/AST/Stmt.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Stmt.h?rev=71903&r1=71902&r2=71903&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/Stmt.h (original)
+++ cfe/trunk/include/clang/AST/Stmt.h Fri May 15 17:32:39 2009
@@ -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; 
   }

Modified: cfe/trunk/lib/AST/Stmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Stmt.cpp?rev=71903&r1=71902&r2=71903&view=diff

==============================================================================
--- cfe/trunk/lib/AST/Stmt.cpp (original)
+++ cfe/trunk/lib/AST/Stmt.cpp Fri May 15 17:32:39 2009
@@ -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);

Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiateStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiateStmt.cpp?rev=71903&r1=71902&r2=71903&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateInstantiateStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateInstantiateStmt.cpp Fri May 15 17:32:39 2009
@@ -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();

Modified: cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp?rev=71903&r1=71902&r2=71903&view=diff

==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiate-function-1.cpp Fri May 15 17:32:39 2009
@@ -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;
     }
   }
 };