[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

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

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

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