use early exit to reduce indentation.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65028 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index db29a8e..6b2a1ff 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -562,33 +562,34 @@
// Insert this declaration into the map.
StoredDeclsMap *Map = static_cast<StoredDeclsMap*>(LookupPtr.getPointer());
StoredDeclsMap::iterator Pos = Map->find(D->getDeclName());
- if (Pos != Map->end()) {
- if (MayBeRedeclaration) {
- // Determine if this declaration is actually a redeclaration.
- std::vector<NamedDecl *>::iterator Redecl
- = std::find_if(Pos->second.begin(), Pos->second.end(),
- std::bind1st(std::mem_fun(&NamedDecl::declarationReplaces),
- D));
- if (Redecl != Pos->second.end()) {
- *Redecl = D;
- return;
- }
- }
-
- // Put this declaration into the appropriate slot.
- if (D->getKind() == Decl::UsingDirective ||
- D->getIdentifierNamespace() == Decl::IDNS_Tag
- || Pos->second.empty())
- Pos->second.push_back(D);
- else if (Pos->second.back()->getIdentifierNamespace() == Decl::IDNS_Tag) {
- NamedDecl *TagD = Pos->second.back();
- Pos->second.back() = D;
- Pos->second.push_back(TagD);
- } else
- Pos->second.push_back(D);
- } else {
+ if (Pos == Map->end()) {
(*Map)[D->getDeclName()].push_back(D);
+ return;
}
+
+ if (MayBeRedeclaration) {
+ // Determine if this declaration is actually a redeclaration.
+ std::vector<NamedDecl *>::iterator Redecl
+ = std::find_if(Pos->second.begin(), Pos->second.end(),
+ std::bind1st(std::mem_fun(&NamedDecl::declarationReplaces),
+ D));
+ if (Redecl != Pos->second.end()) {
+ *Redecl = D;
+ return;
+ }
+ }
+
+ // Put this declaration into the appropriate slot.
+ if (D->getKind() == Decl::UsingDirective ||
+ D->getIdentifierNamespace() == Decl::IDNS_Tag
+ || Pos->second.empty())
+ Pos->second.push_back(D);
+ else if (Pos->second.back()->getIdentifierNamespace() == Decl::IDNS_Tag) {
+ NamedDecl *TagD = Pos->second.back();
+ Pos->second.back() = D;
+ Pos->second.push_back(TagD);
+ } else
+ Pos->second.push_back(D);
}
/// Returns iterator range [First, Last) of UsingDirectiveDecls stored within