aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaOverload.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-05-07 15:55:52 +0000
committerDouglas Gregor <dgregor@apple.com>2010-05-07 15:55:52 +0000
commit44c980611525b607ea3ad5c816bd91f37d1b5df5 (patch)
tree9f5c90858913378ade75f6e7587a1a9e71ed061b /lib/Sema/SemaOverload.cpp
parentf78cc4360eb4284091d0d38f3055084360f8c753 (diff)
Revert r103220. It seems to be breaking self-host
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103259 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaOverload.cpp')
-rw-r--r--lib/Sema/SemaOverload.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index dec9854c72..531ca39a99 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -2289,7 +2289,8 @@ Sema::CompareReferenceRelationship(SourceLocation Loc,
// T1 is a base class of T2.
if (UnqualT1 == UnqualT2)
DerivedToBase = false;
- else if (!RequireCompleteType(Loc, OrigT2, PDiag()) &&
+ else if (!RequireCompleteType(Loc, OrigT1, PDiag()) &&
+ !RequireCompleteType(Loc, OrigT2, PDiag()) &&
IsDerivedFrom(UnqualT2, UnqualT1))
DerivedToBase = true;
else