projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a534f07
)
Fix a merge conflict that was inadvertently introduced in r330888
author
Faisal Vali
<faisalv@yahoo.com>
Thu, 26 Apr 2018 01:05:05 +0000
(
01:05
+0000)
committer
Faisal Vali
<faisalv@yahoo.com>
Thu, 26 Apr 2018 01:05:05 +0000
(
01:05
+0000)
- during the reversion of r330794
llvm-svn: 330889
clang/lib/Sema/SemaTemplate.cpp
patch
|
blob
|
history
diff --git
a/clang/lib/Sema/SemaTemplate.cpp
b/clang/lib/Sema/SemaTemplate.cpp
index
190dd07
..
239f361
100644
(file)
--- a/
clang/lib/Sema/SemaTemplate.cpp
+++ b/
clang/lib/Sema/SemaTemplate.cpp
@@
-4021,12
+4021,6
@@
ExprResult Sema::BuildTemplateIdExpr(const CXXScopeSpec &SS,
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();