[Index] Move reloading from swiftinterface after the "up to date" check

Author: xymus

lib/Index/IndexRecord.cpp

@@ -495,21 +495,6 @@ emitDataForSwiftSerializedModule(ModuleDecl *module,
                                  IndexUnitWriter &parentUnitWriter,
                                  const PathRemapper &pathRemapper,
                                  SourceFile *initialFile) {
-  // Reload resilient modules from swiftinterface to avoid indexing
-  // internal details.
-  if (module->getResilienceStrategy() == ResilienceStrategy::Resilient) {
-    module->getASTContext().setIgnoreAdjacentModules(true);
-
-    ImportPath::Module::Builder builder(module->getName());
-    auto reloadedModule = module->getASTContext().getModule(builder.get());
-
-    if (reloadedModule) {
-      module = reloadedModule;
-    } else {
-      // If we can't rebuild from the swiftinterface, don't index this module.
-      return true;
-    }
-  }
 
   StringRef filename = module->getModuleFilename();
   std::string moduleName = module->getNameStr().str();
@@ -529,6 +514,22 @@ emitDataForSwiftSerializedModule(ModuleDecl *module,
   if (*isUptodateOpt)
     return false;
 
+  // Reload resilient modules from swiftinterface to avoid indexing
+  // internal details.
+  if (module->getResilienceStrategy() == ResilienceStrategy::Resilient) {
+    module->getASTContext().setIgnoreAdjacentModules(true);
+
+    ImportPath::Module::Builder builder(module->getName());
+    auto reloadedModule = module->getASTContext().getModule(builder.get());
+
+    if (reloadedModule) {
+      module = reloadedModule;
+    } else {
+      // If we can't rebuild from the swiftinterface, don't index this module.
+      return true;
+    }
+  }
+
   // FIXME: Would be useful for testing if swift had clang's -Rremark system so
   // we could output a remark here that we are going to create index data for
   // a module file.