Handle instantiation of templates with non-type arguments expressed with an

explicit '&' by introducing an address-of operator prior to checking the
argument's type.

llvm-svn: 94947

clang/lib/Sema/SemaTemplateInstantiate.cpp

@@ -746,6 +746,22 @@ TemplateInstantiator::TransformDeclRefExpr(DeclRefExpr *E) {
                                                 move(RefExpr));
           }
         }
+        if (NTTP->getType()->isPointerType() &&
+            !VD->getType()->isPointerType()) {
+          // If the template argument is expected to be a pointer and value
+          // isn't inherently of pointer type, then it is specified with '&...'
+          // to indicate its address should be used. Build an expression to
+          // take the address of the argument.
+          OwningExprResult RefExpr
+            = SemaRef.BuildDeclRefExpr(VD, VD->getType().getNonReferenceType(),
+                                       E->getLocation());
+          if (RefExpr.isInvalid())
+            return SemaRef.ExprError();
+
+          return SemaRef.CreateBuiltinUnaryOp(E->getLocation(),
+                                              UnaryOperator::AddrOf,
+                                              move(RefExpr));
+        }
 
         return SemaRef.BuildDeclRefExpr(VD, VD->getType().getNonReferenceType(),
                                         E->getLocation());

clang/test/CXX/temp/temp.arg/temp.arg.nontype/p1.cpp

@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+template <const int* p> struct X { };
+
+int i = 42;
+int* iptr = &i;
+void test() {
+  X<&i> x1;
+  X<iptr> x2;
+}