Unbreak and add test case for r90276, a situation in which getBuffer is expected...

Also, update SourceManager.h doxyments for getBuffer() to reflect reality.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90701 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 3b170a6a74f9184815b6cb86d064372e393aade6..b4cf959dc551a72a5d8cbd07ceb94b4c76d112d0 100644 (file)
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -70,8 +70,8 @@ namespace SrcMgr {
     unsigned NumLines;
 
     /// getBuffer - Returns the memory buffer for the associated content.  If
-    /// there is an error opening this buffer the first time, this returns null
-    /// and fills in the ErrorStr with a reason.
+    /// there is an error opening this buffer the first time, this manufactures
+    /// a temporary buffer and returns a non-empty error string.
     const llvm::MemoryBuffer *getBuffer(std::string *ErrorStr = 0) const;
 
     /// getSize - Returns the size of the content encapsulated by this
@@ -426,10 +426,9 @@ public:
   // FileID manipulation methods.
   //===--------------------------------------------------------------------===//
 
-  /// getBuffer - Return the buffer for the specified FileID.  If there is an
-  /// error opening this buffer the first time, this returns null and fills in
-  /// the ErrorStr with a reason.
-  ///
+  /// getBuffer - Return the buffer for the specified FileID. If there is an
+  /// error opening this buffer the first time, this manufactures a temporary
+  /// buffer and returns a non-empty error string.
   const llvm::MemoryBuffer *getBuffer(FileID FID, std::string *Error = 0) const{
     return getSLocEntry(FID).getFile().getContentCache()->getBuffer(Error);
   }

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index 5cdfeafa33cbd735c4aae44e11972ee663843ce8..ce1b19ca7c10f8dee9a858960eac908d1bf4df7f 100644 (file)
--- a/lib/Lex/PPLexerChange.cpp
+++ b/lib/Lex/PPLexerChange.cpp
@@ -81,8 +81,8 @@ bool Preprocessor::EnterSourceFile(FileID FID, const DirectoryLookup *CurDir,
   
   // Get the MemoryBuffer for this FID, if it fails, we fail.
   const llvm::MemoryBuffer *InputFile =
-  if (InputFile == 0)
     getSourceManager().getBuffer(FID, &ErrorStr);
+  if (!ErrorStr.empty())
     return true;
   
   EnterSourceFileWithLexer(new Lexer(FID, InputFile, *this), CurDir);

diff --git a/test/Preprocessor/open-failure.c b/test/Preprocessor/open-failure.c
new file mode 100644 (file)
index 0000000..667b822
--- /dev/null
+++ b/test/Preprocessor/open-failure.c
@@ -0,0 +1,11 @@
+// RUN: rm -rf %t.dir
+// RUN: mkdir %t.dir
+// RUN: echo 'void f0();' > %t.dir/t.h
+// RUN: chmod 000 %t.dir/t.h
+// RUN: clang-cc -verify -I %t.dir %s
+
+// FIXME: Is there a way to test this on Windows?
+// XFAIL: win32
+
+#include "t.h" // expected-error {{Permission denied}}
+int f0(void);