diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-06-24 00:08:59 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-06-24 00:08:59 +0000 |
| commit | cff00d9c127c7c1c25cf2d5345d5008460f235a1 (patch) | |
| tree | c290e899ae8586acf5204519a940c8ae776c82ff /clang/lib/Sema/SemaDecl.cpp | |
| parent | 4d1f660aced0b9660e65928c87b1a6ddf591f2cb (diff) | |
| download | bcm5719-llvm-cff00d9c127c7c1c25cf2d5345d5008460f235a1.tar.gz bcm5719-llvm-cff00d9c127c7c1c25cf2d5345d5008460f235a1.zip | |
Rename objc_lifetime -> objc_ownership, and modify diagnostics to talk about 'ownership', not 'lifetime'.
rdar://9477613.
llvm-svn: 133779
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 4a000e9fc26..adfc6f95013 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -3518,7 +3518,7 @@ bool Sema::inferObjCARCLifetime(ValueDecl *decl) { // Thread-local variables cannot have lifetime. if (lifetime && lifetime != Qualifiers::OCL_ExplicitNone && var->isThreadSpecified()) { - Diag(var->getLocation(), diag::err_arc_thread_lifetime) + Diag(var->getLocation(), diag::err_arc_thread_ownership) << var->getType(); return true; } @@ -6137,7 +6137,7 @@ ParmVarDecl *Sema::CheckParameter(DeclContext *DC, SourceLocation StartLoc, // - otherwise, it's an error if (T->isArrayType()) { if (!T.isConstQualified()) { - Diag(NameLoc, diag::err_arc_array_param_no_lifetime) + Diag(NameLoc, diag::err_arc_array_param_no_ownership) << TSInfo->getTypeLoc().getSourceRange(); } lifetime = Qualifiers::OCL_ExplicitNone; @@ -7902,7 +7902,7 @@ bool Sema::CheckNontrivialField(FieldDecl *FD) { if (getSourceManager().isInSystemHeader(Loc)) { if (!FD->hasAttr<UnavailableAttr>()) FD->addAttr(new (Context) UnavailableAttr(Loc, Context, - "this system field has retaining lifetime")); + "this system field has retaining ownership")); return false; } } @@ -8069,7 +8069,7 @@ void Sema::DiagnoseNontrivial(const RecordType* T, CXXSpecialMember member) { case Qualifiers::OCL_Autoreleasing: case Qualifiers::OCL_Weak: case Qualifiers::OCL_Strong: - Diag((*fi)->getLocation(), diag::note_nontrivial_objc_lifetime) + Diag((*fi)->getLocation(), diag::note_nontrivial_objc_ownership) << QT << EltTy.getObjCLifetime(); return; } @@ -8386,7 +8386,7 @@ void Sema::ActOnFields(Scope* S, if (getSourceManager().isInSystemHeader(loc)) { if (!FD->hasAttr<UnavailableAttr>()) { FD->addAttr(new (Context) UnavailableAttr(loc, Context, - "this system field has retaining lifetime")); + "this system field has retaining ownership")); } } else { Diag(FD->getLocation(), diag::err_arc_objc_object_in_struct); |
