r185058 - A bit of program simplification from r185056

[Larisse Voufo]

Author: lvoufo
Date: Wed Jun 26 22:36:30 2013
New Revision: 185058

URL: http://llvm.org/viewvc/llvm-project?rev=185058&view=rev
Log:
A bit of program simplification from r185056

Modified:
    cfe/trunk/lib/Sema/SemaInit.cpp
    cfe/trunk/lib/Sema/SemaOverload.cpp

Modified: cfe/trunk/lib/Sema/SemaInit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=185058&r1=185057&r2=185058&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaInit.cpp (original)
+++ cfe/trunk/lib/Sema/SemaInit.cpp Wed Jun 26 22:36:30 2013
@@ -6251,8 +6251,7 @@ bool InitializationSequence::Diagnose(Se
       break;
 
     case OR_No_Viable_Function:
-      if (!DestType.getNonReferenceType()->isIncompleteType() ||
-          !S.RequireCompleteType(Kind.getLocation(),
+      if (!S.RequireCompleteType(Kind.getLocation(),
                                  DestType.getNonReferenceType(),
                           diag::err_typecheck_nonviable_condition_incomplete,
                                Args[0]->getType(), Args[0]->getSourceRange()))

Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=185058&r1=185057&r2=185058&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Wed Jun 26 22:36:30 2013
@@ -3232,8 +3232,7 @@ Sema::DiagnoseMultipleUserDefinedConvers
          diag::err_typecheck_ambiguous_condition)
           << From->getType() << ToType << From->getSourceRange();
   else if (OvResult == OR_No_Viable_Function && !CandidateSet.empty()) {
-    if (!ToType->isIncompleteType() ||
-        !RequireCompleteType(From->getLocStart(), ToType,
+    if (!RequireCompleteType(From->getLocStart(), ToType,
                           diag::err_typecheck_nonviable_condition_incomplete,
                              From->getType(), From->getSourceRange()))
       Diag(From->getLocStart(),