From af0e40ac0e38bd507b50139009751035621a53fc Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 12 Nov 2014 14:42:25 +0000 Subject: [PATCH] Simplify code a bit by passing StreamFile to the BitstreamCursor constructor. llvm-svn: 221784 --- clang/lib/Frontend/SerializedDiagnosticReader.cpp | 3 +-- clang/lib/Serialization/ASTReader.cpp | 6 ++---- clang/lib/Serialization/GlobalModuleIndex.cpp | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/clang/lib/Frontend/SerializedDiagnosticReader.cpp b/clang/lib/Frontend/SerializedDiagnosticReader.cpp index 197132d..c8faef3 100644 --- a/clang/lib/Frontend/SerializedDiagnosticReader.cpp +++ b/clang/lib/Frontend/SerializedDiagnosticReader.cpp @@ -29,8 +29,7 @@ std::error_code SerializedDiagnosticReader::readDiagnostics(StringRef File) { StreamFile.init((const unsigned char *)(*Buffer)->getBufferStart(), (const unsigned char *)(*Buffer)->getBufferEnd()); - llvm::BitstreamCursor Stream; - Stream.init(StreamFile); + llvm::BitstreamCursor Stream(StreamFile); // Sniff for the signature. if (Stream.Read(8) != 'D' || diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 8f1abe0..df5a6bf 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -4124,10 +4124,9 @@ std::string ASTReader::getOriginalSourceFile(const std::string &ASTFileName, // Initialize the stream llvm::BitstreamReader StreamFile; - BitstreamCursor Stream; StreamFile.init((const unsigned char *)(*Buffer)->getBufferStart(), (const unsigned char *)(*Buffer)->getBufferEnd()); - Stream.init(StreamFile); + BitstreamCursor Stream(StreamFile); // Sniff for the signature. if (Stream.Read(8) != 'C' || @@ -4211,10 +4210,9 @@ bool ASTReader::readASTFileControlBlock(StringRef Filename, // Initialize the stream llvm::BitstreamReader StreamFile; - BitstreamCursor Stream; StreamFile.init((const unsigned char *)(*Buffer)->getBufferStart(), (const unsigned char *)(*Buffer)->getBufferEnd()); - Stream.init(StreamFile); + BitstreamCursor Stream(StreamFile); // Sniff for the signature. if (Stream.Read(8) != 'C' || diff --git a/clang/lib/Serialization/GlobalModuleIndex.cpp b/clang/lib/Serialization/GlobalModuleIndex.cpp index a67f9f3..4791388 100644 --- a/clang/lib/Serialization/GlobalModuleIndex.cpp +++ b/clang/lib/Serialization/GlobalModuleIndex.cpp @@ -501,10 +501,9 @@ bool GlobalModuleIndexBuilder::loadModuleFile(const FileEntry *File) { // Initialize the input stream llvm::BitstreamReader InStreamFile; - llvm::BitstreamCursor InStream; InStreamFile.init((const unsigned char *)(*Buffer)->getBufferStart(), (const unsigned char *)(*Buffer)->getBufferEnd()); - InStream.init(InStreamFile); + llvm::BitstreamCursor InStream(InStreamFile); // Sniff for the signature. if (InStream.Read(8) != 'C' || -- 2.7.4