This revision was automatically updated to reflect the committed changes.
Closed by commit rL364271: [analyzer] print() JSONify: Create pointers
(authored by Charusso, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D63726?vs=206249&id=206359#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D63726/new/
https://reviews.llvm.org/D63726
Files:
cfe/trunk/lib/StaticAnalyzer/Core/Environment.cpp
cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot
cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot
cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot
cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot
cfe/trunk/test/Analysis/expr-inspection.c
cfe/trunk/utils/analyzer/exploded-graph-rewriter.py
Index: cfe/trunk/lib/StaticAnalyzer/Core/Environment.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/Environment.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/Environment.cpp
@@ -204,13 +204,13 @@
const LocationContext *LCtx, const char *NL,
unsigned int Space, bool IsDot) const {
Indent(Out, Space, IsDot) << "\"environment\": ";
- ++Space;
if (ExprBindings.isEmpty()) {
Out << "null," << NL;
return;
}
+ ++Space;
if (!LCtx) {
// Find the freshest location context.
llvm::SmallPtrSet<const LocationContext *, 16> FoundContexts;
@@ -227,7 +227,8 @@
assert(LCtx);
- Out << '[' << NL; // Start of Environment.
+ Out << "{ \"pointer\": \"" << (const void *)LCtx->getStackFrame()
+ << "\", \"items\": [" << NL;
PrintingPolicy PP = Ctx.getPrintingPolicy();
LCtx->printJson(Out, NL, Space, IsDot, [&](const LocationContext *LC) {
@@ -280,5 +281,5 @@
Out << "null ";
});
- Indent(Out, --Space, IsDot) << "]," << NL; // End of Environment.
+ Indent(Out, --Space, IsDot) << "]}," << NL;
}
Index: cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
@@ -2640,7 +2640,7 @@
return;
}
- Out << '[' << NL;
- Bindings.printJson(Out, NL, ++Space, IsDot);
- Indent(Out, --Space, IsDot) << "]," << NL;
+ Out << "{ \"pointer\": \"" << Bindings.asStore() << "\", \"items\": [" << NL;
+ Bindings.printJson(Out, NL, Space + 1, IsDot);
+ Indent(Out, Space, IsDot) << "]}," << 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
@@ -126,7 +126,8 @@
class Environment(object):
def __init__(self, json_e):
super(Environment, self).__init__()
- self.frames = [EnvironmentFrame(f) for f in json_e]
+ self.ptr = json_e['pointer']
+ self.frames = [EnvironmentFrame(f) for f in json_e['items']]
def diff_frames(self, prev):
# TODO: It's difficult to display a good diff when frame numbers shift.
@@ -190,8 +191,9 @@
class Store(object):
def __init__(self, json_s):
super(Store, self).__init__()
+ self.ptr = json_s['pointer']
self.clusters = collections.OrderedDict(
- [(c['pointer'], StoreCluster(c)) for c in json_s])
+ [(c['pointer'], StoreCluster(c)) for c in json_s['items']])
def diff_clusters(self, prev):
removed = [k for k in prev.clusters if k not in self.clusters]
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot
@@ -29,19 +29,22 @@
"program_state": {
"environment": null,
"constraints": null,
- "store": [
- {
- "cluster": "x",
- "pointer": "0x3",
- "items": [
- {
- "kind": "Default",
- "offset": 0,
- "value": "Undefined"
- }
- ]
- }
- ]
+ "store": {
+ "pointer": "0x2",
+ "items": [
+ {
+ "cluster": "x",
+ "pointer": "0x3",
+ "items": [
+ {
+ "kind": "Default",
+ "offset": 0,
+ "value": "Undefined"
+ }
+ ]
+ }
+ ]
+ }
}
}
\l}"];
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot
@@ -13,21 +13,24 @@
"program_state": {
"store": null,
"constraints": null,
- "environment": [
- {
- "location_context": "#0 Call",
- "lctx_id": 3,
- "calling": "foo",
- "call_line": 4,
- "items": [
- {
- "stmt_id": 5,
- "pretty": "bar()",
- "value": "Unknown"
- }
- ]
- }
- ]
+ "environment": {
+ "pointer": "0x2",
+ "items": [
+ {
+ "location_context": "#0 Call",
+ "lctx_id": 3,
+ "calling": "foo",
+ "call_line": 4,
+ "items": [
+ {
+ "stmt_id": 5,
+ "pretty": "bar()",
+ "value": "Unknown"
+ }
+ ]
+ }
+ ]
+ }
}
}
\l}"];
@@ -56,21 +59,24 @@
"program_state": {
"store": null,
"constraints": null,
- "environment": [
- {
- "location_context": "#0 Call",
- "lctx_id": 3,
- "calling": "foo",
- "call_line": 4,
- "items": [
- {
- "stmt_id": 9,
- "pretty": "baz()",
- "value": "Undefined"
- }
- ]
- }
- ]
+ "environment": {
+ "pointer": "0x2",
+ "items": [
+ {
+ "location_context": "#0 Call",
+ "lctx_id": 3,
+ "calling": "foo",
+ "call_line": 4,
+ "items": [
+ {
+ "stmt_id": 9,
+ "pretty": "baz()",
+ "value": "Undefined"
+ }
+ ]
+ }
+ ]
+ }
}
}
\l}"];
@@ -93,21 +99,24 @@
"program_state": {
"store": null,
"constraints": null,
- "environment": [
- {
- "location_context": "#0 Call",
- "lctx_id": 3,
- "calling": "foo",
- "call_line": 4,
- "items": [
- {
- "stmt_id": 9,
- "pretty": "baz()",
- "value": "Undefined"
- }
- ]
- }
- ]
+ "environment": {
+ "pointer": "0x2",
+ "items": [
+ {
+ "location_context": "#0 Call",
+ "lctx_id": 3,
+ "calling": "foo",
+ "call_line": 4,
+ "items": [
+ {
+ "stmt_id": 9,
+ "pretty": "baz()",
+ "value": "Undefined"
+ }
+ ]
+ }
+ ]
+ }
}
}
\l}"];
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot
@@ -12,19 +12,22 @@
"program_state": {
"environment": null,
"constraints": null,
- "store": [
- {
- "cluster": "x",
- "pointer": "0x3",
- "items": [
- {
- "kind": "Default",
- "offset": 0,
- "value": "Undefined"
- }
- ]
- }
- ]
+ "store": {
+ "pointer": "0x2",
+ "items": [
+ {
+ "cluster": "x",
+ "pointer": "0x3",
+ "items": [
+ {
+ "kind": "Default",
+ "offset": 0,
+ "value": "Undefined"
+ }
+ ]
+ }
+ ]
+ }
}
}
\l}"];
@@ -54,19 +57,22 @@
"program_state": {
"environment": null,
"constraints": null,
- "store": [
- {
- "cluster": "x",
- "pointer": "0x3",
- "items": [
- {
- "kind": "Default",
- "offset": 0,
- "value": "Unknown"
- }
- ]
- }
- ]
+ "store": {
+ "pointer": "0x5",
+ "items": [
+ {
+ "cluster": "x",
+ "pointer": "0x3",
+ "items": [
+ {
+ "kind": "Default",
+ "offset": 0,
+ "value": "Unknown"
+ }
+ ]
+ }
+ ]
+ }
}
}
\l}"];
Index: cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot
===================================================================
--- cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot
+++ cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot
@@ -34,21 +34,24 @@
"program_state": {
"store": null,
"constraints": null,
- "environment": [
- {
- "location_context": "#0 Call",
- "lctx_id": 3,
- "calling": "foo",
- "call_line": 4,
- "items": [
- {
- "stmt_id": 5,
- "pretty": "bar()",
- "value": "Unknown"
- }
- ]
- }
- ]
+ "environment": {
+ "pointer": "0x2",
+ "items": [
+ {
+ "location_context": "#0 Call",
+ "lctx_id": 3,
+ "calling": "foo",
+ "call_line": 4,
+ "items": [
+ {
+ "stmt_id": 5,
+ "pretty": "bar()",
+ "value": "Unknown"
+ }
+ ]
+ }
+ ]
+ }
}
}
\l}"];
Index: cfe/trunk/test/Analysis/expr-inspection.c
===================================================================
--- cfe/trunk/test/Analysis/expr-inspection.c
+++ cfe/trunk/test/Analysis/expr-inspection.c
@@ -24,16 +24,16 @@
}
// CHECK: "program_state": {
-// CHECK-NEXT: "store": [
+// CHECK-NEXT: "store": { "pointer": "{{0x[0-9a-f]+}}", "items": [
// CHECK-NEXT: { "cluster": "y", "pointer": "{{0x[0-9a-f]+}}", "items": [
// CHECK-NEXT: { "kind": "Direct", "offset": 0, "value": "2 S32b" }
// CHECK-NEXT: ]}
-// CHECK-NEXT: ],
-// CHECK-NEXT: "environment": [
+// CHECK-NEXT: ]},
+// CHECK-NEXT: "environment": { "pointer": "{{0x[0-9a-f]+}}", "items": [
// CHECK-NEXT: { "lctx_id": 1, "location_context": "#0 Call", "calling": "foo", "call_line": null, "items": [
// CHECK-NEXT: { "stmt_id": {{[0-9]+}}, "pretty": "clang_analyzer_printState", "value": "&code{clang_analyzer_printState}" }
// CHECK-NEXT: ]}
-// CHECK-NEXT: ],
+// CHECK-NEXT: ]},
// CHECK-NEXT: "constraints": [
// CHECK-NEXT: { "symbol": "reg_$0<int x>", "range": "{ [-2147483648, 13] }" }
// CHECK-NEXT: ],
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
