diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cselim-5.c b/gcc/testsuite/gcc.dg/tree-ssa/cselim-5.c
new file mode 100644
index 00000000000..8d1335f174a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cselim-5.c
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fdump-tree-phiopt1" } */
+
+int t;
+void f(int a, int b, int c, int d)
+{
+  if (b)
+   t = 0;
+  else
+   t = 0;
+}
+
+/* We should sink/merge the stores and end up with a single BB.  */
+
+/* { dg-final { scan-tree-dump-times "t = 0;" 1 "phiopt1" } } */
+/* { dg-final { scan-tree-dump-times "<bb " 1 "phiopt1" } } */
diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc
index 0bf7e58b8f0..324559e6a7d 100644
--- a/gcc/tree-ssa-phiopt.cc
+++ b/gcc/tree-ssa-phiopt.cc
@@ -4048,10 +4048,11 @@ pass_phiopt::execute (function *)
 	    hoist_adjacent_loads (bb, bb1, bb2, bb3);
 
 	  /* Try to see if there are only store in each side of the if
-	     and try to remove that; don't do this for -Og.  */
+	     and try to remove that; don't do this for -Og.
+	     With sinking the stores we might end up with empty blocks.  */
 	  if (EDGE_COUNT (bb3->preds) == 2 && !optimize_debug)
 	    while (cond_if_else_store_replacement_limited (bb1, bb2, bb3))
-	      ;
+	      cfgchanged = true;
 	}
 
       gimple_stmt_iterator gsi;