Index: include/clang/Sema/Sema.h =================================================================== --- include/clang/Sema/Sema.h +++ include/clang/Sema/Sema.h @@ -9738,23 +9738,13 @@ return OriginalLexicalContext ? OriginalLexicalContext : CurContext; } - 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; - /// \brief The diagnostic we should emit for \c D, or \c AR_Available. /// /// \param D The declaration to check. Note that this may be altered to point /// to another declaration that \c D gets it's availability from. i.e., we /// walk the list of typedefs to find an availability attribute. - /// - /// \param ContextVersion The version to compare availability against. - AvailabilityResult - ShouldDiagnoseAvailabilityOfDecl(NamedDecl *&D, VersionTuple ContextVersion, - std::string *Message); + AvailabilityResult ShouldDiagnoseAvailabilityOfDecl(NamedDecl *&D, + std::string *Message); const DeclContext *getCurObjCLexicalContext() const { const DeclContext *DC = getCurLexicalContext(); Index: lib/Sema/SemaDecl.cpp =================================================================== --- lib/Sema/SemaDecl.cpp +++ lib/Sema/SemaDecl.cpp @@ -15602,29 +15602,3 @@ Decl *Sema::getObjCDeclContext() const { return (dyn_cast_or_null(CurContext)); } - -AvailabilityResult Sema::getCurContextAvailability() const { - const Decl *D = cast_or_null(getCurObjCLexicalContext()); - if (!D) - return AR_Available; - - // If we are within an Objective-C method, we should consult - // both the availability of the method as well as the - // enclosing class. If the class is (say) deprecated, - // the entire method is considered deprecated from the - // purpose of checking if the current context is deprecated. - if (const ObjCMethodDecl *MD = dyn_cast(D)) { - AvailabilityResult R = MD->getAvailability(); - if (R != AR_Available) - return R; - D = MD->getClassInterface(); - } - // If we are within an Objective-c @implementation, it - // gets the same availability context as the @interface. - else if (const ObjCImplementationDecl *ID = - dyn_cast(D)) { - D = ID->getClassInterface(); - } - // Recover from user error. - return D ? D->getAvailability() : AR_Available; -} Index: lib/Sema/SemaDeclAttr.cpp =================================================================== --- lib/Sema/SemaDeclAttr.cpp +++ lib/Sema/SemaDeclAttr.cpp @@ -6309,30 +6309,6 @@ diag.Triggered = true; } -static bool isDeclDeprecated(Decl *D) { - do { - if (D->isDeprecated()) - return true; - // A category implicitly has the availability of the interface. - if (const ObjCCategoryDecl *CatD = dyn_cast(D)) - if (const ObjCInterfaceDecl *Interface = CatD->getClassInterface()) - return Interface->isDeprecated(); - } while ((D = cast_or_null(D->getDeclContext()))); - return false; -} - -static bool isDeclUnavailable(Decl *D) { - do { - if (D->isUnavailable()) - return true; - // A category implicitly has the availability of the interface. - if (const ObjCCategoryDecl *CatD = dyn_cast(D)) - if (const ObjCInterfaceDecl *Interface = CatD->getClassInterface()) - return Interface->isUnavailable(); - } while ((D = cast_or_null(D->getDeclContext()))); - return false; -} - static const AvailabilityAttr *getAttrForPlatform(ASTContext &Context, const Decl *D) { // Check each AvailabilityAttr to find the one for this platform. @@ -6361,6 +6337,47 @@ return nullptr; } +/// \brief whether we should emit a diagnostic for \c K and \c DeclVersion in +/// the context of \c Ctx. For example, we should emit an unavailable diagnostic +/// in a deprecated context, but not the other way around. +static bool ShouldDiagnoseAvailabilityInContext(Sema &S, AvailabilityResult K, + VersionTuple DeclVersion, + Decl *Ctx) { + assert(K != AR_Available); + + auto IsContextGreater = [&](const Decl *C) { + if (K == AR_NotYetIntroduced) { + if (auto *AA = getAttrForPlatform(S.Context, C)) + if (AA->getIntroduced() >= DeclVersion) + return true; + } else if (K == AR_Deprecated) + if (C->isDeprecated()) + return true; + + if (C->isUnavailable()) + return true; + return false; + }; + + do { + if (IsContextGreater(Ctx)) + return false; + + // An implementation implicitly has the availability of the interface. + if (const auto *CatOrImpl = dyn_cast(Ctx)) + if (const auto *Interface = CatOrImpl->getClassInterface()) + if (IsContextGreater(Interface)) + return false; + // A category implicitly has the availability of the interface. + if (const ObjCCategoryDecl *CatD = dyn_cast(Ctx)) + if (const ObjCInterfaceDecl *Interface = CatD->getClassInterface()) + if (IsContextGreater(Interface)) + return false; + } while ((Ctx = cast_or_null(Ctx->getDeclContext()))); + + return true; +} + static void DoEmitAvailabilityWarning(Sema &S, AvailabilityResult K, Decl *Ctx, const NamedDecl *D, StringRef Message, SourceLocation Loc, @@ -6377,11 +6394,15 @@ // Matches diag::note_availability_specified_here. unsigned available_here_select_kind; - // Don't warn if our current context is deprecated or unavailable. + VersionTuple DeclVersion; + if (auto *AA = getAttrForPlatform(S.Context, D)) + DeclVersion = AA->getIntroduced(); + + if (!ShouldDiagnoseAvailabilityInContext(S, K, DeclVersion, Ctx)) + return; + switch (K) { case AR_Deprecated: - if (isDeclDeprecated(Ctx) || isDeclUnavailable(Ctx)) - return; diag = !ObjCPropertyAccess ? diag::warn_deprecated : diag::warn_property_method_deprecated; diag_message = diag::warn_deprecated_message; @@ -6391,8 +6412,6 @@ break; case AR_Unavailable: - if (isDeclUnavailable(Ctx)) - return; diag = !ObjCPropertyAccess ? diag::err_unavailable : diag::err_property_method_unavailable; diag_message = diag::err_unavailable_message; @@ -6607,29 +6626,6 @@ 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 std::max(DeclVersion, Context.getTargetInfo().getPlatformMinVersion()); -} - namespace { /// \brief This class implements -Wunguarded-availability. @@ -6643,6 +6639,7 @@ typedef RecursiveASTVisitor Base; Sema &SemaRef; + Decl *Ctx; /// Stack of potentially nested 'if (@available(...))'s. SmallVector AvailabilityStack; @@ -6650,9 +6647,10 @@ void DiagnoseDeclAvailability(NamedDecl *D, SourceRange Range); public: - DiagnoseUnguardedAvailability(Sema &SemaRef, VersionTuple BaseVersion) - : SemaRef(SemaRef) { - AvailabilityStack.push_back(BaseVersion); + DiagnoseUnguardedAvailability(Sema &SemaRef, Decl *Ctx) + : SemaRef(SemaRef), Ctx(Ctx) { + AvailabilityStack.push_back( + SemaRef.Context.getTargetInfo().getPlatformMinVersion()); } void IssueDiagnostics(Stmt *S) { TraverseStmt(S); } @@ -6685,8 +6683,8 @@ NamedDecl *D, SourceRange Range) { VersionTuple ContextVersion = AvailabilityStack.back(); - if (AvailabilityResult Result = SemaRef.ShouldDiagnoseAvailabilityOfDecl( - D, ContextVersion, nullptr)) { + if (AvailabilityResult Result = + SemaRef.ShouldDiagnoseAvailabilityOfDecl(D, nullptr)) { // All other diagnostic kinds have already been handled in // DiagnoseAvailabilityOfDecl. if (Result != AR_NotYetIntroduced) @@ -6695,6 +6693,14 @@ const AvailabilityAttr *AA = getAttrForPlatform(SemaRef.getASTContext(), D); VersionTuple Introduced = AA->getIntroduced(); + if (ContextVersion >= Introduced) + return; + + // If the context of this function is more unavailable then D, we should not + // emit a diagnostic. + if (!ShouldDiagnoseAvailabilityInContext(SemaRef, Result, Introduced, Ctx)) + return; + SemaRef.Diag(Range.getBegin(), diag::warn_unguarded_availability) << Range << D << AvailabilityAttr::getPrettyPlatformName( @@ -6769,6 +6775,5 @@ assert(Body && "Need a body here!"); - VersionTuple BaseVersion = getVersionForDecl(D); - DiagnoseUnguardedAvailability(*this, BaseVersion).IssueDiagnostics(Body); + DiagnoseUnguardedAvailability(*this, D).IssueDiagnostics(Body); } Index: lib/Sema/SemaExpr.cpp =================================================================== --- lib/Sema/SemaExpr.cpp +++ lib/Sema/SemaExpr.cpp @@ -103,9 +103,9 @@ return false; } -AvailabilityResult Sema::ShouldDiagnoseAvailabilityOfDecl( - NamedDecl *&D, VersionTuple ContextVersion, std::string *Message) { - AvailabilityResult Result = D->getAvailability(Message, ContextVersion); +AvailabilityResult +Sema::ShouldDiagnoseAvailabilityOfDecl(NamedDecl *&D, std::string *Message) { + 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. @@ -113,7 +113,7 @@ if (Result == AR_Available) { if (const TagType *TT = TD->getUnderlyingType()->getAs()) { D = TT->getDecl(); - Result = D->getAvailability(Message, ContextVersion); + Result = D->getAvailability(Message); continue; } } @@ -124,7 +124,7 @@ if (ObjCInterfaceDecl *IDecl = dyn_cast(D)) { if (IDecl->getDefinition()) { D = IDecl->getDefinition(); - Result = D->getAvailability(Message, ContextVersion); + Result = D->getAvailability(Message); } } @@ -132,18 +132,10 @@ 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); } - switch (Result) { - case AR_Available: - return Result; - - case AR_Unavailable: - case AR_Deprecated: - return getCurContextAvailability() != Result ? Result : AR_Available; - - case AR_NotYetIntroduced: { + if (Result == AR_NotYetIntroduced) { // Don't do this for enums, they can't be redeclared. if (isa(D) || isa(D)) return AR_Available; @@ -166,23 +158,18 @@ return Warn ? AR_NotYetIntroduced : AR_Available; } - } - llvm_unreachable("Unknown availability result!"); + + return Result; } static void 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)); - std::string Message; - // See if this declaration is unavailable, deprecated, or partial in the - // current context. + // See if this declaration is unavailable, deprecated, or partial. if (AvailabilityResult Result = - S.ShouldDiagnoseAvailabilityOfDecl(D, ContextVersion, &Message)) { + S.ShouldDiagnoseAvailabilityOfDecl(D, &Message)) { if (Result == AR_NotYetIntroduced && S.getCurFunctionOrMethodDecl()) { S.getEnclosingFunction()->HasPotentialAvailabilityViolations = true; @@ -192,8 +179,7 @@ const ObjCPropertyDecl *ObjCPDecl = nullptr; 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; } Index: test/SemaObjC/class-unavail-warning.m =================================================================== --- test/SemaObjC/class-unavail-warning.m +++ test/SemaObjC/class-unavail-warning.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -triple x86_64-apple-darwin10 -verify %s +// RUN: %clang_cc1 -fsyntax-only -fblocks -triple x86_64-apple-darwin10 -verify %s // rdar://9092208 __attribute__((unavailable("not available"))) @@ -98,3 +98,19 @@ @end @interface UnavailSub(cat) // no error @end + +int unavail_global UNAVAILABLE; + +UNAVAILABLE __attribute__((objc_root_class)) +@interface TestAttrContext +-meth; +@end + +@implementation TestAttrContext +-meth { + unavail_global = 2; // no warn + (void) ^{ + unavail_global = 4; // no warn + }; +} +@end