commit 288f76ad86d5de6433eef097a1a5caff0c922e85
author Larisse Voufo <lvoufo@google.com> Thu Jun 27 03:36:30 2013 +0000
committer Larisse Voufo <lvoufo@google.com> Thu Jun 27 03:36:30 2013 +0000
tree daeb6a9ef6df5dece07f5ffbef619f64b1c5b30a
parent 7419d013fd2c4dda596066f4864d5c40e85ba330

A bit of program simplification from r185056

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@185058 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaInit.cpp

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index cbca84d..9370287 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -6251,8 +6251,7 @@
       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()))

lib/Sema/SemaOverload.cpp

diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index b1fe76a..3f7ab1c 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -3232,8 +3232,7 @@
          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(),