diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 13 | ||||
| -rw-r--r-- | clang/test/Sema/warn-null.c | 6 |
2 files changed, 2 insertions, 17 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 8ec58d4283d..22242a5acc9 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -10619,17 +10619,8 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, switch (ConvTy) { case Compatible: - // See if a proper null pointer constant is to be assigned. - if (DstType->isAnyPointerType() && !SrcType->isAnyPointerType() && - SrcExpr->isNullPointerConstant(Context, - Expr::NPC_NeverValueDependent) == - Expr::NPCK_ZeroExpression && - !isUnevaluatedContext()) - Diag(SrcExpr->getExprLoc(), diag::warn_non_literal_null_pointer) - << DstType << SrcExpr->getSourceRange(); - - DiagnoseAssignmentEnum(DstType, SrcType, SrcExpr); - return false; + DiagnoseAssignmentEnum(DstType, SrcType, SrcExpr); + return false; case PointerToInt: DiagKind = diag::ext_typecheck_convert_pointer_int; diff --git a/clang/test/Sema/warn-null.c b/clang/test/Sema/warn-null.c deleted file mode 100644 index 8ac8c5c9d34..00000000000 --- a/clang/test/Sema/warn-null.c +++ /dev/null @@ -1,6 +0,0 @@ -// RUN: %clang_cc1 %s -verify -fsyntax-only - -// PR10837: warn if a non-pointer-typed expression is folded to a null pointer -int *p = 0; -int *q = '\0'; // expected-warning{{expression which evaluates to zero treated as a null pointer constant}} -int *r = (1 - 1); // expected-warning{{expression which evaluates to zero treated as a null pointer constant}} |
