Merge pull request swiftlang#24463 from jckarter/opaque-type-sync

NFC opaque type cleanups

Author: jckarter

lib/IRGen/GenDecl.cpp

@@ -1162,18 +1162,19 @@ void IRGenerator::addLazyFunction(SILFunction *f) {
 }
 
 bool IRGenerator::hasLazyMetadata(TypeDecl *type) {
+  assert(isa<NominalTypeDecl>(type) ||
+         isa<OpaqueTypeDecl>(type));
   auto found = HasLazyMetadata.find(type);
   if (found != HasLazyMetadata.end())
     return found->second;
 
   auto canBeLazy = [&]() -> bool {
-    if (isa<ClangModuleUnit>(type->getInnermostDeclContext()
-                                 ->getModuleScopeContext())) {
+    auto *dc = type->getDeclContext();
+    if (isa<ClangModuleUnit>(dc->getModuleScopeContext())) {
       if (auto nominal = dyn_cast<NominalTypeDecl>(type)) {
         return requiresForeignTypeMetadata(nominal);
       }
-    } else if (type->getInnermostDeclContext()->getParentModule()
-                                                     == SIL.getSwiftModule()) {
+    } else if (dc->getParentModule() == SIL.getSwiftModule()) {
       // When compiling with -Onone keep all metadata for the debugger. Even if
       // it is not used by the program itself.
       if (!Opts.shouldOptimize())

lib/IRGen/IRGenModule.h

@@ -243,7 +243,6 @@ class IRGenerator {
   /// queued up.
   llvm::SmallPtrSet<NominalTypeDecl *, 4> LazilyEmittedFieldMetadata;
   struct LazyOpaqueInfo {
-    bool IsLazy = false;
     bool IsDescriptorUsed = false;
     bool IsDescriptorEmitted = false;
   };

lib/Sema/TypeCheckAccess.cpp

@@ -1049,6 +1049,7 @@ class UsableFromInlineChecker : public AccessControlCheckerBase,
   UNINTERESTING(Var) // Handled at the PatternBinding level.
   UNINTERESTING(Destructor) // Always correct.
   UNINTERESTING(Accessor) // Handled by the Var or Subscript.
+  UNINTERESTING(OpaqueType) // Handled by the Var or Subscript.
 
   /// If \p PBD declared stored instance properties in a fixed-contents struct,
   /// return said struct.
@@ -1193,11 +1194,6 @@ class UsableFromInlineChecker : public AccessControlCheckerBase,
     });
   }
 
-  void visitOpaqueTypeDecl(OpaqueTypeDecl *OTD) {
-    // TODO(opaque): The constraint class/protocols on the opaque interface, as
-    // well as the naming decl for the opaque type, need to be accessible.
-  }
-
   void visitAssociatedTypeDecl(AssociatedTypeDecl *assocType) {
     // This must stay in sync with diag::associated_type_not_usable_from_inline.
     enum {