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 | 1be8eec3ddd2a23c19b453c2639226174eb5d4a8 (patch) | |
| tree | a47c90a1061dcdbd80354210444b002f4828feb9 /lib/Sema/SemaInit.cpp | |
| parent | 6c948378154dc37e772e50f95033530d506fa912 (diff) | |
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!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126048 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 3aeb518827..b0749484f5 100644 --- a/lib/Sema/SemaInit.cpp +++ b/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; |