diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2017-11-15 12:20:41 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2017-11-15 12:20:41 +0000 |
| commit | 99f9759d96cacc70f4beed6ea2b2a5a0f912cadc (patch) | |
| tree | 1a3a74072433d9446ac397ee985eebab1fbe55af | |
| parent | 4a91fb93dbffe4a411f952c8f01ce6c8c77a0403 (diff) | |
| download | bcm5719-llvm-99f9759d96cacc70f4beed6ea2b2a5a0f912cadc.tar.gz bcm5719-llvm-99f9759d96cacc70f4beed6ea2b2a5a0f912cadc.zip | |
[libclang] Fix cursors for in-class initializer of field declarations
Fixes PR33745.
Patch by Nikolai Kosjar!
Differential Revision: https://reviews.llvm.org/D40027
llvm-svn: 318292
| -rw-r--r-- | clang/test/Index/get-cursor.cpp | 8 | ||||
| -rw-r--r-- | clang/tools/libclang/CIndex.cpp | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/clang/test/Index/get-cursor.cpp b/clang/test/Index/get-cursor.cpp index 8aa12d5bc31..e997fc493d8 100644 --- a/clang/test/Index/get-cursor.cpp +++ b/clang/test/Index/get-cursor.cpp @@ -152,6 +152,11 @@ void f_dynamic_noexcept_none() throw(); void f_dynamic_noexcept() throw(int); void f_dynamic_noexcept_any() throw(...); +enum EnumType { Enumerator }; +struct Z { + EnumType e = Enumerator; +}; + // RUN: c-index-test -cursor-at=%s:6:4 %s | FileCheck -check-prefix=CHECK-COMPLETION-1 %s // CHECK-COMPLETION-1: CXXConstructor=X:6:3 // CHECK-COMPLETION-1-NEXT: Completion string: {TypedText X}{LeftParen (}{Placeholder int}{Comma , }{Placeholder int}{RightParen )} @@ -275,3 +280,6 @@ void f_dynamic_noexcept_any() throw(...); // CHECK-FORRANGE: 141:18 DeclRefExpr=coll:140:20 Extent=[141:18 - 141:22] Spelling=coll ([141:18 - 141:22]) // CHECK-FORRANGE: 142:11 DeclRefExpr=lv:141:13 Extent=[142:11 - 142:13] Spelling=lv ([142:11 - 142:13]) +// RUN: c-index-test -cursor-at=%s:157:18 -std=c++11 %s | FileCheck -check-prefix=CHECK-INCLASSINITIALIZER %s +// CHECK-INCLASSINITIALIZER: 157:18 DeclRefExpr=Enumerator:155:17 Extent=[157:18 - 157:28] Spelling=Enumerator ([157:18 - 157:28]) + diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 2a1b63d83e0..74a17d21e02 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -877,6 +877,9 @@ bool CursorVisitor::VisitFieldDecl(FieldDecl *D) { if (Expr *BitWidth = D->getBitWidth()) return Visit(MakeCXCursor(BitWidth, StmtParent, TU, RegionOfInterest)); + if (Expr *Init = D->getInClassInitializer()) + return Visit(MakeCXCursor(Init, StmtParent, TU, RegionOfInterest)); + return false; } |
