r330889 - Fix a merge conflict that was inadvertently introduced in r330888

[Faisal Vali via cfe-commits]

Author: faisalv
Date: Wed Apr 25 18:05:05 2018
New Revision: 330889

URL: http://llvm.org/viewvc/llvm-project?rev=330889&view=rev
Log:
Fix a merge conflict that was inadvertently introduced in r330888 
- during the reversion of r330794

Modified:
    cfe/trunk/lib/Sema/SemaTemplate.cpp

Modified: cfe/trunk/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplate.cpp?rev=330889&r1=330888&r2=330889&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Wed Apr 25 18:05:05 2018
@@ -4021,12 +4021,6 @@ ExprResult Sema::BuildTemplateIdExpr(con
                               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();