commit c362d3813c8685abaf57c0c4a5bc325751642ad9
author Argiris Kirtzidis <akyrtzi@gmail.com> Thu Sep 11 05:16:22 2008 +0000
committer Argiris Kirtzidis <akyrtzi@gmail.com> Thu Sep 11 05:16:22 2008 +0000
tree b1b3ed2db8515d22b74aedcaf93f51966806be4d
parent 8d36abb17fac9932d46774ebd3f8c4e7f7c13d53

Do implicit conversion to bool for the condition in a do-while statement.

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

lib/Sema/SemaStmt.cpp

diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index 706bcdd..d7a812c 100644
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -530,7 +530,10 @@
   DefaultFunctionArrayConversion(condExpr);
   QualType condType = condExpr->getType();
   
-  if (!condType->isScalarType()) // C99 6.8.5p2
+  if (getLangOptions().CPlusPlus) {
+    if (CheckCXXBooleanCondition(condExpr)) // C++ 6.4p4
+      return true;
+  } else if (!condType->isScalarType()) // C99 6.8.5p2
     return Diag(DoLoc, diag::err_typecheck_statement_requires_scalar,
              condType.getAsString(), condExpr->getSourceRange());