Author: fjahanian
Date: Fri Jul 29 20:07:55 2011
New Revision: 136549

URL: http://llvm.org/viewvc/llvm-project?rev=136549&view=rev
Log:
objc rewriter - set the flag passed to 
_Block_object_assign/_Block_object_dispose correctly
for copying a captured block object. // rdar://9846759

Modified:
    cfe/trunk/lib/Rewrite/RewriteObjC.cpp

Modified: cfe/trunk/lib/Rewrite/RewriteObjC.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/RewriteObjC.cpp?rev=136549&r1=136548&r2=136549&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/RewriteObjC.cpp (original)
+++ cfe/trunk/lib/Rewrite/RewriteObjC.cpp Fri Jul 29 20:07:55 2011
@@ -4260,7 +4260,7 @@
     if (BlockByRefDeclsPtrSet.count((*I)))
       S += ", " + utostr(BLOCK_FIELD_IS_BYREF) + "/*BLOCK_FIELD_IS_BYREF*/);";
     else
-      S += ", " + utostr(BLOCK_FIELD_IS_OBJECT) + 
"/*BLOCK_FIELD_IS_OBJECT*/);";
+      S += ", " + utostr(BLOCK_FIELD_IS_BLOCK) + "/*BLOCK_FIELD_IS_BLOCK*/);";
   }
   S += "}\n";
   
@@ -4276,7 +4276,7 @@
     if (BlockByRefDeclsPtrSet.count((*I)))
       S += ", " + utostr(BLOCK_FIELD_IS_BYREF) + "/*BLOCK_FIELD_IS_BYREF*/);";
     else
-      S += ", " + utostr(BLOCK_FIELD_IS_OBJECT) + 
"/*BLOCK_FIELD_IS_OBJECT*/);";
+      S += ", " + utostr(BLOCK_FIELD_IS_BLOCK) + "/*BLOCK_FIELD_IS_BLOCK*/);";
   }
   S += "}\n";
   return S;


_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

Reply via email to