Revert "Don't build invalid AST nodes during recovery"

This reverts commit r224451. It caused us to reject some valid existing
code.

This code appears to run in non-error cases as well as error cases. If
the scope of a DependentScopeDeclRefExpr is still incomplete it probably
means we still have more instantiation to do.

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

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index ce364d0fae8b7d2dac466ce91a021eb51309c656..c7608516036f4e70c90e1237366736440777b1b5 100644 (file)
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -2874,7 +2874,7 @@ Sema::BuildQualifiedTemplateIdExpr(CXXScopeSpec &SS,
   if (!(DC = computeDeclContext(SS, false)) ||
       DC->isDependentContext() ||
       RequireCompleteDeclContext(SS, DC))
-    return ExprError();
+    return BuildDependentDeclRefExpr(SS, TemplateKWLoc, NameInfo, TemplateArgs);
 
   bool MemberOfUnknownSpecialization;
   LookupResult R(*this, NameInfo, LookupOrdinaryName);

diff --git a/test/SemaTemplate/instantiate-dependent-nested-name.cpp b/test/SemaTemplate/instantiate-dependent-nested-name.cpp
index cb2c946edee0623dea3e00dc5f558159e7d1f81b..06a1ed4119d2603cd5e8e3362c774594237bc5bf 100644 (file)
--- a/test/SemaTemplate/instantiate-dependent-nested-name.cpp
+++ b/test/SemaTemplate/instantiate-dependent-nested-name.cpp
@@ -1,19 +1,8 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
-
+// expected-no-diagnostics
 // PR4382
 template<typename T> struct X { static const T A = 1; };
 template<typename T, bool = X<T>::A> struct Y { typedef T A; };
 template<typename T> struct Z { typedef typename Y<T>::A A; };
 extern int x;
 extern Z<int>::A x;
-
-namespace pr21964 {
-struct H;
-template <class> struct T {
-  struct A; // expected-note {{member is declared here}}
-  static void B() {
-    A::template N<H>; // expected-error {{implicit instantiation of undefined member 'pr21964::T<pr21964::H>::A'}}
-  }
-};
-template struct T<H>; // expected-note {{requested here}}
-}