[analyzer] exploded-graph-rewriter: Add support for range constraints.

Diff support included.

A cheap solution is implemented that treats range constraints as
"some sort of key-value map", so it's going to be trivial
to add support for other such maps later, such as dynamic type info.

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@364268 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Analysis/exploded-graph-rewriter/constraints.dot b/test/Analysis/exploded-graph-rewriter/constraints.dot
new file mode 100644 (file)
index 0000000..f9ffde7
--- /dev/null
+++ b/test/Analysis/exploded-graph-rewriter/constraints.dot
@@ -0,0 +1,27 @@
+// RUN: %exploded_graph_rewriter %s | FileCheck %s
+
+// FIXME: Substitution doesn't seem to work on Windows.
+// UNSUPPORTED: system-windows
+
+// CHECK: <tr><td align="left"><b>Ranges: </b></td></tr>
+// CHECK-SAME: <tr><td align="left"><table border="0">
+// CHECK-SAME:   <tr>
+// CHECK-SAME:     <td align="left">reg_$0<x></td>
+// CHECK-SAME:     <td align="left">\{ [0, 0] \}</td>
+// CHECK-SAME:   </tr>
+// CHECK-SAME: </table></td></tr>
+Node0x1 [shape=record,label=
+ "{
+    { "node_id": 1,
+      "pointer": "0x1",
+      "state_id": 2,
+      "program_points": [],
+      "program_state": {
+        "store": null,
+        "environment": null,
+        "constraints": [
+          { "symbol": "reg_$0<x>", "range": "{ [0, 0] }" }
+        ]
+      }
+    }
+\l}"];

diff --git a/test/Analysis/exploded-graph-rewriter/constraints_diff.dot b/test/Analysis/exploded-graph-rewriter/constraints_diff.dot
new file mode 100644 (file)
index 0000000..a65a3a2
--- /dev/null
+++ b/test/Analysis/exploded-graph-rewriter/constraints_diff.dot
@@ -0,0 +1,65 @@
+// RUN: %exploded_graph_rewriter -d %s | FileCheck %s
+
+// FIXME: Substitution doesn't seem to work on Windows.
+// UNSUPPORTED: system-windows
+
+Node0x1 [shape=record,label=
+ "{
+    { "node_id": 1,
+      "pointer": "0x1",
+      "state_id": 2,
+      "program_points": [],
+      "program_state": {
+        "store": null,
+        "environment": null,
+        "constraints": [
+          { "symbol": "reg_$0<x>", "range": "{ [0, 10] }" }
+        ]
+      }
+    }
+\l}"];
+
+Node0x1 -> Node0x3;
+
+// CHECK: Node0x3 [
+// CHECK-SAME: <tr>
+// CHECK-SAME:   <td><font color="red">-</font></td>
+// CHECK-SAME:   <td align="left">reg_$0<x></td>
+// CHECK-SAME:   <td align="left">\{ [0, 10] \}</td>
+// CHECK-SAME: </tr>
+// CHECK-SAME: <tr>
+// CHECK-SAME:   <td><font color="forestgreen">+</font></td>
+// CHECK-SAME:   <td align="left">reg_$0<x></td>
+// CHECK-SAME:   <td align="left">\{ [0, 5] \}</td>
+// CHECK-SAME: </tr>
+Node0x3 [shape=record,label=
+ "{
+    { "node_id": 3,
+      "pointer": "0x3",
+      "state_id": 4,
+      "program_points": [],
+      "program_state": {
+        "store": null,
+        "environment": null,
+        "constraints": [
+          { "symbol": "reg_$0<x>", "range": "{ [0, 5] }" }
+        ]
+      }
+    }
+\l}"];
+
+Node0x3 -> Node0x5;
+
+Node0x5 [shape=record,label=
+ "{
+    { "node_id": 5,
+      "pointer": "0x5",
+      "state_id": 6,
+      "program_points": [],
+      "program_state": {
+        "store": null,
+        "environment": null,
+        "constraints": null
+      }
+    }
+\l}"];

