---

yaml
---
r: 284606
b: refs/heads/swift-5.1-branch-04-24-2019
c: cb2fcb6
h: refs/heads/master

Author: jckarter

[refs]

@@ -1319,4 +1319,4 @@ refs/heads/revert-24065-raj-es-perf-bench: acd6c09b6bd8c5aa922845ee4465bf1333e4f
 refs/heads/rxwei-patch-3: d5f349dedfb5fcaf84c5ac788ad33ea47e502d11
 refs/heads/rxwei-patch-4: d60ed33a03d398b956e1aa81f37b04d0b1cf101e
 refs/heads/rxwei-patch-4-1: b7adfa58fd761906363d280fe323578f61097822
-refs/heads/swift-5.1-branch-04-24-2019: f2d63ef2b2a82a953ad33e48b9fe076fc53efe3c
+refs/heads/swift-5.1-branch-04-24-2019: cb2fcb6e5624163cc7f7526991eda23e10f195e4

branches/swift-5.1-branch-04-24-2019/lib/IRGen/GenDecl.cpp

@@ -1149,17 +1149,21 @@ void IRGenerator::addLazyFunction(SILFunction *f) {
   DefaultIGMForFunction.insert(std::make_pair(f, CurrentIGM));
 }
 
-bool IRGenerator::hasLazyMetadata(NominalTypeDecl *type) {
+bool IRGenerator::hasLazyMetadata(TypeDecl *type) {
   auto found = HasLazyMetadata.find(type);
   if (found != HasLazyMetadata.end())
     return found->second;
 
   auto canBeLazy = [&]() -> bool {
-    if (isa<ClangModuleUnit>(type->getModuleScopeContext())) {
-      return requiresForeignTypeMetadata(type);
-    } else if (type->getParentModule() == SIL.getSwiftModule()) {
-      // When compiling with -Onone keep all metadata for the debugger. Even if it
-      // is not used by the program itself.
+    if (isa<ClangModuleUnit>(type->getInnermostDeclContext()
+                                 ->getModuleScopeContext())) {
+      if (auto nominal = dyn_cast<NominalTypeDecl>(type)) {
+        return requiresForeignTypeMetadata(nominal);
+      }
+    } else if (type->getInnermostDeclContext()->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())
         return false;
       if (Opts.UseJIT)

branches/swift-5.1-branch-04-24-2019/lib/IRGen/GenStruct.cpp

@@ -882,7 +882,7 @@ void IRGenModule::emitStructDecl(StructDecl *st) {
 void IRGenModule::emitFuncDecl(FuncDecl *fd) {
   // If there's an opaque return type for this function, emit its descriptor.
   if (auto opaque = fd->getOpaqueResultTypeDecl()) {
-    if (!IRGen.tryEnableLazyTypeMetadata(opaque))
+    if (!IRGen.hasLazyMetadata(opaque))
       emitOpaqueTypeDecl(opaque);
   }
 }

branches/swift-5.1-branch-04-24-2019/lib/IRGen/IRGenModule.h

@@ -214,7 +214,7 @@ class IRGenerator {
   bool FinishedEmittingLazyDefinitions = false;
 
   /// A map recording if metadata can be emitted lazily for each nominal type.
-  llvm::DenseMap<NominalTypeDecl *, bool> HasLazyMetadata;
+  llvm::DenseMap<TypeDecl *, bool> HasLazyMetadata;
 
   struct LazyTypeGlobalsInfo {
     /// Is there a use of the type metadata?
@@ -356,8 +356,7 @@ class IRGenerator {
   /// Checks if metadata for this type can be emitted lazily. This is true for
   /// non-public types as well as imported types, except for classes and
   /// protocols which are always emitted eagerly.
-  bool hasLazyMetadata(NominalTypeDecl *type);
-  bool hasLazyMetadata(OpaqueTypeDecl *type);
+  bool hasLazyMetadata(TypeDecl *type);
 
   /// Emit everything which is reachable from already emitted IR.
   void emitLazyDefinitions();