commit afdc66f4fa8f74a8ce4811d7148d90a00d1d770f
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Mar 05 08:46:24 2012 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Mar 05 08:46:24 2012 +0000
tree f7f1e19cef4bd1f80039bc89b9f706bac992e35d
parent d3e7057afc3f6211b838e1b4d53a4ee9e799283f

[arcmt]
-Make sure we don't change to '__weak' a __block variable used as output.
-Make sure we don't apply __weak twice.

Fixes rdar://10520757&10521362

llvm-svn: 152020

clang/lib/ARCMigrate/Transforms.cpp

diff --git a/clang/lib/ARCMigrate/Transforms.cpp b/clang/lib/ARCMigrate/Transforms.cpp
index 91121f0..6d08d1e 100644
--- a/clang/lib/ARCMigrate/Transforms.cpp
+++ b/clang/lib/ARCMigrate/Transforms.cpp
@@ -553,6 +553,7 @@
     MigrateCtx.addTraverser(new GCAttrsTraverser());
   }
   MigrateCtx.addTraverser(new PropertyRewriteTraverser());
+  MigrateCtx.addTraverser(new BlockObjCVariableTraverser());
 
   MigrateCtx.traverse(pass.Ctx.getTranslationUnitDecl());
 }
@@ -564,7 +565,6 @@
   removeZeroOutPropsInDeallocFinalize(pass);
   makeAssignARCSafe(pass);
   rewriteUnbridgedCasts(pass);
-  rewriteBlockObjCVariable(pass);
   checkAPIUses(pass);
   traverseAST(pass);
 }