NoQ updated this revision to Diff 205449. NoQ added a comment. Oh, right, thanks!
CHANGES SINCE LAST ACTION https://reviews.llvm.org/D63519/new/ https://reviews.llvm.org/D63519 Files: clang/lib/StaticAnalyzer/Core/RegionStore.cpp clang/test/Analysis/exploded-graph-rewriter/escapes.c clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg clang/utils/analyzer/exploded-graph-rewriter.py Index: clang/utils/analyzer/exploded-graph-rewriter.py =================================================================== --- clang/utils/analyzer/exploded-graph-rewriter.py +++ clang/utils/analyzer/exploded-graph-rewriter.py @@ -284,6 +284,7 @@ .replace('\\"', '"') \ .replace('\\{', '{') \ .replace('\\}', '}') \ + .replace('\\\\', '\\') \ .replace('\\<', '\\\\<') \ .replace('\\>', '\\\\>') \ .rstrip(',') Index: clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg =================================================================== --- clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg +++ clang/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: clang/test/Analysis/exploded-graph-rewriter/escapes.c =================================================================== --- /dev/null +++ clang/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 -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: const char *const foo = "foo"; + // CHECK-SAME: Store: + // CHECK-SAME: <td align="left">foo</td><td align="left">0</td> + // CHECK-SAME: <td align="left">&Element\{"foo",0 S64b,char\}</td> + // CHECK-SAME: Environment: + // CHECK-SAME: <td align="left">"foo"</td> + // CHECK-SAME: <td align="left">&Element\{"foo",0 S64b,char\}</td> + const char *const foo = "foo"; +} Index: clang/lib/StaticAnalyzer/Core/RegionStore.cpp =================================================================== --- clang/lib/StaticAnalyzer/Core/RegionStore.cpp +++ clang/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: clang/utils/analyzer/exploded-graph-rewriter.py =================================================================== --- clang/utils/analyzer/exploded-graph-rewriter.py +++ clang/utils/analyzer/exploded-graph-rewriter.py @@ -284,6 +284,7 @@ .replace('\\"', '"') \ .replace('\\{', '{') \ .replace('\\}', '}') \ + .replace('\\\\', '\\') \ .replace('\\<', '\\\\<') \ .replace('\\>', '\\\\>') \ .rstrip(',') Index: clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg =================================================================== --- clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg +++ clang/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: clang/test/Analysis/exploded-graph-rewriter/escapes.c =================================================================== --- /dev/null +++ clang/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 -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: const char *const foo = "foo"; + // CHECK-SAME: Store: + // CHECK-SAME: <td align="left">foo</td><td align="left">0</td> + // CHECK-SAME: <td align="left">&Element\{"foo",0 S64b,char\}</td> + // CHECK-SAME: Environment: + // CHECK-SAME: <td align="left">"foo"</td> + // CHECK-SAME: <td align="left">&Element\{"foo",0 S64b,char\}</td> + const char *const foo = "foo"; +} Index: clang/lib/StaticAnalyzer/Core/RegionStore.cpp =================================================================== --- clang/lib/StaticAnalyzer/Core/RegionStore.cpp +++ clang/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;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits