This is an archive of the discontinued LLVM Phabricator instance.

[analyzer] print() JSONify: ProgramPoint revision
ClosedPublic

Authored by Charusso on Jun 17 2019, 8:49 AM.

Download Raw Diff

Details

Reviewers

Commits

rG3a4a60eb6a73: [analyzer] print() JSONify: ProgramPoint revision
rC364197: [analyzer] print() JSONify: ProgramPoint revision
rL364197: [analyzer] print() JSONify: ProgramPoint revision

Summary

Now we also print out the filename with its path.

Diff Detail

Repository: rL LLVM

Event Timeline

Charusso created this revision.Jun 17 2019, 8:49 AM

Herald added subscribers: cfe-commits, dkrupp, donat.nagy and 6 others. · View Herald TranscriptJun 17 2019, 8:49 AM

Yes, this would be helpful! Tests?

Added a test case.

Charusso added a parent revision: D63436: [analyzer] Fix JSON dumps for ExplodedNodes.Jun 17 2019, 3:57 PM

Charusso added a child revision: D63462: [analyzer] JsonSupport: Escape escapes.Jun 17 2019, 4:00 PM

Great, thanks!

This revision is now accepted and ready to land.Jun 17 2019, 4:01 PM

Pls commit? ^.^

Closed by commit rL364197: [analyzer] print() JSONify: ProgramPoint revision (authored by Charusso). · Explain WhyJun 24 2019, 9:21 AM

This revision was automatically updated to reflect the committed changes.

Herald added a project: Restricted Project. · View Herald TranscriptJun 24 2019, 9:21 AM

Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

Path

Size

cfe/

trunk/

lib/

Analysis/

ProgramPoint.cpp

3 lines

test/

Analysis/

dump_egraph.c

2 lines

Diff 206238

cfe/trunk/lib/Analysis/ProgramPoint.cpp

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines	static void printLocJson(raw_ostream &Out, SourceLocation Loc,
const SourceManager &SM) {		const SourceManager &SM) {
Out << "\"location\": ";		Out << "\"location\": ";
if (!Loc.isFileID()) {		if (!Loc.isFileID()) {
Out << "null";		Out << "null";
return;		return;
}		}

Out << "{ \"line\": " << SM.getExpansionLineNumber(Loc)		Out << "{ \"line\": " << SM.getExpansionLineNumber(Loc)
<< ", \"column\": " << SM.getExpansionColumnNumber(Loc) << " }";		<< ", \"column\": " << SM.getExpansionColumnNumber(Loc)
		<< ", \"file\": \"" << SM.getFilename(Loc) << "\" }";
}		}

void ProgramPoint::printJson(llvm::raw_ostream &Out, const char *NL) const {		void ProgramPoint::printJson(llvm::raw_ostream &Out, const char *NL) const {
const ASTContext &Context =		const ASTContext &Context =
getLocationContext()->getAnalysisDeclContext()->getASTContext();		getLocationContext()->getAnalysisDeclContext()->getASTContext();
const SourceManager &SM = Context.getSourceManager();		const SourceManager &SM = Context.getSourceManager();
const PrintingPolicy &PP = Context.getPrintingPolicy();		const PrintingPolicy &PP = Context.getPrintingPolicy();
const bool AddQuotes = true;		const bool AddQuotes = true;
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines

cfe/trunk/test/Analysis/dump_egraph.c

	Show All 16 Lines
	}			}

	// CHECK: \"program_points\": [\l    \{ \"kind\": \"Edge\", \"src_id\": 2, \"dst_id\": 1, \"terminator\": null, \"term_kind\": null, \"tag\": null \}\l  ],\l  \"program_state\": null			// CHECK: \"program_points\": [\l    \{ \"kind\": \"Edge\", \"src_id\": 2, \"dst_id\": 1, \"terminator\": null, \"term_kind\": null, \"tag\": null \}\l  ],\l  \"program_state\": null

	// CHECK: \"program_points\": [\l    \{ \"kind\": \"BlockEntrance\", \"block_id\": 1			// CHECK: \"program_points\": [\l    \{ \"kind\": \"BlockEntrance\", \"block_id\": 1

	// CHECK: \"has_report\": true			// CHECK: \"has_report\": true

				// CHECK: \"pretty\": \"*x\", \"location\": \{ \"line\": 16, \"column\": 10, \"file\": \"{{(.+)}}dump_egraph.c\" \}