commit 176edb54908d7cf76650e672dbe147e0347cf38c
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Thu Sep 11 05:16:22 2008 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Thu Sep 11 05:16:22 2008 +0000
tree d8721e8d19d205643d617f2a0a1c0eb40ad52851
parent fea38016a92ea2afc6ab1b87ffeaac3f3aa03fe7

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

llvm-svn: 56096

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 706bcdd..d7a812c 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/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());