diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | test/Sema/typecheck-binop.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 68a3f8d593..4567d82719 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -1603,7 +1603,7 @@ inline QualType Sema::CheckLogicalOperands( // C99 6.5.[13,14] 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); } diff --git a/test/Sema/typecheck-binop.c b/test/Sema/typecheck-binop.c index 05b9ad9067..8367565de2 100644 --- a/test/Sema/typecheck-binop.c +++ b/test/Sema/typecheck-binop.c @@ -18,3 +18,6 @@ int sub4(void *P, void *Q) { return P-Q; /* expected-warning{{GNU void* extension}} */ } +int logicaland1(int a) { + return a && (void)a; /* expected-error{{invalid operands}} */ +} |