r200714 - PR17846, PR17848: don't build a VarTemplateSpecializationDecl for a use of a

[Richard Smith]

Author: rsmith
Date: Mon Feb  3 14:09:56 2014
New Revision: 200714

URL: http://llvm.org/viewvc/llvm-project?rev=200714&view=rev
Log:
PR17846, PR17848: don't build a VarTemplateSpecializationDecl for a use of a
variable template until we know what the template arguments actually are.

Added:
    cfe/trunk/test/SemaTemplate/instantiate-var-template.cpp
Modified:
    cfe/trunk/lib/Sema/SemaTemplate.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=200714&r1=200713&r2=200714&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Mon Feb  3 14:09:56 2014
@@ -2777,10 +2777,13 @@ ExprResult Sema::BuildTemplateIdExpr(con
   assert(!R.isAmbiguous() && "ambiguous lookup when building templateid");
 
   // In C++1y, check variable template ids.
-  if (R.getAsSingle<VarTemplateDecl>()) {
-    return Owned(CheckVarTemplateId(SS, R.getLookupNameInfo(),
-                                    R.getAsSingle<VarTemplateDecl>(),
-                                    TemplateKWLoc, TemplateArgs));
+  bool InstantiationDependent;
+  if (R.getAsSingle<VarTemplateDecl>() &&
+      !TemplateSpecializationType::anyDependentTemplateArguments(
+           *TemplateArgs, InstantiationDependent)) {
+    return CheckVarTemplateId(SS, R.getLookupNameInfo(),
+                              R.getAsSingle<VarTemplateDecl>(),
+                              TemplateKWLoc, TemplateArgs);
   }
 
   // We don't want lookup warnings at this point.

Added: cfe/trunk/test/SemaTemplate/instantiate-var-template.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-var-template.cpp?rev=200714&view=auto
==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-var-template.cpp (added)
+++ cfe/trunk/test/SemaTemplate/instantiate-var-template.cpp Mon Feb  3 14:09:56 2014
@@ -0,0 +1,36 @@
+// RUN: %clang_cc1 -verify -std=c++1y %s
+
+namespace PR17846 {
+  template <typename T> constexpr T pi = T(3.14);
+  template <typename T> constexpr T tau = 2 * pi<T>;
+  constexpr double tau_double = tau<double>;
+  static_assert(tau_double == 6.28, "");
+}
+
+namespace PR17848 {
+  template<typename T> constexpr T var = 12345;
+  template<typename T> constexpr T f() { return var<T>; }
+  constexpr int k = f<int>();
+  static_assert(k == 12345, "");
+}
+
+namespace NonDependent {
+  template<typename T> constexpr T a = 0;
+  template<typename T> constexpr T b = a<int>;
+  static_assert(b<int> == 0, "");
+}
+
+namespace InstantiationDependent {
+  int f(int);
+  void f(char);
+
+  template<int> constexpr int a = 1;
+  template<typename T> constexpr T b = a<sizeof(sizeof(f(T())))>; // expected-error {{invalid application of 'sizeof' to an incomplete type 'void'}}
+
+  static_assert(b<int> == 1, "");
+  static_assert(b<char> == 1, ""); // expected-note {{in instantiation of}} expected-error {{not an integral constant}}
+
+  template<typename T> void f() {
+    static_assert(a<sizeof(sizeof(f(T())))> == 0, ""); // expected-error {{static_assert failed}}
+  }
+}