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

Merge pull request #18489 from davidungar/rdar-42314665-fix-batch-mode-truncation-bug

Browse Source 
[Batch Mode] Rdar 42314665 fix batch mode truncation bug
This commit is contained in:
David Ungar
2018-08-06 22:04:36 -07:00
committed by GitHub
parent 8f36061f25 7e19f7829b
commit f74b7e5178
4 changed files with 345 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1587,7 +1587,7 @@ static std::unique_ptr<DiagnosticConsumer>
createDispatchingDiagnosticConsumerIfNeeded(
const FrontendInputsAndOutputs &inputsAndOutputs,
llvm::function_ref<std::unique_ptr<DiagnosticConsumer>(const InputFile &)>
maybeCreateSingleConsumer) {
maybeCreateConsumerForDiagnosticsFrom) {
// The "4" here is somewhat arbitrary. In practice we're going to have one
// sub-consumer for each diagnostic file we're trying to output, which (again
@@ -1597,14 +1597,14 @@ 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::ConsumerPair, 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));
return false;
});
if (auto consumer = maybeCreateConsumerForDiagnosticsFrom(input))
subconsumers.emplace_back(input.file(), std::move(consumer));
return false;
});
// For batch mode, the compiler must swallow diagnostics pertaining to
// non-primary files in order to avoid Xcode showing the same diagnostic
// multiple times. So, create a diagnostic "eater" for those non-primary
@@ -1614,16 +1614,12 @@ 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())
return nullptr;
if (subConsumers.size() == 1)
return std::move(subConsumers.front()).second;
return llvm::make_unique<FileSpecificDiagnosticConsumer>(subConsumers);
return FileSpecificDiagnosticConsumer::consolidateSubconsumers(subconsumers);
}
/// Creates a diagnostic consumer that handles serializing diagnostics, based on