This is an archive of the discontinued LLVM Phabricator instance.

[ASTDump] Mark BlockDecls which capture this with a tag
ClosedPublic

Authored by steveire on Jan 15 2019, 3:39 PM.

Download Raw Diff

Details

Reviewers

Commits

rG5110ebd9fe5f: [ASTDump] Mark BlockDecls which capture this with a tag
rC351600: [ASTDump] Mark BlockDecls which capture this with a tag
rL351600: [ASTDump] Mark BlockDecls which capture this with a tag

Summary

Removal of the child node makes it easier to separate traversal from
output generation.

Diff Detail

Repository

rC Clang

Build Status

Buildable 27033
Build 27032: arc lint + arc unit

Event Timeline

steveire created this revision.Jan 15 2019, 3:39 PM

Herald added a subscriber: cfe-commits. · View Herald TranscriptJan 15 2019, 3:39 PM

Harbormaster completed remote builds in B26880: Diff 181905.Jan 15 2019, 3:39 PM

Update

Harbormaster completed remote builds in B26882: Diff 181909.Jan 15 2019, 3:47 PM

Was there no test coverage for this situation? If not, can you add some?

Rebase

Harbormaster completed remote builds in B27033: Diff 182475.Jan 18 2019, 1:43 AM

LGTM!

This revision is now accepted and ready to land.Jan 18 2019, 5:45 AM

Closed by commit rL351600: [ASTDump] Mark BlockDecls which capture this with a tag (authored by steveire). · Explain WhyJan 18 2019, 1:59 PM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: llvm-commits. · View Herald TranscriptJan 18 2019, 1:59 PM

Revision Contents

Path

Size

lib/

AST/

ASTDumper.cpp

6 lines

test/

AST/

ast-dump-decl.mm

3 lines

Diff 182475

lib/AST/ASTDumper.cpp

Show First 20 Lines • Show All 1,373 Lines • ▼ Show 20 Lines	if (C.hasCopyExpr())
dumpStmt(C.getCopyExpr());		dumpStmt(C.getCopyExpr());
});		});
}		}

void ASTDumper::VisitBlockDecl(const BlockDecl *D) {		void ASTDumper::VisitBlockDecl(const BlockDecl *D) {
if (D->isVariadic())		if (D->isVariadic())
OS << " variadic";		OS << " variadic";

		if (D->capturesCXXThis())
		OS << " captures_this";

for (auto I : D->parameters())		for (auto I : D->parameters())
dumpDecl(I);		dumpDecl(I);

if (D->capturesCXXThis())
dumpChild([=]{ OS << "capture this"; });

for (const auto &I : D->captures())		for (const auto &I : D->captures())
Visit(I);		Visit(I);
dumpStmt(D->getBody());		dumpStmt(D->getBody());
}		}

//===----------------------------------------------------------------------===//		//===----------------------------------------------------------------------===//
// Stmt dumping methods.		// Stmt dumping methods.
//===----------------------------------------------------------------------===//		//===----------------------------------------------------------------------===//
▲ Show 20 Lines • Show All 263 Lines • Show Last 20 Lines

test/AST/ast-dump-decl.mm

	Show All 33 Lines

	struct Test {			struct Test {
	void f() {			void f() {
	^{ this->yada(); }();			^{ this->yada(); }();
	// CHECK: ExprWithCleanups {{.*}} <line:[[@LINE-1]]:5, col:24> 'void'			// CHECK: ExprWithCleanups {{.*}} <line:[[@LINE-1]]:5, col:24> 'void'
	// CHECK-NEXT: cleanup Block			// CHECK-NEXT: cleanup Block
	// CHECK-NEXT: CallExpr {{.*}} <col:5, col:24> 'void'			// CHECK-NEXT: CallExpr {{.*}} <col:5, col:24> 'void'
	// CHECK-NEXT: BlockExpr {{.*}} <col:5, col:22> 'void (^)()'			// CHECK-NEXT: BlockExpr {{.*}} <col:5, col:22> 'void (^)()'
	// CHECK-NEXT: BlockDecl {{.*}} <col:5, col:22> col:5			// CHECK-NEXT: BlockDecl {{.*}} <col:5, col:22> col:5 captures_this
	// CHECK-NEXT: capture this
	// CHECK-NEXT: CompoundStmt {{.*}} <col:6, col:22>			// CHECK-NEXT: CompoundStmt {{.*}} <col:6, col:22>
	// CHECK-NEXT: CXXMemberCallExpr {{.*}} <col:8, col:19> 'void'			// CHECK-NEXT: CXXMemberCallExpr {{.*}} <col:8, col:19> 'void'
	// CHECK-NEXT: MemberExpr {{.*}} <col:8, col:14> '<bound member function type>' ->yada			// CHECK-NEXT: MemberExpr {{.*}} <col:8, col:14> '<bound member function type>' ->yada
	// CHECK-NEXT: CXXThisExpr {{.}} <col:8> 'Test ' this			// CHECK-NEXT: CXXThisExpr {{.}} <col:8> 'Test ' this
	}			}
	void yada();			void yada();
	};			};