diff options
| -rw-r--r-- | lib/Sema/SemaCodeComplete.cpp | 7 | ||||
| -rw-r--r-- | test/CodeCompletion/Inputs/reserved.h | 2 | ||||
| -rw-r--r-- | test/CodeCompletion/ordinary-name.c | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp index 82861101e8..55288750fd 100644 --- a/lib/Sema/SemaCodeComplete.cpp +++ b/lib/Sema/SemaCodeComplete.cpp @@ -407,13 +407,16 @@ bool ResultBuilder::isInterestingDecl(NamedDecl *ND, return false; // Filter out names reserved for the implementation (C99 7.1.3, - // C++ [lib.global.names]). Users don't need to see those. + // C++ [lib.global.names]) if they come from a system header. // // FIXME: Add predicate for this. if (Id->getLength() >= 2) { const char *Name = Id->getNameStart(); if (Name[0] == '_' && - (Name[1] == '_' || (Name[1] >= 'A' && Name[1] <= 'Z'))) + (Name[1] == '_' || (Name[1] >= 'A' && Name[1] <= 'Z')) && + (ND->getLocation().isInvalid() || + SemaRef.SourceMgr.isInSystemHeader( + SemaRef.SourceMgr.getSpellingLoc(ND->getLocation())))) return false; } } diff --git a/test/CodeCompletion/Inputs/reserved.h b/test/CodeCompletion/Inputs/reserved.h new file mode 100644 index 0000000000..fafe4ac440 --- /dev/null +++ b/test/CodeCompletion/Inputs/reserved.h @@ -0,0 +1,2 @@ +typedef int _INTEGER_TYPE; +typedef float FLOATING_TYPE; diff --git a/test/CodeCompletion/ordinary-name.c b/test/CodeCompletion/ordinary-name.c index 1580d01fd3..0807b74b12 100644 --- a/test/CodeCompletion/ordinary-name.c +++ b/test/CodeCompletion/ordinary-name.c @@ -1,10 +1,14 @@ +#include <reserved.h> struct X { int x; }; - typedef struct t TYPEDEF; - +typedef struct t _TYPEDEF; void foo() { int y; - // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:6:9 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s + // RUN: %clang_cc1 -isystem %S/Inputs -fsyntax-only -code-completion-at=%s:6:9 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s + // CHECK-CC1: _Imaginary + // CHECK-CC1-NOT: _INTEGER_TYPE; + // CHECK-CC1: _TYPEDEF + // CHECK-CC1: FLOATING_TYPE // CHECK-CC1: foo - // CHECK-CC1: y // CHECK-CC1: TYPEDEF + // CHECK-CC1: y |