From 72405d6ec24cdf56d147f88afd33703df4cbf0ea Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 27 Apr 2009 07:35:40 +0000 Subject: [PATCH] fix a couple more places that should be using the DeclCursor instead of the normal stream cursor. llvm-svn: 70198 --- clang/lib/Frontend/PCHReader.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp index ff8795ca6403..bace23ccc622 100644 --- a/clang/lib/Frontend/PCHReader.cpp +++ b/clang/lib/Frontend/PCHReader.cpp @@ -1411,14 +1411,14 @@ bool PCHReader::ReadDeclsLexicallyInContext(DeclContext *DC, // Keep track of where we are in the stream, then jump back there // after reading this context. - SavedStreamPosition SavedPosition(Stream); + SavedStreamPosition SavedPosition(DeclsCursor); // Load the record containing all of the declarations lexically in // this context. - Stream.JumpToBit(Offset); + DeclsCursor.JumpToBit(Offset); RecordData Record; - unsigned Code = Stream.ReadCode(); - unsigned RecCode = Stream.ReadRecord(Code, Record); + unsigned Code = DeclsCursor.ReadCode(); + unsigned RecCode = DeclsCursor.ReadRecord(Code, Record); (void)RecCode; assert(RecCode == pch::DECL_CONTEXT_LEXICAL && "Expected lexical block"); @@ -1430,7 +1430,7 @@ bool PCHReader::ReadDeclsLexicallyInContext(DeclContext *DC, } bool PCHReader::ReadDeclsVisibleInContext(DeclContext *DC, - llvm::SmallVectorImpl & Decls) { + llvm::SmallVectorImpl &Decls) { assert(DC->hasExternalVisibleStorage() && "DeclContext has no visible decls in storage"); uint64_t Offset = DeclContextOffsets[DC].second; @@ -1438,14 +1438,14 @@ bool PCHReader::ReadDeclsVisibleInContext(DeclContext *DC, // Keep track of where we are in the stream, then jump back there // after reading this context. - SavedStreamPosition SavedPosition(Stream); + SavedStreamPosition SavedPosition(DeclsCursor); // Load the record containing all of the declarations visible in // this context. - Stream.JumpToBit(Offset); + DeclsCursor.JumpToBit(Offset); RecordData Record; - unsigned Code = Stream.ReadCode(); - unsigned RecCode = Stream.ReadRecord(Code, Record); + unsigned Code = DeclsCursor.ReadCode(); + unsigned RecCode = DeclsCursor.ReadRecord(Code, Record); (void)RecCode; assert(RecCode == pch::DECL_CONTEXT_VISIBLE && "Expected visible block"); if (Record.size() == 0) @@ -1459,8 +1459,7 @@ bool PCHReader::ReadDeclsVisibleInContext(DeclContext *DC, Decls.back().Name = ReadDeclarationName(Record, Idx); unsigned Size = Record[Idx++]; - llvm::SmallVector & LoadedDecls - = Decls.back().Declarations; + llvm::SmallVector &LoadedDecls = Decls.back().Declarations; LoadedDecls.reserve(Size); for (unsigned I = 0; I < Size; ++I) LoadedDecls.push_back(Record[Idx++]);