When comparing two method overload candidates during overload diagnostics,

skip the object argument conversion if either of the candidates didn't
initialize it.

Fixes PR6421, which is such a very straightforward extension of PR6398 that I
should have worked it into the last test case (and therefore caught it then).
Ah well.

llvm-svn: 97135
This commit is contained in:
John McCall 2010-02-25 10:46:05 +00:00
parent b306bcc266
commit 21b57fa4e5
2 changed files with 4 additions and 2 deletions

View File

@ -4797,7 +4797,8 @@ struct CompareOverloadCandidatesForDisplay {
assert(L->Conversions.size() == R->Conversions.size());
int leftBetter = 0;
for (unsigned I = 0, E = L->Conversions.size(); I != E; ++I) {
unsigned I = (L->IgnoreObjectArgument || R->IgnoreObjectArgument);
for (unsigned E = L->Conversions.size(); I != E; ++I) {
switch (S.CompareImplicitConversionSequences(L->Conversions[I],
R->Conversions[I])) {
case ImplicitConversionSequence::Better:

View File

@ -360,12 +360,13 @@ namespace DerivedToBaseVsVoid {
}
}
// PR 6398
// PR 6398 + PR 6421
namespace test4 {
class A;
class B {
static void foo(); // expected-note {{not viable}}
static void foo(int*); // expected-note {{not viable}}
static void foo(long*); // expected-note {{not viable}}
void bar(A *a) {
foo(a); // expected-error {{no matching function for call}}