--- a/gcc/testsuite/gcc.dg/pr69554-1.c	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/testsuite/gcc.dg/pr69554-1.c	Thu Oct 25 07:37:49 2018 +0900
@@ -12,6 +12,9 @@
 /* { dg-begin-multiline-output "" }
    return (p + 1) + (q + 1);
           ~~~~~~~ ^ ~~~~~~~
+             |         |
+             |         const char *
+             const char *
    { dg-end-multiline-output "" } */
 }
 
@@ -26,10 +29,14 @@
 /* { dg-begin-multiline-output "" }
    return (p + 1)
           ~~~~~~~
+             |
+             const char *
             +
             ^
              (q + 1);
              ~~~~~~~
+                |
+                const char *
    { dg-end-multiline-output "" } */
 }
 
@@ -43,16 +50,20 @@
 
            +  /* { dg-error "invalid operands" } */
              (q + 1);
-/* { dg-locus "12" "" { target *-*-* } "44" } */
+/* { dg-locus "12" "" { target *-*-* } "51" } */
 /* { dg-begin-multiline-output "" }
    return (p + 1)
           ~~~~~~~
+             |
+             const char *
    { dg-end-multiline-output "" } */
 /* { dg-begin-multiline-output "" }
             +
             ^
               (q + 1);
               ~~~~~~~
+                 |
+                 const char *
    { dg-end-multiline-output "" } */
 }
 
@@ -68,12 +79,16 @@
 /* { dg-begin-multiline-output "" }
    return (p + 1)
           ~~~~~~~
+             |
+             const char *
             +
             ^
    { dg-end-multiline-output "" } */
 /* { dg-begin-multiline-output "" }
               (q + 1);
               ~~~~~~~
+                 |
+                 const char *
    { dg-end-multiline-output "" } */
 }
 
@@ -88,10 +103,12 @@
            +  /* { dg-error "invalid operands" } */
 
              (q + 1); /* { dg-locus "14" } */
-/* { dg-locus "12" "" { target *-*-* } "88" } */
+/* { dg-locus "12" "" { target *-*-* } "103" } */
 /* { dg-begin-multiline-output "" }
    return (p + 1)
           ~~~~~~~
+             |
+             const char *
    { dg-end-multiline-output "" } */
 /* { dg-begin-multiline-output "" }
             +
@@ -100,6 +117,8 @@
 /* { dg-begin-multiline-output "" }
               (q + 1);
               ~~~~~~~
+                 |
+                 const char *
    { dg-end-multiline-output "" } */
 }
 
@@ -136,10 +155,12 @@
 	     fringilla sapien elit vitae nisl. Fusce mattis commodo risus
 	     nec convallis. */
              (q + 1); /* { dg-locus "14" } */
-/* { dg-locus "12" "" { target *-*-* } "125" } */
+/* { dg-locus "12" "" { target *-*-* } "144" } */
 /* { dg-begin-multiline-output "" }
    return (p + 1)
           ~~~~~~~
+             |
+             const char *
    { dg-end-multiline-output "" } */
 /* { dg-begin-multiline-output "" }
             +
@@ -148,5 +169,7 @@
 /* { dg-begin-multiline-output "" }
               (q + 1);
               ~~~~~~~
+                 |
+                 const char *
    { dg-end-multiline-output "" } */
 }