Rename objc_lifetime -> objc_ownership, and modify diagnostics to talk about 'ownership', not 'lifetime'.

rdar://9477613.

llvm-svn: 133779

1 files changed, 4 insertions, 4 deletions

diff --git a/clang/lib/ARCMigrate/TransProperties.cpp b/clang/lib/ARCMigrate/TransProperties.cpp
index 2122e03700d..e0009ac241a 100644
--- a/clang/lib/ARCMigrate/TransProperties.cpp
+++ b/clang/lib/ARCMigrate/TransProperties.cpp
@@ -116,7 +116,7 @@ public:
 
     Transaction Trans(Pass.TA);
     Pass.TA.insert(prop.IvarD->getLocation(), "__weak "); 
-    Pass.TA.clearDiagnostic(diag::err_arc_assign_property_lifetime,
+    Pass.TA.clearDiagnostic(diag::err_arc_assign_property_ownership,
                             prop.ArcPropAssignErrorLoc);
   }
 
@@ -126,7 +126,7 @@ public:
       if (PI->ShouldChangeToWeak) {
         Transaction Trans(Pass.TA);
         Pass.TA.insert(PI->IvarD->getLocation(), "__unsafe_unretained ");
-        Pass.TA.clearDiagnostic(diag::err_arc_assign_property_lifetime,
+        Pass.TA.clearDiagnostic(diag::err_arc_assign_property_ownership,
                                 PI->ArcPropAssignErrorLoc);
       }
     }
@@ -151,7 +151,7 @@ public:
           != Qualifiers::OCL_Strong)
       return true;
     if (!Pass.TA.hasDiagnostic(
-                      diag::err_arc_assign_property_lifetime, D->getLocation()))
+                      diag::err_arc_assign_property_ownership, D->getLocation()))
       return true;
 
     // There is a "error: existing ivar for assign property must be
@@ -162,7 +162,7 @@ public:
       Transaction Trans(Pass.TA);
       Pass.TA.insert(ivarD->getLocation(), "__unsafe_unretained ");
       Pass.TA.clearDiagnostic(
-                      diag::err_arc_assign_property_lifetime, D->getLocation());
+                      diag::err_arc_assign_property_ownership, D->getLocation());
     } else {
       // Mark that we want the ivar to become weak.
       unsigned loc = SM.getInstantiationLoc(propD->getAtLoc()).getRawEncoding();