--- a/gcc/testsuite/g++.dg/ext/strncpy-chk1.C	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/testsuite/g++.dg/ext/strncpy-chk1.C	Thu Oct 25 07:37:49 2018 +0900
@@ -1,4 +1,4 @@
-// PR c++/40502
+// PR c++/40502 - [4.5 Regression] crash in cp_diagnostic_starter
 // { dg-do compile }
 // { dg-options "-O2" }
 // { dg-skip-if "packed attribute missing for struct A" { "epiphany-*-*" } }
@@ -9,7 +9,8 @@
 inline void
 foo (char *dest, const char *__restrict src, __SIZE_TYPE__ n)
 {
-  __builtin___strncpy_chk (dest, src, n, __builtin_object_size (dest, 0));	// { dg-warning "specified bound 36 exceeds destination size 35" }
+  // This triggers a -Wstringop-overflow warning (pruned below).
+  __builtin___strncpy_chk (dest, src, n, __builtin_object_size (dest, 0));
 }
 
 void bar (const char *, int);
@@ -30,3 +31,5 @@
 {
   baz (0);
 }
+
+// { dg-prune-output "\\\[-Wstringop-overflow=]" }