diff options
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateExpr.cpp | 9 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/instantiate-function-1.cpp | 8 |
2 files changed, 16 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp index f20d699815a..1e57e1b5a37 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp @@ -55,7 +55,7 @@ namespace { OwningExprResult VisitCXXOperatorCallExpr(CXXOperatorCallExpr *E); OwningExprResult VisitCXXConditionDeclExpr(CXXConditionDeclExpr *E); OwningExprResult VisitConditionalOperator(ConditionalOperator *E); - // FIXME: AddrLabelExpr + OwningExprResult VisitAddrLabelExpr(AddrLabelExpr *E); OwningExprResult VisitStmtExpr(StmtExpr *E); OwningExprResult VisitTypesCompatibleExpr(TypesCompatibleExpr *E); OwningExprResult VisitShuffleVectorExpr(ShuffleVectorExpr *E); @@ -526,6 +526,13 @@ TemplateExprInstantiator::VisitConditionalOperator(ConditionalOperator *E) { move(Cond), move(LHS), move(RHS)); } +Sema::OwningExprResult +TemplateExprInstantiator::VisitAddrLabelExpr(AddrLabelExpr *E) { + return SemaRef.ActOnAddrLabel(E->getAmpAmpLoc(), + E->getLabelLoc(), + E->getLabel()->getID()); +} + Sema::OwningExprResult TemplateExprInstantiator::VisitStmtExpr(StmtExpr *E) { Sema::OwningStmtResult SubStmt = SemaRef.InstantiateCompoundStmt(E->getSubStmt(), TemplateArgs, true); diff --git a/clang/test/SemaTemplate/instantiate-function-1.cpp b/clang/test/SemaTemplate/instantiate-function-1.cpp index be8c0e4cbb4..5b3a6d99840 100644 --- a/clang/test/SemaTemplate/instantiate-function-1.cpp +++ b/clang/test/SemaTemplate/instantiate-function-1.cpp @@ -178,6 +178,14 @@ template<typename T> struct IndirectGoto0 { void f(T x) { // FIXME: crummy error message below goto *x; // expected-error{{incompatible}} + + prior: + T prior_label = &&prior; + + T later_label = &&later; + + later: + (void)(1+1); } }; |
