Template instantiation for the GNU address-of-label extension.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72301 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 16 insertions, 1 deletions

diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp
index f20d699815..1e57e1b5a3 100644
--- a/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/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/test/SemaTemplate/instantiate-function-1.cpp b/test/SemaTemplate/instantiate-function-1.cpp
index be8c0e4cbb..5b3a6d9984 100644
--- a/test/SemaTemplate/instantiate-function-1.cpp
+++ b/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);
   }
 };