Class template (partial) specializations should not show up in code completion results

llvm-svn: 91125

2 files changed, 8 insertions, 3 deletions

diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 73e0ab0fade..63c8bdcc6c2 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -363,6 +363,11 @@ void ResultBuilder::MaybeAddResult(Result R, DeclContext *CurContext) {
   if (isa<FriendDecl>(CanonDecl) || 
       (IDNS & (Decl::IDNS_OrdinaryFriend | Decl::IDNS_TagFriend)))
     return;
+
+  // Class template (partial) specializations are never added as results
+  if (isa<ClassTemplateSpecializationDecl>(CanonDecl) ||
+      isa<ClassTemplatePartialSpecializationDecl>(CanonDecl))
+    return;
   
   if (const IdentifierInfo *Id = R.Declaration->getIdentifier()) {
     // __va_list_tag is a freak of nature. Find it and skip it.
diff --git a/clang/test/CodeCompletion/templates.cpp b/clang/test/CodeCompletion/templates.cpp
index d35e0bb8dcd..5a0bdb19f15 100644
--- a/clang/test/CodeCompletion/templates.cpp
+++ b/clang/test/CodeCompletion/templates.cpp
@@ -2,15 +2,15 @@ namespace std {
   template<typename T>
   class allocator;
   
-  template<typename T, typename Alloc = std::allocator<T> >
-  class vector;
+  template<typename T, typename Alloc = std::allocator<T> > class vector;
+  template<typename Alloc> class vector<bool, Alloc>;
 }
 
 void f() {
   std::
   // RUN: clang-cc -fsyntax-only -code-completion-at=%s:10:8 %s -o - | FileCheck -check-prefix=CC1 %s
   // CHECK-CC1: allocator<<#typename T#>>
-  // CHECK-CC1: vector<<#typename T#>{#, <#typename Alloc#>#}>
+  // CHECK-CC1-NEXT: vector<<#typename T#>{#, <#typename Alloc#>#}>