From 9c64f211b66179d077c17d6808025fcfc39a61a8 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Thu, 5 Apr 2018 18:12:06 +0000 Subject: Remove the temporary availability checking workaround for the nested declarations in @interface. rdar://28825862 llvm-svn: 329324 --- clang/lib/Sema/SemaDeclAttr.cpp | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'clang/lib') diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 1d2c3b55342..709ba377a4b 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -6828,28 +6828,6 @@ static bool ShouldDiagnoseAvailabilityInContext(Sema &S, AvailabilityResult K, return false; }; - // FIXME: This is a temporary workaround! Some existing Apple headers depends - // on nested declarations in an @interface having the availability of the - // interface when they really shouldn't: they are members of the enclosing - // context, and can referenced from there. - if (S.OriginalLexicalContext && cast(S.OriginalLexicalContext) != Ctx) { - const auto *OrigCtx = cast(S.OriginalLexicalContext); - if (CheckContext(OrigCtx)) - return false; - - // An implementation implicitly has the availability of the interface. - if (const auto *CatOrImpl = dyn_cast(OrigCtx)) { - if (const ObjCInterfaceDecl *Interface = CatOrImpl->getClassInterface()) - if (CheckContext(Interface)) - return false; - } - // A category implicitly has the availability of the interface. - else if (const auto *CatD = dyn_cast(OrigCtx)) - if (const ObjCInterfaceDecl *Interface = CatD->getClassInterface()) - if (CheckContext(Interface)) - return false; - } - do { if (CheckContext(Ctx)) return false; -- cgit v1.2.3