diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-05-07 19:42:26 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-05-07 19:42:26 +0000 |
| commit | 496e8b345c21329608b2998038db3508896a66ad (patch) | |
| tree | 21fcaa87e83b7e18147a1780f3eaefc32e6aebb1 /clang/lib/Sema/SemaOverload.cpp | |
| parent | 7828ab1ed9c2b499c249cedfd301e116a66c21f3 (diff) | |
| download | bcm5719-llvm-496e8b345c21329608b2998038db3508896a66ad.tar.gz bcm5719-llvm-496e8b345c21329608b2998038db3508896a66ad.zip | |
Reapply the reference-binding patch applied below, along with a fix to
ensure that we complete the type when we need to look at constructors
during reference binding.
When determining whether the two types involved in reference binding
are reference-compatible, reference-related, etc., do not complete the
type of the reference itself because it is not necessary to determine
well-formedness of the program. Complete the type that we are binding
to, since that can affect whether we know about a derived-to-base
conversion.
Re-fixes PR7080.
llvm-svn: 103283
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 531ca39a996..dec9854c72e 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -2289,8 +2289,7 @@ Sema::CompareReferenceRelationship(SourceLocation Loc, // T1 is a base class of T2. if (UnqualT1 == UnqualT2) DerivedToBase = false; - else if (!RequireCompleteType(Loc, OrigT1, PDiag()) && - !RequireCompleteType(Loc, OrigT2, PDiag()) && + else if (!RequireCompleteType(Loc, OrigT2, PDiag()) && IsDerivedFrom(UnqualT2, UnqualT1)) DerivedToBase = true; else |
