commit ffe912c647240d9e2a5ec622b49660f1a13231aa
author Fariborz Jahanian <fjahanian@apple.com> Fri Dec 11 22:40:48 2009 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Fri Dec 11 22:40:48 2009 +0000
tree b0eb46d0cc252636f78f94c6c4dcd8dbb61908c7
parent f72bdf7eed28a8f5db5a226034cefc74a0a0d99e

Patch to allow C-style cast from 'void *' to block pointer type.
(fixes radar 7465023).

llvm-svn: 91171

clang/lib/Sema/SemaCXXCast.cpp

diff --git a/clang/lib/Sema/SemaCXXCast.cpp b/clang/lib/Sema/SemaCXXCast.cpp
index 857241d..814af90 100644
--- a/clang/lib/Sema/SemaCXXCast.cpp
+++ b/clang/lib/Sema/SemaCXXCast.cpp
@@ -545,6 +545,11 @@
         Kind = CastExpr::CK_AnyPointerToObjCPointerCast;
         return TC_Success;
       }
+      else if (CStyle && DestType->isBlockPointerType()) {
+        // allow c-style cast of void * to block pointers.
+        Kind = CastExpr::CK_AnyPointerToBlockPointerCast;
+        return TC_Success;
+      }
     }
   }