Move IdDeclInfoMap class in an anonymous namespace. Suggestion by Chris Lattner.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49628 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/IdentifierResolver.cpp b/lib/Sema/IdentifierResolver.cpp
index 037802c..c062e80 100644
--- a/lib/Sema/IdentifierResolver.cpp
+++ b/lib/Sema/IdentifierResolver.cpp
@@ -69,13 +69,11 @@
void RemoveShadowed(NamedDecl *D);
};
-} // end anonymous namespace
-
/// IdDeclInfoMap - Associates IdDeclInfos with Identifiers.
/// Allocates 'pools' (vectors of IdDeclInfos) to avoid allocating each
/// individual IdDeclInfo to heap.
-class IdentifierResolver::IdDeclInfoMap {
+class IdDeclInfoMap {
static const unsigned int VECTOR_SIZE = 512;
// Holds vectors of IdDeclInfos that serve as 'pools'.
// New vectors are added when the current one is full.
@@ -90,9 +88,13 @@
IdDeclInfo &operator[](IdentifierInfo *II);
};
+} // end anonymous namespace
-IdentifierResolver::IdentifierResolver() : IdDeclInfos(*new IdDeclInfoMap) {}
-IdentifierResolver::~IdentifierResolver() { delete &IdDeclInfos; }
+
+IdentifierResolver::IdentifierResolver() : IdDeclInfos(new IdDeclInfoMap) {}
+IdentifierResolver::~IdentifierResolver() {
+ delete static_cast<IdDeclInfoMap*>(IdDeclInfos);
+}
/// AddDecl - Link the decl to its shadowed decl chain.
void IdentifierResolver::AddDecl(NamedDecl *D, Scope *S) {
@@ -109,7 +111,8 @@
if (isDeclPtr(Ptr)) {
II->setFETokenInfo(NULL);
- IDI = &IdDeclInfos[II];
+ IdDeclInfoMap &Map = *static_cast<IdDeclInfoMap*>(IdDeclInfos);
+ IDI = &Map[II];
IDI->PushShadowed(static_cast<NamedDecl*>(Ptr));
} else
IDI = toIdDeclInfo(Ptr);
@@ -151,7 +154,8 @@
if (isDeclPtr(Ptr)) {
II->setFETokenInfo(NULL);
- IDI = &IdDeclInfos[II];
+ IdDeclInfoMap &Map = *static_cast<IdDeclInfoMap*>(IdDeclInfos);
+ IDI = &Map[II];
IDI->PushShadowed(static_cast<NamedDecl*>(Ptr));
} else
IDI = toIdDeclInfo(Ptr);
@@ -231,7 +235,7 @@
/// Returns the IdDeclInfo associated to the IdentifierInfo.
/// It creates a new IdDeclInfo if one was not created before for this id.
-IdDeclInfo &IdentifierResolver::IdDeclInfoMap::operator[](IdentifierInfo *II) {
+IdDeclInfo &IdDeclInfoMap::operator[](IdentifierInfo *II) {
assert (II && "null IdentifierInfo passed");
void *Ptr = II->getFETokenInfo<void>();