1 files changed, 27 insertions, 5 deletions
diff --git a/clang/test/Analysis/exploded-graph-rewriter/program_points.dot b/clang/test/Analysis/exploded-graph-rewriter/program_points.dot
index 31dcc4adb62..2c03ac92d0f 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/program_points.dot
+++ b/clang/test/Analysis/exploded-graph-rewriter/program_points.dot
@@ -3,18 +3,28 @@
 // FIXME: Substitution doesn't seem to work on Windows.
 // UNSUPPORTED: system-windows
 
-// CHECK: <b>Program point:</b>
+// CHECK: <b>Program points:</b>
 // CHECK-SAME: <table border="0" align="left" width="0">
 // CHECK-SAME:   <tr>
 // CHECK-SAME:     <td width="0">
 // CHECK-SAME:     </td>
 // CHECK-SAME:     <td align="left" width="0">
-// CHECK-SAME:       <font color="gold3">Edge</font>
+// CHECK-SAME:       <font color="gold3">BlockEdge</font>
 // CHECK-SAME:     </td>
 // CHECK-SAME:     <td align="left">
 // CHECK-SAME:     [B0] -&gt; [B1]
 // CHECK-SAME:     </td>
 // CHECK-SAME:   </tr>
+// CHECK-SAME:   <tr>
+// CHECK-SAME:     <td width="0">
+// CHECK-SAME:     </td>
+// CHECK-SAME:     <td align="left" width="0">
+// CHECK-SAME:       <font color="gold3">BlockEntrance</font>
+// CHECK-SAME:     </td>
+// CHECK-SAME:     <td align="left">
+// CHECK-SAME:     [B1]
+// CHECK-SAME:     </td>
+// CHECK-SAME:   </tr>
 // CHECK-SAME: </table>
 Node0x1 [shape=record,label=
  "{
@@ -26,7 +36,15 @@ Node0x1 [shape=record,label=
         "dst_id": 1,
         "terminator": null,
         "term_kind": null,
-        "tag": null }
+        "tag": null
+      },
+      {
+        "kind": "BlockEntrance",
+        "block_id": 1,
+        "terminator": null,
+        "term_kind": null,
+        "tag": null
+      }
     ]}
 \l}"];
 
@@ -37,14 +55,17 @@ Node0x1 [shape=record,label=
 // CHECK-SAME:       (main file):<b>4</b>:<b>5</b>:
 // CHECK-SAME:     </td>
 // CHECK-SAME:     <td align="left" width="0">
-// CHECK-SAME:       <font color="cyan3">DeclRefExpr</font>
+// CHECK-SAME:       <font color="cyan4">DeclRefExpr</font>
+// CHECK-SAME:     </td>
+// CHECK-SAME:     <td align="left">
+// CHECK-SAME:       <font color="cyan3">PreStmt</font>
 // CHECK-SAME:     </td>
 // CHECK-SAME:     <td>x</td>
 // CHECK-SAME:   </tr>
 // CHECK-SAME:   <tr>
 // CHECK-SAME:     <td width="0">
 // CHECK-SAME:     </td>
-// CHECK-SAME:     <td colspan="2" align="left">
+// CHECK-SAME:     <td colspan="3" align="left">
 // CHECK-SAME:       <b>Tag: </b>
 // CHECK-SAME:       <font color="crimson">ExprEngine : Clean Node</font>
 // CHECK-SAME:     </td>
@@ -57,6 +78,7 @@ Node0x2 [shape=record,label=
       {
         "kind": "Statement",
         "stmt_kind": "DeclRefExpr",
+        "stmt_point_kind": "PreStmt",
         "stmd_id": 3,
         "pointer": "0x3",
         "pretty": "x",