[cfe-commits] r73179 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/SemaTemplate/instantiate-declref-ice.cpp

[Eli Friedman]

Author: efriedma
Date: Wed Jun 10 20:11:20 2009
New Revision: 73179

URL: http://llvm.org/viewvc/llvm-project?rev=73179&view=rev
Log:
Make sure to calculate value-dependence correctly when deal with ICEs.  
(Actually, this isn't precisely correct, but it doesn't make 
sense to query whether an expression that isn't an ICE is 
value-dependent anyway.)


Added:
    cfe/trunk/test/SemaTemplate/instantiate-declref-ice.cpp
Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=73179&r1=73178&r2=73179&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed Jun 10 20:11:20 2009
@@ -1177,7 +1177,12 @@
       ValueDependent = true;
     //    - a constant with integral or enumeration type and is
     //      initialized with an expression that is value-dependent
-    //      (FIXME!).
+    else if (const VarDecl *Dcl = dyn_cast<VarDecl>(VD)) {
+      if (Dcl->getType().getCVRQualifiers() == QualType::Const &&
+          Dcl->getInit()) {
+        ValueDependent = Dcl->getInit()->isValueDependent();
+      }
+    }
   }
 
   return Owned(BuildDeclRefExpr(VD, VD->getType().getNonReferenceType(), Loc,

Added: cfe/trunk/test/SemaTemplate/instantiate-declref-ice.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-declref-ice.cpp?rev=73179&view=auto

==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-declref-ice.cpp (added)
+++ cfe/trunk/test/SemaTemplate/instantiate-declref-ice.cpp Wed Jun 10 20:11:20 2009
@@ -0,0 +1,7 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+template<int i> struct x {
+  static const int j = i;
+  x<j>* y;
+};
+