Author: dergachev Date: Tue Jul 2 18:26:41 2019 New Revision: 364992 URL: http://llvm.org/viewvc/llvm-project?rev=364992&view=rev Log: [analyzer] exploded-graph-rewriter: Implement bug nodes and sink nodes.
Add a label to nodes that have a bug report attached or on which the analysis was generally interrupted. Fix printing has_report and implement printing is_sink in the graph dumper. Differential Revision: https://reviews.llvm.org/D64110 Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp cfe/trunk/test/Analysis/dump_egraph.c cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages.dot cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages_diff.dot cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints.dot cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints_diff.dot cfe/trunk/test/Analysis/exploded-graph-rewriter/edge.dot 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/node_labels.dot cfe/trunk/test/Analysis/exploded-graph-rewriter/program_points.dot cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot cfe/trunk/utils/analyzer/exploded-graph-rewriter.py Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Tue Jul 2 18:26:41 2019 @@ -3006,7 +3006,8 @@ struct DOTGraphTraits<ExplodedGraph*> : for (const auto &EQ : EQClasses) { for (const BugReport &Report : EQ) { - if (Report.getErrorNode()->getState() == N->getState()) + if (Report.getErrorNode()->getState() == N->getState() && + Report.getErrorNode()->getLocation() == N->getLocation()) return true; } } @@ -3042,21 +3043,6 @@ struct DOTGraphTraits<ExplodedGraph*> : return false; } - static std::string getNodeAttributes(const ExplodedNode *N, - ExplodedGraph *) { - SmallVector<StringRef, 10> Out; - auto Noop = [](const ExplodedNode*){}; - if (traverseHiddenNodes(N, Noop, Noop, &nodeHasBugReport)) { - Out.push_back("style=filled"); - Out.push_back("fillcolor=red"); - } - - if (traverseHiddenNodes(N, Noop, Noop, - [](const ExplodedNode *C) { return C->isSink(); })) - Out.push_back("color=blue"); - return llvm::join(Out, ","); - } - static bool isNodeHidden(const ExplodedNode *N) { return N->isTrivial(); } @@ -3069,9 +3055,16 @@ struct DOTGraphTraits<ExplodedGraph*> : const unsigned int Space = 1; ProgramStateRef State = N->getState(); + auto Noop = [](const ExplodedNode*){}; + bool HasReport = traverseHiddenNodes( + N, Noop, Noop, &nodeHasBugReport); + bool IsSink = traverseHiddenNodes( + N, Noop, Noop, [](const ExplodedNode *N) { return N->isSink(); }); + Out << "{ \"node_id\": " << N->getID(G) << ", \"pointer\": \"" << (const void *)N << "\", \"state_id\": " << State->getID() - << ", \"has_report\": " << (nodeHasBugReport(N) ? "true" : "false") + << ", \"has_report\": " << (HasReport ? "true" : "false") + << ", \"is_sink\": " << (IsSink ? "true" : "false") << ",\\l"; Indent(Out, Space, IsDot) << "\"program_points\": [\\l"; Modified: cfe/trunk/test/Analysis/dump_egraph.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/dump_egraph.c?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/dump_egraph.c (original) +++ cfe/trunk/test/Analysis/dump_egraph.c Tue Jul 2 18:26:41 2019 @@ -22,9 +22,9 @@ int foo() { // CHECK: \"program_points\": [\l \{ \"kind\": \"BlockEntrance\", \"block_id\": 1 -// CHECK: \"has_report\": true // CHECK: \"pretty\": \"*x\", \"location\": \{ \"line\": 18, \"column\": 10, \"file\": \"{{(.+)}}dump_egraph.c\" \} // CHECK: \"pretty\": \"'\\\\x13'\" +// CHECK: \"has_report\": true Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages.dot Tue Jul 2 18:26:41 2019 @@ -11,6 +11,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages_diff.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages_diff.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages_diff.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/checker_messages_diff.dot Tue Jul 2 18:26:41 2019 @@ -7,6 +7,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { @@ -59,6 +61,8 @@ Node0x4 [shape=record,label= "{ { "node_id": 4, "pointer": "0x4", + "has_report": false, + "is_sink": false, "state_id": 5, "program_points": [], "program_state": { @@ -86,6 +90,8 @@ Node0x6 [shape=record,label= "{ { "node_id": 6, "pointer": "0x6", + "has_report": false, + "is_sink": false, "state_id": 7, "program_points": [], "program_state": null Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints.dot Tue Jul 2 18:26:41 2019 @@ -14,6 +14,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints_diff.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints_diff.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints_diff.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/constraints_diff.dot Tue Jul 2 18:26:41 2019 @@ -7,6 +7,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { @@ -39,6 +41,8 @@ Node0x3 [shape=record,label= "{ { "node_id": 3, "pointer": "0x3", + "has_report": false, + "is_sink": false, "state_id": 4, "program_points": [], "program_state": { @@ -60,6 +64,8 @@ Node0x5 [shape=record,label= "{ { "node_id": 5, "pointer": "0x5", + "has_report": false, + "is_sink": false, "state_id": 6, "program_points": [], "program_state": { Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/edge.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/edge.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/edge.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/edge.dot Tue Jul 2 18:26:41 2019 @@ -5,7 +5,7 @@ // UNSUPPORTED: system-windows Node0x1 [shape=record,label= - "{{ "node_id": 1, "pointer": "0x1", + "{{ "node_id": 1, "pointer": "0x1", "has_report": false, "is_sink": false, "program_state": null, "program_points": []}\l}"]; // LIGHT: Node0x1 -> Node0x2; @@ -13,5 +13,5 @@ Node0x1 [shape=record,label= Node0x1 -> Node0x2; Node0x2 [shape=record,label= - "{{ "node_id": 2, "pointer": "0x2", + "{{ "node_id": 2, "pointer": "0x2", "has_report": false, "is_sink": false, "program_state": null, "program_points": []}\l}"]; Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/environment.dot Tue Jul 2 18:26:41 2019 @@ -29,6 +29,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/environment_diff.dot Tue Jul 2 18:26:41 2019 @@ -8,6 +8,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { @@ -57,6 +59,8 @@ Node0x6 [shape=record,label= "{ { "node_id": 6, "pointer": "0x6", + "has_report": false, + "is_sink": false, "state_id": 7, "program_points": [], "program_state": { @@ -100,6 +104,8 @@ Node0x9 [shape=record,label= "{ { "node_id": 9, "pointer": "0x9", + "has_report": false, + "is_sink": false, "state_id": 7, "program_points": [], "program_state": { Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/node_labels.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/node_labels.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/node_labels.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/node_labels.dot Tue Jul 2 18:26:41 2019 @@ -15,7 +15,22 @@ // CHECK-SAME: </tr> Node0x1 [shape=record,label= "{ - { "node_id": 1, "pointer": "0x1", + { "node_id": 1, "pointer": "0x1", "has_report": false, "is_sink": false, + "program_state": null, + "program_points": [] + } +\l}"]; + +// CHECK: Node0x2 [ +// CHECK-SAME: <tr><td> +// CHECK-SAME: <font color="red"><b>Bug Report Attached</b></font> +// CHECK-SAME: </td></tr> +// CHECK-SAME: <tr><td> +// CHECK-SAME: <font color="cornflowerblue"><b>Sink Node</b></font> +// CHECK-SAME: </td></tr> +Node0x2 [shape=record,label= + "{ + { "node_id": 2, "pointer": "0x2", "has_report": true, "is_sink": true, "program_state": null, "program_points": [] } Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/program_points.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/program_points.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/program_points.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/program_points.dot Tue Jul 2 18:26:41 2019 @@ -28,7 +28,7 @@ // CHECK-SAME: </table> Node0x1 [shape=record,label= "{ - { "node_id": 1, "pointer": "0x1", + { "node_id": 1, "pointer": "0x1", "has_report": false, "is_sink": false, "program_state": null, "program_points": [ { "kind": "Edge", @@ -73,7 +73,7 @@ Node0x1 [shape=record,label= // CHECK-SAME: </table> Node0x2 [shape=record,label= "{ - { "node_id": 2, "pointer": "0x2", + { "node_id": 2, "pointer": "0x2", "has_report": false, "is_sink": false, "program_state": null, "program_points": [ { "kind": "Statement", @@ -97,7 +97,7 @@ Node0x2 [shape=record,label= // CHECK-SAME: <td>\{ ... \}</td> Node0x3 [shape=record,label= "{ - { "node_id": 3, "pointer": "0x3", + { "node_id": 3, "pointer": "0x3", "has_report": false, "is_sink": false, "program_state": null, "program_points": [ { "kind": "Statement", Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/store.dot Tue Jul 2 18:26:41 2019 @@ -24,6 +24,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { Modified: cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot (original) +++ cfe/trunk/test/Analysis/exploded-graph-rewriter/store_diff.dot Tue Jul 2 18:26:41 2019 @@ -7,6 +7,8 @@ Node0x1 [shape=record,label= "{ { "node_id": 1, "pointer": "0x1", + "has_report": false, + "is_sink": false, "state_id": 2, "program_points": [], "program_state": { @@ -55,6 +57,8 @@ Node0x4 [shape=record,label= "{ { "node_id": 4, "pointer": "0x4", + "has_report": false, + "is_sink": false, "state_id": 5, "program_points": [], "program_state": { @@ -89,6 +93,8 @@ Node0x6 [shape=record,label= "{ { "node_id": 6, "pointer": "0x6", + "has_report": false, + "is_sink": false, "state_id": 7, "program_points": [], "program_state": null Modified: cfe/trunk/utils/analyzer/exploded-graph-rewriter.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/analyzer/exploded-graph-rewriter.py?rev=364992&r1=364991&r2=364992&view=diff ============================================================================== --- cfe/trunk/utils/analyzer/exploded-graph-rewriter.py (original) +++ cfe/trunk/utils/analyzer/exploded-graph-rewriter.py Tue Jul 2 18:26:41 2019 @@ -299,6 +299,8 @@ class ExplodedNode(object): logging.debug('Adding ' + node_id) self.node_id = json_node['node_id'] self.ptr = json_node['pointer'] + self.has_report = json_node['has_report'] + self.is_sink = json_node['is_sink'] self.points = [ProgramPoint(p) for p in json_node['program_points']] self.state = ProgramState(json_node['state_id'], json_node['program_state']) \ @@ -754,6 +756,12 @@ class DotDumpVisitor(object): % ("gray20" if self._dark_mode else "gray", node.node_id, node.ptr, node.state.state_id if node.state is not None else 'Unspecified')) + if node.has_report: + self._dump('<tr><td><font color="red"><b>Bug Report Attached' + '</b></font></td></tr>') + if node.is_sink: + self._dump('<tr><td><font color="cornflowerblue"><b>Sink Node' + '</b></font></td></tr>') self._dump('<tr><td align="left" width="0">') if len(node.points) > 1: self._dump('<b>Program points:</b></td></tr>') _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
