commit 14192764c3cbef0a4e122af786cc27d12e9ae15d
author Faisal Vali <faisalv@yahoo.com> Thu Apr 26 01:05:05 2018
committer Faisal Vali <faisalv@yahoo.com> Thu Apr 26 01:05:05 2018
tree a6d7d0604918954b38bf4c8d0812bef02524af1a
parent 9626b8d4ee5c7c80e6c3962f224fbe12689de975

Fix a merge conflict that was inadvertently introduced in r330888 
- during the reversion of r330794

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

lib/Sema/SemaTemplate.cpp

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 190dd07..239f361 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -4021,12 +4021,6 @@
                               TemplateKWLoc, TemplateArgs);
   }
 
-  if (R.getAsSingle<ConceptDecl>() && !AnyDependentArguments()) {
-    return CheckConceptTemplateId(SS, R.getLookupNameInfo(),
-                                  R.getAsSingle<ConceptDecl>(),
-                                  TemplateKWLoc, TemplateArgs);
-  }
-
   // We don't want lookup warnings at this point.
   R.suppressDiagnostics();