On 9/3/15 10:45 AM, Jonathan Roelofs wrote:
On 9/3/15 10:17 AM, Jakub Jelinek wrote:
On Thu, Sep 03, 2015 at 10:15:02AM -0600, Jonathan Roelofs wrote:
+kcc, mrs
Ping
On 8/27/15 4:44 PM, Jonathan Roelofs wrote:
The attached patch makes the ubsan tests agnostic to ansi escape codes
in their diagnostic output.
It wouldn't hurt if you explained in detail what is the problem you are
trying to solve and why something that works for most people doesn't
work in
your case.
Hi Jakub,
AFAICT, there are two ways to suppress the emission of color codes from
ubsan's diagnostics:
1) Set an environment variable.
2) Make the output stream not a tty.
#1 doesn't seem to be possible in DejaGnu without hacks.
#2 doesn't work in our environment because DejaGnu attempts to make
itself appear to the program under test as if it were a tty. This might
be an artifact of the fact that all of our testing is remote testing
(though that is just blind speculation on my part: I'm not familiar with
how others have their testing set up, nor whether they do remote testing
of the sanitizer runtimes).
Moral of the story is: these tests fail in our environment, but only
because the regexes do not expect the presence of the ansi color codes,
and we can't trick the runtime into not emitting them.
Cheers,
Jon
Tested on an x86_64-linux-gnu target.
2015-08-27 Jonathan Roelofs <jonat...@codesourcery.com>
* c-c++-common/ubsan/align-2.c: Don't be picky about ansi
escape
codes in diagnostics.
* c-c++-common/ubsan/align-4.c: Ditto.
* c-c++-common/ubsan/align-6.c: Ditto.
* c-c++-common/ubsan/align-7.c: Ditto.
* c-c++-common/ubsan/align-9.c: Ditto.
* c-c++-common/ubsan/float-cast-overflow-2.c: Ditto.
* c-c++-common/ubsan/float-cast-overflow-8.c: Ditto.
* c-c++-common/ubsan/object-size-1.c: Ditto.
* c-c++-common/ubsan/object-size-10.c: Ditto.
* c-c++-common/ubsan/object-size-4.c: Ditto.
* c-c++-common/ubsan/object-size-5.c: Ditto.
* c-c++-common/ubsan/object-size-7.c: Ditto.
* c-c++-common/ubsan/object-size-8.c: Ditto.
* c-c++-common/ubsan/object-size-9.c: Ditto.
* c-c++-common/ubsan/overflow-int128.c: Ditto.
* c-c++-common/ubsan/pr63802.c: Ditto.
Oops, forgot the one in `gcc.dg/ubsan/object-size-9.c`.
2015-08-27 Jonathan Roelofs <jonat...@codesourcery.com>
* c-c++-common/ubsan/align-2.c: Don't be picky about ansi escape
codes in diagnostics.
* c-c++-common/ubsan/align-4.c: Ditto.
* c-c++-common/ubsan/align-6.c: Ditto.
* c-c++-common/ubsan/align-7.c: Ditto.
* c-c++-common/ubsan/align-9.c: Ditto.
* c-c++-common/ubsan/float-cast-overflow-2.c: Ditto.
* c-c++-common/ubsan/float-cast-overflow-8.c: Ditto.
* c-c++-common/ubsan/object-size-1.c: Ditto.
* c-c++-common/ubsan/object-size-10.c: Ditto.
* c-c++-common/ubsan/object-size-4.c: Ditto.
* c-c++-common/ubsan/object-size-5.c: Ditto.
* c-c++-common/ubsan/object-size-7.c: Ditto.
* c-c++-common/ubsan/object-size-8.c: Ditto.
* c-c++-common/ubsan/object-size-9.c: Ditto.
* c-c++-common/ubsan/overflow-int128.c: Ditto.
* c-c++-common/ubsan/pr63802.c: Ditto.
* gcc.dg/ubsan/object-size-9.c: Ditto.
Jon
I do not have write access, so I'll need someone to commit this for me
if it is approved.
Jakub
--
Jon Roelofs
jonat...@codesourcery.com
CodeSourcery / Mentor Embedded
Index: gcc/testsuite/gcc.dg/ubsan/object-size-9.c
===================================================================
--- gcc/testsuite/gcc.dg/ubsan/object-size-9.c (revision 454039)
+++ gcc/testsuite/gcc.dg/ubsan/object-size-9.c (working copy)
@@ -19,6 +19,6 @@
}
/* { dg-output "load of address \[^\n\r]* with insufficient space for an
object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (revision 454039)
+++ gcc/testsuite/ChangeLog (working copy)
@@ -1,3 +1,24 @@
+2015-08-27 Jonathan Roelofs <jonat...@codesourcery.com>
+
+ * c-c++-common/ubsan/align-2.c: Don't be picky about ansi escape
+ codes in diagnostics.
+ * c-c++-common/ubsan/align-4.c: Ditto.
+ * c-c++-common/ubsan/align-6.c: Ditto.
+ * c-c++-common/ubsan/align-7.c: Ditto.
+ * c-c++-common/ubsan/align-9.c: Ditto.
+ * c-c++-common/ubsan/float-cast-overflow-2.c: Ditto.
+ * c-c++-common/ubsan/float-cast-overflow-8.c: Ditto.
+ * c-c++-common/ubsan/object-size-1.c: Ditto.
+ * c-c++-common/ubsan/object-size-10.c: Ditto.
+ * c-c++-common/ubsan/object-size-4.c: Ditto.
+ * c-c++-common/ubsan/object-size-5.c: Ditto.
+ * c-c++-common/ubsan/object-size-7.c: Ditto.
+ * c-c++-common/ubsan/object-size-8.c: Ditto.
+ * c-c++-common/ubsan/object-size-9.c: Ditto.
+ * c-c++-common/ubsan/overflow-int128.c: Ditto.
+ * c-c++-common/ubsan/pr63802.c: Ditto.
+ * gcc.dg/ubsan/object-size-9.c: Ditto.
+
2015-07-16 Release Manager
* GCC 5.2.0 released.
Index: gcc/testsuite/c-c++-common/ubsan/pr63802.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/pr63802.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/pr63802.c (working copy)
@@ -20,4 +20,4 @@
return 0;
}
-/* { dg-output "\.c:18:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct test_struct', which requires 64 byte
alignment.*" } */
+/* { dg-output "\.c:18:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct test_struct', which requires 64 byte
alignment.*" } */
Index: gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-2.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-2.c (revision
454039)
+++ gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-2.c (working copy)
@@ -30,44 +30,44 @@
return 0;
}
-/* { dg-output "runtime error: value 1.70141e\\\+38 is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value nan is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value -?nan is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value inf is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value -inf is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value 3.40282e\\\+38 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
-/* { dg-output "\[^\n\r]*runtime error: value -5 is outside the range of
representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value -1.5 is outside the range of
representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value -1 is outside the range of
representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value nan is outside the range of
representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value -?nan is outside the range of
representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value inf is outside the range of
representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*runtime error: value -inf is outside the range of
representable values of type '__int128 unsigned'" } */
+/* { dg-output "runtime error: \[^\n\r]*value 1.70141e\\\+38 is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 1.70141e\\\+38 is
outside the range of representable values of type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value nan is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value -?nan is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value inf is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value -inf is outside the
range of representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value 3.40282e\\\+38 is
outside the range of representable values of type '__int128
unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value -5 is outside the range
of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value -1.5 is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value -1 is outside the range
of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value nan is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value -?nan is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value inf is outside the
range of representable values of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)"
} */
+/* { dg-output "\[^\n\r]*runtime error: \[^\n\r]*value -inf is outside the
range of representable values of type '__int128 unsigned'" } */
Index: gcc/testsuite/c-c++-common/ubsan/align-7.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/align-7.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/align-7.c (working copy)
@@ -28,6 +28,6 @@
return 0;
}
-/* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:16:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
/* { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} } */
/* { dg-final { cleanup-tree-dump "sanopt" } } */
Index: gcc/testsuite/c-c++-common/ubsan/object-size-7.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/object-size-7.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/object-size-7.c (working copy)
@@ -24,6 +24,6 @@
}
/* { dg-output "load of address \[^\n\r]* with insufficient space for an
object of type\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/align-4.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/align-4.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/align-4.c (working copy)
@@ -4,11 +4,11 @@
#include "align-2.c"
-/* { dg-output "\.c:(14|15):\[0-9]*: \[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
-/* { dg-output "\[^\n\r]*\.c:16:\[0-9]*: \[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\[^\n\r]*\.c:(13|16):\[0-9]*: \[^\n\r]*store to misaligned
address 0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
-/* { dg-output "\[^\n\r]*\.c:23:\[0-9]*: \[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
-/* { dg-output "\[^\n\r]*\.c:(29|30):\[0-9]*: \[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
-/* { dg-output "\[^\n\r]*\.c:30:\[0-9]*: \[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
-/* { dg-output "\[^\n\r]*\.c:31:\[0-9]*: \[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
-/* { dg-output "\[^\n\r]*\.c:37:\[0-9]*: \[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte alignment"
} */
+/* { dg-output "\.c:(14|15):\[0-9]*:\[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
+/* { dg-output "\[^\n\r]*\.c:16:\[0-9]*:\[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\[^\n\r]*\.c:(13|16):\[0-9]*:\[^\n\r]*store to misaligned
address 0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
+/* { dg-output "\[^\n\r]*\.c:23:\[0-9]*:\[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
+/* { dg-output "\[^\n\r]*\.c:(29|30):\[0-9]*:\[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
+/* { dg-output "\[^\n\r]*\.c:30:\[0-9]*:\[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
+/* { dg-output "\[^\n\r]*\.c:31:\[0-9]*:\[^\n\r]*member access within
misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48]
byte alignment.*" } */
+/* { dg-output "\[^\n\r]*\.c:37:\[0-9]*:\[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte alignment"
} */
Index: gcc/testsuite/c-c++-common/ubsan/overflow-int128.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/overflow-int128.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/overflow-int128.c (working copy)
@@ -35,13 +35,13 @@
return 0;
}
-/* { dg-output "signed integer overflow: 0x7fffffffffffffffffffffffffffffff
\\+ 1 cannot be represented in type '__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: 1 \\+
0x7fffffffffffffffffffffffffffffff cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow:
0x7fffffffffffffffffffffffffffffff \\+ 1 cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow:
0x7fffffffffffffffffffffffffffff9b \\+ 1024 cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow: -1 \\+
0x80000000000000000000000000000000 cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow:
0x80000000000000000000000000000000 \\+ -1 cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow:
0x80000000000000000000000000000000 - 1 cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow:
0x80000000000000000000000000000064 \\+ -1024 cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*signed integer overflow:
0x7fffffffffffffffffffffffffffffff \\* 2 cannot be represented in type
'__int128'(\n|\r\n|\r)" } */
+/* { dg-output "signed integer overflow: 0x7fffffffffffffffffffffffffffffff
\\+ 1 cannot be represented in type '__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: 1 \\+
0x7fffffffffffffffffffffffffffffff cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow:
0x7fffffffffffffffffffffffffffffff \\+ 1 cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow:
0x7fffffffffffffffffffffffffffff9b \\+ 1024 cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow: -1 \\+
0x80000000000000000000000000000000 cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow:
0x80000000000000000000000000000000 \\+ -1 cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow:
0x80000000000000000000000000000000 - 1 cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow:
0x80000000000000000000000000000064 \\+ -1024 cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*signed integer overflow:
0x7fffffffffffffffffffffffffffffff \\* 2 cannot be represented in type
'__int128'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*negation of 0x80000000000000000000000000000000 cannot
be represented in type '__int128'; cast to an unsigned type to negate this
value to itself\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-8.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-8.c (revision
454039)
+++ gcc/testsuite/c-c++-common/ubsan/float-cast-overflow-8.c (working copy)
@@ -100,7 +100,7 @@
/* float */
/* { dg-output "value -129 is outside the range of representable values of
type 'signed char'\[^\n\r]*(\n|\r\n|\r)" { target { ilp32 || lp64 } } } */
-/* { dg-output "value \[0-9.e+-]* is outside the range of representable values
of type 'signed char'\[^\n\r]*(\n|\r\n|\r)" { target { ! { ilp32 || lp64 } } }
} */
+/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type 'signed char'\[^\n\r]*(\n|\r\n|\r)" { target { ! {
ilp32 || lp64 } } } } */
/* { dg-output "\[^\n\r]*value 128 is outside the range of representable
values of type 'signed char'\[^\n\r]*(\n|\r\n|\r)" { target { ilp32 || lp64 } }
} */
/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type 'signed char'\[^\n\r]*(\n|\r\n|\r)" { target { ! {
ilp32 || lp64 } } } } */
/* { dg-output "\[^\n\r]*value (-129|-1) is outside the range of representable
values of type 'char'\[^\n\r]*(\n|\r\n|\r)" { target { ilp32 || lp64 } } } */
@@ -198,8 +198,8 @@
/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type 'long long int'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type 'long long int'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*value -1 is outside the range of representable values
of type 'long long unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type 'long long unsigned int'" } */
-/* { dg-output "(\n|\r\n|\r)\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" { target { int128
} } } */
+/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type 'long long unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" { target { int128
} } } */
+/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type '__int128'\[^\n\r]*(\n|\r\n|\r)" { target { int128
} } } */
/* { dg-output "\[^\n\r]*value -1 is outside the range of representable values
of type '__int128 unsigned'\[^\n\r]*(\n|\r\n|\r)" { target { int128 } } } */
/* { dg-output "\[^\n\r]*value \[0-9.e+-]* is outside the range of
representable values of type '__int128 unsigned'" { target { int128 } } } */
Index: gcc/testsuite/c-c++-common/ubsan/object-size-4.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/object-size-4.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/object-size-4.c (working copy)
@@ -22,10 +22,10 @@
}
/* { dg-output "load of address \[^\n\r]* with insufficient space for an
object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/object-size-8.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/object-size-8.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/object-size-8.c (working copy)
@@ -27,6 +27,6 @@
}
/* { dg-output "load of address \[^\n\r]* with insufficient space for an
object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/align-9.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/align-9.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/align-9.c (working copy)
@@ -17,5 +17,5 @@
return 0;
}
-/* { dg-output "\.c:8:\[0-9]*: \[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'const long int', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:8:\[0-9]*: \[^\n\r]*store to misaligned address
0x\[0-9a-fA-F]* for type 'long int', which requires \[48] byte alignment" } */
+/* { dg-output "\.c:8:\[0-9]*:\[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'const long int', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:8:\[0-9]*:\[^\n\r]*store to misaligned address
0x\[0-9a-fA-F]* for type 'long int', which requires \[48] byte alignment" } */
Index: gcc/testsuite/c-c++-common/ubsan/object-size-10.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/object-size-10.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/object-size-10.c (working copy)
@@ -21,7 +21,7 @@
/* { dg-output "index 128 out of bounds for type 'char
\\\[128\\\]'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
@@ -41,7 +41,7 @@
/* { dg-output "\[^\n\r]*index 128 out of bounds for type 'int
\\\[128\\\]'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
@@ -54,7 +54,7 @@
/* { dg-output "\[^\n\r]*index 128 out of bounds for type 'int
\\\[128\\\]'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/object-size-1.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/object-size-1.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/object-size-1.c (working copy)
@@ -22,19 +22,19 @@
}
/* { dg-output "load of address \[^\n\r]* with insufficient space for an
object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
@@ -54,19 +54,19 @@
}
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
@@ -82,11 +82,11 @@
}
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
@@ -100,7 +100,7 @@
}
/* { dg-output "\[^\n\r]*store to address \[^\n\r]* with insufficient space
for an object of type 'int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/object-size-5.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/object-size-5.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/object-size-5.c (working copy)
@@ -21,11 +21,11 @@
}
/* { dg-output "load of address \[^\n\r]* with insufficient space for an
object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/object-size-9.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/object-size-9.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/object-size-9.c (working copy)
@@ -22,7 +22,7 @@
}
/* { dg-output "load of address \[^\n\r]* with insufficient space for an
object of type 'char'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
@@ -37,7 +37,7 @@
/* { dg-output "\[^\n\r]*index 12 out of bounds for type 'char
\\\[8\\\]'\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
/* { dg-output "\[^\n\r]*store to address \[^\n\r]* with insufficient space
for an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" {
target { c++ } } } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
@@ -52,7 +52,7 @@
}
/* { dg-output "\[^\n\r]*store to address \[^\n\r]* with insufficient space
for an object of type 'char'\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" {
target { c++ } } } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" { target { c++ } } } */
@@ -66,7 +66,7 @@
/* { dg-output "\[^\n\r]*index 12 out of bounds for type 'U
\\\[10\\\]'\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
@@ -79,7 +79,7 @@
}
/* { dg-output "\[^\n\r]*load of address \[^\n\r]* with insufficient space for
an object of type 'unsigned int'\[^\n\r]*(\n|\r\n|\r)" } */
-/* { dg-output "\[^\n\r]*note: pointer points here\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "\[^\n\r]*note: \[^\n\r\]*pointer points
here\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "\[^\n\r]*\\^\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/ubsan/align-2.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/align-2.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/align-2.c (working copy)
@@ -46,11 +46,11 @@
return 0;
}
-/* { dg-output "\.c:(14|15):\[0-9]*: \[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
-/* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:(13|16):\[0-9]*: \[^\n\r]*store to misaligned address
0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
-/* { dg-output "\.c:23:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:(29|30):\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:30:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:31:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:37:\[0-9]*: \[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte alignment"
} */
+/* { dg-output "\.c:(14|15):\[0-9]*:\[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
+/* { dg-output "\.c:16:\[0-9]*:\[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:(13|16):\[0-9]*:\[^\n\r]*store to misaligned address
0x\[0-9a-fA-F]* for type 'int', which requires 4 byte alignment.*" } */
+/* { dg-output "\.c:23:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:(29|30):\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:30:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:31:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:37:\[0-9]*:\[^\n\r]*load of misaligned address
0x\[0-9a-fA-F]* for type 'long long int', which requires \[48] byte alignment"
} */
Index: gcc/testsuite/c-c++-common/ubsan/align-6.c
===================================================================
--- gcc/testsuite/c-c++-common/ubsan/align-6.c (revision 454039)
+++ gcc/testsuite/c-c++-common/ubsan/align-6.c (working copy)
@@ -26,8 +26,8 @@
return 0;
}
-/* { dg-output "\.c:14:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:15:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:17:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
-/* { dg-output "\.c:18:\[0-9]*: \[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:14:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:15:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:16:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:17:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
+/* { dg-output "\.c:18:\[0-9]*:\[^\n\r]*member access within misaligned
address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte
alignment.*" } */
