Cleanup DeclContext::addDecl and DeclContext::insert interface, from Piotr Rak
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62122 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 988fa1a..24172a5 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -533,7 +533,7 @@
RecFields[i]->getIdentifier(),
RecFields[i]->getType(),
RecFields[i]->getBitWidth(), false, 0);
- NewRD->addDecl(*this, Field);
+ NewRD->addDecl(Field);
}
NewRD->completeDefinition(*this);
RD = NewRD;
@@ -1554,7 +1554,7 @@
SourceLocation(), 0,
FieldTypes[i], /*BitWidth=*/0,
/*Mutable=*/false, /*PrevDecl=*/0);
- CFConstantStringTypeDecl->addDecl(*this, Field, true);
+ CFConstantStringTypeDecl->addDecl(Field);
}
CFConstantStringTypeDecl->completeDefinition(*this);
@@ -1584,7 +1584,7 @@
SourceLocation(), 0,
FieldTypes[i], /*BitWidth=*/0,
/*Mutable=*/false, /*PrevDecl=*/0);
- ObjCFastEnumerationStateTypeDecl->addDecl(*this, Field, true);
+ ObjCFastEnumerationStateTypeDecl->addDecl(Field);
}
ObjCFastEnumerationStateTypeDecl->completeDefinition(*this);
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index cafe535..8eb52b7 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -514,7 +514,7 @@
}
}
-void DeclContext::addDecl(ASTContext &Context, ScopedDecl *D, bool AllowLookup) {
+void DeclContext::addDecl(ScopedDecl *D) {
assert(D->getLexicalDeclContext() == this && "Decl inserted into wrong lexical context");
assert(!D->NextDeclInScope && D != LastDecl &&
"Decl already inserted into a DeclContext");
@@ -525,8 +525,7 @@
} else {
FirstDecl = LastDecl = D;
}
- if (AllowLookup)
- D->getDeclContext()->insert(Context, D);
+ D->getDeclContext()->insert(D);
}
/// buildLookup - Build the lookup data structure with all of the
@@ -596,10 +595,10 @@
return Ctx;
}
-void DeclContext::insert(ASTContext &Context, ScopedDecl *D) {
+void DeclContext::insert(ScopedDecl *D) {
DeclContext *PrimaryContext = getPrimaryContext();
if (PrimaryContext != this) {
- PrimaryContext->insert(Context, D);
+ PrimaryContext->insert(D);
return;
}
@@ -612,7 +611,7 @@
// If we are a transparent context, insert into our parent context,
// too. This operation is recursive.
if (isTransparentContext())
- getParent()->insert(Context, D);
+ getParent()->insert(D);
}
void DeclContext::insertImpl(ScopedDecl *D) {