commit 5773a6c4ab5a3a7aa9f089bfde3ca1c99ea674ac
author Eli Friedman <eli.friedman@gmail.com> Tue May 13 20:16:47 2008 +0000
committer Eli Friedman <eli.friedman@gmail.com> Tue May 13 20:16:47 2008 +0000
tree 74d348006198e1fd9e0559d667282f15bc99a53c
parent 73cb10307bfc597f8b326e1c276648f6770de574

Both operands to && have to be scalars, not just one.



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

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 68a3f8d..4567d82 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -1603,7 +1603,7 @@
   UsualUnaryConversions(lex);
   UsualUnaryConversions(rex);
   
-  if (lex->getType()->isScalarType() || rex->getType()->isScalarType())
+  if (lex->getType()->isScalarType() && rex->getType()->isScalarType())
     return Context.IntTy;
   return InvalidOperands(loc, lex, rex);
 }