diff options
| -rw-r--r-- | include/clang/AST/ExprCXX.h | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateExpr.cpp | 14 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiate-expr-4.cpp | 18 |
3 files changed, 35 insertions, 1 deletions
diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h index df01e9bef4..d02c6042f2 100644 --- a/include/clang/AST/ExprCXX.h +++ b/include/clang/AST/ExprCXX.h @@ -351,6 +351,10 @@ public: Expr(CXXThrowExprClass, Ty, false, false), Op(expr), ThrowLoc(l) {} const Expr *getSubExpr() const { return cast_or_null<Expr>(Op); } Expr *getSubExpr() { return cast_or_null<Expr>(Op); } + void setSubExpr(Expr *E) { Op = E; } + + SourceLocation getThrowLoc() const { return ThrowLoc; } + void setThrowLoc(SourceLocation L) { ThrowLoc = L; } virtual SourceRange getSourceRange() const { if (getSubExpr() == 0) diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp index b9671c2c17..55be2c2c8f 100644 --- a/lib/Sema/SemaTemplateInstantiateExpr.cpp +++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp @@ -83,7 +83,7 @@ namespace { OwningExprResult VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr *E); OwningExprResult VisitCXXNullPtrLiteralExpr(CXXNullPtrLiteralExpr *E); // FIXME: CXXTypeIdExpr - // FIXME: CXXThrowExpr + OwningExprResult VisitCXXThrowExpr(CXXThrowExpr *E); // FIXME: CXXDefaultArgExpr OwningExprResult VisitCXXConstructExpr(CXXConstructExpr *E); OwningExprResult VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr *E); @@ -813,6 +813,18 @@ TemplateExprInstantiator::VisitCXXThisExpr(CXXThisExpr *E) { } Sema::OwningExprResult +TemplateExprInstantiator::VisitCXXThrowExpr(CXXThrowExpr *E) { + OwningExprResult SubExpr(SemaRef, (void *)0); + if (E->getSubExpr()) { + SubExpr = Visit(E->getSubExpr()); + if (SubExpr.isInvalid()) + return SemaRef.ExprError(); + } + + return SemaRef.ActOnCXXThrow(E->getThrowLoc(), move(SubExpr)); +} + +Sema::OwningExprResult TemplateExprInstantiator::VisitCXXConstructExpr(CXXConstructExpr *E) { assert(!cast<CXXRecordDecl>(E->getConstructor()->getDeclContext()) ->isDependentType() && "Dependent constructor shouldn't be here"); diff --git a/test/SemaTemplate/instantiate-expr-4.cpp b/test/SemaTemplate/instantiate-expr-4.cpp index 2fd9f04569..6ef0f83add 100644 --- a/test/SemaTemplate/instantiate-expr-4.cpp +++ b/test/SemaTemplate/instantiate-expr-4.cpp @@ -95,3 +95,21 @@ struct Delete0 { template struct Delete0<int*>; template struct Delete0<X*>; template struct Delete0<int>; // expected-note{{instantiation}} + +// --------------------------------------------------------------------- +// throw expressions +// --------------------------------------------------------------------- +template<typename T> +struct Throw1 { + void f(T t) { + throw; + throw t; // expected-error{{incomplete type}} + } +}; + +struct Incomplete; // expected-note{{forward}} + +template struct Throw1<int>; +template struct Throw1<int*>; +template struct Throw1<Incomplete*>; // expected-note{{instantiation}} + |