summaryrefslogtreecommitdiffstats
path: root/lib/ARCMigrate/TransProperties.cpp
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2011-11-07 18:40:32 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2011-11-07 18:40:32 +0000
commitbf8455c56cc5e328c31a2b56f5587cd0873ba0ae (patch)
treea44350cb04a276a1debaf548f60af76cca5c6e96 /lib/ARCMigrate/TransProperties.cpp
parent11cbe2a7fb565678fca456f6bc2d4648ced3adb3 (diff)
[arcmt] Map property decls to their GC attributes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143978 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ARCMigrate/TransProperties.cpp')
-rw-r--r--lib/ARCMigrate/TransProperties.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ARCMigrate/TransProperties.cpp b/lib/ARCMigrate/TransProperties.cpp
index 1512e4e96d..f9f642ffc8 100644
--- a/lib/ARCMigrate/TransProperties.cpp
+++ b/lib/ARCMigrate/TransProperties.cpp
@@ -127,7 +127,7 @@ public:
PropsTy &props = I->second;
if (!getPropertyType(props)->isObjCRetainableType())
continue;
- if (hasIvarWithExplicitOwnership(props))
+ if (hasIvarWithExplicitARCOwnership(props))
continue;
Transaction Trans(Pass.TA);
@@ -457,7 +457,10 @@ private:
return false;
}
- bool hasIvarWithExplicitOwnership(PropsTy &props) const {
+ bool hasIvarWithExplicitARCOwnership(PropsTy &props) const {
+ if (Pass.isGCMigration())
+ return false;
+
for (PropsTy::iterator I = props.begin(), E = props.end(); I != E; ++I) {
if (isUserDeclared(I->IvarD)) {
if (isa<AttributedType>(I->IvarD->getType()))