commit f4312dc9b690fc79039560c125e9e3f8ea8a478e
author Steve Naroff <snaroff@apple.com> Thu Dec 11 19:29:16 2008 +0000
committer Steve Naroff <snaroff@apple.com> Thu Dec 11 19:29:16 2008 +0000
tree 9fda3cd8218cba2d75fe27fffd8f25c168e2a316
parent a4c46df1cd63e06af2a094b68b902a3eb232f056

Fix <rdar://problem/6435382> clang ObjC rewriter: @property/@synthesize and blocks don't work together



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60887 91177308-0d34-0410-b5e6-96231b3b80d8

Driver/RewriteObjC.cpp

diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index 2487d23..e071cb9 100644
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -720,7 +720,7 @@
   // attributes (copy, retain, nonatomic). 
   // See objc-act.c:objc_synthesize_new_setter() for details.
   Setr += getIvarAccessString(ClassDecl, OID) + " = ";
-  Setr += OID->getNameAsCString();
+  Setr += PD->getNameAsCString();
   Setr += "; }";
   InsertText(onePastSemiLoc, Setr.c_str(), Setr.size());
 
@@ -861,16 +861,19 @@
   ResultStr += "\nstatic ";
   if (OMD->getResultType()->isObjCQualifiedIdType())
     ResultStr += "id";
-  else if (OMD->getResultType()->isFunctionPointerType()) {
+  else if (OMD->getResultType()->isFunctionPointerType() ||
+           OMD->getResultType()->isBlockPointerType()) {
     // needs special handling, since pointer-to-functions have special
     // syntax (where a decaration models use).
     QualType retType = OMD->getResultType();
-    if (const PointerType* PT = retType->getAsPointerType()) {
-      QualType PointeeTy = PT->getPointeeType();
-      if ((FPRetType = PointeeTy->getAsFunctionType())) {
-        ResultStr += FPRetType->getResultType().getAsString();
-        ResultStr += "(*";
-      }
+    QualType PointeeTy;
+    if (const PointerType* PT = retType->getAsPointerType())
+      PointeeTy = PT->getPointeeType();
+    else if (const BlockPointerType *BPT = retType->getAsBlockPointerType())
+      PointeeTy = BPT->getPointeeType();
+    if ((FPRetType = PointeeTy->getAsFunctionType())) {
+      ResultStr += FPRetType->getResultType().getAsString();
+      ResultStr += "(*";
     }
   } else
     ResultStr += OMD->getResultType().getAsString();