summaryrefslogtreecommitdiffstats
path: root/lib/Sema/SemaExpr.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2014-11-11 21:54:19 +0000
committerFariborz Jahanian <fjahanian@apple.com>2014-11-11 21:54:19 +0000
commit11cd6ea70a8ac074e47b4b0dbd6ef90034411b7f (patch)
treeb78232d48189558e2ec905a7d912b5d98c358f0c /lib/Sema/SemaExpr.cpp
parent23b4498ed6fdd39fde582b6086c6f7c580a044ae (diff)
Revert r221702 until I address Richard Trieu's
comments. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@221714 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaExpr.cpp')
-rw-r--r--lib/Sema/SemaExpr.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index a8429b92ed..37a08cfb08 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -8413,10 +8413,7 @@ inline QualType Sema::CheckLogicalOperands( // C99 6.5.[13,14]
if (!LHS.get()->getType()->isScalarType() ||
!RHS.get()->getType()->isScalarType())
return InvalidOperands(Loc, LHS, RHS);
-
- CheckAlwaysNonNullPointer(LHS.get());
- CheckAlwaysNonNullPointer(RHS.get());
-
+
return Context.IntTy;
}
@@ -12974,7 +12971,6 @@ ExprResult Sema::CheckBooleanCondition(Expr *E, SourceLocation Loc) {
<< T << E->getSourceRange();
return ExprError();
}
- CheckAlwaysNonNullPointer(E);
}
return E;