maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[analyzer] exploded-graph-rewriter: Fix escaping StringRegions. 

Quotes around StringRegions are now escaped and unescaped correctly,
producing valid JSON.

Additionally, add a forgotten escape for Store values.

Differential Revision: https://reviews.llvm.org/D63519

llvm-svn: 363897
This commit is contained in:
Artem Dergachev 2019-06-19 23:33:55 +00:00
parent 064c8c689a
commit b50d167358
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/StaticAnalyzer/Core/RegionStore.cpp
View File

@ -210,6 +210,7 @@ public:
void printJson(raw_ostream &Out, const char *NL = "\n",
unsigned int Space = 0, bool IsDot = false) const {
for (iterator I = begin(); I != end(); ++I) {
// TODO: We might need a .printJson for I.getKey() as well.
Indent(Out, Space, IsDot)
<< "{ \"cluster\": \"" << I.getKey() << "\", \"pointer\": \""
<< (const void *)I.getKey() << "\", \"items\": [" << NL;
@ -217,8 +218,9 @@ public:
++Space;
const ClusterBindings &CB = I.getData();
for (ClusterBindings::iterator CI = CB.begin(); CI != CB.end(); ++CI) {
Indent(Out, Space, IsDot) << "{ " << CI.getKey() << ", \"value\": \""
<< CI.getData() << "\" }";
Indent(Out, Space, IsDot) << "{ " << CI.getKey() << ", \"value\": ";
CI.getData().printJson(Out, /*AddQuotes=*/true);
Out << " }";
if (std::next(CI) != CB.end())
Out << ',';
Out << NL;

18
clang/test/Analysis/exploded-graph-rewriter/escapes.c Normal file
View File

@ -0,0 +1,18 @@
// FIXME: Figure out how to use %clang_analyze_cc1 with our lit.local.cfg.
// RUN: %clang_cc1 -analyze -triple x86_64-unknown-linux-gnu \
// RUN: -analyzer-checker=core \
// RUN: -analyzer-dump-egraph=%t.dot %s
// RUN: %exploded_graph_rewriter %t.dot | FileCheck %s
// FIXME: Substitution doesn't seem to work on Windows.
// UNSUPPORTED: system-windows
void string_region_escapes() {
// CHECK: <td align="left"><b>Store: </b></td>
// CHECK-SAME: <td align="left">foo</td><td align="left">0</td>
// CHECK-SAME: <td align="left">&amp;Element\{"foo",0 S64b,char\}</td>
// CHECK: <td align="left"><b>Environment: </b></td>
// CHECK-SAME: <td align="left">"foo"</td>
// CHECK-SAME: <td align="left">&amp;Element\{"foo",0 S64b,char\}</td>
const char *const foo = "foo";
}

2
clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg
View File

@ -15,4 +15,4 @@ config.substitutions.append(('%exploded_graph_rewriter',
config.clang_src_dir,
'utils', 'analyzer')))))
config.suffixes = ['.dot']
config.suffixes.add('.dot')

1
clang/utils/analyzer/exploded-graph-rewriter.py
View File

@ -199,6 +199,7 @@ class ExplodedGraph(object):
.replace('\\"', '"') \
.replace('\\{', '{') \
.replace('\\}', '}') \
.replace('\\\\', '\\') \
.replace('\\<', '\\\\<') \
.replace('\\>', '\\\\>') \
.rstrip(',')