Index: tests/raii/.expect/dtor-early-exit-ERR1.txt
===================================================================
--- tests/raii/.expect/dtor-early-exit-ERR1.txt	(revision 6c7fe7bc083d126dd92f7876d08dc172094a04ff)
+++ tests/raii/.expect/dtor-early-exit-ERR1.txt	(revision 9fba8e65fbf69e0f9a9b68e4f545f5f92c1e878e)
@@ -1,4 +1,1 @@
-raii/dtor-early-exit.cfa:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
-  with target: L1
-  with original target: L1
-
+raii/dtor-early-exit.cfa:150:1 error: jump to label "L1" crosses initialization of "y".
Index: tests/raii/.expect/dtor-early-exit-ERR2.txt
===================================================================
--- tests/raii/.expect/dtor-early-exit-ERR2.txt	(revision 6c7fe7bc083d126dd92f7876d08dc172094a04ff)
+++ tests/raii/.expect/dtor-early-exit-ERR2.txt	(revision 9fba8e65fbf69e0f9a9b68e4f545f5f92c1e878e)
@@ -1,4 +1,1 @@
-raii/dtor-early-exit.cfa:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
-  with target: L2
-  with original target: L2
-
+raii/dtor-early-exit.cfa:214:1 error: jump to label "L2" crosses initialization of "y".