From: Benjamin Kramer Date: Thu, 23 Feb 2012 15:18:31 +0000 (+0000) Subject: Unique CXXBasePath decls with the SmallVector/pod_sort/std::unique idiom instead... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0e49e587afd15ccc6c2f910a979f0d3d602d166;p=clang Unique CXXBasePath decls with the SmallVector/pod_sort/std::unique idiom instead of employing a wasteful std::set. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151255 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/AST/CXXInheritance.cpp b/lib/AST/CXXInheritance.cpp index f29bfd1319..f6ce983399 100644 --- a/lib/AST/CXXInheritance.cpp +++ b/lib/AST/CXXInheritance.cpp @@ -23,12 +23,15 @@ using namespace clang; void CXXBasePaths::ComputeDeclsFound() { assert(NumDeclsFound == 0 && !DeclsFound && "Already computed the set of declarations"); - - std::set Decls; - for (CXXBasePaths::paths_iterator Path = begin(), PathEnd = end(); - Path != PathEnd; ++Path) - Decls.insert(*Path->Decls.first); - + + SmallVector Decls; + for (paths_iterator Path = begin(), PathEnd = end(); Path != PathEnd; ++Path) + Decls.push_back(*Path->Decls.first); + + // Eliminate duplicated decls. + llvm::array_pod_sort(Decls.begin(), Decls.end()); + std::unique(Decls.begin(), Decls.end()); + NumDeclsFound = Decls.size(); DeclsFound = new NamedDecl * [NumDeclsFound]; std::copy(Decls.begin(), Decls.end(), DeclsFound);