diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-02-19 21:32:49 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-02-19 21:32:49 +0000 |
| commit | b491ed36b4ef9943e21fb47405b5ed8bea412b99 (patch) | |
| tree | de8868396de7c68d645551bf1e8c841e32642c0d /clang/lib/Sema/SemaInit.cpp | |
| parent | 47ffd35beac5a3a999baaf72f373d5ce8cf6f66f (diff) | |
| download | bcm5719-llvm-b491ed36b4ef9943e21fb47405b5ed8bea412b99.tar.gz bcm5719-llvm-b491ed36b4ef9943e21fb47405b5ed8bea412b99.zip | |
Handle the resolution of a reference to a function template (which
includes explicitly-specified template arguments) to a function
template specialization in cases where no deduction is performed or
deduction fails. Patch by Faisal Vali, fixes PR7505!
llvm-svn: 126048
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 3aeb5188270..b0749484f5d 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -3190,7 +3190,10 @@ InitializationSequence::InitializationSequence(Sema &S, /*InOverloadResolution*/ false, /*CStyle=*/Kind.isCStyleOrFunctionalCast())) { - if (Initializer->getType() == Context.OverloadTy) + DeclAccessPair dap; + if (Initializer->getType() == Context.OverloadTy && + !S.ResolveAddressOfOverloadedFunction(Initializer + , DestType, false, dap)) SetFailed(InitializationSequence::FK_AddressOfOverloadFailed); else SetFailed(InitializationSequence::FK_ConversionFailed); @@ -4161,15 +4164,16 @@ bool InitializationSequence::Diagnose(Sema &S, << Args[0]->getSourceRange(); break; - case FK_ConversionFailed: + case FK_ConversionFailed: { + QualType FromType = Args[0]->getType(); S.Diag(Kind.getLocation(), diag::err_init_conversion_failed) << (int)Entity.getKind() << DestType << Args[0]->isLValue() - << Args[0]->getType() + << FromType << Args[0]->getSourceRange(); break; - + } case FK_TooManyInitsForScalar: { SourceRange R; |
