From 1148c92bdb10ac42c543363b7ed587a1950a5e20 Mon Sep 17 00:00:00 2001 From: Erik Pilkington Date: Thu, 28 Jul 2016 22:51:11 +0000 Subject: [PATCH] Revert "[ObjC] Consider availability of context when emitting availability warnings" Reverting r277058, while I fugure out why it broke internal bots. This reverts commit e514ffa8b657416c6784bbe6da9f5de19365103d. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@277070 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/DeclBase.h | 8 +------- include/clang/Sema/Sema.h | 7 +------ lib/AST/DeclBase.cpp | 26 ++++++++++++-------------- lib/Sema/SemaDeclAttr.cpp | 23 ----------------------- lib/Sema/SemaExpr.cpp | 20 +++++++------------- test/SemaObjC/attr-availability.m | 31 ------------------------------- 6 files changed, 21 insertions(+), 94 deletions(-) diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h index f2912a116b..ec8bb3aaa3 100644 --- a/include/clang/AST/DeclBase.h +++ b/include/clang/AST/DeclBase.h @@ -17,7 +17,6 @@ #include "clang/AST/AttrIterator.h" #include "clang/AST/DeclarationName.h" #include "clang/Basic/Specifiers.h" -#include "clang/Basic/VersionTuple.h" #include "llvm/ADT/PointerUnion.h" #include "llvm/ADT/iterator.h" #include "llvm/ADT/iterator_range.h" @@ -604,12 +603,7 @@ public: /// AR_Available, will be set to a (possibly empty) message /// describing why the declaration has not been introduced, is /// deprecated, or is unavailable. - /// - /// \param EnclosingVersion The version to compare with. If empty, assume the - /// deployment target version. - AvailabilityResult - getAvailability(std::string *Message = nullptr, - VersionTuple EnclosingVersion = VersionTuple()) const; + AvailabilityResult getAvailability(std::string *Message = nullptr) const; /// \brief Determine whether this declaration is marked 'deprecated'. /// diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index dd99abe9f6..a04ab9496f 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -9596,12 +9596,7 @@ public: } AvailabilityResult getCurContextAvailability() const; - - /// \brief Get the verison that this context implies. - /// For instance, a method in an interface that is annotated with an - /// availability attribuite effectively has the availability of the interface. - VersionTuple getVersionForDecl(const Decl *Ctx) const; - + const DeclContext *getCurObjCLexicalContext() const { const DeclContext *DC = getCurLexicalContext(); // A category implicitly has the attribute of the interface. diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp index 8342c0f2e3..8918e18d43 100644 --- a/lib/AST/DeclBase.cpp +++ b/lib/AST/DeclBase.cpp @@ -400,12 +400,11 @@ const Attr *Decl::getDefiningAttr() const { /// diagnostics. static AvailabilityResult CheckAvailability(ASTContext &Context, const AvailabilityAttr *A, - std::string *Message, - VersionTuple EnclosingVersion) { - if (EnclosingVersion.empty()) - EnclosingVersion = Context.getTargetInfo().getPlatformMinVersion(); + std::string *Message) { + VersionTuple TargetMinVersion = + Context.getTargetInfo().getPlatformMinVersion(); - if (EnclosingVersion.empty()) + if (TargetMinVersion.empty()) return AR_Available; // Check if this is an App Extension "platform", and if so chop off @@ -450,7 +449,7 @@ static AvailabilityResult CheckAvailability(ASTContext &Context, // Make sure that this declaration has already been introduced. if (!A->getIntroduced().empty() && - EnclosingVersion < A->getIntroduced()) { + TargetMinVersion < A->getIntroduced()) { if (Message) { Message->clear(); llvm::raw_string_ostream Out(*Message); @@ -464,7 +463,7 @@ static AvailabilityResult CheckAvailability(ASTContext &Context, } // Make sure that this declaration hasn't been obsoleted. - if (!A->getObsoleted().empty() && EnclosingVersion >= A->getObsoleted()) { + if (!A->getObsoleted().empty() && TargetMinVersion >= A->getObsoleted()) { if (Message) { Message->clear(); llvm::raw_string_ostream Out(*Message); @@ -478,7 +477,7 @@ static AvailabilityResult CheckAvailability(ASTContext &Context, } // Make sure that this declaration hasn't been deprecated. - if (!A->getDeprecated().empty() && EnclosingVersion >= A->getDeprecated()) { + if (!A->getDeprecated().empty() && TargetMinVersion >= A->getDeprecated()) { if (Message) { Message->clear(); llvm::raw_string_ostream Out(*Message); @@ -494,10 +493,9 @@ static AvailabilityResult CheckAvailability(ASTContext &Context, return AR_Available; } -AvailabilityResult Decl::getAvailability(std::string *Message, - VersionTuple EnclosingVersion) const { +AvailabilityResult Decl::getAvailability(std::string *Message) const { if (auto *FTD = dyn_cast(this)) - return FTD->getTemplatedDecl()->getAvailability(Message, EnclosingVersion); + return FTD->getTemplatedDecl()->getAvailability(Message); AvailabilityResult Result = AR_Available; std::string ResultMessage; @@ -522,7 +520,7 @@ AvailabilityResult Decl::getAvailability(std::string *Message, if (const auto *Availability = dyn_cast(A)) { AvailabilityResult AR = CheckAvailability(getASTContext(), Availability, - Message, EnclosingVersion); + Message); if (AR == AR_Unavailable) return AR_Unavailable; @@ -581,8 +579,8 @@ bool Decl::isWeakImported() const { return true; if (const auto *Availability = dyn_cast(A)) { - if (CheckAvailability(getASTContext(), Availability, nullptr, - VersionTuple()) == AR_NotYetIntroduced) + if (CheckAvailability(getASTContext(), Availability, + nullptr) == AR_NotYetIntroduced) return true; } } diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 287632382d..73fd057a2a 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -6484,26 +6484,3 @@ void Sema::EmitAvailabilityWarning(AvailabilityDiagnostic AD, DoEmitAvailabilityWarning(*this, AD, Ctx, D, Message, Loc, UnknownObjCClass, ObjCProperty, ObjCPropertyAccess); } - -VersionTuple Sema::getVersionForDecl(const Decl *D) const { - assert(D && "Expected a declaration here!"); - - VersionTuple DeclVersion; - if (const auto *AA = getAttrForPlatform(getASTContext(), D)) - DeclVersion = AA->getIntroduced(); - - const ObjCInterfaceDecl *Interface = nullptr; - - if (const auto *MD = dyn_cast(D)) - Interface = MD->getClassInterface(); - else if (const auto *ID = dyn_cast(D)) - Interface = ID->getClassInterface(); - - if (Interface) { - if (const auto *AA = getAttrForPlatform(getASTContext(), Interface)) - if (AA->getIntroduced() > DeclVersion) - DeclVersion = AA->getIntroduced(); - } - - return DeclVersion; -} diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 6539790224..19a3d035d3 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -107,14 +107,9 @@ static AvailabilityResult DiagnoseAvailabilityOfDecl(Sema &S, NamedDecl *D, SourceLocation Loc, const ObjCInterfaceDecl *UnknownObjCClass, bool ObjCPropertyAccess) { - VersionTuple ContextVersion; - if (const DeclContext *DC = S.getCurObjCLexicalContext()) - ContextVersion = S.getVersionForDecl(cast(DC)); - - // See if this declaration is unavailable, deprecated, or partial in the - // current context. + // See if this declaration is unavailable or deprecated. std::string Message; - AvailabilityResult Result = D->getAvailability(&Message, ContextVersion); + AvailabilityResult Result = D->getAvailability(&Message); // For typedefs, if the typedef declaration appears available look // to the underlying type to see if it is more restrictive. @@ -122,7 +117,7 @@ DiagnoseAvailabilityOfDecl(Sema &S, NamedDecl *D, SourceLocation Loc, if (Result == AR_Available) { if (const TagType *TT = TD->getUnderlyingType()->getAs()) { D = TT->getDecl(); - Result = D->getAvailability(&Message, ContextVersion); + Result = D->getAvailability(&Message); continue; } } @@ -133,7 +128,7 @@ DiagnoseAvailabilityOfDecl(Sema &S, NamedDecl *D, SourceLocation Loc, if (ObjCInterfaceDecl *IDecl = dyn_cast(D)) { if (IDecl->getDefinition()) { D = IDecl->getDefinition(); - Result = D->getAvailability(&Message, ContextVersion); + Result = D->getAvailability(&Message); } } @@ -141,7 +136,7 @@ DiagnoseAvailabilityOfDecl(Sema &S, NamedDecl *D, SourceLocation Loc, if (Result == AR_Available) { const DeclContext *DC = ECD->getDeclContext(); if (const EnumDecl *TheEnumDecl = dyn_cast(DC)) - Result = TheEnumDecl->getAvailability(&Message, ContextVersion); + Result = TheEnumDecl->getAvailability(&Message); } const ObjCPropertyDecl *ObjCPDecl = nullptr; @@ -149,8 +144,7 @@ DiagnoseAvailabilityOfDecl(Sema &S, NamedDecl *D, SourceLocation Loc, Result == AR_NotYetIntroduced) { if (const ObjCMethodDecl *MD = dyn_cast(D)) { if (const ObjCPropertyDecl *PD = MD->findPropertyDecl()) { - AvailabilityResult PDeclResult = - PD->getAvailability(nullptr, ContextVersion); + AvailabilityResult PDeclResult = PD->getAvailability(nullptr); if (PDeclResult == Result) ObjCPDecl = PD; } @@ -204,7 +198,7 @@ DiagnoseAvailabilityOfDecl(Sema &S, NamedDecl *D, SourceLocation Loc, break; } - return Result; + return Result; } /// \brief Emit a note explaining that this function is deleted. diff --git a/test/SemaObjC/attr-availability.m b/test/SemaObjC/attr-availability.m index 1be949086d..6cbb3cc22d 100644 --- a/test/SemaObjC/attr-availability.m +++ b/test/SemaObjC/attr-availability.m @@ -294,34 +294,3 @@ __attribute__((objc_root_class)) [obj method]; // expected-error{{'method' is unavailable}} } @end - -#if defined(WARN_PARTIAL) - -int fn_10_7() __attribute__((availability(macosx, introduced=10.7))); // expected-note{{marked partial here}} -int fn_10_8() __attribute__((availability(macosx, introduced=10.8))) { // expected-note{{marked partial here}} - return fn_10_7(); -} - -__attribute__((objc_root_class)) -@interface LookupAvailabilityBase --(void) method1; -@end - -@implementation LookupAvailabilityBase --(void)method1 { fn_10_7(); } // expected-warning{{partial}} expected-note{{explicitly redeclare}} -@end - -__attribute__((availability(macosx, introduced=10.7))) -@interface LookupAvailability : LookupAvailabilityBase -- (void)method2; -- (void)method3; -- (void)method4 __attribute__((availability(macosx, introduced=10.8))); -@end - -@implementation LookupAvailability --(void)method2 { fn_10_7(); } --(void)method3 { fn_10_8(); } // expected-warning{{partial}} expected-note{{explicitly redeclare}} --(void)method4 { fn_10_8(); } -@end - -#endif -- 2.40.0