[cfe-commits] r60962 - /cfe/trunk/Driver/RewriteObjC.cpp

Steve Naroff snaroff at apple.com
Fri Dec 12 13:05:53 PST 2008


Author: snaroff
Date: Fri Dec 12 15:05:34 2008
New Revision: 60962

URL: http://llvm.org/viewvc/llvm-project?rev=60962&view=rev
Log:
Fix <rdar://problem/6435837> clang ObjC rewriter: use Block_release instead of Block_destroy.

Modified:
    cfe/trunk/Driver/RewriteObjC.cpp

Modified: cfe/trunk/Driver/RewriteObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/RewriteObjC.cpp?rev=60962&r1=60961&r2=60962&view=diff

==============================================================================
--- cfe/trunk/Driver/RewriteObjC.cpp (original)
+++ cfe/trunk/Driver/RewriteObjC.cpp Fri Dec 12 15:05:34 2008
@@ -540,7 +540,7 @@
   Preamble += "// Runtime copy/destroy helper functions\n";
   Preamble += "__OBJC_RW_STATICIMPORT void _Block_copy_assign(void *, void *);\n";
   Preamble += "__OBJC_RW_STATICIMPORT void _Block_byref_assign_copy(void *, void *);\n";
-  Preamble += "__OBJC_RW_STATICIMPORT void _Block_destroy(void *);\n";
+  Preamble += "__OBJC_RW_STATICIMPORT void _Block_release(void *);\n";
   Preamble += "__OBJC_RW_STATICIMPORT void _Block_byref_release(void *);\n";
   Preamble += "__OBJC_RW_STATICIMPORT void *_NSConcreteGlobalBlock;\n";
   Preamble += "__OBJC_RW_STATICIMPORT void *_NSConcreteStackBlock;\n";
@@ -3529,7 +3529,7 @@
   S += "*src) {";
   for (llvm::SmallPtrSet<ValueDecl*,8>::iterator I = ImportedBlockDecls.begin(), 
       E = ImportedBlockDecls.end(); I != E; ++I) {
-    S += "_Block_destroy((void*)src->";
+    S += "_Block_release((void*)src->";
     S += (*I)->getNameAsString();
     S += ");";
   }





More information about the cfe-commits mailing list