pass the reason for failure up from MemoryBuffer and report it

in diagnostics when we fail to open a file.  This allows us to
report things like:

$ clang test.c -I.
test.c:2:10: fatal error: error opening file './foo.h': Permission denied
#include "foo.h"
         ^

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

diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td
index 39123d9b371ab5284cce51d9ca1d4627b1ad8125..cc06ab3a869842ffbda3abb97e213ed33ec7d093 100644 (file)
--- a/include/clang/Basic/DiagnosticLexKinds.td
+++ b/include/clang/Basic/DiagnosticLexKinds.td
@@ -171,7 +171,7 @@ def err_pp_invalid_directive : Error<"invalid preprocessing directive">;
 def err_pp_hash_error : Error<"#error%0">;
 def err_pp_file_not_found : Error<"'%0' file not found">, DefaultFatal;
 def err_pp_error_opening_file : Error<
-  "error opening file '%0'">, DefaultFatal;
+  "error opening file '%0': %1">, DefaultFatal;
 def err_pp_empty_filename : Error<"empty filename">;
 def err_pp_include_too_deep : Error<"#include nested too deeply">;
 def err_pp_expects_filename : Error<"expected \"FILENAME\" or <FILENAME>">;

diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 7e9ac531017e89c60961cb370a6f92bda79becbe..67b3d50064343b686fe78bcdb6cba4cc0c2f70a0 100644 (file)
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -77,8 +77,10 @@ namespace SrcMgr {
     /// ContentCache.
     mutable FileID FirstFID;
 
-    /// getBuffer - Returns the memory buffer for the associated content.
-    const llvm::MemoryBuffer *getBuffer() const;
+    /// 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.
+    const llvm::MemoryBuffer *getBuffer(std::string *ErrorStr = 0) const;
 
     /// getSize - Returns the size of the content encapsulated by this
     ///  ContentCache. This can be the size of the source file or the size of an
@@ -432,10 +434,12 @@ public:
   // FileID manipulation methods.
   //===--------------------------------------------------------------------===//
 
-  /// getBuffer - Return the buffer for the specified FileID.
+  /// 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.
   ///
-  const llvm::MemoryBuffer *getBuffer(FileID FID) const {
-    return getSLocEntry(FID).getFile().getContentCache()->getBuffer();
+  const llvm::MemoryBuffer *getBuffer(FileID FID, std::string *Error = 0) const{
+    return getSLocEntry(FID).getFile().getContentCache()->getBuffer(Error);
   }
 
   /// getFileEntryForID - Returns the FileEntry record for the provided FileID.

diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h
index edd34b7189695ba93c887f9bb9a440b7e4de494b..c8e4a0f2097338b6d7f7e23933414da2ab1fab32 100644 (file)
--- a/include/clang/Lex/Preprocessor.h
+++ b/include/clang/Lex/Preprocessor.h
@@ -330,8 +330,9 @@ public:
 
   /// EnterSourceFile - Add a source file to the top of the include stack and
   /// start lexing tokens from it instead of the current buffer.  Return true
-  /// on failure.
-  bool EnterSourceFile(FileID CurFileID, const DirectoryLookup *Dir);
+  /// and fill in ErrorStr with the error information on failure.
+  bool EnterSourceFile(FileID CurFileID, const DirectoryLookup *Dir,
+                       std::string *ErrorStr = 0);
 
   /// EnterMacro - Add a Macro to the top of the include stack and start lexing
   /// tokens from it instead of the current buffer.  Args specifies the

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index a85bef0f29edfd21fc77d3ada45c1b7df1b80777..394f493fa902ca9edf06c5564d121c812f183c65 100644 (file)
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -47,12 +47,12 @@ unsigned ContentCache::getSize() const {
   return Buffer ? Buffer->getBufferSize() : Entry->getSize();
 }
 
-const llvm::MemoryBuffer *ContentCache::getBuffer() const {
+const llvm::MemoryBuffer *ContentCache::getBuffer(std::string *ErrorStr) const {
   // Lazily create the Buffer for ContentCaches that wrap files.
   if (!Buffer && Entry) {
     // FIXME: Should we support a way to not have to do this check over
     //   and over if we cannot open the file?
-    Buffer = MemoryBuffer::getFile(Entry->getName(), 0, Entry->getSize());
+    Buffer = MemoryBuffer::getFile(Entry->getName(), ErrorStr,Entry->getSize());
     if (isTruncated())
       const_cast<ContentCache *>(this)->truncateAt(TruncateAtLine, 
                                                    TruncateAtColumn);

diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 9caca339be32f406cb7ffb9febd5619c3592cab6..028593f39c7309f3dc84261d55a1051e15d04269 100644 (file)
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -1112,9 +1112,10 @@ void Preprocessor::HandleIncludeDirective(Token &IncludeTok,
   }
 
   // Finally, if all is good, enter the new file!
-  if (EnterSourceFile(FID, CurDir))
+  std::string ErrorStr;
+  if (EnterSourceFile(FID, CurDir, &ErrorStr))
     Diag(FilenameTok, diag::err_pp_error_opening_file)
-      << std::string(SourceMgr.getFileEntryForID(FID)->getName());
+      << std::string(SourceMgr.getFileEntryForID(FID)->getName()) << ErrorStr;
 }
 
 /// HandleIncludeNextDirective - Implements #include_next.

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index 8a61d7b9c247eddbd549baa30ddb61b5eb5c8d65..1580b87dac6afb989e4add78dcd856ec90419ef2 100644 (file)
--- a/lib/Lex/PPLexerChange.cpp
+++ b/lib/Lex/PPLexerChange.cpp
@@ -64,7 +64,8 @@ PreprocessorLexer *Preprocessor::getCurrentFileLexer() const {
 
 /// EnterSourceFile - Add a source file to the top of the include stack and
 /// start lexing tokens from it instead of the current buffer.
-bool Preprocessor::EnterSourceFile(FileID FID, const DirectoryLookup *CurDir) {
+bool Preprocessor::EnterSourceFile(FileID FID, const DirectoryLookup *CurDir,
+                                   std::string *ErrorStr) {
   assert(CurTokenLexer == 0 && "Cannot #include a file inside a macro!");
   ++NumEnteredSourceFiles;
 
@@ -79,7 +80,8 @@ bool Preprocessor::EnterSourceFile(FileID FID, const DirectoryLookup *CurDir) {
   }
   
   // Get the MemoryBuffer for this FID, if it fails, we fail.
-  const llvm::MemoryBuffer *InputFile = getSourceManager().getBuffer(FID);
+  const llvm::MemoryBuffer *InputFile =
+    getSourceManager().getBuffer(FID, ErrorStr);
   if (InputFile == 0)
     return true;