__typeof should be able to handle block pointer types when

rewriting. Fixes radar 7659483.

llvm-svn: 96549

2 files changed, 7 insertions, 1 deletions

diff --git a/clang/lib/Frontend/RewriteObjC.cpp b/clang/lib/Frontend/RewriteObjC.cpp
index 9d4d6047160..5d99491cd6a 100644
--- a/clang/lib/Frontend/RewriteObjC.cpp
+++ b/clang/lib/Frontend/RewriteObjC.cpp
@@ -4416,7 +4416,7 @@ void RewriteObjC::RewriteCastExpr(CStyleCastExpr *CE) {
     const TypeOfExprType *TypeOfExprTypePtr = cast<TypeOfExprType>(TypePtr);
     QT = TypeOfExprTypePtr->getUnderlyingExpr()->getType();
     std::string TypeAsString = "(";
-    TypeAsString += QT.getAsString();
+    RewriteBlockPointerType(TypeAsString, QT);
     TypeAsString += ")";
     ReplaceText(LocStart, endBuf-startBuf+1, TypeAsString);
     return;
diff --git a/clang/test/Rewriter/rewrite-block-pointer.mm b/clang/test/Rewriter/rewrite-block-pointer.mm
index 229eb895008..4a4fa347084 100644
--- a/clang/test/Rewriter/rewrite-block-pointer.mm
+++ b/clang/test/Rewriter/rewrite-block-pointer.mm
@@ -27,3 +27,9 @@ static void y(int (^cmp)(int, int)) {
 		x(cmp);
     });
 }
+
+// radar 7659483
+void *_Block_copy(const void *aBlock);
+void x(void (^block)(void)) {
+        block = ((__typeof(block))_Block_copy((const void *)(block)));
+}