Merge pull request #12741 from graydon/named-lazy-member-loading-write-by-default

Author: swift-ci

include/swift/Serialization/SerializationOptions.h

@@ -37,7 +37,6 @@ namespace swift {
 
     bool AutolinkForceLoad = false;
     bool EnableNestedTypeLookupTable = false;
-    bool EnableDeclMemberNamesTable = false;
     bool SerializeAllSIL = false;
     bool SerializeOptionsForDebugging = false;
     bool IsSIB = false;

lib/AST/NameLookup.cpp

@@ -1310,6 +1310,20 @@ populateLookupTableEntryFromLazyIDCLoader(ASTContext &ctx,
   }
 }
 
+static void
+populateLookupTableEntryFromMembers(ASTContext &ctx,
+                                    MemberLookupTable &LookupTable,
+                                    DeclName name,
+                                    IterableDeclContext *IDC) {
+  for (auto m : IDC->getMembers()) {
+    if (auto v = dyn_cast<ValueDecl>(m)) {
+      if (v->getFullName().matchesRef(name)) {
+        LookupTable.addMember(m);
+      }
+    }
+  }
+}
+
 TinyPtrVector<ValueDecl *> NominalTypeDecl::lookupDirect(
                                                   DeclName name,
                                                   bool ignoreNewExtensions) {
@@ -1385,10 +1399,15 @@ TinyPtrVector<ValueDecl *> NominalTypeDecl::lookupDirect(
     } else {
       if (!ignoreNewExtensions) {
         for (auto E : getExtensions()) {
-          if (populateLookupTableEntryFromLazyIDCLoader(ctx, Table,
-                                                        name, E)) {
-            useNamedLazyMemberLoading = false;
-            break;
+          if (E->wasDeserialized()) {
+            if (populateLookupTableEntryFromLazyIDCLoader(ctx, Table,
+                                                          name, E)) {
+              useNamedLazyMemberLoading = false;
+              break;
+            }
+          } else {
+            populateLookupTableEntryFromMembers(ctx, Table,
+                                                name, E);
           }
         }
       }

lib/FrontendTool/FrontendTool.cpp

@@ -835,8 +835,6 @@ static bool performCompile(CompilerInstance &Instance,
       serializationOpts.OutputPath = opts.ModuleOutputPath.c_str();
       serializationOpts.SerializeAllSIL = true;
       serializationOpts.IsSIB = true;
-      serializationOpts.EnableDeclMemberNamesTable =
-        Invocation.getLangOptions().NamedLazyMemberLoading;
 
       serialize(DC, serializationOpts, SM.get());
     }
@@ -901,8 +899,6 @@ static bool performCompile(CompilerInstance &Instance,
             Invocation.getClangImporterOptions().ExtraArgs;
         serializationOpts.EnableNestedTypeLookupTable =
             opts.EnableSerializationNestedTypeLookupTable;
-        serializationOpts.EnableDeclMemberNamesTable =
-          Invocation.getLangOptions().NamedLazyMemberLoading;
         if (!IRGenOpts.ForceLoadSymbolName.empty())
           serializationOpts.AutolinkForceLoad = true;
 
@@ -981,8 +977,6 @@ static bool performCompile(CompilerInstance &Instance,
       serializationOpts.OutputPath = opts.ModuleOutputPath.c_str();
       serializationOpts.SerializeAllSIL = true;
       serializationOpts.IsSIB = true;
-      serializationOpts.EnableDeclMemberNamesTable =
-        Invocation.getLangOptions().NamedLazyMemberLoading;
 
       serialize(DC, serializationOpts, SM.get());
     }

lib/Serialization/Serialization.cpp

@@ -4668,8 +4668,7 @@ static void collectInterestingNestedDeclarations(
 }
 
 void Serializer::writeAST(ModuleOrSourceFile DC,
-                          bool enableNestedTypeLookupTable,
-                          bool enableDeclMemberNamesTable) {
+                          bool enableNestedTypeLookupTable) {
   DeclTable topLevelDecls, operatorDecls, operatorMethodDecls;
   DeclTable precedenceGroupDecls;
   ObjCMethodTable objcMethods;
@@ -4804,24 +4803,22 @@ void Serializer::writeAST(ModuleOrSourceFile DC,
       EntryPoint.emit(ScratchRecord, entryPointClassID.getValue());
     }
 
-    if (enableDeclMemberNamesTable) {
-      {
-        // Write sub-tables to a skippable sub-block.
-        BCBlockRAII restoreBlock(Out, DECL_MEMBER_TABLES_BLOCK_ID, 4);
-        decl_member_tables_block::DeclMembersLayout DeclMembersTable(Out);
-        for (auto &entry : DeclMemberNames) {
-          // Save BitOffset we're writing sub-table to.
-          static_assert(bitOffsetFitsIn32Bits(), "BitOffset too large");
-          assert(Out.GetCurrentBitNo() < (1ull << 32));
-          entry.second.first = Out.GetCurrentBitNo();
-          // Write sub-table.
-          writeDeclMembersTable(DeclMembersTable, *entry.second.second);
-        }
+    {
+      // Write sub-tables to a skippable sub-block.
+      BCBlockRAII restoreBlock(Out, DECL_MEMBER_TABLES_BLOCK_ID, 4);
+      decl_member_tables_block::DeclMembersLayout DeclMembersTable(Out);
+      for (auto &entry : DeclMemberNames) {
+        // Save BitOffset we're writing sub-table to.
+        static_assert(bitOffsetFitsIn32Bits(), "BitOffset too large");
+        assert(Out.GetCurrentBitNo() < (1ull << 32));
+        entry.second.first = Out.GetCurrentBitNo();
+        // Write sub-table.
+        writeDeclMembersTable(DeclMembersTable, *entry.second.second);
       }
-      // Write top-level table mapping names to sub-tables.
-      index_block::DeclMemberNamesLayout DeclMemberNamesTable(Out);
-      writeDeclMemberNamesTable(DeclMemberNamesTable, DeclMemberNames);
     }
+    // Write top-level table mapping names to sub-tables.
+    index_block::DeclMemberNamesLayout DeclMemberNamesTable(Out);
+    writeDeclMemberNamesTable(DeclMemberNamesTable, DeclMemberNames);
   }
 }
 
@@ -4854,8 +4851,7 @@ void Serializer::writeToStream(raw_ostream &os, ModuleOrSourceFile DC,
     S.writeHeader(options);
     S.writeInputBlock(options);
     S.writeSIL(SILMod, options.SerializeAllSIL);
-    S.writeAST(DC, options.EnableNestedTypeLookupTable,
-               options.EnableDeclMemberNamesTable);
+    S.writeAST(DC, options.EnableNestedTypeLookupTable);
   }
 
   S.writeToStream(os);

lib/Serialization/Serialization.h

@@ -387,8 +387,7 @@ class Serializer {
 
   /// Top-level entry point for serializing a module.
   void writeAST(ModuleOrSourceFile DC,
-                bool enableNestedTypeLookupTable,
-                bool enableDeclMemberNamesTable);
+                bool enableNestedTypeLookupTable);
 
   void writeToStream(raw_ostream &os);