This is an archive of the discontinued LLVM Phabricator instance.

[libclang] Fix cursors for in-class initializer of field declarations
ClosedPublic

Authored by nik on Nov 14 2017, 6:55 AM.

Download Raw Diff

Details

Reviewers

klimek
bkramer
arphaman
erikjv

Commits

rG99f9759d96ca: [libclang] Fix cursors for in-class initializer of field declarations
rC318292: [libclang] Fix cursors for in-class initializer of field declarations
rL318292: [libclang] Fix cursors for in-class initializer of field declarations

Summary

Fixes PR33745.

Diff Detail

Build Status

Buildable 12160
Build 12160: arc lint + arc unit

Event Timeline

nik created this revision.Nov 14 2017, 6:55 AM

Harbormaster completed remote builds in B12160: Diff 122837.Nov 14 2017, 6:55 AM

nik added reviewers: klimek, bkramer, arphaman, erikjv.Nov 14 2017, 6:57 AM

Added PR.

Second try :>

lgtm

This revision is now accepted and ready to land.Nov 14 2017, 8:51 AM

Thanks for the fast review! :)

Please land/submit this for me as I don't have permissions for this.

Closed by commit rL318292: [libclang] Fix cursors for in-class initializer of field declarations (authored by d0k). · Explain WhyNov 15 2017, 4:21 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

test/

Index/

get-cursor.cpp

8 lines

tools/

libclang/

CIndex.cpp

3 lines

Diff 122837

test/Index/get-cursor.cpp

	Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Lines

	// noexcept specifications			// noexcept specifications
	void f_noexcept() noexcept;			void f_noexcept() noexcept;
	template <class T> void f_computed_noexcept(T t) noexcept(noexcept(t+t));			template <class T> void f_computed_noexcept(T t) noexcept(noexcept(t+t));
	void f_dynamic_noexcept_none() throw();			void f_dynamic_noexcept_none() throw();
	void f_dynamic_noexcept() throw(int);			void f_dynamic_noexcept() throw(int);
	void f_dynamic_noexcept_any() throw(...);			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			// 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: CXXConstructor=X:6:3
	// CHECK-COMPLETION-1-NEXT: Completion string: {TypedText X}{LeftParen (}{Placeholder int}{Comma , }{Placeholder int}{RightParen )}			// CHECK-COMPLETION-1-NEXT: Completion string: {TypedText X}{LeftParen (}{Placeholder int}{Comma , }{Placeholder int}{RightParen )}

	// RUN: c-index-test -cursor-at=%s:31:16 %s \| FileCheck -check-prefix=CHECK-COMPLETION-2 %s			// RUN: c-index-test -cursor-at=%s:31:16 %s \| FileCheck -check-prefix=CHECK-COMPLETION-2 %s
	// CHECK-COMPLETION-2: CXXMethod=getAnotherX:31:5 (Definition)			// CHECK-COMPLETION-2: CXXMethod=getAnotherX:31:5 (Definition)
	// CHECK-COMPLETION-2-NEXT: Completion string: {ResultType X}{TypedText getAnotherX}{LeftParen (}{RightParen )}			// CHECK-COMPLETION-2-NEXT: Completion string: {ResultType X}{TypedText getAnotherX}{LeftParen (}{RightParen )}

	▲ Show 20 Lines • Show All 107 Lines • ▼ Show 20 Lines
	// CHECK-SPELLING: 152:6 FunctionDecl=f_dynamic_noexcept:152:6 (noexcept dynamic) Extent=[152:1 - 152:37] Spelling=f_dynamic_noexcept ([152:6 - 152:24])			// CHECK-SPELLING: 152:6 FunctionDecl=f_dynamic_noexcept:152:6 (noexcept dynamic) Extent=[152:1 - 152:37] Spelling=f_dynamic_noexcept ([152:6 - 152:24])
	// CHECK-SPELLING: 153:6 FunctionDecl=f_dynamic_noexcept_any:153:6 (noexcept dynamic any) Extent=[153:1 - 153:41] Spelling=f_dynamic_noexcept_any ([153:6 - 153:28])			// CHECK-SPELLING: 153:6 FunctionDecl=f_dynamic_noexcept_any:153:6 (noexcept dynamic any) Extent=[153:1 - 153:41] Spelling=f_dynamic_noexcept_any ([153:6 - 153:28])

	// RUN: c-index-test -cursor-at=%s:141:13 -cursor-at=%s:141:18 -cursor-at=%s:142:11 -std=c++11 %s \| FileCheck -check-prefix=CHECK-FORRANGE %s			// RUN: c-index-test -cursor-at=%s:141:13 -cursor-at=%s:141:18 -cursor-at=%s:142:11 -std=c++11 %s \| FileCheck -check-prefix=CHECK-FORRANGE %s
	// CHECK-FORRANGE: 141:13 VarDecl=lv:141:13 (Definition) Extent=[141:8 - 141:17] Spelling=lv ([141:13 - 141:15])			// CHECK-FORRANGE: 141:13 VarDecl=lv:141:13 (Definition) Extent=[141:8 - 141:17] Spelling=lv ([141:13 - 141:15])
	// CHECK-FORRANGE: 141:18 DeclRefExpr=coll:140:20 Extent=[141:18 - 141:22] Spelling=coll ([141:18 - 141:22])			// 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])			// 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])

tools/libclang/CIndex.cpp

This file is larger than 256 KB, so syntax highlighting is disabled by default.

	Show First 20 Lines • Show All 871 Lines • ▼ Show 20 Lines

	bool CursorVisitor::VisitFieldDecl(FieldDecl *D) {			bool CursorVisitor::VisitFieldDecl(FieldDecl *D) {
	if (VisitDeclaratorDecl(D))			if (VisitDeclaratorDecl(D))
	return true;			return true;

	if (Expr *BitWidth = D->getBitWidth())			if (Expr *BitWidth = D->getBitWidth())
	return Visit(MakeCXCursor(BitWidth, StmtParent, TU, RegionOfInterest));			return Visit(MakeCXCursor(BitWidth, StmtParent, TU, RegionOfInterest));

				if (Expr *Init = D->getInClassInitializer())
				return Visit(MakeCXCursor(Init, StmtParent, TU, RegionOfInterest));

	return false;			return false;
	}			}

	bool CursorVisitor::VisitVarDecl(VarDecl *D) {			bool CursorVisitor::VisitVarDecl(VarDecl *D) {
	if (VisitDeclaratorDecl(D))			if (VisitDeclaratorDecl(D))
	return true;			return true;

	if (Expr *Init = D->getInit())			if (Expr *Init = D->getInit())
	▲ Show 20 Lines • Show All 7,523 Lines • Show Last 20 Lines