Merge pull request swiftlang#72275 from hamishknight/unset

[Index] Scope the setting of `IgnoreAdjacentModules`

Author: hamishknight

lib/Index/IndexRecord.cpp

@@ -757,10 +757,10 @@ emitDataForSwiftSerializedModule(ModuleDecl *module,
       module->getResilienceStrategy() == ResilienceStrategy::Resilient &&
       !module->isBuiltFromInterface() &&
       !module->isStdlibModule()) {
-    module->getASTContext().setIgnoreAdjacentModules(true);
+    auto &ctx = module->getASTContext();
+    llvm::SaveAndRestore<bool> S(ctx.IgnoreAdjacentModules, true);
 
     ImportPath::Module::Builder builder(module->getName());
-    ASTContext &ctx = module->getASTContext();
     auto reloadedModule = ctx.getModule(builder.get(),
                                         /*AllowMemoryCached=*/false);