diff options
| -rw-r--r-- | clang/lib/Basic/FileManager.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 26 |
2 files changed, 25 insertions, 3 deletions
diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index f3afe6d..c0d3685 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/lib/Basic/FileManager.cpp @@ -489,7 +489,7 @@ FileManager::getBufferForFile(const FileEntry *Entry, bool isVolatile, uint64_t FileSize = Entry->getSize(); // If there's a high enough chance that the file have changed since we // got its size, force a stat before opening it. - if (isVolatile || Entry->isNamedPipe()) + if (isVolatile) FileSize = -1; StringRef Filename = Entry->getName(); diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index e3018b2..5c82878 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -858,8 +858,30 @@ bool CompilerInstance::InitializeSourceManager(const FrontendInputFile &Input, } FileEntryRef File = *FileOrErr; - SourceMgr.setMainFileID( - SourceMgr.createFileID(File, SourceLocation(), Kind)); + // The natural SourceManager infrastructure can't currently handle named + // pipes, but we would at least like to accept them for the main + // file. Detect them here, read them with the volatile flag so FileMgr will + // pick up the correct size, and simply override their contents as we do for + // STDIN. + if (File.getFileEntry().isNamedPipe()) { + auto MB = + FileMgr.getBufferForFile(&File.getFileEntry(), /*isVolatile=*/true); + if (MB) { + // Create a new virtual file that will have the correct size. + const FileEntry *FE = + FileMgr.getVirtualFile(InputFile, (*MB)->getBufferSize(), 0); + SourceMgr.overrideFileContents(FE, std::move(*MB)); + SourceMgr.setMainFileID( + SourceMgr.createFileID(FE, SourceLocation(), Kind)); + } else { + Diags.Report(diag::err_cannot_open_file) << InputFile + << MB.getError().message(); + return false; + } + } else { + SourceMgr.setMainFileID( + SourceMgr.createFileID(File, SourceLocation(), Kind)); + } } else { llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> SBOrErr = llvm::MemoryBuffer::getSTDIN(); |