Commit 68813cd7 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r195126: 

------------------------------------------------------------------------
r195126 | joerg | 2013-11-19 05:38:38 -0800 (Tue, 19 Nov 2013) | 2 lines

Revert r194540, it breaks various C++ programs.

------------------------------------------------------------------------

llvm-svn: 195139
parent 9afea597

clang/lib/Sema/SemaExpr.cpp

+2 −11
Original line number Diff line number Diff line
@@ -10619,15 +10619,6 @@ 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;

clang/test/Sema/warn-null.c

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
// 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}}