diff options
| author | Marek Polacek <polacek@redhat.com> | 2013-04-03 16:01:38 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2013-04-03 16:01:38 +0000 |
| commit | 71c581e77d0da68c1364fa14ae06402bd8f44cc8 (patch) | |
| tree | 3d71aea3b7c65c6b4d6670c73032719a212301c3 /gcc | |
| parent | 4a32ef809ace73d7fb581e97e154b325f36ab0b9 (diff) | |
| download | gcc-71c581e77d0da68c1364fa14ae06402bd8f44cc8.zip gcc-71c581e77d0da68c1364fa14ae06402bd8f44cc8.tar.gz gcc-71c581e77d0da68c1364fa14ae06402bd8f44cc8.tar.bz2 | |
re PR sanitizer/55702 (ICE: in instrument_func_exit, at tsan.c:684 with -fsanitize=thread and __builtin_return())
PR sanitizer/55702
* tsan.c (instrument_func_exit): Allow BUILT_IN_RETURN
functions.
* gcc.dg/pr55702.c: New test.
From-SVN: r197430
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr55702.c | 9 | ||||
| -rw-r--r-- | gcc/tsan.c | 3 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9ce142c..7d86b28 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-04-03 Marek Polacek <polacek@redhat.com> + + PR sanitizer/55702 + * tsan.c (instrument_func_exit): Allow BUILT_IN_RETURN + functions. + 2013-04-03 Kyrylo Tkachov <kyrylo.tkachov@arm.com> PR target/56809 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5e64fa6..b5530fe 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-04-03 Marek Polacek <polacek@redhat.com> + + PR sanitizer/55702 + * gcc.dg/pr55702.c: New test. + 2013-04-03 Kyrylo Tkachov <kyrylo.tkachov@arm.com> PR target/56809 diff --git a/gcc/testsuite/gcc.dg/pr55702.c b/gcc/testsuite/gcc.dg/pr55702.c new file mode 100644 index 0000000..8770a37 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr55702.c @@ -0,0 +1,9 @@ +/* PR sanitizer/55702 */ +/* { dg-do compile { target { x86_64-*-linux* && lp64 } } } */ +/* { dg-options "-fsanitize=thread" } */ + +void +foo () +{ + __builtin_return (0); +} @@ -681,7 +681,8 @@ instrument_func_exit (void) { gsi = gsi_last_bb (e->src); stmt = gsi_stmt (gsi); - gcc_assert (gimple_code (stmt) == GIMPLE_RETURN); + gcc_assert (gimple_code (stmt) == GIMPLE_RETURN + || gimple_call_builtin_p (stmt, BUILT_IN_RETURN)); loc = gimple_location (stmt); builtin_decl = builtin_decl_implicit (BUILT_IN_TSAN_FUNC_EXIT); g = gimple_build_call (builtin_decl, 0); |