diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-12-01 16:54:29 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-12-01 16:54:29 +0000 |
| commit | 6edca7d9bde368cce0633cf0315735cfa46eccbe (patch) | |
| tree | cef36df2ab2f0f1b7b8465d868537143fb68cb89 /clang/lib/Sema/SemaTemplate.cpp | |
| parent | 2dece5747a0f7bd711a5d8fa93b613351f7b6e07 (diff) | |
| download | bcm5719-llvm-6edca7d9bde368cce0633cf0315735cfa46eccbe.tar.gz bcm5719-llvm-6edca7d9bde368cce0633cf0315735cfa46eccbe.zip | |
Handle CC and NoReturn when instantiating members of class templates.
Before we were considering them only when instantiating templates.
This fixes pr18033.
llvm-svn: 196050
Diffstat (limited to 'clang/lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index e995ae1c36e..7b901d2df87 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -7436,7 +7436,8 @@ DeclResult Sema::ActOnExplicitInstantiation(Scope *S, NamedDecl *Prev = *P; if (!HasExplicitTemplateArgs) { if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(Prev)) { - if (Context.hasSameUnqualifiedType(Method->getType(), R)) { + QualType Adjusted = adjustCCAndNoReturn(R, Method->getType()); + if (Context.hasSameUnqualifiedType(Method->getType(), Adjusted)) { Matches.clear(); Matches.addDecl(Method, P.getAccess()); |
