Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2022-06-03 09:53:40 -07:00
8 changed files with 93 additions and 46 deletions

View File

@@ -1761,7 +1761,9 @@ static void emitIndexDataForSourceFile(SourceFile *PrimarySourceFile,
if (OutputFile.empty())
OutputFile = PSPs.OutputFilename;
(void) index::indexAndRecord(PrimarySourceFile, OutputFile,
opts.IndexStorePath, opts.IndexSystemModules,
opts.IndexStorePath,
!opts.IndexIgnoreClangModules,
opts.IndexSystemModules,
opts.IndexIgnoreStdlib, isDebugCompilation,
Invocation.getTargetTriple(),
*Instance.getDependencyTracker(),
@@ -1776,6 +1778,7 @@ static void emitIndexDataForSourceFile(SourceFile *PrimarySourceFile,
opts.InputsAndOutputs
.copyIndexUnitOutputFilenames(),
moduleToken, opts.IndexStorePath,
!opts.IndexIgnoreClangModules,
opts.IndexSystemModules,
opts.IndexIgnoreStdlib,
isDebugCompilation,