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

Fix ambiguity detection in GetBestOverloadCandidateSimple. 

When performing the simplistic overload resolution for single-argument methods,
don't check the best overload for ambiguity with itself when the best overload
doesn't happen to be the first one.

Fixes PR13480.

llvm-svn: 160961
This commit is contained in:
Benjamin Kramer 2012-07-30 15:53:26 +00:00
parent 355b660a4b
commit bc7dd9ea02
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/AST/DeclCXX.cpp
View File

@ -344,8 +344,8 @@ GetBestOverloadCandidateSimple(
if (Cands[Best].second.compatiblyIncludes(Cands[I].second))
Best = I;
for (unsigned I = 1; I != N; ++I)
if (Cands[Best].second.compatiblyIncludes(Cands[I].second))
for (unsigned I = 0; I != N; ++I)
if (I != Best && Cands[Best].second.compatiblyIncludes(Cands[I].second))
return 0;
return Cands[Best].first;

11
clang/test/SemaCXX/cxx98-compat.cpp
View File

@ -335,3 +335,14 @@ namespace NullPointerTemplateArg {
X<(int*)0> x; // expected-warning {{use of null pointer as non-type template argument is incompatible with C++98}}
Y<(int A::*)0> y; // expected-warning {{use of null pointer as non-type template argument is incompatible with C++98}}
}
namespace PR13480 {
struct basic_iterator {
basic_iterator(const basic_iterator &it) {}
basic_iterator(basic_iterator &it) {} // expected-note {{because type 'PR13480::basic_iterator' has a user-declared copy constructor}}
};
union test {
basic_iterator it; // expected-warning {{union member 'it' with a non-trivial copy constructor is incompatible with C++98}}
};
}