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

Move supplementary outputs to SupplementaryOutputs in FrontendInputsAndOutputs.

Browse Source
This commit is contained in:
David Ungar
2018-02-03 18:10:13 -08:00
parent 7271f682bf
commit ba4f2a84b4
15 changed files with 526 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Frontend/FrontendOptions.cpp
View File

@@ -117,10 +117,9 @@ void FrontendOptions::forAllOutputPaths(
fn(input.outputFilename());
}
const std::string *outputs[] = {
&ModuleOutputPath,
&ModuleDocOutputPath,
&ObjCHeaderOutputPath
};
&InputsAndOutputs.supplementaryOutputs().ModuleOutputPath,
&InputsAndOutputs.supplementaryOutputs().ModuleDocOutputPath,
&InputsAndOutputs.supplementaryOutputs().ObjCHeaderOutputPath};
for (const std::string *next : outputs) {
if (!next->empty())
fn(*next);
@@ -195,11 +194,6 @@ FrontendOptions::suffixForPrincipalOutputFileForAction(ActionType action) {
}
}
bool FrontendOptions::hasUnusedDependenciesFilePath() const {
return !DependenciesFilePath.empty() &&
!canActionEmitDependencies(RequestedAction);
}
bool FrontendOptions::canActionEmitDependencies(ActionType action) {
switch (action) {
case ActionType::NoneAction:
@@ -231,11 +225,7 @@ bool FrontendOptions::canActionEmitDependencies(ActionType action) {
}
}
bool FrontendOptions::hasUnusedObjCHeaderOutputPath() const {
return !ObjCHeaderOutputPath.empty() && !canActionEmitHeader(RequestedAction);
}
bool FrontendOptions::canActionEmitHeader(ActionType action) {
bool FrontendOptions::canActionEmitObjCHeader(ActionType action) {
switch (action) {
case ActionType::NoneAction:
case ActionType::DumpParse:
@@ -266,11 +256,6 @@ bool FrontendOptions::canActionEmitHeader(ActionType action) {
}
}
bool FrontendOptions::hasUnusedLoadedModuleTracePath() const {
return !LoadedModuleTracePath.empty() &&
!canActionEmitLoadedModuleTrace(RequestedAction);
}
bool FrontendOptions::canActionEmitLoadedModuleTrace(ActionType action) {
switch (action) {
case ActionType::NoneAction:
@@ -302,14 +287,6 @@ bool FrontendOptions::canActionEmitLoadedModuleTrace(ActionType action) {
}
}
bool FrontendOptions::hasUnusedModuleOutputPath() const {
return !ModuleOutputPath.empty() && !canActionEmitModule(RequestedAction);
}
bool FrontendOptions::hasUnusedModuleDocOutputPath() const {
return !ModuleDocOutputPath.empty() && !canActionEmitModule(RequestedAction);
}
bool FrontendOptions::canActionEmitModule(ActionType action) {
switch (action) {
case ActionType::NoneAction: