[llvm-branch-commits] [cfe-branch] r293797 - Merging r293787:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Feb  1 12:45:31 2017
New Revision: 293797

URL: http://llvm.org/viewvc/llvm-project?rev=293797&view=rev
Log:
Merging r293787:
------------------------------------------------------------------------
r293787 | arphaman | 2017-02-01 09:37:28 -0800 (Wed, 01 Feb 2017) | 5 lines

[CodeGen][ObjC] Avoid asserting on block pointer types in
isPointerZeroInitializable

rdar://30111891

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

Added:
    cfe/branches/release_40/test/CodeGenObjC/block-ptr-type-crash.m
      - copied unchanged from r293787, cfe/trunk/test/CodeGenObjC/block-ptr-type-crash.m
Modified:
    cfe/branches/release_40/   (props changed)
    cfe/branches/release_40/lib/CodeGen/CodeGenTypes.cpp

Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 12:45:31 2017
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293134,293360,293369,293596,293678
+/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291955,291963-291964,292032,292052,292183,292194,292247,292265,292497,292555,292558-292559,292561,292590,292800,292847,292874,292991,293134,293360,293369,293596,293678,293787
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_40/lib/CodeGen/CodeGenTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/CodeGen/CodeGenTypes.cpp?rev=293797&r1=293796&r2=293797&view=diff
==============================================================================
--- cfe/branches/release_40/lib/CodeGen/CodeGenTypes.cpp (original)
+++ cfe/branches/release_40/lib/CodeGen/CodeGenTypes.cpp Wed Feb  1 12:45:31 2017
@@ -737,7 +737,7 @@ CodeGenTypes::getCGRecordLayout(const Re
 }
 
 bool CodeGenTypes::isPointerZeroInitializable(QualType T) {
-  assert (T->isAnyPointerType() && "Invalid type");
+  assert((T->isAnyPointerType() || T->isBlockPointerType()) && "Invalid type");
   return isZeroInitializable(T);
 }