commit 402804b6d67c880c97e575342189025fe28c0f81
author Yaxun Liu <Yaxun.Liu@amd.com> Thu Dec 15 08:09:08 2016 +0000
committer Yaxun Liu <Yaxun.Liu@amd.com> Thu Dec 15 08:09:08 2016 +0000
tree f05c793f67afb7f12b82a43b0926afd04c0ae4ec
parent 61ef150d53e4a9a3f14f614991f8132a5bb4eedc

Re-commit r289252 and r289285, and fix PR31374

llvm-svn: 289787

clang/lib/CodeGen/CGExprAgg.cpp

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