intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-03 02:26:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

When performing copy initialization via user-defined conversions,

Browse Source 
don't allow two user-defined conversions. Fixes PR6595 (again).

llvm-svn: 107379
This commit is contained in:
Douglas Gregor
2010-07-01 03:43:00 +00:00
parent 3671ad4571
commit 7c42659cee
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/Sema/SemaInit.cpp
View File

@@ -2858,7 +2858,6 @@ static void TryUserDefinedConversion(Sema &S,
Con != ConEnd; ++Con) {
NamedDecl *D = *Con;
DeclAccessPair FoundDecl = DeclAccessPair::make(D, D->getAccess());
bool SuppressUserConversions = false;
// Find the constructor (which may be a template).
CXXConstructorDecl *Constructor = 0;
@@ -2867,17 +2866,8 @@ static void TryUserDefinedConversion(Sema &S,
if (ConstructorTmpl)
Constructor = cast<CXXConstructorDecl>(
ConstructorTmpl->getTemplatedDecl());
else {
else
Constructor = cast<CXXConstructorDecl>(D);
// If we're performing copy initialization using a copy constructor,
// we suppress user-defined conversions on the arguments.
// FIXME: Move constructors?
if (Kind.getKind() == InitializationKind::IK_Copy &&
Constructor->isCopyConstructor())
SuppressUserConversions = true;
}
if (!Constructor->isInvalidDecl() &&
Constructor->isConvertingConstructor(AllowExplicit)) {
@@ -2885,11 +2875,11 @@ static void TryUserDefinedConversion(Sema &S,
S.AddTemplateOverloadCandidate(ConstructorTmpl, FoundDecl,
/*ExplicitArgs*/ 0,
&Initializer, 1, CandidateSet,
SuppressUserConversions);
/*SuppressUserConversions=*/true);
else
S.AddOverloadCandidate(Constructor, FoundDecl,
&Initializer, 1, CandidateSet,
SuppressUserConversions);
/*SuppressUserConversions=*/true);
}
}
}

9
clang/test/SemaCXX/conditional-expr.cpp
View File

@@ -199,17 +199,24 @@ void test()
}
namespace PR6595 {
struct OtherString {
OtherString();
OtherString(const char*);
};
struct String {
String(const char *);
String(const OtherString&);
operator const char*() const;
};
void f(bool Cond, String S) {
void f(bool Cond, String S, OtherString OS) {
(void)(Cond? S : "");
(void)(Cond? "" : S);
const char a[1] = {'a'};
(void)(Cond? S : a);
(void)(Cond? a : S);
(void)(Cond? OS : S);
}
}