Sema: Kill some duplication in @Frozen checking

Author: slavapestov

lib/Sema/TypeCheckAttr.cpp

@@ -2085,19 +2085,21 @@ void AttributeChecker::visitImplementsAttr(ImplementsAttr *attr) {
 }
 
 void AttributeChecker::visitFrozenAttr(FrozenAttr *attr) {
-  switch (D->getModuleContext()->getResilienceStrategy()) {
+  auto *ED = cast<EnumDecl>(D);
+
+  switch (ED->getModuleContext()->getResilienceStrategy()) {
   case ResilienceStrategy::Default:
     diagnoseAndRemoveAttr(attr, diag::enum_frozen_nonresilient, attr);
     return;
   case ResilienceStrategy::Resilient:
     break;
   }
 
-  if (cast<EnumDecl>(D)->getFormalAccess() >= AccessLevel::Public)
-    return;
-  if (D->getAttrs().hasAttribute<UsableFromInlineAttr>())
-    return;
-  diagnoseAndRemoveAttr(attr, diag::enum_frozen_nonpublic, attr);
+  auto access = ED->getFormalAccess(/*useDC=*/nullptr,
+                                    /*isUsageFromInline=*/true);
+  if (access < AccessLevel::Public) {
+    diagnoseAndRemoveAttr(attr, diag::enum_frozen_nonpublic, attr);
+  }
 }
 
 void TypeChecker::checkDeclAttributes(Decl *D) {