maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Sort overload results by viability. 

llvm-svn: 93215
This commit is contained in:
John McCall 2010-01-12 00:48:53 +00:00
parent 0d1da2298a
commit ad2587a394
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
clang/lib/Sema/SemaOverload.cpp
View File

@ -4422,28 +4422,36 @@ void NoteAmbiguousUserConversions(Sema &S, SourceLocation OpLoc,
} }
} }
struct CompareOverloadCandidates { struct CompareOverloadCandidatesForDisplay {
SourceManager &SM; Sema &S;
CompareOverloadCandidates(SourceManager &SM) : SM(SM) {} CompareOverloadCandidatesForDisplay(Sema &S) : S(S) {}
bool operator()(const OverloadCandidate *L, bool operator()(const OverloadCandidate *L,
const OverloadCandidate *R) { const OverloadCandidate *R) {
// Order first by viability. // Order first by viability.
if (L->Viable != R->Viable) if (L->Viable) {
return L->Viable; if (!R->Viable) return true;
// TODO: introduce a tri-valued comparison for overload
// candidates. Would be more worthwhile if we had a sort
// that could exploit it.
if (S.isBetterOverloadCandidate(*L, *R)) return true;
if (S.isBetterOverloadCandidate(*R, *L)) return false;
} else if (R->Viable)
return false;
// Put declared functions first. // Put declared functions first.
if (L->Function) { if (L->Function) {
if (!R->Function) return true; if (!R->Function) return true;
return SM.isBeforeInTranslationUnit(L->Function->getLocation(), return S.SourceMgr.isBeforeInTranslationUnit(L->Function->getLocation(),
R->Function->getLocation()); R->Function->getLocation());
} else if (R->Function) return false; } else if (R->Function) return false;
// Then surrogates. // Then surrogates.
if (L->IsSurrogate) { if (L->IsSurrogate) {
if (!R->IsSurrogate) return true; if (!R->IsSurrogate) return true;
return SM.isBeforeInTranslationUnit(L->Surrogate->getLocation(), return S.SourceMgr.isBeforeInTranslationUnit(L->Surrogate->getLocation(),
R->Surrogate->getLocation()); R->Surrogate->getLocation());
} else if (R->IsSurrogate) return false; } else if (R->IsSurrogate) return false;
// And builtins just come in a jumble. // And builtins just come in a jumble.
@ -4470,7 +4478,8 @@ Sema::PrintOverloadCandidates(OverloadCandidateSet& CandidateSet,
Cand != LastCand; ++Cand) Cand != LastCand; ++Cand)
if (Cand->Viable || OCD == OCD_AllCandidates) if (Cand->Viable || OCD == OCD_AllCandidates)
Cands.push_back(Cand); Cands.push_back(Cand);
std::sort(Cands.begin(), Cands.end(), CompareOverloadCandidates(SourceMgr)); std::sort(Cands.begin(), Cands.end(),
CompareOverloadCandidatesForDisplay(*this));
bool ReportedAmbiguousConversions = false; bool ReportedAmbiguousConversions = false;