averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle index file path differently.

Browse Source
This commit is contained in:
David Ungar
2018-03-15 21:42:53 -07:00
parent 1999cbc514
commit 919c224d5a
4 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Driver/Compilation.cpp
View File

@@ -26,6 +26,7 @@
#include "swift/Driver/ParseableOutput.h"
#include "swift/Driver/ToolChain.h"
#include "swift/Frontend/OutputFileMap.h"
#include "swift/Option/Options.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/SetVector.h"
@@ -128,7 +129,8 @@ Compilation::Compilation(DiagnosticEngine &Diags,
Stats(std::move(StatsReporter)) {
};
static bool writeFilelistIfNecessary(const Job *job, DiagnosticEngine &diags);
static bool writeFilelistIfNecessary(const Job *job, const ArgList &args,
DiagnosticEngine &diags);
using CommandSet = llvm::SmallPtrSet<const Job *, 16>;
using CommandSetVector = llvm::SetVector<const Job*>;
@@ -258,7 +260,8 @@ namespace driver {
void addPendingJobToTaskQueue(const Job *Cmd) {
// FIXME: Failing here should not take down the whole process.
bool success = writeFilelistIfNecessary(Cmd, Comp.Diags);
bool success =
writeFilelistIfNecessary(Cmd, *Comp.TranslatedArgs.get(), Comp.Diags);
assert(success && "failed to write filelist");
(void)success;
@@ -1108,7 +1111,8 @@ static void writeCompilationRecord(StringRef path, StringRef argsHash,
}
}
static bool writeFilelistIfNecessary(const Job *job, DiagnosticEngine &diags) {
static bool writeFilelistIfNecessary(const Job *job, const ArgList &args,
DiagnosticEngine &diags) {
bool ok = true;
for (const FilelistInfo &filelistInfo : job->getFilelistInfos()) {
if (filelistInfo.path.empty())
@@ -1140,12 +1144,16 @@ static bool writeFilelistIfNecessary(const Job *job, DiagnosticEngine &diags) {
}
break;
case FilelistInfo::WhichFiles::PrimaryInputs:
for (const Action *A : job->getSource().getInputs()) {
const auto *IA = cast<InputAction>(A);
const llvm::opt::Arg &InArg = IA->getInputArg();
if (ToolChain::canCompileInputArgumentBePrimary(job->getOutput(),
InArg))
// Ensure that -index-file-path works in conjunction with
// -driver-use-filelists. It needs to be the only primary.
if (Arg *A = args.getLastArg(options::OPT_index_file_path))
out << A->getValue() << "\n";
else {
// The normal case for non-single-compile jobs.
for (const Action *A : job->getSource().getInputs()) {
const auto *IA = cast<InputAction>(A);
out << IA->getInputArg().getValue() << "\n";
}
}
break;
case FilelistInfo::WhichFiles::Output: {
@@ -1155,11 +1163,10 @@ static bool writeFilelistIfNecessary(const Job *job, DiagnosticEngine &diags) {
out << output << "\n";
break;
}
case FilelistInfo::WhichFiles::SupplementaryOutput: {
case FilelistInfo::WhichFiles::SupplementaryOutput:
job->getOutput().writeOutputFileMap(out);
break;
}
}
}
return ok;
}
@@ -1198,7 +1205,7 @@ int Compilation::performSingleCommand(const Job *Cmd) {
break;
}
if (!writeFilelistIfNecessary(Cmd, Diags))
if (!writeFilelistIfNecessary(Cmd, *TranslatedArgs.get(), Diags))
return 1;
switch (Level) {