summaryrefslogtreecommitdiffstats
path: root/clang/lib
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
commit56f14e575dd33f1540ae442e18fe3137b402c621 (patch)
treec9bc5aaeab1bdd322571225c1cd3a5cbd4b8a750 /clang/lib
parent542ad315977cb928130d87e3a72572900e54bc2d (diff)
downloadbcm5719-llvm-56f14e575dd33f1540ae442e18fe3137b402c621.tar.gz
bcm5719-llvm-56f14e575dd33f1540ae442e18fe3137b402c621.zip
Revert r103220. It seems to be breaking self-host
llvm-svn: 103259
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaOverload.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index dec9854c72e..531ca39a996 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/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
OpenPOWER on IntegriCloud