dexonsmith updated this revision to Diff 311004.
dexonsmith retitled this revision from "Reapply "Frontend: Sink named pipe
logic from CompilerInstance down to FileManager"" to "Basic: Support named
pipes natively in SourceManager".
dexonsmith edited the summary of this revision.
dexonsmith added a comment.
Updates:
- Rebased on top of https://reviews.llvm.org/D92984, which drops the `const
FileEntry*` version of `createFileID`.
- Add a test for `#include`-ing from a named pipe, which now works because the
named pipe support is native to SourceManager instead of special logic in
`CompilerInstance`.
- Updated the commit message / summary / title to better reflect the commit
content. The new changes are bigger than the original, and I realized that
describing it as a revert-of-a-revert+changes was inaccurate.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D92531/new/
https://reviews.llvm.org/D92531
Files:
clang/lib/Basic/FileManager.cpp
clang/lib/Basic/SourceManager.cpp
clang/lib/Frontend/CompilerInstance.cpp
clang/test/Misc/dev-fd-fs.c
Index: clang/test/Misc/dev-fd-fs.c
===================================================================
--- clang/test/Misc/dev-fd-fs.c
+++ clang/test/Misc/dev-fd-fs.c
@@ -8,7 +8,13 @@
// RUN: cat %s | %clang -x c /dev/fd/0 -E > %t
// RUN: FileCheck --check-prefix DEV-FD-INPUT < %t %s
//
+// RUN: cat %s | %clang -x c %s -E -DINCLUDE_FROM_STDIN > %t
+// RUN: FileCheck --check-prefix DEV-FD-INPUT \
+// RUN: --check-prefix DEV-FD-INPUT-INCLUDE < %t %s
+//
+// DEV-FD-INPUT-INCLUDE: int w;
// DEV-FD-INPUT: int x;
+// DEV-FD-INPUT-INCLUDE: int y;
// Check writing to /dev/fd named pipes. We use cat here as before to ensure we
@@ -27,4 +33,11 @@
//
// DEV-FD-REG-OUTPUT: int x;
+#ifdef INCLUDE_FROM_STDIN
+#undef INCLUDE_FROM_STDIN
+int w;
+#include "/dev/fd/0"
+int y;
+#else
int x;
+#endif
Index: clang/lib/Frontend/CompilerInstance.cpp
===================================================================
--- clang/lib/Frontend/CompilerInstance.cpp
+++ clang/lib/Frontend/CompilerInstance.cpp
@@ -856,32 +856,9 @@
Diags.Report(diag::err_fe_error_reading) << InputFile;
return false;
}
- FileEntryRef File = *FileOrErr;
-
- // 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.
- FileEntryRef FE =
- FileMgr.getVirtualFileRef(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));
- }
+
+ SourceMgr.setMainFileID(
+ SourceMgr.createFileID(*FileOrErr, SourceLocation(), Kind));
} else {
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> SBOrErr =
llvm::MemoryBuffer::getSTDIN();
Index: clang/lib/Basic/SourceManager.cpp
===================================================================
--- clang/lib/Basic/SourceManager.cpp
+++ clang/lib/Basic/SourceManager.cpp
@@ -120,8 +120,10 @@
// Clang (including elsewhere in this file!) use 'unsigned' to represent file
// offsets, line numbers, string literal lengths, and so on, and fail
// miserably on large source files.
- if ((uint64_t)ContentsEntry->getSize() >=
- std::numeric_limits<unsigned>::max()) {
+ auto diagnoseFileTooLarge = [&](uint64_t Size) {
+ if (Size < std::numeric_limits<unsigned>::max())
+ return false;
+
if (Diag.isDiagnosticInFlight())
Diag.SetDelayedDiagnostic(diag::err_file_too_large,
ContentsEntry->getName());
@@ -129,8 +131,14 @@
Diag.Report(Loc, diag::err_file_too_large)
<< ContentsEntry->getName();
+ return true;
+ };
+
+ // Check ContentsEntry's size, unless it's a named pipe (in which case we
+ // need to load the buffer first).
+ if (!ContentsEntry->isNamedPipe() &&
+ diagnoseFileTooLarge(ContentsEntry->getSize()))
return None;
- }
auto BufferOrError = FM.getBufferForFile(ContentsEntry, IsFileVolatile);
@@ -153,9 +161,14 @@
Buffer = std::move(*BufferOrError);
- // Check that the file's size is the same as in the file entry (which may
- // have come from a stat cache).
- if (Buffer->getBufferSize() != (size_t)ContentsEntry->getSize()) {
+ // If this is a named pipe, check the buffer to see if it's too big.
+ // Otherwise, check that the file's size is the same as in the file entry
+ // (which may have come from a stat cache).
+ if (ContentsEntry->isNamedPipe()) {
+ // Check the buffer size directly if this is a named pipe.
+ if (diagnoseFileTooLarge(Buffer->getBufferSize()))
+ return None;
+ } else if (Buffer->getBufferSize() != (size_t)ContentsEntry->getSize()) {
if (Diag.isDiagnosticInFlight())
Diag.SetDelayedDiagnostic(diag::err_file_modified,
ContentsEntry->getName());
@@ -528,6 +541,12 @@
int LoadedID, unsigned LoadedOffset) {
SrcMgr::ContentCache &IR = getOrCreateContentCache(SourceFile,
isSystem(FileCharacter));
+
+ // If this is a named pipe, immediately load the buffer to ensure subsequent
+ // calls to ContentCache::getSize are accurate.
+ if (IR.ContentsEntry->isNamedPipe())
+ (void)IR.getBufferOrNone(Diag, getFileManager(), SourceLocation());
+
return createFileIDImpl(IR, SourceFile.getName(), IncludePos, FileCharacter,
LoadedID, LoadedOffset);
}
Index: clang/lib/Basic/FileManager.cpp
===================================================================
--- clang/lib/Basic/FileManager.cpp
+++ clang/lib/Basic/FileManager.cpp
@@ -489,7 +489,7 @@
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)
+ if (isVolatile || Entry->isNamedPipe())
FileSize = -1;
StringRef Filename = Entry->getName();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
