From 91c6b6a9331a7a492e1c316c6b8f17760ce4607c Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 23 Feb 2012 15:18:31 +0000 Subject: Unique CXXBasePath decls with the SmallVector/pod_sort/std::unique idiom instead of employing a wasteful std::set. llvm-svn: 151255 --- clang/lib/AST/CXXInheritance.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'clang/lib/AST/CXXInheritance.cpp') diff --git a/clang/lib/AST/CXXInheritance.cpp b/clang/lib/AST/CXXInheritance.cpp index f29bfd13192..f6ce983399b 100644 --- a/clang/lib/AST/CXXInheritance.cpp +++ b/clang/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); -- cgit v1.2.3