Revert "Fix implementation of [temp.local]p4."

This reverts commit 40bd10b770813bd1471d46f514545437516aa4ba.

This seems to now emit an error when building the sanitizer tests:
http://green.lab.llvm.org/green/job/clang-stage1-configure-RA/53965/consoleFull.

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

1 files changed, 2 insertions, 17 deletions

diff --git a/include/clang/Sema/Lookup.h b/include/clang/Sema/Lookup.h
index 0466d06d75..990005f1cc 100644
--- a/include/clang/Sema/Lookup.h
+++ b/include/clang/Sema/Lookup.h
@@ -172,8 +172,7 @@ public:
       : SemaPtr(Other.SemaPtr), NameInfo(Other.NameInfo),
         LookupKind(Other.LookupKind), IDNS(Other.IDNS), Redecl(Other.Redecl),
         ExternalRedecl(Other.ExternalRedecl), HideTags(Other.HideTags),
-        AllowHidden(Other.AllowHidden),
-        TemplateNameLookup(Other.TemplateNameLookup) {}
+        AllowHidden(Other.AllowHidden) {}
 
   // FIXME: Remove these deleted methods once the default build includes
   // -Wdeprecated.
@@ -194,8 +193,7 @@ public:
         HideTags(std::move(Other.HideTags)),
         Diagnose(std::move(Other.Diagnose)),
         AllowHidden(std::move(Other.AllowHidden)),
-        Shadowed(std::move(Other.Shadowed)),
-        TemplateNameLookup(std::move(Other.TemplateNameLookup)) {
+        Shadowed(std::move(Other.Shadowed)) {
     Other.Paths = nullptr;
     Other.Diagnose = false;
   }
@@ -218,7 +216,6 @@ public:
     Diagnose = std::move(Other.Diagnose);
     AllowHidden = std::move(Other.AllowHidden);
     Shadowed = std::move(Other.Shadowed);
-    TemplateNameLookup = std::move(Other.TemplateNameLookup);
     Other.Paths = nullptr;
     Other.Diagnose = false;
     return *this;
@@ -289,15 +286,6 @@ public:
     HideTags = Hide;
   }
 
-  /// Sets whether this is a template-name lookup. For template-name lookups,
-  /// injected-class-names are treated as naming a template rather than a
-  /// template specialization.
-  void setTemplateNameLookup(bool TemplateName) {
-    TemplateNameLookup = TemplateName;
-  }
-
-  bool isTemplateNameLookup() const { return TemplateNameLookup; }
-
   bool isAmbiguous() const {
     return getResultKind() == Ambiguous;
   }
@@ -751,9 +739,6 @@ private:
   /// declaration that we skipped. This only happens when \c LookupKind
   /// is \c LookupRedeclarationWithLinkage.
   bool Shadowed = false;
-
-  /// True if we're looking up a template-name.
-  bool TemplateNameLookup = false;
 };
 
 /// Consumes visible declarations found when searching for