aboutsummaryrefslogtreecommitdiff
path: root/lib/Serialization/ASTReader.cpp
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2010-08-25 08:44:16 +0000
committerChandler Carruth <chandlerc@gmail.com>2010-08-25 08:44:16 +0000
commit62c78d54bee499dd87f768f48b21c9b5ec15e516 (patch)
treead008abed42b4aa274b97453b9fcd789121ebeef /lib/Serialization/ASTReader.cpp
parent781472fe99a120098c631b0cbe33c89f8cef5e70 (diff)
Rename *PendingImplicitInstantiations to *PendingInstantiations. No
functionality changed. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112040 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Serialization/ASTReader.cpp')
-rw-r--r--lib/Serialization/ASTReader.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index abe9b16a1a..f07215cb8f 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -1927,11 +1927,11 @@ ASTReader::ReadASTBlock(PerFileData &F) {
case PENDING_IMPLICIT_INSTANTIATIONS:
// Optimization for the first block.
- if (PendingImplicitInstantiations.empty())
- PendingImplicitInstantiations.swap(Record);
+ if (PendingInstantiations.empty())
+ PendingInstantiations.swap(Record);
else
- PendingImplicitInstantiations.insert(
- PendingImplicitInstantiations.end(), Record.begin(), Record.end());
+ PendingInstantiations.insert(PendingInstantiations.end(),
+ Record.begin(), Record.end());
break;
case SEMA_DECL_REFS:
@@ -3430,12 +3430,11 @@ void ASTReader::InitializeSema(Sema &S) {
// If there were any pending implicit instantiations, deserialize them
// and add them to Sema's queue of such instantiations.
- assert(PendingImplicitInstantiations.size() % 2 == 0 &&
- "Expected pairs of entries");
- for (unsigned Idx = 0, N = PendingImplicitInstantiations.size(); Idx < N;) {
- ValueDecl *D=cast<ValueDecl>(GetDecl(PendingImplicitInstantiations[Idx++]));
- SourceLocation Loc = ReadSourceLocation(PendingImplicitInstantiations, Idx);
- SemaObj->PendingImplicitInstantiations.push_back(std::make_pair(D, Loc));
+ assert(PendingInstantiations.size() % 2 == 0 && "Expected pairs of entries");
+ for (unsigned Idx = 0, N = PendingInstantiations.size(); Idx < N;) {
+ ValueDecl *D=cast<ValueDecl>(GetDecl(PendingInstantiations[Idx++]));
+ SourceLocation Loc = ReadSourceLocation(PendingInstantiations, Idx);
+ SemaObj->PendingInstantiations.push_back(std::make_pair(D, Loc));
}
// Load the offsets of the declarations that Sema references.