diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-12-01 02:11:49 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-12-01 02:11:49 +0000 |
commit | baa4783d310c7a991690795e0fb9b63d4a781003 (patch) | |
tree | 4611ab6a56b729824edd8ed05e7b72cf2bc3f7d9 /clang/lib/Sema/SemaTemplate.cpp | |
parent | b66cb88c2e29cb032d1efe08ad64d1bfa72d3780 (diff) | |
download | bcm5719-llvm-baa4783d310c7a991690795e0fb9b63d4a781003.tar.gz bcm5719-llvm-baa4783d310c7a991690795e0fb9b63d4a781003.zip |
PR31081: ignore exception specifications when deducing function template
arguments from a declaration; despite what the standard says, this form of
deduction should not be considering exception specifications.
llvm-svn: 288301
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 4e941a53b8e..9a6434579f4 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -8075,7 +8075,8 @@ DeclResult Sema::ActOnExplicitInstantiation(Scope *S, NamedDecl *Prev = *P; if (!HasExplicitTemplateArgs) { if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(Prev)) { - QualType Adjusted = adjustCCAndNoReturn(R, Method->getType()); + QualType Adjusted = adjustCCAndNoReturn(R, Method->getType(), + /*AdjustExceptionSpec*/true); if (Context.hasSameUnqualifiedType(Method->getType(), Adjusted)) { Matches.clear(); |