commit a33849b368b0973e64ee9c49af4c080a59f99eb4
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Nov 07 18:46:50 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Nov 07 18:46:50 2011 +0000
tree bdec609b9c1a1e36561e96bffea6d5eeadcdf2d4
parent b0e1e121b32a9a04b39f1b77b3068bce2f3be05a

[arcmt] Fix handling NSMakeCollectable inside an objc method.

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

lib/ARCMigrate/Transforms.cpp

diff --git a/lib/ARCMigrate/Transforms.cpp b/lib/ARCMigrate/Transforms.cpp
index 86812a5..96c472c 100644
--- a/lib/ARCMigrate/Transforms.cpp
+++ b/lib/ARCMigrate/Transforms.cpp
@@ -302,6 +302,7 @@
 
 class ASTTransform : public RecursiveASTVisitor<ASTTransform> {
   MigrationContext &MigrateCtx;
+  typedef RecursiveASTVisitor<ASTTransform> base;
 
 public:
   ASTTransform(MigrationContext &MigrateCtx) : MigrateCtx(MigrateCtx) { }
@@ -315,7 +316,7 @@
            E = MigrateCtx.traversers_end(); I != E; ++I)
       (*I)->traverseObjCImplementation(ImplCtx);
 
-    return true;
+    return base::TraverseObjCImplementationDecl(D);
   }
 
   bool TraverseStmt(Stmt *rootS) {

test/ARCMT/GC.m

diff --git a/test/ARCMT/GC.m b/test/ARCMT/GC.m
index e49bca8..2884679 100644
--- a/test/ARCMT/GC.m
+++ b/test/ARCMT/GC.m
@@ -66,4 +66,8 @@
 
 @implementation I4Impl
 @synthesize pw1, pw2, ps, pds, pds2;
+
+-(void)test1:(CFTypeRef *)cft {
+  id x = NSMakeCollectable(cft);
+}
 @end

test/ARCMT/GC.m.result

diff --git a/test/ARCMT/GC.m.result b/test/ARCMT/GC.m.result
index 67a70e3..aaa5ee5 100644
--- a/test/ARCMT/GC.m.result
+++ b/test/ARCMT/GC.m.result
@@ -61,4 +61,8 @@
 
 @implementation I4Impl
 @synthesize pw1, pw2, ps, pds, pds2;
+
+-(void)test1:(CFTypeRef *)cft {
+  id x = CFBridgingRelease(cft);
+}
 @end