diff --git a/test/Analysis/exploded-graph-rewriter/environment.dot b/test/Analysis/exploded-graph-rewriter/environment.dot
index 7271684642a28508c00e0c578a2df18efa4ae7ce..e18cc7fc192d481bf18dd5016c117ca77d7226c7 100644 (file)
--- a/test/Analysis/exploded-graph-rewriter/environment.dot
+++ b/test/Analysis/exploded-graph-rewriter/environment.dot
@@ -33,6 +33,7 @@ Node0x1 [shape=record,label=
       "program_points": [],
       "program_state": {
         "store": null,
+        "constraints": null,
         "environment": [
           {
             "location_context": "#0 Call",

diff --git a/test/Analysis/exploded-graph-rewriter/environment_diff.dot b/test/Analysis/exploded-graph-rewriter/environment_diff.dot
index 83cf0eb94716f3f44672b92a4dfadde31932b4ce..33fe07d8789ffdfe93f797478becd230df104331 100644 (file)
--- a/test/Analysis/exploded-graph-rewriter/environment_diff.dot
+++ b/test/Analysis/exploded-graph-rewriter/environment_diff.dot
@@ -12,6 +12,7 @@ Node0x1 [shape=record,label=
       "program_points": [],
       "program_state": {
         "store": null,
+        "constraints": null,
         "environment": [
           {
             "location_context": "#0 Call",
@@ -54,6 +55,7 @@ Node0x6 [shape=record,label=
       "program_points": [],
       "program_state": {
         "store": null,
+        "constraints": null,
         "environment": [
           {
             "location_context": "#0 Call",
@@ -90,6 +92,7 @@ Node0x9 [shape=record,label=
       "program_points": [],
       "program_state": {
         "store": null,
+        "constraints": null,
         "environment": [
           {
             "location_context": "#0 Call",

diff --git a/test/Analysis/exploded-graph-rewriter/store.dot b/test/Analysis/exploded-graph-rewriter/store.dot
index 3f1a937b737d22edeeeb0ca6bbe86b6261690d4d..22f4eba623cd20cf9213301c9a23d01ac5552111 100644 (file)
--- a/test/Analysis/exploded-graph-rewriter/store.dot
+++ b/test/Analysis/exploded-graph-rewriter/store.dot
@@ -28,6 +28,7 @@ Node0x1 [shape=record,label=
       "program_points": [],
       "program_state": {
         "environment": null,
+        "constraints": null,
         "store": [
           {
             "cluster": "x",

diff --git a/test/Analysis/exploded-graph-rewriter/store_diff.dot b/test/Analysis/exploded-graph-rewriter/store_diff.dot
index 47ea9af014b3d9f6caf045824ef4cd48936a4b1d..d0a4e19817af9d0867a6e4a184fa7342f98a564b 100644 (file)
--- a/test/Analysis/exploded-graph-rewriter/store_diff.dot
+++ b/test/Analysis/exploded-graph-rewriter/store_diff.dot
@@ -11,6 +11,7 @@ Node0x1 [shape=record,label=
       "program_points": [],
       "program_state": {
         "environment": null,
+        "constraints": null,
         "store": [
           {
             "cluster": "x",
@@ -52,6 +53,7 @@ Node0x4 [shape=record,label=
       "program_points": [],
       "program_state": {
         "environment": null,
+        "constraints": null,
         "store": [
           {
             "cluster": "x",

diff --git a/utils/analyzer/exploded-graph-rewriter.py b/utils/analyzer/exploded-graph-rewriter.py
index 1eb2f896bee24d3c5e096647dc2dff865143bd9f..4aae72c0da6edf7f9f980e20177e12afdc9d4755 100755 (executable)
--- a/utils/analyzer/exploded-graph-rewriter.py
+++ b/utils/analyzer/exploded-graph-rewriter.py
@@ -25,6 +25,19 @@ def diff_dicts(curr, prev):
     return (removed, added)
 
 
+# Represents any program state trait that is a dictionary of key-value pairs.
+class GenericMap(object):
+    def __init__(self, generic_map):
+        self.generic_map = generic_map
+
+    def diff(self, prev):
+        return diff_dicts(self.generic_map, prev.generic_map)
+
+    def is_different(self, prev):
+        removed, added = self.diff(prev)
+        return len(removed) != 0 or len(added) != 0
+
+
 # A deserialized source location.
 class SourceLocation(object):
     def __init__(self, json_loc):
@@ -203,8 +216,10 @@ class ProgramState(object):
             if json_ps['store'] is not None else None
         self.environment = Environment(json_ps['environment']) \
             if json_ps['environment'] is not None else None
+        self.constraints = GenericMap(collections.OrderedDict([
+            (c['symbol'], c['range']) for c in json_ps['constraints']
+        ])) if json_ps['constraints'] is not None else None
         # TODO: Objects under construction.
-        # TODO: Constraint ranges.
         # TODO: Dynamic types of objects.
         # TODO: Checker messages.
 
@@ -479,11 +494,57 @@ class DotDumpVisitor(object):
             else:
                 self._dump('</td></tr><tr><td align="left">')
                 self.visit_store(s.store)
-        self._dump('</td></tr><hr />')
+        self._dump('</td></tr>')
+
+    def visit_generic_map(self, m, prev_m=None):
+        self._dump('<table border="0">')
+
+        def dump_pair(m, k, is_added=None):
+            self._dump('<tr><td>%s</td>'
+                       '<td align="left">%s</td>'
+                       '<td align="left">%s</td></tr>'
+                       % (self._diff_plus_minus(is_added),
+                          k, m.generic_map[k]))
+
+        if prev_m is not None:
+            removed, added = m.diff(prev_m)
+            for k in removed:
+                dump_pair(prev_m, k, False)
+            for k in added:
+                dump_pair(m, k, True)
+        else:
+            for k in m.generic_map:
+                dump_pair(m, k, None)
+
+        self._dump('</table>')
+
+    def visit_generic_map_in_state(self, selector, s, prev_s=None):
+        self._dump('<tr><td align="left">'
+                   '<b>Ranges: </b>')
+        m = getattr(s, selector)
+        if m is None:
+            self._dump('<i> Nothing!</i>')
+        else:
+            prev_m = None
+            if prev_s is not None:
+                prev_m = getattr(prev_s, selector)
+                if prev_m is not None:
+                    if m.is_different(prev_m):
+                        self._dump('</td></tr><tr><td align="left">')
+                        self.visit_generic_map(m, prev_m)
+                    else:
+                        self._dump('<i> No changes!</i>')
+            if prev_m is None:
+                self._dump('</td></tr><tr><td align="left">')
+                self.visit_generic_map(m)
+        self._dump('</td></tr>')
 
     def visit_state(self, s, prev_s):
         self.visit_store_in_state(s, prev_s)
+        self._dump('<hr />')
         self.visit_environment_in_state(s, prev_s)
+        self._dump('<hr />')
+        self.visit_generic_map_in_state('constraints', s, prev_s)
 
     def visit_node(self, node):
         self._dump('%s [shape=record,label=<<table border="0">'