2 files changed, 2 insertions, 21 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
diff --git a/clang/test/SemaTemplate/instantiate-complete.cpp b/clang/test/SemaTemplate/instantiate-complete.cpp
index a2cb0491732..d854c9e6aac 100644
--- a/clang/test/SemaTemplate/instantiate-complete.cpp
+++ b/clang/test/SemaTemplate/instantiate-complete.cpp
@@ -99,23 +99,3 @@ namespace TemporaryObjectCopy {
 
   template void f(int);
 }
-
-namespace PR7080 {
-  template <class T, class U>
-  class X
-  {
-    typedef char true_t;
-    class false_t { char dummy[2]; };
-    static true_t dispatch(U);
-    static false_t dispatch(...);
-    static T trigger();
-  public:
-    enum { value = sizeof(dispatch(trigger())) == sizeof(true_t) };
-  };
-
-  template <class T>
-  class rv : public T
-  { };
-
-  bool x = X<int, rv<int>&>::value;
-}