commit 9d9922af13edf3ddf8804a41a98d997324fdd58e
author Abramo Bagnara <abramo.bagnara@gmail.com> Mon Feb 06 14:31:00 2012 +0000
committer Abramo Bagnara <abramo.bagnara@gmail.com> Mon Feb 06 14:31:00 2012 +0000
tree 52a4d06afe4b992548aeed9ccffd3203ad11cba0
parent 5bbc385ad2d8e487edfbc2756eaf4fb0b920cfe4

Fixed instantiation of DependentScopeDeclRefExpr.

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

lib/Sema/SemaExprMember.cpp

diff --git a/lib/Sema/SemaExprMember.cpp b/lib/Sema/SemaExprMember.cpp
index 1545d6e..92cf619 100644
--- a/lib/Sema/SemaExprMember.cpp
+++ b/lib/Sema/SemaExprMember.cpp
@@ -232,8 +232,8 @@
   case IMA_Mixed_StaticContext:
   case IMA_Unresolved_StaticContext:
   case IMA_Field_Uneval_Context:
-    if (TemplateArgs)
-      return BuildTemplateIdExpr(SS, TemplateKWLoc, R, false, *TemplateArgs);
+    if (TemplateArgs || TemplateKWLoc.isValid())
+      return BuildTemplateIdExpr(SS, TemplateKWLoc, R, false, TemplateArgs);
     return BuildDeclarationNameExpr(SS, R, false);
 
   case IMA_Error_StaticContext: