[llvm-branch-commits] [cfe-branch] r118567 - /cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov  9 11:32:12 2010
New Revision: 118567

URL: http://llvm.org/viewvc/llvm-project?rev=118567&view=rev
Log:
Merge r118372:
--
Author: Ted Kremenek <kremenek at apple.com>
Date:   Sun Nov 7 06:11:36 2010 +0000

    Change the StringSet used by CalculateHiddenNames() to use a BumpPtrAllocator.

Modified:
    cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp

Modified: cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp?rev=118567&r1=118566&r2=118567&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Frontend/ASTUnit.cpp Tue Nov  9 11:32:12 2010
@@ -1611,11 +1611,11 @@
 
 /// \brief Helper function that computes which global names are hidden by the
 /// local code-completion results.
-void CalculateHiddenNames(const CodeCompletionContext &Context,
-                          CodeCompletionResult *Results,
-                          unsigned NumResults,
-                          ASTContext &Ctx,
-                          llvm::StringSet<> &HiddenNames) {
+static void CalculateHiddenNames(const CodeCompletionContext &Context,
+                                 CodeCompletionResult *Results,
+                                 unsigned NumResults,
+                                 ASTContext &Ctx,
+                          llvm::StringSet<llvm::BumpPtrAllocator> &HiddenNames){
   bool OnlyTagNames = false;
   switch (Context.getKind()) {
   case CodeCompletionContext::CCC_Recovery:
@@ -1698,7 +1698,7 @@
                                             : (1 << (Context.getKind() - 1)));
 
   // Contains the set of names that are hidden by "local" completion results.
-  llvm::StringSet<> HiddenNames;
+  llvm::StringSet<llvm::BumpPtrAllocator> HiddenNames;
   llvm::SmallVector<CodeCompletionString *, 4> StringsToDestroy;
   typedef CodeCompletionResult Result;
   llvm::SmallVector<Result, 8> AllResults;