diff options
| -rw-r--r-- | include/clang/Basic/SourceManager.h | 6 | ||||
| -rw-r--r-- | lib/Basic/SourceManager.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index fd4f3f4f7a..2098698400 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -466,7 +466,7 @@ public: unsigned PreallocatedID = 0, unsigned Offset = 0) { const SrcMgr::ContentCache *IR = getOrCreateContentCache(SourceFile); - if (IR == 0) return FileID(); // Error opening file? + assert(IR && "getOrCreateContentCache() cannot return NULL"); return createFileID(IR, IncludePos, FileCharacter, PreallocatedID, Offset); } @@ -516,9 +516,7 @@ public: /// /// \param DoNotFree If true, then the buffer will not be freed when the /// source manager is destroyed. - /// - /// \returns true if an error occurred, false otherwise. - bool overrideFileContents(const FileEntry *SourceFile, + void overrideFileContents(const FileEntry *SourceFile, const llvm::MemoryBuffer *Buffer, bool DoNotFree = false); diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index b8383c3e58..8564a76feb 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -525,15 +525,13 @@ SourceManager::getMemoryBufferForFile(const FileEntry *File, return IR->getBuffer(Diag, *this, SourceLocation(), Invalid); } -bool SourceManager::overrideFileContents(const FileEntry *SourceFile, +void SourceManager::overrideFileContents(const FileEntry *SourceFile, const llvm::MemoryBuffer *Buffer, bool DoNotFree) { const SrcMgr::ContentCache *IR = getOrCreateContentCache(SourceFile); - if (IR == 0) - return true; + assert(IR && "getOrCreateContentCache() cannot return NULL"); const_cast<SrcMgr::ContentCache *>(IR)->replaceBuffer(Buffer, DoNotFree); - return false; } llvm::StringRef SourceManager::getBufferData(FileID FID, bool *Invalid) const { |