commit 7849eeb0359e086870633437529c7f8a6a30a952
author Nico Weber <nicolasweber@gmx.de> Wed Dec 14 21:38:18 2016 +0000
committer Nico Weber <nicolasweber@gmx.de> Wed Dec 14 21:38:18 2016 +0000
tree f6e8d655f9a1feba6677efeb815d749321625ee1
parent 65aedad62862a356c49fc5457277fb0c9cd3a75a

Revert 289252 (and follow-up 289285), it caused PR31374

llvm-svn: 289713

clang/lib/CodeGen/CGExprAgg.cpp

diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index 35148be..e24a085 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -1052,8 +1052,7 @@
     return true;
   // (int*)0 - Null pointer expressions.
   if (const CastExpr *ICE = dyn_cast<CastExpr>(E))
-    return ICE->getCastKind() == CK_NullToPointer &&
-        CGF.getTypes().isPointerZeroInitializable(E->getType());
+    return ICE->getCastKind() == CK_NullToPointer;
   // '\0'
   if (const CharacterLiteral *CL = dyn_cast<CharacterLiteral>(E))
     return CL->getValue() == 0;