diff options
| -rw-r--r-- | include/clang/Frontend/PCHReader.h | 5 | ||||
| -rw-r--r-- | lib/Frontend/PCHReader.cpp | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/clang/Frontend/PCHReader.h b/include/clang/Frontend/PCHReader.h index 8f53405c52..90f79b86f3 100644 --- a/include/clang/Frontend/PCHReader.h +++ b/include/clang/Frontend/PCHReader.h @@ -86,7 +86,8 @@ private: ASTConsumer *Consumer; /// \brief The bitstream reader from which we'll read the PCH file. - llvm::BitstreamReader Stream; + llvm::BitstreamReader StreamFile; + llvm::BitstreamCursor Stream; /// \brief The file name of the PCH file. std::string FileName; @@ -422,7 +423,7 @@ public: Sema *getSema() { return SemaObj; } /// \brief Retrieve the stream that this PCH reader is reading from. - llvm::BitstreamReader &getStream() { return Stream; } + llvm::BitstreamCursor &getStream() { return Stream; } /// \brief Retrieve the identifier table associated with the /// preprocessor. diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp index c2d50ce9fc..375fcdddf5 100644 --- a/lib/Frontend/PCHReader.cpp +++ b/lib/Frontend/PCHReader.cpp @@ -41,15 +41,15 @@ namespace { /// \brief Helper class that saves the current stream position and /// then restores it when destroyed. struct VISIBILITY_HIDDEN SavedStreamPosition { - explicit SavedStreamPosition(llvm::BitstreamReader &Stream) - : Stream(Stream), Offset(Stream.GetCurrentBitNo()) { } + explicit SavedStreamPosition(llvm::BitstreamCursor &Cursor) + : Cursor(Cursor), Offset(Cursor.GetCurrentBitNo()) { } ~SavedStreamPosition() { - Stream.JumpToBit(Offset); + Cursor.JumpToBit(Offset); } private: - llvm::BitstreamReader &Stream; + llvm::BitstreamCursor &Cursor; uint64_t Offset; }; } @@ -1974,8 +1974,9 @@ PCHReader::PCHReadResult PCHReader::ReadPCH(const std::string &FileName) { } // Initialize the stream - Stream.init((const unsigned char *)Buffer->getBufferStart(), - (const unsigned char *)Buffer->getBufferEnd()); + StreamFile.init((const unsigned char *)Buffer->getBufferStart(), + (const unsigned char *)Buffer->getBufferEnd()); + Stream.init(StreamFile); // Sniff for the signature. if (Stream.Read(8) != 'C' || |