forked from OSchip/llvm-project
Frontend: Delete output streams before closing CompilerInstance outputs
Delete the output streams coming from CompilerInstance::createOutputFile() and friends once writes are finished. Concretely, replacing `OS->flush()` with `OS.reset()` in: - `ExtractAPIAction::EndSourceFileAction()` - `PrecompiledPreambleAction::setEmittedPreamblePCH()` - `cc1_main()'s support for `-ftime-trace` This fixes theoretical bugs related to proxy streams, which may have cleanups to run in their destructor. For example, a proxy that CompilerInstance sometimes uses is `buffer_ostream`, which wraps a `raw_ostream` lacking pwrite support and adds it. `flush()` does not promise that output is complete; `buffer_ostream` needs to wait until the destructor to forward anything so that it can service later calls to `pwrite()`. If the destructor isn't called then the proxied stream hasn't received any content. This also protects against some logic bugs, triggering a null dereference on a later attempt to write to the stream. No tests, since in practice these particular code paths never use use `buffer_ostream`; you need to be writing a binary file to a pipe (such as stdout) to hit it, but `-extract-api` writes a text file and the other two use computed filenames that will never (in practice) be a pipe. This is effectively NFC, for now. But I have some other patches in the works that add guard rails, crashing if the stream hasn't been destructed by the time the CompilerInstance is told to keep the output file, since in most cases this is a problem. Differential Revision: https://reviews.llvm.org/D124635
This commit is contained in:
parent
f68c0a2f58
commit
2d13386783
|
@ -793,7 +793,7 @@ void ExtractAPIAction::EndSourceFileAction() {
|
|||
// FIXME: Make the kind of APISerializer configurable.
|
||||
SymbolGraphSerializer SGSerializer(*API, ProductName);
|
||||
SGSerializer.serialize(*OS);
|
||||
OS->flush();
|
||||
OS.reset();
|
||||
}
|
||||
|
||||
std::unique_ptr<raw_pwrite_stream>
|
||||
|
|
|
@ -248,7 +248,7 @@ public:
|
|||
if (FileOS) {
|
||||
*FileOS << Buffer->Data;
|
||||
// Make sure it hits disk now.
|
||||
FileOS->flush();
|
||||
FileOS.reset();
|
||||
}
|
||||
|
||||
this->HasEmittedPreamblePCH = true;
|
||||
|
|
|
@ -260,8 +260,7 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
|
|||
Path.str(), /*Binary=*/false, /*RemoveFileOnSignal=*/false,
|
||||
/*useTemporary=*/false)) {
|
||||
llvm::timeTraceProfilerWrite(*profilerOutput);
|
||||
// FIXME(ibiryukov): make profilerOutput flush in destructor instead.
|
||||
profilerOutput->flush();
|
||||
profilerOutput.reset();
|
||||
llvm::timeTraceProfilerCleanup();
|
||||
Clang->clearOutputFiles(false);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue