commit 791b86ec55a71659cbddc3bbaaf495c699872ddf
author Richard Trieu <rtrieu@google.com> Wed Nov 19 06:08:18 2014 +0000
committer Richard Trieu <rtrieu@google.com> Wed Nov 19 06:08:18 2014 +0000
tree dc711812cf4e6fbb29ef1939516da3dfcaa6a0d4
parent f552996fb397558dfccdcd9b2b8c62d608663265

Add the exception for strings in logical and expressions to -Wstring-conversion
for C code.

llvm-svn: 222327

clang/lib/Sema/SemaChecking.cpp

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index aa6bf17..91ba91e 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -6613,10 +6613,17 @@
       continue;
     AnalyzeImplicitConversions(S, ChildExpr, CC);
   }
+
   if (BO && BO->isLogicalOp()) {
-    ::CheckBoolLikeConversion(S, BO->getLHS(), BO->getLHS()->getExprLoc());
-    ::CheckBoolLikeConversion(S, BO->getRHS(), BO->getRHS()->getExprLoc());
+    Expr *SubExpr = BO->getLHS()->IgnoreParenImpCasts();
+    if (!IsLogicalAndOperator || !isa<StringLiteral>(SubExpr))
+      ::CheckBoolLikeConversion(S, SubExpr, SubExpr->getExprLoc());
+
+    SubExpr = BO->getRHS()->IgnoreParenImpCasts();
+    if (!IsLogicalAndOperator || !isa<StringLiteral>(SubExpr))
+      ::CheckBoolLikeConversion(S, SubExpr, SubExpr->getExprLoc());
   }
+
   if (const UnaryOperator *U = dyn_cast<UnaryOperator>(E))
     if (U->getOpcode() == UO_LNot)
       ::CheckBoolLikeConversion(S, U->getSubExpr(), CC);