[analyzer] print() JSONify: ProgramPoint revision

Csaba Dabis · Csaba Dabis · commit 3a4a60eb6a73 · 2019-06-24T16:19:39.000Z
Summary: Now we also print out the filename with its path. Reviewers: NoQ Reviewed By: NoQ Subscribers: xazax.hun, baloghadamsoftware, szepet, a.sidorin, mikhail.ramalho, Szelethus, donat.nagy, dkrupp, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D63438 llvm-svn: 364197
diff --git a/clang/lib/Analysis/ProgramPoint.cpp b/clang/lib/Analysis/ProgramPoint.cpp
@@ -55,7 +55,8 @@ static void printLocJson(raw_ostream &Out, SourceLocation 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 {
diff --git a/clang/test/Analysis/dump_egraph.c b/clang/test/Analysis/dump_egraph.c
@@ -22,3 +22,5 @@ int foo() {
 
 // CHECK: \"has_report\": true
 
+// CHECK: \"pretty\": \"*x\", \"location\": \{ \"line\": 16, \"column\": 10, \"file\": \"{{(.+)}}dump_egraph.c\" \}
+

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ static void printLocJson(raw_ostream &Out, SourceLocation Loc,`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`Out << "{ \"line\": " << SM.getExpansionLineNumber(Loc)`
`58`		`- << ", \"column\": " << SM.getExpansionColumnNumber(Loc) << " }";`
	`58`	`+ << ", \"column\": " << SM.getExpansionColumnNumber(Loc)`
	`59`	`+ << ", \"file\": \"" << SM.getFilename(Loc) << "\" }";`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`void ProgramPoint::printJson(llvm::raw_ostream &Out, const char *NL) const {`
Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,5 @@ int foo() {`
`22`	`22`
`23`	`23`	`// CHECK: \"has_report\": true`
`24`	`24`
	`25`	`+// CHECK: \"pretty\": \"*x\", \"location\": \{ \"line\": 16, \"column\": 10, \"file\": \"{{(.+)}}dump_egraph.c\" \}`
	`26`	`+`