This revision was automatically updated to reflect the committed changes.
Closed by commit rL363897: [analyzer] exploded-graph-rewriter: Fix escaping
StringRegions. (authored by dergachev, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D63519?vs=205449&id=205705#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D63519/new/
https://reviews.llvm.org/D63519
Files:
cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
cfe/trunk/test/Analysis/exploded-graph-rewriter/escapes.c
cfe/trunk/test/Analysis/exploded-graph-rewriter/lit.local.cfg
cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/escapes.c
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/escapes.c
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/escapes.c
@@ -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">&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">&Element\{"foo",0 S64b,char\}</td>
+ const char *const foo = "foo";
+}
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/lit.local.cfg
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/lit.local.cfg
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/lit.local.cfg
@@ -15,4 +15,4 @@
config.clang_src_dir,
'utils', 'analyzer')))))
-config.suffixes = ['.dot']
+config.suffixes.add('.dot')
Index: cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
@@ -210,6 +210,7 @@
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 @@
++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;
Index: cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
===================================================================
--- cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
+++ cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
@@ -199,6 +199,7 @@
.replace('\\"', '"') \
.replace('\\{', '{') \
.replace('\\}', '}') \
+ .replace('\\\\', '\\') \
.replace('\\<', '\\\\<') \
.replace('\\>', '\\\\>') \
.rstrip(',')
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/escapes.c
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/escapes.c
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/escapes.c
@@ -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">&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">&Element\{"foo",0 S64b,char\}</td>
+ const char *const foo = "foo";
+}
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/lit.local.cfg
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/lit.local.cfg
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/lit.local.cfg
@@ -15,4 +15,4 @@
config.clang_src_dir,
'utils', 'analyzer')))))
-config.suffixes = ['.dot']
+config.suffixes.add('.dot')
Index: cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
@@ -210,6 +210,7 @@
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 @@
++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;
Index: cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
===================================================================
--- cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
+++ cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
@@ -199,6 +199,7 @@
.replace('\\"', '"') \
.replace('\\{', '{') \
.replace('\\}', '}') \
+ .replace('\\\\', '\\') \
.replace('\\<', '\\\\<') \
.replace('\\>', '\\\\>') \
.rstrip(',')
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
