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

Merge branch 'main' into tbkka-assertions2

Browse Source
This commit is contained in:
Tim Kientzle
2024-06-18 17:52:00 -07:00
committed by GitHub
parent 1d961ba22d e3de3da703
commit 1098054291
741 changed files with 12849 additions and 4479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/FrontendTool/FrontendTool.cpp
View File

@@ -599,6 +599,8 @@ mapFrontendInvocationToAction(const CompilerInvocation &Invocation) {
return "backend";
else
return "compile";
case FrontendOptions::ActionType::EmitModuleOnly:
return "emit-module";
default:
return "compile";
}
@@ -635,7 +637,8 @@ static swift::file_types::ID computeFileTypeForPath(const StringRef Path) {
static DetailedTaskDescription
constructDetailedTaskDescription(const CompilerInvocation &Invocation,
ArrayRef<InputFile> PrimaryInputs,
ArrayRef<const char *> Args) {
ArrayRef<const char *> Args,
bool isEmitModuleOnly = false) {
// Command line and arguments
std::string Executable = Invocation.getFrontendOptions().MainExecutablePath;
SmallVector<std::string, 16> Arguments;
@@ -654,10 +657,12 @@ constructDetailedTaskDescription(const CompilerInvocation &Invocation,
}
for (const auto &input : PrimaryInputs) {
// Main outputs
auto OutputFile = input.outputFilename();
if (!OutputFile.empty())
Outputs.push_back(OutputPair(computeFileTypeForPath(OutputFile), OutputFile));
if (!isEmitModuleOnly) {
// Main per-input outputs
auto OutputFile = input.outputFilename();
if (!OutputFile.empty())
Outputs.push_back(OutputPair(computeFileTypeForPath(OutputFile), OutputFile));
}
// Supplementary outputs
const auto &primarySpecificFiles = input.getPrimarySpecificPaths();
@@ -2336,10 +2341,14 @@ int swift::performFrontend(ArrayRef<const char *> Args,
return false;
});
} else {
// If no primary inputs are present, we are in WMO.
// If no primary inputs are present, we are in WMO or EmitModule.
bool isEmitModule =
Invocation.getFrontendOptions().RequestedAction ==
FrontendOptions::ActionType::EmitModuleOnly;
emitBeganMessage(llvm::errs(),
mapFrontendInvocationToAction(Invocation),
constructDetailedTaskDescription(Invocation, IO.getAllInputs(), Args),
constructDetailedTaskDescription(Invocation, IO.getAllInputs(),
Args, isEmitModule),
OSPid, ProcInfo);
}
};