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

Make Subconsumer into a class.

Browse Source
This commit is contained in:
David Ungar
2018-08-02 21:14:49 -07:00
parent 01582a2fe3
commit 67c8d9c357
4 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1596,12 +1596,12 @@ createDispatchingDiagnosticConsumerIfNeeded(
// So a value of "4" here means that there would be no heap allocation on a
// clean build of a module with up to 32 files on an 8-core machine, if the
// user doesn't customize anything.
SmallVector<FileSpecificDiagnosticConsumer::Subconsumer, 4> subConsumers;
SmallVector<FileSpecificDiagnosticConsumer::Subconsumer, 4> subconsumers;
inputsAndOutputs.forEachInputProducingSupplementaryOutput(
[&](const InputFile &input) -> bool {
if (auto subConsumer = maybeCreateSingleConsumer(input))
subConsumers.emplace_back(input.file(), std::move(subConsumer));
if (auto subconsumer = maybeCreateSingleConsumer(input))
subconsumers.emplace_back(FileSpecificDiagnosticConsumer::Subconsumer(input.file(), std::move(subconsumer)));
return false;
});
// For batch mode, the compiler must swallow diagnostics pertaining to
@@ -1613,16 +1613,16 @@ createDispatchingDiagnosticConsumerIfNeeded(
if (inputsAndOutputs.hasMultiplePrimaryInputs()) {
inputsAndOutputs.forEachNonPrimaryInput(
[&](const InputFile &input) -> bool {
subConsumers.emplace_back(input.file(), nullptr);
subconsumers.emplace_back(input.file(), nullptr);
return false;
});
}
if (subConsumers.empty())
if (subconsumers.empty())
return nullptr;
if (subConsumers.size() == 1)
return std::move(subConsumers.front()).second;
return llvm::make_unique<FileSpecificDiagnosticConsumer>(subConsumers);
if (subconsumers.size() == 1)
return std::move(subconsumers.front()).consumer;
return llvm::make_unique<FileSpecificDiagnosticConsumer>(subconsumers);
}
/// Creates a diagnostic consumer that handles serializing diagnostics, based on